Refactor test blueprint catalog

Change-Id: I948067b25787c7a79f769ac4055c34ffdd2f172d
Issue-ID: CCSDK-1047
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>

diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
index 81b3061..1c9029d 100755 (executable)
--- a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
@@ -57,7 +57,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true

diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
index 5b651e6..049d846 100755 (executable)
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -62,7 +62,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # blueprints.load.initial-data may be overridden by ENV variables
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true

diff --git a/ms/controllerblueprints/application/src/main/resources/application-dev.properties b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
index 30b71fb..9a5e75d 100755 (executable)
--- a/ms/controllerblueprints/application/src/main/resources/application-dev.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
@@ -57,7 +57,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true

diff --git a/ms/controllerblueprints/application/src/main/resources/application.properties b/ms/controllerblueprints/application/src/main/resources/application.properties
index ec61be4..0c78936 100755 (executable)
--- a/ms/controllerblueprints/application/src/main/resources/application.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application.properties
@@ -61,7 +61,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # blueprints.load.initial-data may be overridden by ENV variables
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true

diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 9aebd79..e0369ae 100755 (executable)
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -42,7 +42,7 @@ controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment
 # Controller Blueprint Load Configurations\r
 controllerblueprints.loadInitialData=false\r
 controllerblueprints.loadBluePrint=false\r
-controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/starter-blueprint\r
+controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint\r
 controllerblueprints.loadModelType=false\r
 controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type\r
 controllerblueprints.loadResourceDictionary=false\r
