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>

6 files changed, 22 insertions, 56 deletions

diff --git a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index 714195f3..9c70d6ea 100644
--- 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": {}

         },

         "interfaces": {

-          "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {

+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

             "operations": {

               "process": {

                 "inputs": {

@@ -258,7 +258,7 @@
         }

       },

       "interfaces": {

-        "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {

+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

           "operations": {

             "process": {

               "inputs": {

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 6d469ea8..207fcc41 100644
--- 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 @@
 {

   "description": "This is Resource Assignment Component API",

   "version": "1.0.0",

-  "properties": {

-    "type": {

-      "description": "Request Id used to store the generated configuration, in the database along with the template-name",

-      "required": false,

-      "type": "string"

-    }

-  },

-  "interfaces": {

-    "DefaultOperation": {

-      "operations": {

-        "validate": {

-          "inputs": {

-            "action-name": {

-              "description": "validate for action",

-              "required": false,

-              "type": "string"

-            }

-          }

-        }

-      }

-    }

-  },

-  "artifacts" :{

-    "component-jar": {

-      "description": "Component Jar",

-      "type": "artifact-component-jar",

-      "file": "Component/basecomponent.jar"

-    }

-  },

-  "derived_from": "tosca.nodes.Root"

+   "derived_from": "tosca.nodes.Root"

 }
\ 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 65028ace..cb091da0 100644
--- 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",

               "login-account": "sndc-local",

               "source": "local",

-              "target-ip-address": "{\"get_attribute\":\"lo0-local-ipv4-address\"}",

+              "target-ip-address":  { "get_attribute": ["SELF", "lo0-local-ipv4-address"]},

               "port-number": 22,

               "connection-time-out": 30

             }

@@ -58,21 +58,21 @@
           }

         },

         "interfaces": {

-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {

+          "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {

             "operations": {

               "process": {

                 "inputs": {

-                  "action-name": "{ \"get_input\" : \"action-name\" }",

-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",

-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",

+                  "action-name": { "get_input" : "action-name" },

+                  "service-template-name": { "get_input" : "template_name" },

+                  "service-template-version": { "get_input" : "service-template-version" },

                   "resource-type": "vnf-type",

-                  "request-id": "{ \"get_input\" : \"request-id\" }",

-                  "resource-id": "{ \"get_input\" : \"hostname\" }",

+                  "request-id": { "get_input" : "request-id" },

+                  "resource-id": { "get_input" : "hostname" },

                   "execution-script": "execution-script"

                 },

                 "outputs": {

-                  "response-data": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }",

-                  "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }"

+                  "response-data": { "get_input" : ["SELF", "netconf-executor-baseconfig.response-data"] },

+                  "status": { "get_input" : ["SELF", "netconf-executor-baseconfig.status"] }

                 },

                 "implementation" : {

                   "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"

@@ -88,7 +88,7 @@
           "component-node": {}

         },

         "interfaces": {

-          "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": {

+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

             "operations": {

               "process": {

                 "inputs": {

@@ -96,12 +96,12 @@
                     "base-config-template",

                     "licence-template"

                   ],

-                  "action-name": "{ \"get_input\" : \"action-name\" }",

-                  "service-template-name": "{ \"get_attribute\" : \"template_name\" }",

-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",

+                  "action-name": { "get_input" : "action-name" },

+                  "service-template-name": { "get_input" : "template_name" },

+                  "service-template-version": { "get_input" : "service-template-version" },

                   "resource-type": "vnf-type",

-                  "request-id": "{ \"get_input\" : \"request-id\" }",

-                  "resource-id": "{ \"get_input\" : \"hostname\" }"

+                  "request-id": { "get_input" : "request-id" },

+                  "resource-id": { "get_input" : "hostname" }

                 },

                 "outputs": {

                   "resource-assignment-params": "success",

@@ -127,12 +127,7 @@
           }

         },

         "capabilities": {

-          "dg-node": {},

-          "content": {

-            "properties": {

-              "type": "json"

-            }

-          }

+          "dg-node": {}

         },

         "interfaces": {

           "CONFIG": {

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 764f9e89..9e86b8ae 100644
--- 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 @@
 		}

 	},

 	"interfaces": {

-		"org-openecomp-sdnc-config-generator-service-ConfigGeneratorNode": {

+		"org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {

 			"operations": {

 				"process": {

 					"inputs": {

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 aed667aa..7dcff583 100644
--- 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 @@
     }

   },

   "interfaces": {

-    "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {

+    "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {

       "operations": {

         "process": {

           "inputs": {

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 03f3c284..1389bc32 100644
--- 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 @@
     }

   },

   "interfaces": {

-    "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode": {

+    "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

       "operations": {

         "process": {

           "inputs": {