Controller Blueprints Microservice

Add Controller Blueprint NodeTemplate Interface, Operation, Input and Output validation

Change-Id: I6fae38cc8a4a36ddacc93bcea4b0061f846c6aba
Issue-ID: CCSDK-484
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

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 635e177..851ded2 100644 (file)
--- a/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
@@ -44,7 +44,7 @@
       "resource-assignment": {\r
         "type": "component-resource-assignment",\r
         "properties":{\r
-          "request-id": ["1234", "1234"]\r
+          "request-id": "1234"\r
         },\r
         "interfaces": {\r
           "DefaultComponentNode": {\r
@@ -80,7 +80,7 @@
       "resource-assignment-py": {\r
         "type": "component-resource-assignment",\r
         "properties":{\r
-          "request-id": ["1234", "1234"]\r
+          "request-id": "1234"\r
         },\r
         "interfaces": {\r
           "DefaultComponentNode": {\r

diff --git a/ms/controllerblueprints/modules/service/load/model_type/node_type/component-netconf-executor.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/component-netconf-executor.json
index aed667a..240caf3 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/model_type/node_type/component-netconf-executor.json
+++ b/ms/controllerblueprints/modules/service/load/model_type/node_type/component-netconf-executor.json
@@ -23,12 +23,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

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 5824031..155dc72 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
@@ -64,8 +64,8 @@
               "process": {\r
                 "inputs": {\r
                   "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                  "template_name": "{ \"get_attribute\" : \"template_name\" }",\r
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",\r
+                  "template-name": "{ \"get_attribute\" : \"template_name\" }",\r
+                  "template-version": "{ \"get_attribute\" : \"template_version\" }",\r
                   "resource-type": "vnf-type",\r
                   "request-id": "{ \"get_input\" : \"request-id\" }",\r
                   "resource-id": "{ \"get_input\" : \"hostname\" }",\r