diff options
| author |   Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com> | 2018-09-07 15:24:07 +0000 |
|---|---|---|
| committer | Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com> | 2018-09-07 15:24:07 +0000 |
| commit | 76a5c64401739c8e3eb0d4e03465c89910424ce7 (patch) | |
| tree | f987f76c03665b159f21b683f6a575e0024ccb9b /ms/controllerblueprints/modules/service/src/test | |
| parent | b838e7802dbb719a8ee7c45b3c5a637a1120f3c7 (diff) | |
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>
Diffstat (limited to 'ms/controllerblueprints/modules/service/src/test')
2 files changed, 7 insertions, 55 deletions
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 155dc723..d5d3f669 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 9f8af1aa..b6898d84 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" : {
|