From f2a776249a28d99564c44a76bde875b163170770 Mon Sep 17 00:00:00 2001 From: "Muthuramalingam, Brinda Santh(bs2796)" Date: Wed, 5 Sep 2018 23:40:46 +0000 Subject: 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) --- .../model_type/node_type/dg-activate-netconf.json | 2 +- .../model_type/node_type/dg-config-generator.json | 2 +- .../node_type/dg-resource-assign-activate.json | 2 +- .../node_type/dg-resource-assignment.json | 2 +- .../node_type/tosca.nodes.Component.json | 5 ++++ .../load/model_type/node_type/tosca.nodes.DG.json | 5 ++++ .../load/model_type/node_type/tosca.nodes.Vnf.json | 5 ++++ .../node_type/tosca.nodes.component.Python.json | 5 ++++ .../Definitions/activation-blueprint.json | 4 +-- .../blueprints/vrr-test/Definitions/vrr-test.json | 4 +-- .../model_type/node_type/dg-activate-netconf.json | 2 +- .../model_type/node_type/dg-config-generator.json | 2 +- .../node_type/dg-resource-assign-activate.json | 2 +- .../node_type/dg-resource-assignment.json | 2 +- .../service_template/default_netconf.json | 4 +-- .../test/resources/enhance/enhance-template.json | 23 ++------------- .../test/resources/enhance/enhanced-template.json | 34 ++++------------------ 17 files changed, 43 insertions(+), 62 deletions(-) create mode 100644 ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Component.json create mode 100644 ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.DG.json create mode 100644 ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Vnf.json create mode 100644 ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.component.Python.json (limited to 'ms') 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 c638df00c..a9d16eddc 100644 --- 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 28bace0f0..6794b3c89 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 e98fa5a67..22a4d813c 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 36fbb6861..7c01faa13 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 index 000000000..bc4827b8b --- /dev/null +++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Component.json @@ -0,0 +1,5 @@ +{ + "description": "This is default Component Node", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" +} \ 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 index 000000000..86728cf2f --- /dev/null +++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.DG.json @@ -0,0 +1,5 @@ +{ + "description": "This is Directed Graph Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" +} \ 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 index 000000000..acb1f2f31 --- /dev/null +++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.Vnf.json @@ -0,0 +1,5 @@ +{ + "description": "This is VNF Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" +} \ 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 index 000000000..7b67c8cb2 --- /dev/null +++ b/ms/controllerblueprints/application/load/model_type/node_type/tosca.nodes.component.Python.json @@ -0,0 +1,5 @@ +{ + "description": "This is Python Component", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" +} \ 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 635e177a1..851ded2ca 100644 --- 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": { "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/blueprints/vrr-test/Definitions/vrr-test.json b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json index d71dd2011..a06165bf9 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { @@ -524,7 +524,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-activate-netconf.json b/ms/controllerblueprints/modules/service/load/model_type/node_type/dg-activate-netconf.json index c638df00c..a9d16eddc 100644 --- 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 28bace0f0..6794b3c89 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 e98fa5a67..22a4d813c 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 36fbb6861..7c01faa13 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 95c829c4f..14f724e54 100644 --- 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": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { @@ -459,7 +459,7 @@ "is-start-flow": { "required": false, "type": "boolean", - "default": "false" + "default": false } }, "capabilities": { 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 fedf1da21..5824031e2 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 @@ -118,7 +118,7 @@ "properties": { "mode": "sync", "version": "LATEST", - "is-start-flow": "false" + "is-start-flow": false }, "requirements": { "component-dependency": { @@ -152,7 +152,7 @@ "properties": { "mode": "sync", "version": "LATEST", - "is-start-flow": "false" + "is-start-flow": false }, "requirements": { "component-dependency": { @@ -195,16 +195,8 @@ { "name": "bundle-mac", "property": { - "description": "", "required": true, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - } + "type": "string" }, "input-param": false, "dictionary-name": "bundle-mac", @@ -220,10 +212,6 @@ "description": "", "required": true, "type": "list", - "status": "", - "constraints": [ - {} - ], "entry_schema": { "type": "dt-v4-aggregate" } @@ -293,13 +281,8 @@ { "name": "licenses", "property": { - "description": "", "required": true, "type": "list", - "status": "", - "constraints": [ - {} - ], "entry_schema": { "type": "dt-license-key" } 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 0633c64d0..c3f257382 100644 --- 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", "properties" : { "bundle-mac" : { - "description" : "", "required" : true, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, "hostname" : { "required" : true, "type" : "string" }, "licenses" : { - "description" : "", "required" : true, "type" : "list", - "status" : "", - "constraints" : [ { } ], "entry_schema" : { "type" : "dt-license-key" } @@ -142,8 +133,6 @@ "description" : "", "required" : true, "type" : "list", - "status" : "", - "constraints" : [ { } ], "entry_schema" : { "type" : "dt-v4-aggregate" } @@ -178,7 +167,7 @@ "is-start-flow" : { "required" : false, "type" : "boolean", - "default" : "false" + "default" : false } }, "capabilities" : { @@ -468,7 +457,7 @@ "is-start-flow" : { "required" : false, "type" : "boolean", - "default" : "false" + "default" : false } }, "capabilities" : { @@ -630,7 +619,7 @@ "properties" : { "mode" : "sync", "version" : "LATEST", - "is-start-flow" : "false" + "is-start-flow" : false }, "capabilities" : { "dg-node" : { }, @@ -664,7 +653,7 @@ "properties" : { "mode" : "sync", "version" : "LATEST", - "is-start-flow" : "false" + "is-start-flow" : false }, "capabilities" : { "dg-node" : { }, @@ -709,14 +698,8 @@ "mapping" : [ { "name" : "bundle-mac", "property" : { - "description" : "", "required" : true, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, "input-param" : false, "dictionary-name" : "bundle-mac", @@ -729,8 +712,6 @@ "description" : "", "required" : true, "type" : "list", - "status" : "", - "constraints" : [ { } ], "entry_schema" : { "type" : "dt-v4-aggregate" } @@ -791,11 +772,8 @@ "mapping" : [ { "name" : "licenses", "property" : { - "description" : "", "required" : true, "type" : "list", - "status" : "", - "constraints" : [ { } ], "entry_schema" : { "type" : "dt-license-key" } -- cgit 1.2.3-korg