Controller Blueprints Microservice

Add Capability Definition validations and add custom capabilities Types for content, mapping, netconf, ssh and sftp

Change-Id: I6a89d20280852034ce6ee56d2a9e97d3aab9c2db
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/artifact-config-template.json b/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json
index be9bbfc..af99d75 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json
@@ -12,7 +12,7 @@
        },\r
        "capabilities": {\r
                "content": {\r
-                       "type": "tosca.capability.Content",\r
+                       "type": "tosca.capabilities.Content",\r
                        "properties": {\r
                                "content": {\r
                                        "required": true,\r
@@ -21,7 +21,7 @@
                        }\r
                },\r
                "mapping": {\r
-                       "type": "tosca.capability.Mapping",\r
+                       "type": "tosca.capabilities.Mapping",\r
                        "properties": {\r
                                "mapping": {\r
                                        "required": false,\r

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 a9d16ed..57667de 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
@@ -21,20 +21,6 @@
        "capabilities": {
                "dg-node": {
                        "type": "tosca.capabilities.Node"
-               },
-               "content": {
-                       "type": "tosca.capability.Content",
-                       "properties": {
-                               "type": {
-                                       "required": false,
-                                       "type": "string",
-                                       "default": "json"
-                               },
-                               "content": {
-                                       "required": true,
-                                       "type": "string"
-                               }
-                       }
                }
        },
        "requirements": {

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 6794b3c..e59c34b 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
@@ -21,20 +21,6 @@
        "capabilities": {\r
                "dg-node": {\r
                        "type": "tosca.capabilities.Node"\r
-               },\r
-               "content": {\r
-                       "type": "tosca.capability.Content",\r
-                       "properties": {\r
-                               "type": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "json"\r
-                               },\r
-                               "content": {\r
-                                       "required": true,\r
-                                       "type": "string"\r
-                               }\r
-                       }\r
                }\r
        },\r
        "requirements": {\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 22a4d81..ca703a7 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
@@ -21,20 +21,6 @@
        "capabilities": {\r
                "dg-node": {\r
                        "type": "tosca.capabilities.Node"\r
-               },\r
-               "content": {\r
-                       "type": "tosca.capability.Content",\r
-                       "properties": {\r
-                               "type": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "json"\r
-                               },\r
-                               "content": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               }\r
-                       }\r
                }\r
        },\r
        "requirements": {\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 7c01faa..9cce82a 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
@@ -21,20 +21,6 @@
        "capabilities": {\r
                "dg-node": {\r
                        "type": "tosca.capabilities.Node"\r
-               },\r
-               "content": {\r
-                       "type": "tosca.capability.Content",\r
-                       "properties": {\r
-                               "type": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "json"\r
-                               },\r
-                               "content": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               }\r
-                       }\r
                }\r
        },\r
        "requirements": {\r

diff --git a/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json b/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json
index 54573ba..246f177 100644 (file)
--- a/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json
+++ b/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json
@@ -3,7 +3,7 @@
        "version": "1.0.0",\r
        "capabilities": {\r
                "netconf": {\r
-                       "type": "tosca.capability.Netconf",\r
+                       "type": "tosca.capabilities.Netconf",\r
                        "properties": {\r
                                "login-key": {\r
                                        "required": true,\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 724dfc4..5fe2d25 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
@@ -274,20 +274,6 @@
       "capabilities": {\r
         "dg-node": {\r
           "type": "tosca.capabilities.Node"\r
-        },\r
-        "content": {\r
-          "type": "tosca.capability.Content",\r
-          "properties": {\r
-            "type": {\r
-              "required": false,\r
-              "type": "string",\r
-              "default": "json"\r
-            },\r
-            "content": {\r
-              "required": false,\r
-              "type": "string"\r
-            }\r
-          }\r
         }\r
       },\r
       "requirements": {\r
@@ -398,7 +384,7 @@
       },\r
       "capabilities": {\r
         "content": {\r
-          "type": "tosca.capability.Content",\r
+          "type": "tosca.capabilities.Content",\r
           "properties": {\r
             "content": {\r
               "required": true,\r
@@ -407,7 +393,7 @@
           }\r
         },\r
         "mapping": {\r
-          "type": "tosca.capability.Mapping",\r
+          "type": "tosca.capabilities.Mapping",\r
           "properties": {\r
             "mapping": {\r
               "required": false,\r
@@ -426,7 +412,7 @@
       "version": "1.0.0",\r
       "capabilities": {\r
         "netconf": {\r
-          "type": "tosca.capability.Netconf",\r
+          "type": "tosca.capabilities.Netconf",\r
           "properties": {\r
             "profile-name": {\r
               "required": true,\r
@@ -449,7 +435,7 @@
           }\r
         },\r
         "ssh": {\r
-          "type": "tosca.capability.Ssh",\r
+          "type": "tosca.capabilities.Ssh",\r
           "properties": {\r
             "profile-name": {\r
               "required": true,\r
@@ -477,7 +463,7 @@
           }\r
         },\r
         "sftp": {\r
-          "type": "tosca.capability.Sftp",\r
+          "type": "tosca.capabilities.Sftp",\r
           "properties": {\r
             "profile-name": {\r
               "required": true,\r
@@ -530,20 +516,6 @@
       "capabilities": {\r
         "dg-node": {\r
           "type": "tosca.capabilities.Node"\r
-        },\r
-        "content": {\r
-          "type": "tosca.capability.Content",\r
-          "properties": {\r
-            "type": {\r
-              "required": false,\r
-              "type": "string",\r
-              "default": "json"\r
-            },\r
-            "content": {\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          }\r
         }\r
       },\r
       "requirements": {\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 14f724e..8b1c790 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
@@ -279,7 +279,7 @@
                        "version": "1.0.0",\r
                        "capabilities": {\r
                                "netconf": {\r
-                                       "type": "tosca.capability.Netconf",\r
+                                       "type": "tosca.capabilities.Netconf",\r
                                        "properties": {\r
                                                "password": {\r
                                                        "required": false,\r
@@ -311,7 +311,7 @@
                                        }\r
                                },\r
                                "ssh": {\r
-                                       "type": "tosca.capability.Ssh",\r
+                                       "type": "tosca.capabilities.Ssh",\r
                                        "properties": {\r
                                                "password": {\r
                                                        "required": false,\r
@@ -343,7 +343,7 @@
                                        }\r
                                },\r
                                "sftp": {\r
-                                       "type": "tosca.capability.Sftp",\r
+                                       "type": "tosca.capabilities.Sftp",\r
                                        "properties": {\r
                                                "password": {\r
                                                        "required": false,\r
@@ -402,7 +402,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -467,7 +467,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -521,7 +521,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -530,7 +530,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\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 155dc72..d5d3f66 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
@@ -128,12 +128,7 @@
           }\r
         },\r
         "capabilities": {\r
-          "dg-node": {},\r
-          "content": {\r
-            "properties": {\r
-              "type": "json"\r
-            }\r
-          }\r
+          "dg-node": {}\r
         },\r
         "interfaces": {\r
           "CONFIG": {\r
@@ -162,12 +157,7 @@
           }\r
         },\r
         "capabilities": {\r
-          "dg-node": {},\r
-          "content": {\r
-            "properties": {\r
-              "type": "json"\r
-            }\r
-          }\r
+          "dg-node": {}\r
         },\r
         "interfaces": {\r
           "CONFIG": {\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 9f8af1a..b6898d8 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
@@ -173,20 +173,6 @@
       "capabilities" : {\r
         "dg-node" : {\r
           "type" : "tosca.capabilities.Node"\r
-        },\r
-        "content" : {\r
-          "type" : "tosca.capability.Content",\r
-          "properties" : {\r
-            "type" : {\r
-              "required" : false,\r
-              "type" : "string",\r
-              "default" : "json"\r
-            },\r
-            "content" : {\r
-              "required" : false,\r
-              "type" : "string"\r
-            }\r
-          }\r
         }\r
       },\r
       "requirements" : {\r
@@ -307,7 +293,7 @@
       },\r
       "capabilities" : {\r
         "content" : {\r
-          "type" : "tosca.capability.Content",\r
+          "type" : "tosca.capabilities.Content",\r
           "properties" : {\r
             "content" : {\r
               "required" : true,\r
@@ -316,7 +302,7 @@
           }\r
         },\r
         "mapping" : {\r
-          "type" : "tosca.capability.Mapping",\r
+          "type" : "tosca.capabilities.Mapping",\r
           "properties" : {\r
             "mapping" : {\r
               "required" : false,\r
@@ -335,7 +321,7 @@
       "version" : "1.0.0",\r
       "capabilities" : {\r
         "netconf" : {\r
-          "type" : "tosca.capability.Netconf",\r
+          "type" : "tosca.capabilities.Netconf",\r
           "properties" : {\r
             "login-key" : {\r
               "required" : true,\r
@@ -483,20 +469,6 @@
       "capabilities" : {\r
         "dg-node" : {\r
           "type" : "tosca.capabilities.Node"\r
-        },\r
-        "content" : {\r
-          "type" : "tosca.capability.Content",\r
-          "properties" : {\r
-            "type" : {\r
-              "required" : false,\r
-              "type" : "string",\r
-              "default" : "json"\r
-            },\r
-            "content" : {\r
-              "required" : true,\r
-              "type" : "string"\r
-            }\r
-          }\r
         }\r
       },\r
       "requirements" : {\r
@@ -642,12 +614,7 @@
           "is-start-flow" : false\r
         },\r
         "capabilities" : {\r
-          "dg-node" : { },\r
-          "content" : {\r
-            "properties" : {\r
-              "type" : "json"\r
-            }\r
-          }\r
+          "dg-node" : { }\r
         },\r
         "requirements" : {\r
           "component-dependency" : {\r
@@ -676,12 +643,7 @@
           "is-start-flow" : false\r
         },\r
         "capabilities" : {\r
-          "dg-node" : { },\r
-          "content" : {\r
-            "properties" : {\r
-              "type" : "json"\r
-            }\r
-          }\r
+          "dg-node" : { }\r
         },\r
         "requirements" : {\r
           "component-dependency" : {\r