From a2cb0a6777ab9a278ce0efdb65a355b68718cc0b Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Mon, 16 Sep 2019 22:37:59 -0400 Subject: Fix deploy failure and other test cases. Change-Id: Ia43eebefb40190ed3fa6b65ee79f14c10ad222eb Issue-ID: CCSDK-1730 Signed-off-by: Brinda Santh --- .../Definitions/resources_definition_types.json | 4 +- .../Definitions/resources_definition_types.json | 4 +- .../Definitions/resources_definition_types.json | 2 +- .../Definitions/resources_definition_types.json | 2 +- components/model-catalog/proto-definition/pom.xml | 87 ---------------------- .../proto-definition/src/main/README.md | 1 - .../proto-definition/src/test/README.md | 1 - .../starter-dictionary/service-instance-id.json | 4 +- components/pom.xml | 41 ---------- .../functions/ansible-awx-executor/pom.xml | 1 + .../functions/cli-executor/pom.xml | 1 + .../functions/netconf-executor/pom.xml | 1 + .../functions/resource-resolution/pom.xml | 1 + .../functions/restconf-executor/pom.xml | 1 + .../modules/inbounds/configs-api/pom.xml | 2 - .../api/utils/BluePrintEnhancerUtilsTest.kt | 5 +- .../modules/inbounds/health-api/pom.xml | 6 +- pom.xml | 1 - 18 files changed, 17 insertions(+), 148 deletions(-) delete mode 100644 components/model-catalog/proto-definition/pom.xml delete mode 100644 components/model-catalog/proto-definition/src/main/README.md delete mode 100644 components/model-catalog/proto-definition/src/test/README.md delete mode 100644 components/pom.xml diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json index 240624094..426b91d34 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json @@ -474,7 +474,7 @@ "any-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" @@ -484,7 +484,7 @@ "processor-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json index 09b99fbeb..ef1c5e24f 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json @@ -1076,7 +1076,7 @@ "any-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" @@ -1086,7 +1086,7 @@ "processor-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json index aa0836232..5f50eaa51 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json @@ -30,7 +30,7 @@ "type": "source-db", "properties": { "endpoint-selector": "dynamic-db-source", - "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping": { }, "output-key-mapping": { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json index 4c128a9b4..941d2546b 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json @@ -16,7 +16,7 @@ "type": "source-db", "properties": { "endpoint-selector": "dynamic-db-source", - "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping": { }, "output-key-mapping": { diff --git a/components/model-catalog/proto-definition/pom.xml b/components/model-catalog/proto-definition/pom.xml deleted file mode 100644 index 9c6d802a0..000000000 --- a/components/model-catalog/proto-definition/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - 4.0.0 - - org.onap.ccsdk.cds - parent - 0.7.0-SNAPSHOT - ../../../ - - - org.onap.ccsdk.cds.components - proto-definition - 0.7.0-SNAPSHOT - jar - - Controller Blueprints Proto Definition - Controller Blueprints Proto Definition - - - - io.grpc - grpc-protobuf - 1.17.1 - - - io.grpc - grpc-stub - 1.17.1 - - - com.google.protobuf - protobuf-java-util - 3.6.1 - - - - - - - kr.motd.maven - os-maven-plugin - 1.6.1 - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 - - - com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier} - - grpc-java - - io.grpc:protoc-gen-grpc-java:1.18.0:exe:${os.detected.classifier} - - proto - - - - - compile - compile-custom - - - - - - - diff --git a/components/model-catalog/proto-definition/src/main/README.md b/components/model-catalog/proto-definition/src/main/README.md deleted file mode 100644 index f63edde3f..000000000 --- a/components/model-catalog/proto-definition/src/main/README.md +++ /dev/null @@ -1 +0,0 @@ -Standard maven directory for source diff --git a/components/model-catalog/proto-definition/src/test/README.md b/components/model-catalog/proto-definition/src/test/README.md deleted file mode 100644 index 4701e06b7..000000000 --- a/components/model-catalog/proto-definition/src/test/README.md +++ /dev/null @@ -1 +0,0 @@ -Standard maven directory for unit test cases diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json index f78771a60..4b1f4f38f 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json @@ -14,7 +14,7 @@ "any-db": { "type": "source-db", "properties": { - "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping": { }, "output-key-mapping": { @@ -25,7 +25,7 @@ "processor-db": { "type": "source-db", "properties": { - "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", "input-key-mapping": { }, "output-key-mapping": { diff --git a/components/pom.xml b/components/pom.xml deleted file mode 100644 index 2febac501..000000000 --- a/components/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - org.onap.ccsdk.cds - parent - 0.7.0-SNAPSHOT - - 4.0.0 - components - Components Root - pom - - UTF-8 - UTF-8 - yyyyMMdd'T'HHmmss'Z' - ${maven.build.timestamp} - 1.8 - 1.8 - 1.8 - - - - model-catalog/proto-definition - - diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml index 8b59b17f7..9613030cd 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml @@ -24,6 +24,7 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions ansible-awx-executor + 0.7.0-SNAPSHOT Blueprints Processor Function - Ansible AWX Executor Blueprints Processor Function - Ansible Executor diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml index 89f409a70..b45fdb3f8 100644 --- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml @@ -23,6 +23,7 @@ 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions cli-executor + 0.7.0-SNAPSHOT Blueprints Processor Function - CLI Executor Blueprints Processor Function - CLI Executor diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml index f163c0e1a..a10dfba38 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml @@ -23,6 +23,7 @@ 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions netconf-executor + 0.7.0-SNAPSHOT Blueprints Processor Function - Netconf Executor Blueprints Processor Function - Netconf Executor diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index be524fe22..66210f258 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -23,6 +23,7 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions resource-resolution + 0.7.0-SNAPSHOT jar Blueprints Processor Function - Resource Resolution Blueprints Processor Function - Resource Resolution diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml index c1dd50126..2872a5a8f 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml @@ -23,6 +23,7 @@ 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions restconf-executor + 0.7.0-SNAPSHOT Blueprints Processor Function - Restconf Executor Blueprints Processor Function - Restconf Executor diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index b09a8ac41..d4d030772 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -21,8 +21,6 @@ inbounds 0.7.0-SNAPSHOT - - org.onap.ccsdk.cds.blueprintsprocessor configs-api 0.7.0-SNAPSHOT jar diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt index 599987361..10bf887f6 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt @@ -22,13 +22,12 @@ import org.junit.Before import org.junit.Test import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.mock.MockFilePart import org.onap.ccsdk.cds.controllerblueprints.core.* -import java.nio.file.Paths import java.util.* import kotlin.test.assertTrue class BluePrintEnhancerUtilsTest { - private val blueprintDir = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration" + private val blueprintDir = "./../../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration" private val blueprintArchivePath: String = "./target/blueprints/archive" private val blueprintEnrichmentPath: String = "./target/blueprints/enrichment" private var zipBlueprintFileName = normalizedPathName(blueprintArchivePath, "test.zip") @@ -39,7 +38,7 @@ class BluePrintEnhancerUtilsTest { assertTrue(archiveDir.exists(), "failed to create archiveDir(${archiveDir.absolutePath}") val enhancerDir = normalizedFile(blueprintEnrichmentPath).reCreateDirs() assertTrue(enhancerDir.exists(), "failed to create enhancerDir(${enhancerDir.absolutePath}") - val blueprintFile = Paths.get(blueprintDir).toFile().normalize() + val blueprintFile = normalizedFile(blueprintDir) val testZipFile = blueprintFile.compress(zipBlueprintFileName) assertTrue(testZipFile.exists(), "Failed to create blueprint test zip(${testZipFile.absolutePath}") } diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml index 964de1e3c..6037804af 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml @@ -21,14 +21,12 @@ inbounds org.onap.ccsdk.cds.blueprintsprocessor - 0.6.1-SNAPSHOT + 0.7.0-SNAPSHOT - org.onap.ccsdk.cds.blueprintsprocessor health-api - jar - health api for checking the system + Blueprints Processor Health API checking system check health endpoints diff --git a/pom.xml b/pom.xml index ddeb8c824..5d58742ec 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,6 @@ limitations under the License. CCSDK Controller Design Studio - components cds-ui ms -- cgit 1.2.3-korg