Add JSON type validation and enrichment

Change-Id: I479b8214c7979dd5bc28acac68f747f06f3f231e
Issue-ID: CCSDK-1134
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 6025dbd..7a92398 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -24,19 +24,23 @@
       "file": "Definitions/policy_types.json"
     }
   ],
-  "dsl_definitions" : {
+  "dsl_definitions": {
+    "dynamic-netconf-properties": {
+      "device-name": "netconf device",
+      "host-name": "sample-host"
+    },
     "dynamic-rest-source": {
-      "type" : "basic-type",
-      "url" : "http://localhost:8080",
-      "userId" : {
+      "type": "basic-type",
+      "url": "http://localhost:8080",
+      "userId": {
         "get_input": "rest-user-name"
       }
     },
     "dynamic-db-source": {
-      "type" : "maria-db",
-      "url" : "jdbc:mysql://localhost:3306/sdnctl",
-      "username" : "sdnctl",
-      "password" : {
+      "type": "maria-db",
+      "url": "jdbc:mysql://localhost:3306/sdnctl",
+      "username": "sdnctl",
+      "password": {
         "get_attribute": [
           "BPP",
           "dynamic-db-source.password"
@@ -241,7 +245,8 @@
                   "script-type": "jython",
                   "script-class-reference": "Scripts/python/NetconfRpcExample.py",
                   "instance-dependencies": [
-                  ]
+                  ],
+                  "dynamic-properties": "*dynamic-netconf-properties"
                 },
                 "outputs": {
                   "response-data": "",

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index b2ba348..8f6c44f 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -20,6 +20,11 @@
                   "entry_schema": {
                     "type": "string"
                   }
+                },
+                "dynamic-properties": {
+                  "description": "Dynamic Json Content or DSL Json reference.",
+                  "required": false,
+                  "type": "json"
                 }
               },
               "outputs": {
@@ -87,6 +92,11 @@
                   "entry_schema": {
                     "type": "string"
                   }
+                },
+                "dynamic-properties": {
+                  "description": "Dynamic Json Content or DSL Json reference.",
+                  "required": false,
+                  "type": "json"
                 }
               },
               "outputs": {
@@ -153,6 +163,11 @@
                   "description": "Action Name of the process",
                   "required": false,
                   "type": "string"
+                },
+                "dynamic-properties": {
+                  "description": "Dynamic Json Content or DSL Json reference.",
+                  "required": false,
+                  "type": "json"
                 }
               },
               "outputs": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
index af8aae1..5a024a7 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
@@ -18,6 +18,11 @@
               "entry_schema": {
                 "type": "string"
               }
+            },
+            "dynamic-properties": {
+              "description": "Dynamic Json Content or DSL Json reference.",
+              "required": false,
+              "type": "json"
             }
           },
           "outputs": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
index e5cb4cb..7e429c0 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
@@ -50,6 +50,11 @@
               "entry_schema": {\r
                 "type": "string"\r
               }\r
+            },\r
+            "dynamic-properties": {\r
+              "description": "Dynamic Json Content or DSL Json reference.",\r
+              "required": false,\r
+              "type": "json"\r
             }\r
           },\r
           "outputs": {\r

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
index 5dbef4d..f437a79 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
@@ -54,6 +54,11 @@
               "description": "Action Name of the process",
               "required": false,
               "type": "string"
+            },
+            "dynamic-properties": {
+              "description": "Dynamic Json Content or DSL Json reference.",
+              "required": false,
+              "type": "json"
             }
           },
           "outputs": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
index 192ed25..cb28a4a 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json
@@ -38,6 +38,11 @@
               "entry_schema": {
                 "type": "string"
               }
+            },
+            "dynamic-properties": {
+              "description": "Dynamic Json Content or DSL Json reference.",
+              "required": false,
+              "type": "json"
             }
           },
           "outputs": {