summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>2019-03-08 16:57:08 -0500
committerBrinda Santh Muthuramalingam <brindasanth@in.ibm.com>2019-03-11 13:44:18 +0000
commita1c4477bfe00531af77fb71e8a2c6066b165ae55 (patch)
tree3d718d01dfa6e71e830af7946bcd1b903f07206d
parent1f6fd9370efaa9c24b95a50ffdbd59d3409a9ea0 (diff)
Add JSON type validation and enrichment
Change-Id: I479b8214c7979dd5bc28acac68f747f06f3f231e Issue-ID: CCSDK-1134 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json23
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json15
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json5
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json5
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json5
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/component-restconf-executor.json5
6 files changed, 49 insertions, 9 deletions
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 6025dbd6d..7a9239819 100644
--- 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 b2ba348a4..8f6c44f94 100644
--- 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 af8aae12e..5a024a7d6 100644
--- 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 e5cb4cba0..7e429c011 100644
--- 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": {
"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-resource-resolution.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
index 5dbef4dcc..f437a79a9 100644
--- 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 192ed2566..cb28a4a10 100644
--- 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": {