Controller Blueprints Microservice

Add Property Assign validation and Data Type Entry schema validation.

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

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/application/load/model_type/node_type/dg-activate-netconf.json
index c638df0..a9d16ed 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/dg-activate-netconf.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/dg-activate-netconf.json
@@ -15,7 +15,7 @@
                "is-start-flow": {
                        "required": false,
                        "type": "boolean",
-                       "default": "false"
+                       "default": false
                }
        },
        "capabilities": {

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/application/load/model_type/node_type/dg-config-generator.json
index 28bace0..6794b3c 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/dg-config-generator.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/dg-config-generator.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\r

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assign-activate.json
index e98fa5a..22a4d81 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assign-activate.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assign-activate.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\r

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assignment.json
index 36fbb68..7c01faa 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assignment.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/dg-resource-assignment.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\r

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Component.json b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Component.json
new file mode 100644 (file)
index 0000000..bc4827b
--- /dev/null
+++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Component.json
@@ -0,0 +1,5 @@
+{\r
+  "description": "This is default Component Node",\r
+  "version": "1.0.0",\r
+  "derived_from": "tosca.nodes.Root"\r
+}
\ No newline at end of file

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.DG.json b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.DG.json
new file mode 100644 (file)
index 0000000..86728cf
--- /dev/null
+++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.DG.json
@@ -0,0 +1,5 @@
+{\r
+  "description": "This is Directed Graph Node Type",\r
+  "version": "1.0.0",\r
+  "derived_from": "tosca.nodes.Root"\r
+}
\ No newline at end of file

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Vnf.json b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Vnf.json
new file mode 100644 (file)
index 0000000..acb1f2f
--- /dev/null
+++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Vnf.json
@@ -0,0 +1,5 @@
+{\r
+  "description": "This is VNF Node Type",\r
+  "version": "1.0.0",\r
+  "derived_from": "tosca.nodes.Root"\r
+}
\ No newline at end of file

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.component.Python.json b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.component.Python.json
new file mode 100644 (file)
index 0000000..7b67c8c
--- /dev/null
+++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.component.Python.json
@@ -0,0 +1,5 @@
+{\r
+  "description": "This is Python Component",\r
+  "version": "1.0.0",\r
+  "derived_from": "tosca.nodes.Root"\r
+}
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/ms/controllerblueprints/modules/service/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index 635e177..851ded2 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/ms/controllerblueprints/modules/service/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/blueprints/vrr-test/Definitions/vrr-test.json b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json
index d71dd20..a06165b 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
@@ -268,7 +268,7 @@
         "is-start-flow": {\r
           "required": false,\r
           "type": "boolean",\r
-          "default": "false"\r
+          "default": false\r
         }\r
       },\r
       "capabilities": {\r
@@ -524,7 +524,7 @@
         "is-start-flow": {\r
           "required": false,\r
           "type": "boolean",\r
-          "default": "false"\r
+          "default": false\r
         }\r
       },\r
       "capabilities": {\r

diff --git a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-activate-netconf.json
index c638df0..a9d16ed 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-activate-netconf.json
+++ b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-activate-netconf.json
@@ -15,7 +15,7 @@
                "is-start-flow": {
                        "required": false,
                        "type": "boolean",
-                       "default": "false"
+                       "default": false
                }
        },
        "capabilities": {

diff --git a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-config-generator.json
index 28bace0..6794b3c 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-config-generator.json
+++ b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-config-generator.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\r

diff --git a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assign-activate.json
index e98fa5a..22a4d81 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assign-activate.json
+++ b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assign-activate.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\r

diff --git a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assignment.json
index 36fbb68..7c01faa 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assignment.json
+++ b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-resource-assignment.json
@@ -15,7 +15,7 @@
                "is-start-flow": {\r
                        "required": false,\r
                        "type": "boolean",\r
-                       "default": "false"\r
+                       "default": false\r
                }\r
        },\r
        "capabilities": {\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 95c829c..14f724e 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
@@ -394,7 +394,7 @@
                                "is-start-flow": {\r
                                        "required": false,\r
                                        "type": "boolean",\r
-                                       "default": "false"\r
+                                       "default": false\r
                                }\r
                        },\r
                        "capabilities": {\r
@@ -459,7 +459,7 @@
                                "is-start-flow": {\r
                                        "required": false,\r
                                        "type": "boolean",\r
-                                       "default": "false"\r
+                                       "default": false\r
                                }\r
                        },\r
                        "capabilities": {\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 fedf1da..5824031 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
@@ -118,7 +118,7 @@
         "properties": {\r
           "mode": "sync",\r
           "version": "LATEST",\r
-          "is-start-flow": "false"\r
+          "is-start-flow": false\r
         },\r
         "requirements": {\r
           "component-dependency": {\r
@@ -152,7 +152,7 @@
         "properties": {\r
           "mode": "sync",\r
           "version": "LATEST",\r
-          "is-start-flow": "false"\r
+          "is-start-flow": false\r
         },\r
         "requirements": {\r
           "component-dependency": {\r
@@ -195,16 +195,8 @@
                 {\r
                   "name": "bundle-mac",\r
                   "property": {\r
-                    "description": "",\r
                     "required": true,\r
-                    "type": "string",\r
-                    "status": "",\r
-                    "constraints": [\r
-                      {}\r
-                    ],\r
-                    "entry_schema": {\r
-                      "type": ""\r
-                    }\r
+                    "type": "string"\r
                   },\r
                   "input-param": false,\r
                   "dictionary-name": "bundle-mac",\r
@@ -220,10 +212,6 @@
                     "description": "",\r
                     "required": true,\r
                     "type": "list",\r
-                    "status": "",\r
-                    "constraints": [\r
-                      {}\r
-                    ],\r
                     "entry_schema": {\r
                       "type": "dt-v4-aggregate"\r
                     }\r
@@ -293,13 +281,8 @@
                 {\r
                   "name": "licenses",\r
                   "property": {\r
-                    "description": "",\r
                     "required": true,\r
                     "type": "list",\r
-                    "status": "",\r
-                    "constraints": [\r
-                      {}\r
-                    ],\r
                     "entry_schema": {\r
                       "type": "dt-license-key"\r
                     }\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 0633c64..c3f2573 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
@@ -115,25 +115,16 @@
       "version" : "1.0.0",\r
       "properties" : {\r
         "bundle-mac" : {\r
-          "description" : "",\r
           "required" : true,\r
-          "type" : "string",\r
-          "status" : "",\r
-          "constraints" : [ { } ],\r
-          "entry_schema" : {\r
-            "type" : ""\r
-          }\r
+          "type" : "string"\r
         },\r
         "hostname" : {\r
           "required" : true,\r
           "type" : "string"\r
         },\r
         "licenses" : {\r
-          "description" : "",\r
           "required" : true,\r
           "type" : "list",\r
-          "status" : "",\r
-          "constraints" : [ { } ],\r
           "entry_schema" : {\r
             "type" : "dt-license-key"\r
           }\r
@@ -142,8 +133,6 @@
           "description" : "",\r
           "required" : true,\r
           "type" : "list",\r
-          "status" : "",\r
-          "constraints" : [ { } ],\r
           "entry_schema" : {\r
             "type" : "dt-v4-aggregate"\r
           }\r
@@ -178,7 +167,7 @@
         "is-start-flow" : {\r
           "required" : false,\r
           "type" : "boolean",\r
-          "default" : "false"\r
+          "default" : false\r
         }\r
       },\r
       "capabilities" : {\r
@@ -468,7 +457,7 @@
         "is-start-flow" : {\r
           "required" : false,\r
           "type" : "boolean",\r
-          "default" : "false"\r
+          "default" : false\r
         }\r
       },\r
       "capabilities" : {\r
@@ -630,7 +619,7 @@
         "properties" : {\r
           "mode" : "sync",\r
           "version" : "LATEST",\r
-          "is-start-flow" : "false"\r
+          "is-start-flow" : false\r
         },\r
         "capabilities" : {\r
           "dg-node" : { },\r
@@ -664,7 +653,7 @@
         "properties" : {\r
           "mode" : "sync",\r
           "version" : "LATEST",\r
-          "is-start-flow" : "false"\r
+          "is-start-flow" : false\r
         },\r
         "capabilities" : {\r
           "dg-node" : { },\r
@@ -709,14 +698,8 @@
               "mapping" : [ {\r
                 "name" : "bundle-mac",\r
                 "property" : {\r
-                  "description" : "",\r
                   "required" : true,\r
-                  "type" : "string",\r
-                  "status" : "",\r
-                  "constraints" : [ { } ],\r
-                  "entry_schema" : {\r
-                    "type" : ""\r
-                  }\r
+                  "type" : "string"\r
                 },\r
                 "input-param" : false,\r
                 "dictionary-name" : "bundle-mac",\r
@@ -729,8 +712,6 @@
                   "description" : "",\r
                   "required" : true,\r
                   "type" : "list",\r
-                  "status" : "",\r
-                  "constraints" : [ { } ],\r
                   "entry_schema" : {\r
                     "type" : "dt-v4-aggregate"\r
                   }\r
@@ -791,11 +772,8 @@
               "mapping" : [ {\r
                 "name" : "licenses",\r
                 "property" : {\r
-                  "description" : "",\r
                   "required" : true,\r
                   "type" : "list",\r
-                  "status" : "",\r
-                  "constraints" : [ { } ],\r
                   "entry_schema" : {\r
                     "type" : "dt-license-key"\r
                   }\r