Controller Blueprints Microservice

Modify get_input, get_attribute, get_property and get_artifact functions string implementation to Json Implementation.

Change-Id: I6d4aadd370dc23127a176964f84fc9bb5e7ab5ee
Issue-ID: CCSDK-432
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

diff --git a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index 714195f..9c70d6e 100644 (file)
--- a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
@@ -40,7 +40,7 @@
           "component-node": {}\r
         },\r
         "interfaces": {\r
-          "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
             "operations": {\r
               "process": {\r
                 "inputs": {\r
@@ -258,7 +258,7 @@
         }\r
       },\r
       "interfaces": {\r
-        "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
           "operations": {\r
             "process": {\r
               "inputs": {\r

diff --git a/components/core/load/blueprints/simple-baseconfig/Definitions/sample-nodetype.json b/components/core/load/blueprints/simple-baseconfig/Definitions/sample-nodetype.json
index 6d469ea..207fcc4 100644 (file)
--- a/components/core/load/blueprints/simple-baseconfig/Definitions/sample-nodetype.json
+++ b/components/core/load/blueprints/simple-baseconfig/Definitions/sample-nodetype.json
@@ -1,34 +1,5 @@
 {\r
   "description": "This is Resource Assignment Component API",\r
   "version": "1.0.0",\r
-  "properties": {\r
-    "type": {\r
-      "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-      "required": false,\r
-      "type": "string"\r
-    }\r
-  },\r
-  "interfaces": {\r
-    "DefaultOperation": {\r
-      "operations": {\r
-        "validate": {\r
-          "inputs": {\r
-            "action-name": {\r
-              "description": "validate for action",\r
-              "required": false,\r
-              "type": "string"\r
-            }\r
-          }\r
-        }\r
-      }\r
-    }\r
-  },\r
-  "artifacts" :{\r
-    "component-jar": {\r
-      "description": "Component Jar",\r
-      "type": "artifact-component-jar",\r
-      "file": "Component/basecomponent.jar"\r
-    }\r
-  },\r
-  "derived_from": "tosca.nodes.Root"\r
+   "derived_from": "tosca.nodes.Root"\r
 }
\ No newline at end of file

diff --git a/components/core/load/blueprints/simple-baseconfig/Definitions/simple-baseconfig.json b/components/core/load/blueprints/simple-baseconfig/Definitions/simple-baseconfig.json
index 65028ac..cb091da 100644 (file)
--- a/components/core/load/blueprints/simple-baseconfig/Definitions/simple-baseconfig.json
+++ b/components/core/load/blueprints/simple-baseconfig/Definitions/simple-baseconfig.json
@@ -38,7 +38,7 @@
               "login-key": "sdnc",\r
               "login-account": "sndc-local",\r
               "source": "local",\r
-              "target-ip-address": "{\"get_attribute\":\"lo0-local-ipv4-address\"}",\r
+              "target-ip-address":  { "get_attribute": ["SELF", "lo0-local-ipv4-address"]},\r
               "port-number": 22,\r
               "connection-time-out": 30\r
             }\r
@@ -58,21 +58,21 @@
           }\r
         },\r
         "interfaces": {\r
-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {\r
+          "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {\r
             "operations": {\r
               "process": {\r
                 "inputs": {\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",\r
+                  "action-name": { "get_input" : "action-name" },\r
+                  "service-template-name": { "get_input" : "template_name" },\r
+                  "service-template-version": { "get_input" : "service-template-version" },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"hostname\" }",\r
+                  "request-id": { "get_input" : "request-id" },\r
+                  "resource-id": { "get_input" : "hostname" },\r
                   "execution-script": "execution-script"\r
                 },\r
                 "outputs": {\r
-                  "response-data": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }",\r
-                  "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }"\r
+                  "response-data": { "get_input" : ["SELF", "netconf-executor-baseconfig.response-data"] },\r
+                  "status": { "get_input" : ["SELF", "netconf-executor-baseconfig.status"] }\r
                 },\r
                 "implementation" : {\r
                   "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"\r
@@ -88,7 +88,7 @@
           "component-node": {}\r
         },\r
         "interfaces": {\r
-          "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
             "operations": {\r
               "process": {\r
                 "inputs": {\r
@@ -96,12 +96,12 @@
                     "base-config-template",\r
                     "licence-template"\r
                   ],\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",\r
+                  "action-name": { "get_input" : "action-name" },\r
+                  "service-template-name": { "get_input" : "template_name" },\r
+                  "service-template-version": { "get_input" : "service-template-version" },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"hostname\" }"\r
+                  "request-id": { "get_input" : "request-id" },\r
+                  "resource-id": { "get_input" : "hostname" }\r
                 },\r
                 "outputs": {\r
                   "resource-assignment-params": "success",\r
@@ -127,12 +127,7 @@
           }\r
         },\r
         "capabilities": {\r
-          "dg-node": {},\r
-          "content": {\r
-            "properties": {\r
-              "type": "json"\r
-            }\r
-          }\r
+          "dg-node": {}\r
         },\r
         "interfaces": {\r
           "CONFIG": {\r

diff --git a/components/core/load/model_type/node_type/component-config-generator.json b/components/core/load/model_type/node_type/component-config-generator.json
index 764f9e8..9e86b8a 100644 (file)
--- a/components/core/load/model_type/node_type/component-config-generator.json
+++ b/components/core/load/model_type/node_type/component-config-generator.json
@@ -7,7 +7,7 @@
                }\r
        },\r
        "interfaces": {\r
-               "org-openecomp-sdnc-config-generator-service-ConfigGeneratorNode": {\r
+               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
                        "operations": {\r
                                "process": {\r
                                        "inputs": {\r

diff --git a/components/core/load/model_type/node_type/component-netconf-executor.json b/components/core/load/model_type/node_type/component-netconf-executor.json
index aed667a..7dcff58 100644 (file)
--- a/components/core/load/model_type/node_type/component-netconf-executor.json
+++ b/components/core/load/model_type/node_type/component-netconf-executor.json
@@ -14,7 +14,7 @@
     }\r
   },\r
   "interfaces": {\r
-    "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {\r
+    "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {\r
       "operations": {\r
         "process": {\r
           "inputs": {\r

diff --git a/components/core/load/model_type/node_type/component-resource-assignment.json b/components/core/load/model_type/node_type/component-resource-assignment.json
index 03f3c28..1389bc3 100644 (file)
--- a/components/core/load/model_type/node_type/component-resource-assignment.json
+++ b/components/core/load/model_type/node_type/component-resource-assignment.json
@@ -7,7 +7,7 @@
     }\r
   },\r
   "interfaces": {\r
-    "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+    "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
       "operations": {\r
         "process": {\r
           "inputs": {\r

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt
index 8459220..8bfa2db 100644 (file)
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/ConfigModelConstant.kt
@@ -31,12 +31,6 @@ object ConfigModelConstant {
 \r
     const val MODEL_TYPE_NODE_ARTIFACT = "tosca.nodes.Artifact"\r
 \r
-    const val MODEL_TYPE_CAPABILITY_NETCONF = "tosca.capability.Netconf"\r
-    const val MODEL_TYPE_CAPABILITY_SSH = "tosca.capability.Ssh"\r
-    const val MODEL_TYPE_CAPABILITY_SFTP = "tosca.capability.Sftp"\r
-    const val MODEL_TYPE_CAPABILITY_CHEF = "tosca.capability.Chef"\r
-    const val MODEL_TYPE_CAPABILITY_ANSIBLEF = "tosca.capability.Ansible"\r
-\r
     const val CAPABILITY_PROPERTY_MAPPING = "mapping"\r
 \r
     const val PROPERTY_RECIPE_NAMES = "action-names"\r

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
index 19d515e..82e232d 100644 (file)
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionService.kt
@@ -25,6 +25,7 @@ import org.onap.ccsdk.apps.controllerblueprints.core.data.*
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
 import com.att.eelf.configuration.EELFLogger\r
 import com.att.eelf.configuration.EELFManager\r
+\r
 /**\r
  *\r
  *\r
@@ -115,32 +116,34 @@ object BluePrintExpressionService {
     @JvmStatic\r
     fun populateAttributeExpression(jsonNode: JsonNode): AttributeExpression {\r
         val arrayNode: ArrayNode = jsonNode.first() as ArrayNode\r
-        check(arrayNode.size() >= 3) {\r
+        check(arrayNode.size() >= 2) {\r
             throw BluePrintException(String.format("missing attribute expression, " +\r
                     "it should be [ <modelable_entity_name>, <optional_req_or_cap_name>, <attribute_name>," +\r
                     " <nested_attribute_name_or_index_1>, ..., <nested_attribute_name_or_index_n> ] , but present {}", jsonNode))\r
         }\r
 \r
         var reqOrCapEntityName: String? = null\r
-        var propertyName = ""\r
-        var subProperty: String? = null\r
-        if (arrayNode.size() == 2) {\r
-            propertyName = arrayNode[1].textValue()\r
-        } else if (arrayNode.size() == 3) {\r
-            reqOrCapEntityName = arrayNode[1].textValue()\r
-            propertyName = arrayNode[2].textValue()\r
-        } else if (arrayNode.size() > 3) {\r
-            reqOrCapEntityName = arrayNode[1].textValue()\r
-            propertyName = arrayNode[2].textValue()\r
-            val propertyPaths: List<String> = arrayNode.filterIndexed { index, obj ->\r
-                index >= 3\r
-            }.map { it.textValue() }\r
-            subProperty = propertyPaths.joinToString("/")\r
+        var attributeName = ""\r
+        var subAttributeName: String? = null\r
+        when {\r
+            arrayNode.size() == 2 -> attributeName = arrayNode[1].textValue()\r
+            arrayNode.size() == 3 -> {\r
+                reqOrCapEntityName = arrayNode[1].textValue()\r
+                attributeName = arrayNode[2].textValue()\r
+            }\r
+            arrayNode.size() > 3 -> {\r
+                reqOrCapEntityName = arrayNode[1].textValue()\r
+                attributeName = arrayNode[2].textValue()\r
+                val propertyPaths: List<String> = arrayNode.filterIndexed { index, _ ->\r
+                    index >= 3\r
+                }.map { it.textValue() }\r
+                subAttributeName = propertyPaths.joinToString("/")\r
+            }\r
         }\r
         return AttributeExpression(modelableEntityName = arrayNode[0].asText(),\r
                 reqOrCapEntityName = reqOrCapEntityName,\r
-                attributeName = propertyName,\r
-                subAttributeName = subProperty\r
+                attributeName = attributeName,\r
+                subAttributeName = subAttributeName\r
         )\r
     }\r
 \r

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
index 911a891..a021402 100644 (file)
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
@@ -60,14 +60,22 @@ class BluePrintExpressionServiceTest {
 \r
     @Test\r
     fun testAttributeExpression() {\r
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")\r
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"resource\"] }")\r
         val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)\r
         assertNotNull(expressionData, " Failed to populate expression data")\r
         assertEquals(expressionData.isExpression, true, "Failed to identify as expression")\r
         assertNotNull(expressionData.attributeExpression, " Failed to populate attribute expression data")\r
         assertEquals("SELF", expressionData.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
-        assertEquals("attribute-name", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")\r
-        assertEquals("resource/name",expressionData.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")\r
+        assertEquals("resource", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")\r
+\r
+        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")\r
+        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)\r
+        assertNotNull(expressionData1, " Failed to populate expression data")\r
+        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")\r
+        assertNotNull(expressionData1.attributeExpression, " Failed to populate attribute expression data")\r
+        assertEquals("SELF", expressionData1.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")\r
+        assertEquals("attribute-name", expressionData1.attributeExpression?.attributeName, " Failed to get expected attributeName")\r
+        assertEquals("resource/name",expressionData1.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")\r
     }\r
 \r
 \r

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 919dc56..277ec3a 100644 (file)
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -87,7 +87,7 @@ class BluePrintRuntimeServiceTest {
         log.info("Prepared Context {}", context)\r
 \r
         val inContext: MutableMap<String, Any?> = bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationInputs("resource-assignment-ra-component",\r
-                "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode", "process")\r
+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process")\r
 \r
         log.info("In Context {}", inContext)\r
 \r
@@ -110,18 +110,18 @@ class BluePrintRuntimeServiceTest {
 \r
         val componentContext: MutableMap<String, Any?> = hashMapOf()\r
         val successValue: JsonNode = jsonNodeFromObject("Success")\r
-        componentContext["resource-assignment-ra-component.org-onap-sdnc-config-assignment-service-ConfigAssignmentNode.process.status"] = successValue\r
-        componentContext["resource-assignment-ra-component.org-onap-sdnc-config-assignment-service-ConfigAssignmentNode.process.resource-assignment-params"] = null\r
+        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.status"] = successValue\r
+        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.resource-assignment-params"] = null\r
 \r
         bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationOutputs("resource-assignment-ra-component",\r
-                "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode", "process", componentContext)\r
+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process", componentContext)\r
 \r
         assertEquals(NullNode.instance,\r
-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-sdnc-config-assignment-service-ConfigAssignmentNode/operations/process/properties/resource-assignment-params"),\r
+                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/resource-assignment-params"),\r
                 "Failed to get operation property resource-assignment-params")\r
 \r
         assertEquals(successValue,\r
-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-sdnc-config-assignment-service-ConfigAssignmentNode/operations/process/properties/status"),\r
+                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/status"),\r
                 "Failed to get operation property status")\r
 \r
 \r

diff --git a/components/core/src/test/resources/componentnode/default.json b/components/core/src/test/resources/componentnode/default.json
index b7265fc..184b598 100644 (file)
--- a/components/core/src/test/resources/componentnode/default.json
+++ b/components/core/src/test/resources/componentnode/default.json
@@ -41,13 +41,13 @@
                        "generate-configuration": {\r
                                "type": "mock-component-generateConfig",\r
                                "interfaces": {\r
-                                       "org-openecomp-sdnc-config-params-service-MockComponentNode": {\r
+                                       "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
                                                                        "entity-type": "vnf-type",\r
                                                                        "template-content": "sample-template",\r
-                                                                       "entity-id": "{ \"get_input\" : \"vnf-id\" }"\r
+                                                                       "entity-id": { "get_input" : "vnf-id" }\r
                                                                },\r
                                                                "outputs": {\r
                                                                        "mergedData": "merged Data",\r
@@ -63,7 +63,7 @@
        "node_types": {\r
                "mock-component-generateConfig": {\r
                        "interfaces": {\r
-                               "org-openecomp-sdnc-config-params-service-MockComponentNode": {\r
+                               "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/components/core/src/test/resources/properties/convert.json b/components/core/src/test/resources/properties/convert.json
index cb7d08e..af79915 100644 (file)
--- a/components/core/src/test/resources/properties/convert.json
+++ b/components/core/src/test/resources/properties/convert.json
@@ -19,12 +19,12 @@
                                                                "required": true\r
                                                        }\r
                                                ],\r
-                                               "pre-data": "{ \"get_attribute\" : \"get-resource-assignment.config-params\" }",\r
+                                               "pre-data": { "get_input" : "get-resource-assignment.config-params" },\r
                                                "prifix": "get-resource-assignment"\r
                                        },\r
                                        "outputs": {\r
                                                "resource-assignment-status": "success",\r
-                                               "resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params\" }"\r
+                                               "resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params" }\r
                                        }\r
                                }\r
                        }\r

diff --git a/components/core/src/test/resources/properties/default.json b/components/core/src/test/resources/properties/default.json
index 0ac97f9..ec416dc 100644 (file)
--- a/components/core/src/test/resources/properties/default.json
+++ b/components/core/src/test/resources/properties/default.json
@@ -1,5 +1,5 @@
 {\r
-       "default": "{ \"get_input\" : \"loopback-default\" }",\r
+       "default": { "get_input" : "loopback-default" },\r
        "domain": "ethernet",\r
        "criteria": [\r
                {\r
@@ -8,7 +8,7 @@
                        "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"\r
                },\r
                {\r
-                       "value": "{ \"get_input\" : \"host-ip-address\" }",\r
+                       "value": { "get_input" : "host-ip-address" },\r
                        "type": "simple",\r
                        "nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"\r
                }\r

diff --git a/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index d4fbf5c..06e7e93 100644 (file)
--- a/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
@@ -2,7 +2,7 @@
   "metadata": {\r
     "template_author": "Brinda Santh Muthuramalingam",\r
     "author-email": "brindasanth@gmail.com",\r
-    "user-groups" : "ADMIN, OPERATION",\r
+    "user-groups": "ADMIN, OPERATION",\r
     "template_name": "baseconfiguration",\r
     "template_version": "1.0.0",\r
     "template_tags": "brinda, tosca"\r
@@ -30,9 +30,21 @@
       "activate-process": {\r
         "type": "bpmn-activate",\r
         "properties": {\r
-          "process-name": { "get_input" : "action-name" },\r
-          "version" : { "get_property" : ["SELF", "process-name"] },\r
-          "content": { "get_artifact" : ["SELF", "activate-process"] }\r
+          "process-name": {\r
+            "get_input": "action-name"\r
+          },\r
+          "version": {\r
+            "get_property": [\r
+              "SELF",\r
+              "process-name"\r
+            ]\r
+          },\r
+          "content": {\r
+            "get_artifact": [\r
+              "SELF",\r
+              "activate-process"\r
+            ]\r
+          }\r
         },\r
         "artifacts": {\r
           "activate-process": {\r
@@ -43,7 +55,7 @@
       },\r
       "resource-assignment": {\r
         "type": "component-resource-assignment",\r
-        "properties":{\r
+        "properties": {\r
           "request-id": "1234"\r
         },\r
         "interfaces": {\r
@@ -51,12 +63,28 @@
             "operations": {\r
               "process": {\r
                 "inputs": {\r
-                  "action-name": { "get_input" : "action-name" },\r
+                  "action-name": {\r
+                    "get_input": "action-name"\r
+                  },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": { "get_input" : "request-id" },\r
-                  "resource-id": { "get_input" : "hostname" },\r
-                  "template-content": { "get_artifact" : ["SELF", "baseconfig-template"] },\r
-                  "mapping-content": { "get_artifact" : ["SELF", "baseconfig-mapping"] }\r
+                  "request-id": {\r
+                    "get_input": "request-id"\r
+                  },\r
+                  "resource-id": {\r
+                    "get_input": "hostname"\r
+                  },\r
+                  "template-content": {\r
+                    "get_artifact": [\r
+                      "SELF",\r
+                      "baseconfig-template"\r
+                    ]\r
+                  },\r
+                  "mapping-content": {\r
+                    "get_artifact": [\r
+                      "SELF",\r
+                      "baseconfig-mapping"\r
+                    ]\r
+                  }\r
                 },\r
                 "outputs": {\r
                   "resource-assignment-params": "",\r
@@ -79,18 +107,20 @@
       },\r
       "resource-assignment-py": {\r
         "type": "component-resource-assignment",\r
-        "properties":{\r
+        "properties": {\r
           "request-id": "1234"\r
         },\r
         "interfaces": {\r
           "DefaultComponentNode": {\r
             "operations": {\r
               "process": {\r
-                "implementation" :{\r
-                  "primary" : "component-script"\r
+                "implementation": {\r
+                  "primary": "component-script"\r
                 },\r
                 "inputs": {\r
-                  "action-name": { "get_input" : "action-name" }\r
+                  "action-name": {\r
+                    "get_input": "action-name"\r
+                  }\r
                 },\r
                 "outputs": {\r
                   "resource-assignment-params": "",\r
@@ -108,37 +138,37 @@
         }\r
       }\r
     },\r
-    "workflows":{\r
-      "activate-process":{\r
-        "steps" : {\r
-            "call-resource-assignment" : {\r
-              "description" : "Invoke Resource Assignment Component",\r
-              "target" : "resource-assignment",\r
-              "activities" : [\r
-                {\r
-                  "call_operation": "ResourceAssignmentNode.process"\r
-                }\r
-              ],\r
-              "on_success" : [\r
-                "download-baseconfig"\r
-              ]\r
-            },\r
-          "download-baseconfig" : {\r
-            "description" : "Call Download Base Config Component",\r
-            "target" : "activate-netconf",\r
-            "activities" : [\r
+    "workflows": {\r
+      "activate-process": {\r
+        "steps": {\r
+          "call-resource-assignment": {\r
+            "description": "Invoke Resource Assignment Component",\r
+            "target": "resource-assignment",\r
+            "activities": [\r
+              {\r
+                "call_operation": "ResourceAssignmentNode.process"\r
+              }\r
+            ],\r
+            "on_success": [\r
+              "download-baseconfig"\r
+            ]\r
+          },\r
+          "download-baseconfig": {\r
+            "description": "Call Download Base Config Component",\r
+            "target": "activate-netconf",\r
+            "activities": [\r
               {\r
                 "call_operation": "NetconfTransactionNode.process"\r
               }\r
             ],\r
-            "on_success" : [\r
+            "on_success": [\r
               "download-licence"\r
             ]\r
           },\r
-          "download-licence" : {\r
-            "description" : "Call Download Licence Component",\r
-            "target" : "activate-netconf",\r
-            "activities" : [\r
+          "download-licence": {\r
+            "description": "Call Download Licence Component",\r
+            "target": "activate-netconf",\r
+            "activities": [\r
               {\r
                 "call_operation": "NetconfTransactionNode.process"\r
               }\r
@@ -214,7 +244,7 @@
         "version": {\r
           "required": false,\r
           "type": "string",\r
-          "default" : "LATEST"\r
+          "default": "LATEST"\r
         }\r
       },\r
       "derived_from": "tosca.nodes.DG"\r
@@ -222,74 +252,16 @@
     "tosca.nodes.Component": {\r
       "description": "This is Resource Assignment Component API",\r
       "version": "1.0.0",\r
-      "properties": {\r
-        "type": {\r
-          "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-          "required": false,\r
-          "type": "string"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "DefaultOperation": {\r
-          "operations": {\r
-            "validate": {\r
-              "inputs": {\r
-                "action-name": {\r
-                  "description": "validate for action",\r
-                  "required": false,\r
-                  "type": "string"\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "artifacts" :{\r
-        "component-jar": {\r
-          "description": "Component Jar",\r
-          "type": "artifact-component-jar",\r
-          "file": "Component/basecomponent.jar"\r
-        }\r
-      },\r
       "derived_from": "tosca.nodes.Root"\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
+    "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.component.Python": {\r
       "description": "This is Resource Assignment Python Component API",\r
       "version": "1.0.0",\r
-      "properties": {\r
-        "type": {\r
-          "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-          "required": false,\r
-          "type": "string"\r
-        }\r
-      },\r
-      "interfaces": {\r
-        "DefaultOperation": {\r
-          "operations": {\r
-            "validate": {\r
-              "inputs": {\r
-                "action-name": {\r
-                  "description": "validate for action",\r
-                  "required": false,\r
-                  "type": "string"\r
-                }\r
-              }\r
-            }\r
-          }\r
-        }\r
-      },\r
-      "artifacts" :{\r
-        "component-jar": {\r
-          "description": "Component Jar",\r
-          "type": "artifact-component-jar",\r
-          "file": "Component/basecomponent.jar"\r
-        }\r
-      },\r
       "derived_from": "tosca.nodes.Root"\r
     },\r
     "component-resource-assignment": {\r
@@ -392,7 +364,7 @@
     }\r
   },\r
   "data_types": {\r
-    "sample-property" : {\r
+    "sample-property": {\r
       "description": "This is sample data type",\r
       "version": "1.0.0",\r
       "properties": {\r
@@ -407,10 +379,10 @@
         "version": {\r
           "required": false,\r
           "type": "string",\r
-          "default" : "LATEST"\r
+          "default": "LATEST"\r
         }\r
       },\r
-      "derived_from" : "tosca.datatypes.Root"\r
+      "derived_from": "tosca.datatypes.Root"\r
     }\r
   }\r
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json b/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json
index 34c0284..d424a8e 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json
@@ -7,16 +7,16 @@
     }\r
   },\r
   "interfaces": {\r
-    "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+    "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
       "operations": {\r
         "process": {\r
           "inputs": {\r
-            "service-template-name": {\r
+           "template-name": {\r
               "description": "Service Template Name.",\r
               "required": true,\r
               "type": "string"\r
             },\r
-            "service-template-version": {\r
+           "template-version": {\r
               "description": "Service Template Version.",\r
               "required": true,\r
               "type": "string"\r

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
index 5fe2d25..41f6e92 100644 (file)
--- 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
@@ -3,7 +3,7 @@
     "template_author": "Brinda Santh ( bs2796@onap.com )",\r
     "template_name": "vrr-test",\r
     "template_version": "1.0.0",\r
-    "template_tags" : "brinda, VRR",\r
+    "template_tags": "brinda, VRR",\r
     "release": "201802",\r
     "service-type": "AVPN",\r
     "vnf-type": "VRR"\r
@@ -172,20 +172,30 @@
       "resource-assignment": {\r
         "type": "component-resource-assignment",\r
         "interfaces": {\r
-          "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
             "operations": {\r
               "process": {\r
                 "inputs": {\r
-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\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": "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"vnf-id\" }"\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
@@ -205,8 +215,12 @@
           "netconf": {\r
             "properties": {\r
               "profile-name": "sample",\r
-              "oam-ipv4-address": "{ \"get_attribute\" : \"hostname\" }",\r
-              "port-number": { "get_input" : "host-port" },\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
@@ -218,19 +232,29 @@
           "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {\r
             "operations": {\r
               "process": {\r
-                "implementation" : {\r
-                  "primary" : "file://netconf-adaptor/DefaultGetConfig.py"\r
+                "implementation": {\r
+                  "primary": "file://netconf-adaptor/DefaultGetConfig.py"\r
                 },\r
                 "inputs": {\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\r
+                  "action-name": {\r
+                    "get_input": "action-name"\r
+                  },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": "{ \"get_attribute\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"vnf-id\" }",\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": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }",\r
-                  "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }"\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
@@ -311,7 +335,7 @@
         }\r
       },\r
       "interfaces": {\r
-        "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
           "operations": {\r
             "process": {\r
               "inputs": {\r
@@ -320,12 +344,12 @@
                   "required": true,\r
                   "type": "string"\r
                 },\r
-                "service-template-name": {\r
+                "template-name": {\r
                   "description": "Service Template Name.",\r
                   "required": true,\r
                   "type": "string"\r
                 },\r
-                "service-template-version": {\r
+                "template-version": {\r
                   "description": "Service Template Version.",\r
                   "required": true,\r
                   "type": "string"\r
@@ -569,12 +593,12 @@
                   "required": true,\r
                   "type": "string"\r
                 },\r
-                "service-template-name": {\r
+                "template-name": {\r
                   "description": "Service Template Name",\r
                   "required": true,\r
                   "type": "string"\r
                 },\r
-                "service-template-version": {\r
+                "template-version": {\r
                   "description": "Service Template Version",\r
                   "required": true,\r
                   "type": "string"\r
@@ -617,25 +641,25 @@
       },\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
+    "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
+    "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
+    "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
+    "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

diff --git a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
index 8b1c790..5b5332f 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
+++ b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
@@ -13,11 +13,11 @@
                                "required": true,\r
                                "type": "string"\r
                        },\r
-                       "service-template-name": {\r
+                       "template-name": {\r
                                "required": true,\r
                                "type": "string"\r
                        },\r
-                       "service-template-version": {\r
+                       "template-version": {\r
                                "required": true,\r
                                "type": "string"\r
                        },\r
@@ -146,7 +146,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -155,8 +155,8 @@
                                                                                "base-config-template",\r
                                                                                "licence-template"\r
                                                                        ],\r
-                                                                       "request-id": "{ \"get_attribute\" : \"request-id\" }",\r
-                                                                       "resource-id": "{ \"get_input\" : \"vnf-id\" }"\r
+                                                                       "request-id": { "get_input" : "request-id" },\r
+                                                                       "resource-id": { "get_input" : "vnf-id" }\r
                                                                },\r
                                                                "outputs": {\r
                                                                        "resource-assignment-params": "",\r
@@ -220,10 +220,10 @@
                                                                        ],\r
                                                                        "resource-type": "vnf-type",\r
                                                                        "initialise-sftp": false,\r
-                                                                       "request-id": "{ \"get_input\" : \"request-id\" }",\r
+                                                                       "request-id": {"get_input" : "request-id"},\r
                                                                        "initialise-ssh": false,\r
-                                                                       "resource-id": "{ \"get_input\" : \"vnf-id\" }",\r
-                                                                       "action-name": "{ \"get_input\" : \"action-name\" }"\r
+                                                                       "resource-id": { "get_input" : "vnf-id" },\r
+                                                                       "action-name": {"get_input" : "action-name"}\r
                                                                },\r
                                                                "outputs": {\r
                                                                        "rpc-response-message": "",\r
@@ -400,20 +400,6 @@
                        "capabilities": {\r
                                "dg-node": {\r
                                        "type": "tosca.capabilities.Node"\r
-                               },\r
-                               "content": {\r
-                                       "type": "tosca.capabilities.Content",\r
-                                       "properties": {\r
-                                               "type": {\r
-                                                       "required": false,\r
-                                                       "type": "string",\r
-                                                       "default": "json"\r
-                                               },\r
-                                               "content": {\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
                                }\r
                        },\r
                        "requirements": {\r
@@ -465,20 +451,6 @@
                        "capabilities": {\r
                                "dg-node": {\r
                                        "type": "tosca.capabilities.Node"\r
-                               },\r
-                               "content": {\r
-                                       "type": "tosca.capabilities.Content",\r
-                                       "properties": {\r
-                                               "type": {\r
-                                                       "required": false,\r
-                                                       "type": "string",\r
-                                                       "default": "json"\r
-                                               },\r
-                                               "content": {\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
                                }\r
                        },\r
                        "requirements": {\r
@@ -553,7 +525,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
index d5d3f66..70d03e0 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
@@ -39,7 +39,12 @@
               "login-key": "sdnc",\r
               "login-account": "sndc-local",\r
               "source": "local",\r
-              "target-ip-address": "{\"get_attribute\":\"lo0-local-ipv4-address\"}",\r
+              "target-ip-address": {\r
+                "get_attribute": [\r
+                  "SELF",\r
+                  "lo0-local-ipv4-address"\r
+                ]\r
+              },\r
               "port-number": 22,\r
               "connection-time-out": 30\r
             }\r
@@ -63,20 +68,40 @@
             "operations": {\r
               "process": {\r
                 "inputs": {\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                  "template-name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "template-version": "{ \"get_attribute\" : \"template_version\" }",\r
+                  "action-name": {\r
+                    "get_input": "action-name"\r
+                  },\r
+                  "template-name": {\r
+                    "get_input": "template_name"\r
+                  },\r
+                  "template-version": {\r
+                    "get_input": "template_version"\r
+                  },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"hostname\" }",\r
+                  "request-id": {\r
+                    "get_input": "request-id"\r
+                  },\r
+                  "resource-id": {\r
+                    "get_input": "hostname"\r
+                  },\r
                   "execution-script": "execution-script"\r
                 },\r
                 "outputs": {\r
-                  "response-data": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }",\r
-                  "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }"\r
+                  "response-data": {\r
+                    "get_attribute": [\r
+                      "SELF",\r
+                      "netconf-executor-baseconfig.response-data"\r
+                    ]\r
+                  },\r
+                  "status": {\r
+                    "get_attribute": [\r
+                      "SELF",\r
+                      "netconf-executor-baseconfig.status"\r
+                    ]\r
+                  }\r
                 },\r
-                "implementation" : {\r
-                  "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"\r
+                "implementation": {\r
+                  "primary": "file://netconf_adaptor/DefaultBaseLicenceConfig.py"\r
                 }\r
               }\r
             }\r
@@ -89,7 +114,7 @@
           "component-node": {}\r
         },\r
         "interfaces": {\r
-          "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
             "operations": {\r
               "process": {\r
                 "inputs": {\r
@@ -97,12 +122,22 @@
                     "base-config-template",\r
                     "licence-template"\r
                   ],\r
-                  "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",\r
+                  "action-name": {\r
+                    "get_input": "action-name"\r
+                  },\r
+                  "template-name": {\r
+                    "get_input": "template_name"\r
+                  },\r
+                  "template-version": {\r
+                    "get_input": "template-version"\r
+                  },\r
                   "resource-type": "vnf-type",\r
-                  "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id": "{ \"get_input\" : \"hostname\" }"\r
+                  "request-id": {\r
+                    "get_input": "request-id"\r
+                  },\r
+                  "resource-id": {\r
+                    "get_input": "hostname"\r
+                  }\r
                 },\r
                 "outputs": {\r
                   "resource-assignment-params": "success",\r

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index b6898d8..bf3deff 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -215,16 +215,16 @@
         }\r
       },\r
       "interfaces" : {\r
-        "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode" : {\r
+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
           "operations" : {\r
             "process" : {\r
               "inputs" : {\r
-                "service-template-name" : {\r
+                "template-name" : {\r
                   "description" : "Service Template Name.",\r
                   "required" : true,\r
                   "type" : "string"\r
                 },\r
-                "service-template-version" : {\r
+                "template-version" : {\r
                   "description" : "Service Template Version.",\r
                   "required" : true,\r
                   "type" : "string"\r
@@ -535,7 +535,9 @@
               "login-key" : "sdnc",\r
               "login-account" : "sndc-local",\r
               "source" : "local",\r
-              "target-ip-address" : "{\"get_attribute\":\"lo0-local-ipv4-address\"}",\r
+              "target-ip-address" : {\r
+                "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ]\r
+              },\r
               "port-number" : 22,\r
               "connection-time-out" : 30\r
             }\r
@@ -562,17 +564,31 @@
                   "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"\r
                 },\r
                 "inputs" : {\r
-                  "action-name" : "{ \"get_input\" : \"action-name\" }",\r
-                  "template-name" : "{ \"get_attribute\" : \"template_name\" }",\r
-                  "template-version" : "{ \"get_attribute\" : \"template_version\" }",\r
+                  "action-name" : {\r
+                    "get_input" : "action-name"\r
+                  },\r
+                  "template-name" : {\r
+                    "get_input" : "template_name"\r
+                  },\r
+                  "template-version" : {\r
+                    "get_input" : "template_version"\r
+                  },\r
                   "resource-type" : "vnf-type",\r
-                  "request-id" : "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id" : "{ \"get_input\" : \"hostname\" }",\r
+                  "request-id" : {\r
+                    "get_input" : "request-id"\r
+                  },\r
+                  "resource-id" : {\r
+                    "get_input" : "hostname"\r
+                  },\r
                   "execution-script" : "execution-script"\r
                 },\r
                 "outputs" : {\r
-                  "response-data" : "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }",\r
-                  "status" : "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }"\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
@@ -585,17 +601,27 @@
           "component-node" : { }\r
         },\r
         "interfaces" : {\r
-          "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode" : {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
             "operations" : {\r
               "process" : {\r
                 "inputs" : {\r
                   "template-names" : [ "base-config-template", "licence-template" ],\r
-                  "action-name" : "{ \"get_input\" : \"action-name\" }",\r
-                  "service-template-name" : "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version" : "{ \"get_attribute\" : \"service-template-version\" }",\r
+                  "action-name" : {\r
+                    "get_input" : "action-name"\r
+                  },\r
+                  "template-name" : {\r
+                    "get_input" : "template_name"\r
+                  },\r
+                  "template-version" : {\r
+                    "get_input" : "template-version"\r
+                  },\r
                   "resource-type" : "vnf-type",\r
-                  "request-id" : "{ \"get_input\" : \"request-id\" }",\r
-                  "resource-id" : "{ \"get_input\" : \"hostname\" }"\r
+                  "request-id" : {\r
+                    "get_input" : "request-id"\r
+                  },\r
+                  "resource-id" : {\r
+                    "get_input" : "hostname"\r
+                  }\r
                 },\r
                 "outputs" : {\r
                   "resource-assignment-params" : "success",\r