From 9b85990c525fd20cca292bb30f9ba5b00f3d2a7e Mon Sep 17 00:00:00 2001 From: "Muthuramalingam, Brinda Santh(bs2796)" Date: Fri, 7 Sep 2018 15:24:07 +0000 Subject: 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) --- .../blueprints/vrr-test/Definitions/vrr-test.json | 38 +++-------------- .../service_template/default_netconf.json | 14 +++---- .../test/resources/enhance/enhance-template.json | 14 +------ .../test/resources/enhance/enhanced-template.json | 48 +++------------------- 4 files changed, 19 insertions(+), 95 deletions(-) (limited to 'ms/controllerblueprints/modules/service') 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 724dfc4d6..5fe2d2510 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 @@ -274,20 +274,6 @@ "capabilities": { "dg-node": { "type": "tosca.capabilities.Node" - }, - "content": { - "type": "tosca.capability.Content", - "properties": { - "type": { - "required": false, - "type": "string", - "default": "json" - }, - "content": { - "required": false, - "type": "string" - } - } } }, "requirements": { @@ -398,7 +384,7 @@ }, "capabilities": { "content": { - "type": "tosca.capability.Content", + "type": "tosca.capabilities.Content", "properties": { "content": { "required": true, @@ -407,7 +393,7 @@ } }, "mapping": { - "type": "tosca.capability.Mapping", + "type": "tosca.capabilities.Mapping", "properties": { "mapping": { "required": false, @@ -426,7 +412,7 @@ "version": "1.0.0", "capabilities": { "netconf": { - "type": "tosca.capability.Netconf", + "type": "tosca.capabilities.Netconf", "properties": { "profile-name": { "required": true, @@ -449,7 +435,7 @@ } }, "ssh": { - "type": "tosca.capability.Ssh", + "type": "tosca.capabilities.Ssh", "properties": { "profile-name": { "required": true, @@ -477,7 +463,7 @@ } }, "sftp": { - "type": "tosca.capability.Sftp", + "type": "tosca.capabilities.Sftp", "properties": { "profile-name": { "required": true, @@ -530,20 +516,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/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json index 14f724e54..8b1c7909a 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 @@ -279,7 +279,7 @@ "version": "1.0.0", "capabilities": { "netconf": { - "type": "tosca.capability.Netconf", + "type": "tosca.capabilities.Netconf", "properties": { "password": { "required": false, @@ -311,7 +311,7 @@ } }, "ssh": { - "type": "tosca.capability.Ssh", + "type": "tosca.capabilities.Ssh", "properties": { "password": { "required": false, @@ -343,7 +343,7 @@ } }, "sftp": { - "type": "tosca.capability.Sftp", + "type": "tosca.capabilities.Sftp", "properties": { "password": { "required": false, @@ -402,7 +402,7 @@ "type": "tosca.capabilities.Node" }, "content": { - "type": "tosca.capability.Content", + "type": "tosca.capabilities.Content", "properties": { "type": { "required": false, @@ -467,7 +467,7 @@ "type": "tosca.capabilities.Node" }, "content": { - "type": "tosca.capability.Content", + "type": "tosca.capabilities.Content", "properties": { "type": { "required": false, @@ -521,7 +521,7 @@ }, "capabilities": { "content": { - "type": "tosca.capability.Content", + "type": "tosca.capabilities.Content", "properties": { "content": { "required": true, @@ -530,7 +530,7 @@ } }, "mapping": { - "type": "tosca.capability.Mapping", + "type": "tosca.capabilities.Mapping", "properties": { "mapping": { "required": false, 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 155dc7235..d5d3f6698 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 @@ -128,12 +128,7 @@ } }, "capabilities": { - "dg-node": {}, - "content": { - "properties": { - "type": "json" - } - } + "dg-node": {} }, "interfaces": { "CONFIG": { @@ -162,12 +157,7 @@ } }, "capabilities": { - "dg-node": {}, - "content": { - "properties": { - "type": "json" - } - } + "dg-node": {} }, "interfaces": { "CONFIG": { 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 9f8af1aaf..b6898d845 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 @@ -173,20 +173,6 @@ "capabilities" : { "dg-node" : { "type" : "tosca.capabilities.Node" - }, - "content" : { - "type" : "tosca.capability.Content", - "properties" : { - "type" : { - "required" : false, - "type" : "string", - "default" : "json" - }, - "content" : { - "required" : false, - "type" : "string" - } - } } }, "requirements" : { @@ -307,7 +293,7 @@ }, "capabilities" : { "content" : { - "type" : "tosca.capability.Content", + "type" : "tosca.capabilities.Content", "properties" : { "content" : { "required" : true, @@ -316,7 +302,7 @@ } }, "mapping" : { - "type" : "tosca.capability.Mapping", + "type" : "tosca.capabilities.Mapping", "properties" : { "mapping" : { "required" : false, @@ -335,7 +321,7 @@ "version" : "1.0.0", "capabilities" : { "netconf" : { - "type" : "tosca.capability.Netconf", + "type" : "tosca.capabilities.Netconf", "properties" : { "login-key" : { "required" : true, @@ -483,20 +469,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" : { @@ -642,12 +614,7 @@ "is-start-flow" : false }, "capabilities" : { - "dg-node" : { }, - "content" : { - "properties" : { - "type" : "json" - } - } + "dg-node" : { } }, "requirements" : { "component-dependency" : { @@ -676,12 +643,7 @@ "is-start-flow" : false }, "capabilities" : { - "dg-node" : { }, - "content" : { - "properties" : { - "type" : "json" - } - } + "dg-node" : { } }, "requirements" : { "component-dependency" : { -- cgit 1.2.3-korg