From: Brinda Santh <brindasanth@in.ibm.com>
Date: Thu, 6 Sep 2018 01:47:01 +0000 (-0400)
Subject: Controller Blueprints Microservice
X-Git-Tag: 0.4.2~160^2~127
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=674ff8788638a375226ab9b36c9552ca9918194f;p=ccsdk%2Fcds.git

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 635e177a1..851ded2ca 100644
--- 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": {
         "type": "component-resource-assignment",
         "properties":{
-          "request-id": ["1234", "1234"]
+          "request-id": "1234"
         },
         "interfaces": {
           "DefaultComponentNode": {
@@ -80,7 +80,7 @@
       "resource-assignment-py": {
         "type": "component-resource-assignment",
         "properties":{
-          "request-id": ["1234", "1234"]
+          "request-id": "1234"
         },
         "interfaces": {
           "DefaultComponentNode": {
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 aed667aaf..240caf3fc 100644
--- 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,
               "type": "string"
             },
-            "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"
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 5824031e2..155dc7235 100644
--- 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": {
                 "inputs": {
                   "action-name": "{ \"get_input\" : \"action-name\" }",
-                  "template_name": "{ \"get_attribute\" : \"template_name\" }",
-                  "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }",
+                  "template-name": "{ \"get_attribute\" : \"template_name\" }",
+                  "template-version": "{ \"get_attribute\" : \"template_version\" }",
                   "resource-type": "vnf-type",
                   "request-id": "{ \"get_input\" : \"request-id\" }",
                   "resource-id": "{ \"get_input\" : \"hostname\" }",