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>
---
 .../blueprints/vrr-test/Definitions/vrr-test.json  | 38 +++-------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

(limited to 'ms/controllerblueprints/modules/service/load')

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 724dfc4d..5fe2d251 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": {
-- 
cgit 1.2.3-korg