From 9b85990c525fd20cca292bb30f9ba5b00f3d2a7e Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
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) <bs2796@att.com>
---
 .../model_type/node_type/artifact-config-template.json     |  4 ++--
 .../load/model_type/node_type/dg-activate-netconf.json     | 14 --------------
 .../load/model_type/node_type/dg-config-generator.json     | 14 --------------
 .../model_type/node_type/dg-resource-assign-activate.json  | 14 --------------
 .../load/model_type/node_type/dg-resource-assignment.json  | 14 --------------
 .../load/model_type/node_type/vnf-netconf-device.json      |  2 +-
 6 files changed, 3 insertions(+), 59 deletions(-)

(limited to 'ms/controllerblueprints/application/load')

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,
-- 
cgit 1.2.3-korg