Refractor controller blueprint modules

Move controller blueprints modules to blueprints processor and change the maven group name.

Fix test cba and model type paths

Fix dependencies issues.

Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b

2 files changed, 0 insertions, 194 deletions

diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
deleted file mode 100644
index 375bd8eae..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2019 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.validation
-
-import io.mockk.every
-import io.mockk.mockk
-import org.junit.Test
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintError
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Step
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Workflow
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.DefaultBluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
-import org.onap.ccsdk.cds.controllerblueprints.validation.extension.ResourceDefinitionValidator
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class BluePrintDesignTimeValidatorServiceTest {
-
-    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
-    private val bluePrintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
-    private val mockBluePrintTypeValidatorService = MockBluePrintTypeValidatorService()
-    private val resourceDefinitionValidator = mockk<ResourceDefinitionValidator>()
-    private val defaultBluePrintValidatorService = BluePrintDesignTimeValidatorService(mockBluePrintTypeValidatorService, resourceDefinitionValidator)
-    private val workflowValidator = BluePrintWorkflowValidatorImpl(mockBluePrintTypeValidatorService)
-
-    @Test
-    fun testValidateOfType() {
-        every { resourceDefinitionValidator.validate(bluePrintRuntime, any(), any()) } returns Unit
-
-        val valid = defaultBluePrintValidatorService.validateBluePrints(bluePrintRuntime)
-        assertTrue(valid, "failed in blueprint Validation")
-    }
-
-    @Test
-    fun testValidateWorkflowFailToFoundNodeTemplate() {
-        val workflowName = "resource-assignment"
-
-        val step = Step()
-        step.target = "TestCaseFailNoNodeTemplate"
-        val workflow = Workflow()
-        workflow.steps = mutableMapOf("test" to step)
-        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
-
-        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
-        assertEquals(
-            "Failed to validate Workflow(resource-assignment)'s step(test)'s definition : resource-assignment/steps/test : could't get node template for the name(TestCaseFailNoNodeTemplate)",
-            bluePrintRuntime.getBluePrintError().errors[0]
-        )
-    }
-
-    @Test
-    fun testValidateWorkflowFailNodeTemplateNotDgGeneric() {
-        val workflowName = "resource-assignment"
-        val nodeTemplateName = "resource-assignment-process"
-
-        val nodeTemplate = mockk<NodeTemplate>()
-        every { nodeTemplate.type } returns "TestNodeType"
-
-        val nodeType = mockk<NodeType>()
-        every { nodeType.derivedFrom } returns "tosca.nodes.TEST"
-
-        val blueprintContext = mockk<BluePrintContext>()
-        every { blueprintContext.nodeTemplateByName(nodeTemplateName) } returns nodeTemplate
-        every { blueprintContext.nodeTemplateNodeType(nodeTemplateName) } returns nodeType
-
-        val bluePrintRuntime = mockk<DefaultBluePrintRuntimeService>("1234")
-
-        every { bluePrintRuntime.getBluePrintError() } returns BluePrintError()
-        every { bluePrintRuntime.bluePrintContext() } returns blueprintContext
-
-        val step = Step()
-        step.target = nodeTemplateName
-        val workflow = Workflow()
-        workflow.steps = mutableMapOf("test" to step)
-        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
-
-        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
-        assertEquals(
-            "Failed to validate Workflow(resource-assignment)'s step(test)'s definition : " +
-                    "resource-assignment/steps/test : NodeType(TestNodeType) derived from is 'tosca.nodes.TEST', " +
-                    "Expected 'tosca.nodes.Workflow' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0]
-        )
-    }
-
-    @Test
-    fun testValidateWorkflowSuccess() {
-        val workflowName = "resource-assignment"
-        workflowValidator.validate(bluePrintRuntime, workflowName, bluePrintRuntime.bluePrintContext().workflowByName(workflowName))
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt
deleted file mode 100644
index 11c6c037c..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintDataTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintServiceTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTopologyTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintWorkflowValidator
-
-class MockBluePrintTypeValidatorService : BluePrintTypeValidatorService {
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidator(referenceName: String, classType: Class<T>): T? {
-        return null
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(referenceNamePrefix: String, classType: Class<T>): List<T>? {
-        return null
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(classType: Class<T>): List<T>? {
-        return null
-    }
-
-    override fun getServiceTemplateValidators(): List<BluePrintServiceTemplateValidator> {
-        return listOf(BluePrintServiceTemplateValidatorImpl(this))
-    }
-
-    override fun getDataTypeValidators(): List<BluePrintDataTypeValidator> {
-        return listOf(BluePrintDataTypeValidatorImpl(this))
-    }
-
-    override fun getArtifactTypeValidators(): List<BluePrintArtifactTypeValidator> {
-        return listOf(BluePrintArtifactTypeValidatorImpl(this))
-    }
-
-    override fun getArtifactDefinitionsValidators(): List<BluePrintArtifactDefinitionValidator> {
-        return listOf(BluePrintArtifactDefinitionValidatorImpl(this))
-    }
-
-    override fun getNodeTypeValidators(): List<BluePrintNodeTypeValidator> {
-        return listOf(BluePrintNodeTypeValidatorImpl(this))
-    }
-
-    override fun getTopologyTemplateValidators(): List<BluePrintTopologyTemplateValidator> {
-        return listOf(BluePrintTopologyTemplateValidatorImpl(this))
-    }
-
-    override fun getNodeTemplateValidators(): List<BluePrintNodeTemplateValidator> {
-        return listOf(BluePrintNodeTemplateValidatorImpl(this))
-    }
-
-    override fun getWorkflowValidators(): List<BluePrintWorkflowValidator> {
-        return listOf(BluePrintWorkflowValidatorImpl(this))
-    }
-
-    override fun getPropertyDefinitionValidators(): List<BluePrintPropertyDefinitionValidator> {
-        return listOf(BluePrintPropertyDefinitionValidatorImpl(this))
-    }
-
-    override fun getAttributeDefinitionValidators(): List<BluePrintAttributeDefinitionValidator> {
-        return listOf(BluePrintAttributeDefinitionValidatorImpl(this))
-    }
-}