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>

2 files changed, 79 insertions, 107 deletions

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 d4fbf5cf..06e7e930 100644
--- 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": {

     "template_author": "Brinda Santh Muthuramalingam",

     "author-email": "brindasanth@gmail.com",

-    "user-groups" : "ADMIN, OPERATION",

+    "user-groups": "ADMIN, OPERATION",

     "template_name": "baseconfiguration",

     "template_version": "1.0.0",

     "template_tags": "brinda, tosca"

@@ -30,9 +30,21 @@
       "activate-process": {

         "type": "bpmn-activate",

         "properties": {

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

-          "version" : { "get_property" : ["SELF", "process-name"] },

-          "content": { "get_artifact" : ["SELF", "activate-process"] }

+          "process-name": {

+            "get_input": "action-name"

+          },

+          "version": {

+            "get_property": [

+              "SELF",

+              "process-name"

+            ]

+          },

+          "content": {

+            "get_artifact": [

+              "SELF",

+              "activate-process"

+            ]

+          }

         },

         "artifacts": {

           "activate-process": {

@@ -43,7 +55,7 @@
       },

       "resource-assignment": {

         "type": "component-resource-assignment",

-        "properties":{

+        "properties": {

           "request-id": "1234"

         },

         "interfaces": {

@@ -51,12 +63,28 @@
             "operations": {

               "process": {

                 "inputs": {

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

+                  "action-name": {

+                    "get_input": "action-name"

+                  },

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

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

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

-                  "template-content": { "get_artifact" : ["SELF", "baseconfig-template"] },

-                  "mapping-content": { "get_artifact" : ["SELF", "baseconfig-mapping"] }

+                  "request-id": {

+                    "get_input": "request-id"

+                  },

+                  "resource-id": {

+                    "get_input": "hostname"

+                  },

+                  "template-content": {

+                    "get_artifact": [

+                      "SELF",

+                      "baseconfig-template"

+                    ]

+                  },

+                  "mapping-content": {

+                    "get_artifact": [

+                      "SELF",

+                      "baseconfig-mapping"

+                    ]

+                  }

                 },

                 "outputs": {

                   "resource-assignment-params": "",

@@ -79,18 +107,20 @@
       },

       "resource-assignment-py": {

         "type": "component-resource-assignment",

-        "properties":{

+        "properties": {

           "request-id": "1234"

         },

         "interfaces": {

           "DefaultComponentNode": {

             "operations": {

               "process": {

-                "implementation" :{

-                  "primary" : "component-script"

+                "implementation": {

+                  "primary": "component-script"

                 },

                 "inputs": {

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

+                  "action-name": {

+                    "get_input": "action-name"

+                  }

                 },

                 "outputs": {

                   "resource-assignment-params": "",

@@ -108,37 +138,37 @@
         }

       }

     },

-    "workflows":{

-      "activate-process":{

-        "steps" : {

-            "call-resource-assignment" : {

-              "description" : "Invoke Resource Assignment Component",

-              "target" : "resource-assignment",

-              "activities" : [

-                {

-                  "call_operation": "ResourceAssignmentNode.process"

-                }

-              ],

-              "on_success" : [

-                "download-baseconfig"

-              ]

-            },

-          "download-baseconfig" : {

-            "description" : "Call Download Base Config Component",

-            "target" : "activate-netconf",

-            "activities" : [

+    "workflows": {

+      "activate-process": {

+        "steps": {

+          "call-resource-assignment": {

+            "description": "Invoke Resource Assignment Component",

+            "target": "resource-assignment",

+            "activities": [

+              {

+                "call_operation": "ResourceAssignmentNode.process"

+              }

+            ],

+            "on_success": [

+              "download-baseconfig"

+            ]

+          },

+          "download-baseconfig": {

+            "description": "Call Download Base Config Component",

+            "target": "activate-netconf",

+            "activities": [

               {

                 "call_operation": "NetconfTransactionNode.process"

               }

             ],

-            "on_success" : [

+            "on_success": [

               "download-licence"

             ]

           },

-          "download-licence" : {

-            "description" : "Call Download Licence Component",

-            "target" : "activate-netconf",

-            "activities" : [

+          "download-licence": {

+            "description": "Call Download Licence Component",

+            "target": "activate-netconf",

+            "activities": [

               {

                 "call_operation": "NetconfTransactionNode.process"

               }

@@ -214,7 +244,7 @@
         "version": {

           "required": false,

           "type": "string",

-          "default" : "LATEST"

+          "default": "LATEST"

         }

       },

       "derived_from": "tosca.nodes.DG"

@@ -222,74 +252,16 @@
     "tosca.nodes.Component": {

       "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"

     },

-    "tosca.nodes.DG" : {

-      "description" : "This is Directed Graph Node Type",

-      "version" : "1.0.0",

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

+    "tosca.nodes.DG": {

+      "description": "This is Directed Graph Node Type",

+      "version": "1.0.0",

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

     },

     "tosca.nodes.component.Python": {

       "description": "This is Resource Assignment Python 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"

     },

     "component-resource-assignment": {

@@ -392,7 +364,7 @@
     }

   },

   "data_types": {

-    "sample-property" : {

+    "sample-property": {

       "description": "This is sample data type",

       "version": "1.0.0",

       "properties": {

@@ -407,10 +379,10 @@
         "version": {

           "required": false,

           "type": "string",

-          "default" : "LATEST"

+          "default": "LATEST"

         }

       },

-      "derived_from" : "tosca.datatypes.Root"

+      "derived_from": "tosca.datatypes.Root"

     }

   }

 }
\ 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 34c02848..d424a8e4 100644
--- 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 @@
     }

   },

   "interfaces": {

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

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

       "operations": {

         "process": {

           "inputs": {

-            "service-template-name": {

+           "template-name": {

               "description": "Service Template Name.",

               "required": true,

               "type": "string"

             },

-            "service-template-version": {

+           "template-version": {

               "description": "Service Template Version.",

               "required": true,

               "type": "string"