From ca395c635569bc70c16397a25dc46d7a9f0629a4 Mon Sep 17 00:00:00 2001
From: Brinda Santh <brindasanth@in.ibm.com>
Date: Sun, 26 Aug 2018 16:20:04 -0400
Subject: Controller Blueprints Microservice

Add Standardized resource definition in Initial data loading and Dictionary management services.

Change-Id: Ib33ba2ecf3cb1e1fb9b5dea71532e6bc8280bcbb
Issue-ID: CCSDK-487
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
---
 .../modules/resource-dict/load/model_type/node_type/source-db.json | 4 ++--
 .../resource-dict/load/model_type/node_type/source-default.json    | 2 +-
 .../resource-dict/load/model_type/node_type/source-input.json      | 2 +-
 .../resource-dict/load/model_type/node_type/source-rest.json       | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'ms/controllerblueprints/modules/resource-dict/load')

diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json
index 7ebeaa82..661a9503 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-db.json
@@ -7,7 +7,7 @@
       "type": "string",
       "constraints": [
         {
-          "validValues": [
+          "valid_values": [
             "SQL",
             "PLSQL"
           ]
@@ -33,7 +33,7 @@
       }
     },
     "key-dependencies": {
-      "required": false,
+      "required": true,
       "type": "list",
       "entry_schema": {
         "type": "string"
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
index dd0bffcc..13e234e1 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
@@ -7,7 +7,7 @@
       "type": "string"
     },
     "key-dependencies": {
-      "required": false,
+      "required": true,
       "type": "list",
       "entry_schema": {
         "type": "string"
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
index 99c4691c..126ea30b 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
@@ -7,7 +7,7 @@
       "type": "string"
     },
     "key-dependencies": {
-      "required": false,
+      "required": true,
       "type": "list",
       "entry_schema": {
         "type": "string"
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
index e77020ec..f8dd8b6f 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
@@ -8,8 +8,7 @@
       "default": "JSON",
       "constraints": [
         {
-          "validValues": [
-            "XML",
+          "valid_values": [
             "JSON"
           ]
         }
@@ -29,7 +28,7 @@
       "default": "JSON_PATH",
       "constraints": [
         {
-          "validValues": [
+          "valid_values": [
             "JSON_PATH",
             "JSON_POINTER"
           ]
@@ -51,7 +50,7 @@
       }
     },
     "key-dependencies": {
-      "required": false,
+      "required": true,
       "type": "list",
       "entry_schema": {
         "type": "string"
-- 
cgit 1.2.3-korg