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 | 9b85990c525fd20cca292bb30f9ba5b00f3d2a7e (patch) | |
| tree | 73d45f173e0b05f7639f91c14874d1dffead7c03 | |
| parent | 5e8bc659af8e98fe82b9cddea4c7f1b92dfecfc0 (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>
10 files changed, 22 insertions, 154 deletions
diff --git a/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json b/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json index be9bbfc0e..af99d75b8 100644 --- a/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json +++ b/ms/controllerblueprints/application/load/model_type/node_type/artifact-config-template.json @@ -12,7 +12,7 @@ },
"capabilities": {
"content": {
- "type": "tosca.capability.Content",
+ "type": "tosca.capabilities.Content",
"properties": {
"content": {
"required": true,
@@ -21,7 +21,7 @@ }
},
"mapping": {
- "type": "tosca.capability.Mapping",
+ "type": "tosca.capabilities.Mapping",
"properties": {
"mapping": {
"required": false,
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 a9d16eddc..57667de98 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 @@ -21,20 +21,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/application/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/application/load/model_type/node_type/dg-config-generator.json index 6794b3c89..e59c34b6e 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 @@ -21,20 +21,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/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 22a4d813c..ca703a793 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 @@ -21,20 +21,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": {
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 7c01faa13..9cce82a9e 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 @@ -21,20 +21,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": {
diff --git a/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json b/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json index 54573bade..246f17706 100644 --- a/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json +++ b/ms/controllerblueprints/application/load/model_type/node_type/vnf-netconf-device.json @@ -3,7 +3,7 @@ "version": "1.0.0",
"capabilities": {
"netconf": {
- "type": "tosca.capability.Netconf",
+ "type": "tosca.capabilities.Netconf",
"properties": {
"login-key": {
"required": true,
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" : {
|