From 76a5c64401739c8e3eb0d4e03465c89910424ce7 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>
---
 .../Definitions/activation-blueprint.json           | 21 +--------------------
 .../node_type/artifact-config-template.json         |  4 ++--
 .../model_type/node_type/dg-activate-netconf.json   | 14 --------------
 .../model_type/node_type/dg-config-generator.json   | 14 --------------
 .../node_type/dg-resource-assign-activate.json      | 14 --------------
 .../node_type/dg-resource-assignment.json           | 14 --------------
 6 files changed, 3 insertions(+), 78 deletions(-)

(limited to 'components/core/load')

diff --git a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index 3eb4fedc..714195f3 100644
--- a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
@@ -91,12 +91,7 @@
           }
         },
         "capabilities": {
-          "dg-node": {},
-          "content": {
-            "properties": {
-              "type": "json"
-            }
-          }
+          "dg-node": {}
         },
         "interfaces": {
           "CONFIG": {
@@ -226,20 +221,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/components/core/load/model_type/node_type/artifact-config-template.json b/components/core/load/model_type/node_type/artifact-config-template.json
index be9bbfc0..af99d75b 100644
--- a/components/core/load/model_type/node_type/artifact-config-template.json
+++ b/components/core/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/components/core/load/model_type/node_type/dg-activate-netconf.json b/components/core/load/model_type/node_type/dg-activate-netconf.json
index a9d16edd..57667de9 100644
--- a/components/core/load/model_type/node_type/dg-activate-netconf.json
+++ b/components/core/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/components/core/load/model_type/node_type/dg-config-generator.json b/components/core/load/model_type/node_type/dg-config-generator.json
index 6794b3c8..e59c34b6 100644
--- a/components/core/load/model_type/node_type/dg-config-generator.json
+++ b/components/core/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/components/core/load/model_type/node_type/dg-resource-assign-activate.json b/components/core/load/model_type/node_type/dg-resource-assign-activate.json
index 22a4d813..ca703a79 100644
--- a/components/core/load/model_type/node_type/dg-resource-assign-activate.json
+++ b/components/core/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/components/core/load/model_type/node_type/dg-resource-assignment.json b/components/core/load/model_type/node_type/dg-resource-assignment.json
index 7c01faa1..9cce82a9 100644
--- a/components/core/load/model_type/node_type/dg-resource-assignment.json
+++ b/components/core/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": {
-- 
cgit 1.2.3-korg