@@ -52,7 +52,7 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip\r
 \r
 # CBA examples for tests cases\r
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprints\r
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint\r
 \r
 # Web server config\r
 server.port=8080
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
index 0c4d94f..d06ce23 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
@@ -34,7 +34,7 @@ class BluePrintContextTest {
 
     private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
 
-    val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+    val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
 
     @Test
     fun testBluePrintContextCreation() {

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 7a17875..03e233f 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -132,7 +132,7 @@ class BluePrintRuntimeServiceTest {
     }
 
     private fun getBluePrintRuntimeService(): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
-        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
         val blueprintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
         val checkBasePath = blueprintRuntime.get(BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH)
 

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
index 861f7d0..be360d9 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
@@ -39,7 +39,7 @@ class BluePrintValidatorDefaultServiceTest {
     @Test
     fun testValidateBluePrint() {
 
-        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
         val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)
         val properties: MutableMap<String, Any> = hashMapOf()
 

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
index 528f2c6..1293173 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
@@ -35,7 +35,7 @@ class BluePrintFileUtilsTest {
 
     @Test
     fun testBlueprintCopy() = runBlocking {
-        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-copy-test")
 

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
index 80daad5..599bb3b 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
@@ -27,7 +27,7 @@ class BluePrintMetadataUtilsTest {
     @Test
     fun testToscaMetaData(){
 
-        val basePath : String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val basePath : String = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val toscaMetaData : ToscaMetaData =  BluePrintMetadataUtils.toscaMetaData(basePath)
         assertNotNull(toscaMetaData, "Missing Tosca Definition Object")

diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
index e48035b..f5d157d 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
@@ -32,7 +32,7 @@ import kotlin.test.assertTrue
 
 class BluePrintValidatorServiceImplTest {
 
-    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+    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 defaultBluePrintValidatorService = BluePrintValidatorServiceImpl(mockBluePrintTypeValidatorService)

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json
deleted file mode 100644 (file)
index 41f6e92..0000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json
+++ /dev/null
@@ -1,759 +0,0 @@
-{\r
-  "metadata": {\r
-    "template_author": "Brinda Santh ( bs2796@onap.com )",\r
-    "template_name": "vrr-test",\r
-    "template_version": "1.0.0",\r
-    "template_tags": "brinda, VRR",\r
-    "release": "201802",\r
-    "service-type": "AVPN",\r
-    "vnf-type": "VRR"\r
-  },\r
-  "topology_template": {\r
-    "inputs": {\r
-      "request-id": {\r
-        "required": true,\r
-        "type": "string"\r
-      },\r
-      "service-instance-id": {\r
-        "required": true,\r
-        "type": "string"\r
-      },\r
-      "action-name": {\r
-        "required": true,\r
-        "type": "string"\r
-      },\r
-      "scope-type": {\r
-        "required": true,\r
-        "type": "string"\r
-      },\r
-      "hostname": {\r
-        "required": true,\r
-        "type": "string"\r
-      },\r
-      "resource-assignment-request": {\r
-        "description": "This is Dynamic Data type for the receipe resource-assignment-action.",\r
-        "required": false,\r
-        "type": "dt-resource-assignment-request"\r
-      }\r
-    },\r
-    "node_templates": {\r
-      "base-config-template": {\r
-        "type": "artifact-config-template",\r
-        "properties": {\r
-          "action-names": [\r
-            "resource-assignment-action"\r
-          ]\r
-        },\r
-        "capabilities": {\r
-          "content": {\r
-            "properties": {\r
-              "content": "db://base-config-template"\r
-            }\r
-          },\r
-          "mapping": {\r
-            "properties": {\r
-              "mapping": [\r
-                {\r
-                  "name": "vnf-id",\r
-                  "input-param": true,\r
-                  "property": {\r
-                    "type": "string",\r
-                    "required": true\r
-                  },\r
-                  "dictionary-name": "vnf-id",\r
-                  "dictionary-source": "input"\r
-                },\r
-                {\r
-                  "name": "group-name",\r
-                  "input-param": true,\r
-                  "property": {\r
-                    "type": "string",\r
-                    "required": true\r
-                  },\r
-                  "dictionary-name": "group-name",\r
-                  "dictionary-source": "input"\r
-                }\r
-              ]\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "activate-action": {\r
-        "type": "dg-activate-netconf",\r
-        "interfaces": {\r
-          "CONFIG": {\r
-            "operations": {\r
-              "ActivateNetconf": {}\r
-            }\r
-          }\r
-        },\r
-        "capabilities": {\r
-          "dg-node": {}\r
-        },\r
-        "requirements": {\r
-          "component-dependency": {\r
-            "capability": "component-node",\r
-            "node": "transaction-netconf-baseconfig",\r
-            "relationship": "tosca.relationships.DependsOn"\r
-          }\r
-        }\r
-      },\r
-      "resource-assignment-action": {\r
-        "type": "dg-resource-assignment",\r
-        "interfaces": {\r
-          "CONFIG": {\r
-            "operations": {\r
-              "ResourceAssignment": {}\r
-            }\r
-          }\r
-        },\r
-        "capabilities": {\r
-          "dg-node": {}\r
-        },\r
-        "requirements": {\r
-          "component-dependency": {\r
-            "capability": "component-node",\r
-            "node": "resource-assignment",\r
-            "relationship": "tosca.relationships.DependsOn"\r
-          }\r
-        }\r
-      },\r
-      "licence-template": {\r
-        "type": "artifact-config-template",\r
-        "properties": {\r
-          "action-names": [\r
-            "resource-assignment-action"\r
-          ]\r
-        },\r
-        "capabilities": {\r
-          "content": {\r
-            "properties": {\r
-              "content": "db://licence-template"\r
-            }\r
-          },\r
-          "mapping": {\r
-            "properties": {\r
-              "mapping": [\r
-                {\r
-                  "name": "licence-key",\r
-                  "input-param": true,\r
-                  "property": {\r
-                    "type": "string",\r
-                    "required": true\r
-                  },\r
-                  "dictionary-name": "licence-key",\r
-                  "dictionary-source": "input"\r
-                }\r
-              ]\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "runningconfig-template": {\r
-        "type": "artifact-config-template",\r
-        "properties": {\r
-          "action-names": [\r
-            "resource-assignment-action"\r
-          ]\r
-        },\r
-        "capabilities": {\r
-          "content": {\r
-            "properties": {\r
-              "content": "db://runningconfig-template"\r
-            }\r
-          },\r
-          "mapping": {\r
-            "properties": {\r
-              "mapping": []\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "resource-assignment": {\r
-        "type": "component-resource-assignment",\r
-        "interfaces": {\r
-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
-            "operations": {\r
-              "process": {\r
-                "inputs": {\r
-                  "template-name": {\r
-                    "get_input": "template_name"\r
-                  },\r
-                  "template-version": {\r
-                    "get_input": "template_version"\r
-                  },\r
-                  "action-name": {\r
-                    "get_input": "action-name"\r
-                  },\r
-                  "resource-type": "vnf-type",\r
-                  "template-names": [\r
-                    "base-config-template",\r
-                    "licence-template"\r
-                  ],\r
-                  "request-id": {\r
-                    "get_input": "request-id"\r
-                  },\r
-                  "resource-id": {\r
-                    "get_input": "vnf-id"\r
-                  }\r
-                },\r
-                "outputs": {\r
-                  "resource-assignment-params": "",\r
-                  "status": ""\r
-                }\r
-              }\r
-            }\r
-          }\r
-        },\r
-        "capabilities": {\r
-          "component-node": {}\r
-        }\r
-      },\r
-      "vrr-netconf-device": {\r
-        "type": "vnf-netconf-device",\r
-        "capabilities": {\r
-          "netconf": {\r
-            "properties": {\r
-              "profile-name": "sample",\r
-              "oam-ipv4-address": {\r
-                "get_input": "hostname"\r
-              },\r
-              "port-number": {\r
-                "get_input": "host-port"\r
-              },\r
-              "connection-time-out": 30\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "transaction-netconf-baseconfig": {\r
-        "type": "component-netconf-executor",\r
-        "interfaces": {\r
-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {\r
-            "operations": {\r
-              "process": {\r
-                "implementation": {\r
-                  "primary": "file://netconf-adaptor/DefaultGetConfig.py"\r
-                },\r
-                "inputs": {\r
-                  "action-name": {\r
-                    "get_input": "action-name"\r
-                  },\r
-                  "resource-type": "vnf-type",\r
-                  "request-id": {\r
-                    "get_input": "request-id"\r
-                  },\r
-                  "resource-id": {\r
-                    "get_input": "vnf-id"\r
-                  },\r
-                  "execution-script": "execution-script"\r
-                },\r
-                "outputs": {\r
-                  "response-data": {\r
-                    "get_attribute": ["SELF",  "netconf-executor-baseconfig.response-data"]\r
-                  },\r
-                  "status": {\r
-                    "get_attribute": ["SELF", "netconf-executor-baseconfig.status"]\r
-                  }\r
-                }\r
-              }\r
-            }\r
-          }\r
-        },\r
-        "capabilities": {\r
-          "component-node": {\r
-          }\r
-        },\r
-        "requirements": {\r
-          "netconf-connection": {\r
-            "capability": "netconf",\r
-            "node": "vrr-netconf-device",\r
-            "relationship": "tosca.relationships.ConnectsTo"\r
-          }\r
-        }\r
-      }\r
-    }\r
-  },\r
-  "node_types": {\r
-    "dg-resource-assignment": {\r
-      "description": "This is Resource Assignment Directed Graph",\r
-      "version": "1.0.0",\r
-      "properties": {\r
-        "mode": {\r
-          "required": false,\r
-          "type": "string",\r
-          "default": "sync"\r
-        },\r
-        "version": {\r
-          "required": false,\r
-          "type": "string",\r
-          "default": "LATEST"\r
-        },\r
-        "is-start-flow": {\r
-          "required": false,\r
-          "type": "boolean",\r
-          "default": false\r
-        }\r
-      },\r
-      "capabilities": {\r
-        "dg-node": {\r
-          "type": "tosca.capabilities.Node"\r
-        }\r
-      },\r
-      "requirements": {\r
-        "component-dependency": {\r
-          "capability": "component-node",\r
-          "node": "component-resource-assignment",\r
-          "relationship": "tosca.relationships.DependsOn"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "CONFIG": {\r
-          "operations": {\r
-            "ResourceAssignment": {\r
-              "inputs": {\r
-                "params": {\r
-                  "required": false,\r
-                  "type": "list",\r
-                  "entry_schema": {\r
-                    "type": "datatype-property"\r
-                  }\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.DG"\r
-    },\r
-    "component-resource-assignment": {\r
-      "description": "This is Resource Assignment Component API",\r
-      "version": "1.0.0",\r
-      "capabilities": {\r
-        "component-node": {\r
-          "type": "tosca.capabilities.Node"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
-          "operations": {\r
-            "process": {\r
-              "inputs": {\r
-                "action-name": {\r
-                  "description": "Action Name of the process",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "template-name": {\r
-                  "description": "Service Template Name.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "template-version": {\r
-                  "description": "Service Template Version.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "resource-type": {\r
-                  "description": "Request type.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "template-names": {\r
-                  "description": "Name of the artifact Node Templates, to get the template Content.",\r
-                  "required": true,\r
-                  "type": "list",\r
-                  "entry_schema": {\r
-                    "type": "string"\r
-                  }\r
-                },\r
-                "request-id": {\r
-                  "description": "Request Id, Unique Id for the request.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "resource-id": {\r
-                  "description": "Resource Id.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                }\r
-              },\r
-              "outputs": {\r
-                "resource-assignment-params": {\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "status": {\r
-                  "required": true,\r
-                  "type": "string"\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.Component"\r
-    },\r
-    "artifact-config-template": {\r
-      "description": "This is Configuration Velocity Template",\r
-      "version": "1.0.0",\r
-      "properties": {\r
-        "action-names": {\r
-          "required": true,\r
-          "type": "list",\r
-          "entry_schema": {\r
-            "type": "string"\r
-          }\r
-        }\r
-      },\r
-      "capabilities": {\r
-        "content": {\r
-          "type": "tosca.capabilities.Content",\r
-          "properties": {\r
-            "content": {\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          }\r
-        },\r
-        "mapping": {\r
-          "type": "tosca.capabilities.Mapping",\r
-          "properties": {\r
-            "mapping": {\r
-              "required": false,\r
-              "type": "list",\r
-              "entry_schema": {\r
-                "type": "datatype-resource-assignment"\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.Artifact"\r
-    },\r
-    "vnf-netconf-device": {\r
-      "description": "This is VNF Device with Netconf and SSH Capability",\r
-      "version": "1.0.0",\r
-      "capabilities": {\r
-        "netconf": {\r
-          "type": "tosca.capabilities.Netconf",\r
-          "properties": {\r
-            "profile-name": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "oam-ipv4-address": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "port-number": {\r
-              "required": true,\r
-              "type": "integer",\r
-              "default": 830\r
-            },\r
-            "connection-time-out": {\r
-              "required": false,\r
-              "type": "integer",\r
-              "default": 30\r
-            }\r
-          }\r
-        },\r
-        "ssh": {\r
-          "type": "tosca.capabilities.Ssh",\r
-          "properties": {\r
-            "profile-name": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "oam-ipv4-address": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "port-number": {\r
-              "required": true,\r
-              "type": "integer",\r
-              "default": 22\r
-            },\r
-            "message-time-out": {\r
-              "required": false,\r
-              "type": "integer",\r
-              "default": 3000\r
-            },\r
-            "connection-time-out": {\r
-              "required": false,\r
-              "type": "integer",\r
-              "default": 3000\r
-            }\r
-          }\r
-        },\r
-        "sftp": {\r
-          "type": "tosca.capabilities.Sftp",\r
-          "properties": {\r
-            "profile-name": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "oam-ipv4-address": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "port-number": {\r
-              "required": true,\r
-              "type": "integer",\r
-              "default": 22\r
-            },\r
-            "message-time-out": {\r
-              "required": false,\r
-              "type": "integer",\r
-              "default": 3000\r
-            },\r
-            "connection-time-out": {\r
-              "required": false,\r
-              "type": "integer",\r
-              "default": 3000\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.Vnf"\r
-    },\r
-    "dg-activate-netconf": {\r
-      "description": "This is Download Netconf Directed Graph",\r
-      "version": "1.0.0",\r
-      "properties": {\r
-        "mode": {\r
-          "required": false,\r
-          "type": "string",\r
-          "default": "sync"\r
-        },\r
-        "version": {\r
-          "required": false,\r
-          "type": "string",\r
-          "default": "LATEST"\r
-        },\r
-        "is-start-flow": {\r
-          "required": false,\r
-          "type": "boolean",\r
-          "default": false\r
-        }\r
-      },\r
-      "capabilities": {\r
-        "dg-node": {\r
-          "type": "tosca.capabilities.Node"\r
-        }\r
-      },\r
-      "requirements": {\r
-        "component-dependency": {\r
-          "capability": "component-node",\r
-          "node": "component-netconf-executor",\r
-          "relationship": "tosca.relationships.DependsOn"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "CONFIG": {\r
-          "operations": {\r
-            "ActivateNetconf": {\r
-              "inputs": {\r
-                "params": {\r
-                  "required": false,\r
-                  "type": "list",\r
-                  "entry_schema": {\r
-                    "type": "datatype-property"\r
-                  }\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.DG"\r
-    },\r
-    "component-netconf-executor": {\r
-      "description": "This is Netconf Transaction Configuration Component API",\r
-      "version": "1.0.0",\r
-      "capabilities": {\r
-        "component-node": {\r
-          "type": "tosca.capabilities.Node"\r
-        }\r
-      },\r
-      "requirements": {\r
-        "netconf-connection": {\r
-          "capability": "netconf",\r
-          "node": "vnf-netconf-device",\r
-          "relationship": "tosca.relationships.ConnectsTo"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {\r
-          "operations": {\r
-            "process": {\r
-              "inputs": {\r
-                "request-id": {\r
-                  "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "template-name": {\r
-                  "description": "Service Template Name",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "template-version": {\r
-                  "description": "Service Template Version",\r
-                  "required": true,\r
-                  "type": "string"\r
-                },\r
-                "action-name": {\r
-                  "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                  "required": false,\r
-                  "type": "string"\r
-                },\r
-                "resource-type": {\r
-                  "description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                  "required": false,\r
-                  "type": "string"\r
-                },\r
-                "resource-id": {\r
-                  "description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                  "required": false,\r
-                  "type": "string"\r
-                },\r
-                "execution-script": {\r
-                  "description": "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",\r
-                  "required": true,\r
-                  "type": "string"\r
-                }\r
-              },\r
-              "outputs": {\r
-                "response-data": {\r
-                  "description": "Execution Response Data in JSON format.",\r
-                  "type": "string"\r
-                },\r
-                "status": {\r
-                  "description": "Status of the Component Execution ( success or failure )",\r
-                  "required": true,\r
-                  "type": "string"\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "derived_from": "tosca.nodes.Component"\r
-    },\r
-    "tosca.nodes.DG": {\r
-      "description": "This is Directed Graph Node Type",\r
-      "version": "1.0.0",\r
-      "derived_from": "tosca.nodes.Root"\r
-    },\r
-    "tosca.nodes.Vnf": {\r
-      "description": "This is VNF Node Type",\r
-      "version": "1.0.0",\r
-      "derived_from": "tosca.nodes.Root"\r
-    },\r
-    "tosca.nodes.Artifact": {\r
-      "description": "This is Deprecated Artifact Node Type.",\r
-      "version": "1.0.0",\r
-      "derived_from": "tosca.nodes.Root"\r
-    },\r
-    "tosca.nodes.Component": {\r
-      "description": "This is default Component Node",\r
-      "version": "1.0.0",\r
-      "derived_from": "tosca.nodes.Root"\r
-    }\r
-  },\r
-  "data_types": {\r
-    "datatype-resource-assignment": {\r
-      "version": "1.0.0",\r
-      "description": "This is Resource Assignment Data Type",\r
-      "properties": {\r
-        "property": {\r
-          "required": true,\r
-          "type": "datatype-property"\r
-        },\r
-        "input-param": {\r
-          "required": true,\r
-          "type": "boolean"\r
-        },\r
-        "dictionary-name": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "dictionary-source": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "dependencies": {\r
-          "required": true,\r
-          "type": "list",\r
-          "entry_schema": {\r
-            "type": "string"\r
-          }\r
-        },\r
-        "status": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "message": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "updated-date": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "updated-by": {\r
-          "required": false,\r
-          "type": "string"\r
-        }\r
-      },\r
-      "derived_from": "tosca.datatypes.Root"\r
-    },\r
-    "datatype-property": {\r
-      "version": "1.0.0",\r
-      "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",\r
-      "properties": {\r
-        "type": {\r
-          "required": true,\r
-          "type": "string"\r
-        },\r
-        "description": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "required": {\r
-          "required": false,\r
-          "type": "boolean"\r
-        },\r
-        "default": {\r
-          "required": false,\r
-          "type": "string"\r
-        },\r
-        "entry_schema": {\r
-          "required": false,\r
-          "type": "string"\r
-        }\r
-      },\r
-      "derived_from": "tosca.datatypes.Root"\r
-    },\r
-    "dt-resource-assignment-request": {\r
-      "version": "1.0.0",\r
-      "description": "This is Dynamic Data type definition generated from resource mapping for the config template name base-config-template.",\r
-      "properties": {\r
-        "vnf-id": {\r
-          "required": true,\r
-          "type": "string"\r
-        },\r
-        "group-name": {\r
-          "required": true,\r
-          "type": "string"\r
-        },\r
-        "licence-key": {\r
-          "required": true,\r
-          "type": "string"\r
-        }\r
-      },\r
-      "derived_from": "tosca.datatypes.Dynamic"\r
-    }\r
-  }\r
-}
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644 (file)
index a4e1df3..0000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-TOSCA-Meta-File-Version: 1.0.0\r
-CSAR-Version: 1.0\r
-Created-By: Brinda Santh M\r
-Entry-Definitions: Definitions/vrr-test.json\r
-Template-Tags: vrr-test, Brinda Santh\r

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl
deleted file mode 100644 (file)
index 92dba10..0000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl
+++ /dev/null
@@ -1,40 +0,0 @@
- <config>\r
-               <configuration>\r
-                       <groups>\r
-                               <name>${group-name}</name>\r
-                               <routing-instances>\r
-                                       <instance>\r
-                                               <name>&lt;*&gt;</name>\r
-                                               <protocols>\r
-                                                       <pim>\r
-                                                               <dense-groups>\r
-                                                                       <dynamic-reject />\r
-                                                                       <pim-dense-group-type>\r
-                                                                               <name>224.0.1.40/32</name>\r
-                                                                       </pim-dense-group-type>\r
-                                                                       <pim-dense-group-type>\r
-                                                                               <name>224.0.1.39/32</name>\r
-                                                                       </pim-dense-group-type>\r
-                                                                       <pim-dense-group-type>\r
-                                                                               <name>224.0.0.0/4</name>\r
-                                                                               <reject />\r
-                                                                       </pim-dense-group-type>\r
-                                                               </dense-groups>\r
-                                                               <rp>\r
-                                                                       <auto-rp>\r
-                                                                               <discovery />\r
-                                                                       </auto-rp>\r
-                                                               </rp>\r
-                                                               <interface>\r
-                                                                       <name>&lt;*&gt;</name>\r
-                                                                       <disable />\r
-                                                                       <priority>1000</priority>\r
-                                                               </interface>\r
-                                                               <reset-tracking-bit />\r
-                                                       </pim>\r
-                                               </protocols>\r
-                                       </instance>\r
-                               </routing-instances>\r
-                       </groups>\r
-               </configuration>\r
-       </config>
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl
deleted file mode 100644 (file)
index 626974f..0000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl
+++ /dev/null
@@ -1,4 +0,0 @@
- <config>\r
-               <configuration>\r
-               </configuration>\r
-                </config>\r

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/__init__.py b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
index 4ab6708..8d32413 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -61,7 +61,7 @@ class BluePrintEnhancerServiceImplTest {
     @Throws(Exception::class)
     fun testEnhancementAndValidation() {
 
-        val basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val targetPath = Paths.get("target", "bp-enhance").toUri().path
 

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 1c2c1c0..20450f4 100755 (executable)
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -28,7 +28,7 @@ controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=false
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=false
 controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=false
@@ -38,4 +38,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip
 
 # CBA examples for tests cases
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprints
\ No newline at end of file
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
\ No newline at end of file