From 50eeeb8ec7bf3dc6c1d43f82f340b4abbec964de Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Wed, 5 Sep 2018 23:40:46 +0000
Subject: Controller Blueprints Microservice

Add Property Assign validation and Data Type Entry schema validation.

Change-Id: Ifa40f62f848d06381ab83d7f1c9e7c6526f5edf0
Issue-ID: CCSDK-484
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 .../service_template/default_netconf.json          |  4 +--
 .../test/resources/enhance/enhance-template.json   | 23 ++-------------
 .../test/resources/enhance/enhanced-template.json  | 34 ++++------------------
 3 files changed, 11 insertions(+), 50 deletions(-)

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

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 95c829c4..14f724e5 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
@@ -394,7 +394,7 @@
 				"is-start-flow": {
 					"required": false,
 					"type": "boolean",
-					"default": "false"
+					"default": false
 				}
 			},
 			"capabilities": {
@@ -459,7 +459,7 @@
 				"is-start-flow": {
 					"required": false,
 					"type": "boolean",
-					"default": "false"
+					"default": false
 				}
 			},
 			"capabilities": {
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 fedf1da2..5824031e 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
@@ -118,7 +118,7 @@
         "properties": {
           "mode": "sync",
           "version": "LATEST",
-          "is-start-flow": "false"
+          "is-start-flow": false
         },
         "requirements": {
           "component-dependency": {
@@ -152,7 +152,7 @@
         "properties": {
           "mode": "sync",
           "version": "LATEST",
-          "is-start-flow": "false"
+          "is-start-flow": false
         },
         "requirements": {
           "component-dependency": {
@@ -195,16 +195,8 @@
                 {
                   "name": "bundle-mac",
                   "property": {
-                    "description": "",
                     "required": true,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                      {}
-                    ],
-                    "entry_schema": {
-                      "type": ""
-                    }
+                    "type": "string"
                   },
                   "input-param": false,
                   "dictionary-name": "bundle-mac",
@@ -220,10 +212,6 @@
                     "description": "",
                     "required": true,
                     "type": "list",
-                    "status": "",
-                    "constraints": [
-                      {}
-                    ],
                     "entry_schema": {
                       "type": "dt-v4-aggregate"
                     }
@@ -293,13 +281,8 @@
                 {
                   "name": "licenses",
                   "property": {
-                    "description": "",
                     "required": true,
                     "type": "list",
-                    "status": "",
-                    "constraints": [
-                      {}
-                    ],
                     "entry_schema": {
                       "type": "dt-license-key"
                     }
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 0633c64d..c3f25738 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
@@ -115,25 +115,16 @@
       "version" : "1.0.0",
       "properties" : {
         "bundle-mac" : {
-          "description" : "",
           "required" : true,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
+          "type" : "string"
         },
         "hostname" : {
           "required" : true,
           "type" : "string"
         },
         "licenses" : {
-          "description" : "",
           "required" : true,
           "type" : "list",
-          "status" : "",
-          "constraints" : [ { } ],
           "entry_schema" : {
             "type" : "dt-license-key"
           }
@@ -142,8 +133,6 @@
           "description" : "",
           "required" : true,
           "type" : "list",
-          "status" : "",
-          "constraints" : [ { } ],
           "entry_schema" : {
             "type" : "dt-v4-aggregate"
           }
@@ -178,7 +167,7 @@
         "is-start-flow" : {
           "required" : false,
           "type" : "boolean",
-          "default" : "false"
+          "default" : false
         }
       },
       "capabilities" : {
@@ -468,7 +457,7 @@
         "is-start-flow" : {
           "required" : false,
           "type" : "boolean",
-          "default" : "false"
+          "default" : false
         }
       },
       "capabilities" : {
@@ -630,7 +619,7 @@
         "properties" : {
           "mode" : "sync",
           "version" : "LATEST",
-          "is-start-flow" : "false"
+          "is-start-flow" : false
         },
         "capabilities" : {
           "dg-node" : { },
@@ -664,7 +653,7 @@
         "properties" : {
           "mode" : "sync",
           "version" : "LATEST",
-          "is-start-flow" : "false"
+          "is-start-flow" : false
         },
         "capabilities" : {
           "dg-node" : { },
@@ -709,14 +698,8 @@
               "mapping" : [ {
                 "name" : "bundle-mac",
                 "property" : {
-                  "description" : "",
                   "required" : true,
-                  "type" : "string",
-                  "status" : "",
-                  "constraints" : [ { } ],
-                  "entry_schema" : {
-                    "type" : ""
-                  }
+                  "type" : "string"
                 },
                 "input-param" : false,
                 "dictionary-name" : "bundle-mac",
@@ -729,8 +712,6 @@
                   "description" : "",
                   "required" : true,
                   "type" : "list",
-                  "status" : "",
-                  "constraints" : [ { } ],
                   "entry_schema" : {
                     "type" : "dt-v4-aggregate"
                   }
@@ -791,11 +772,8 @@
               "mapping" : [ {
                 "name" : "licenses",
                 "property" : {
-                  "description" : "",
                   "required" : true,
                   "type" : "list",
-                  "status" : "",
-                  "constraints" : [ { } ],
                   "entry_schema" : {
                     "type" : "dt-license-key"
                   }
-- 
cgit 1.2.3-korg