From 3ec03cca444a2810005053a308ed0f3ecb00b063 Mon Sep 17 00:00:00 2001
From: Vidyashree-Huawei <vidyashree.rama@huawei.com>
Date: Fri, 10 Apr 2020 17:36:09 +0530
Subject: CDS attributes are not shown properly in UI

Handled for legacy and operational policy

Change-Id: I504c4aa2531b19b09965ad1dbc03c9944931f77b
Issue-ID: CLAMP-809
Signed-off-by: Vidyashree-Huawei <vidyashree.rama@huawei.com>
---
 .../operational_policies/operational_policy.json   | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
index 49d7878a8..7214b022c 100644
--- a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
+++ b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
@@ -99,6 +99,7 @@
                 "anyOf": [
                   {
                     "title": "APPC",
+                    "type": "object",
                     "properties": {
                       "actor": {
                         "title": "actor",
@@ -108,7 +109,7 @@
                           "hidden": true
                         }
                       },
-                      "type": {
+                      "recipe": {
                         "title": "recipe",
                         "type": "string",
                         "default": "",
@@ -129,6 +130,7 @@
                   },
                   {
                     "title": "SO",
+                    "type": "object",
                     "properties": {
                       "actor": {
                         "title": "actor",
@@ -138,7 +140,7 @@
                           "hidden": true
                         }
                       },
-                      "type": {
+                      "recipe": {
                         "title": "recipe",
                         "type": "string",
                         "default": "",
@@ -156,6 +158,7 @@
                   },
                   {
                     "title": "SDNC",
+                    "type": "object",
                     "properties": {
                       "actor": {
                         "title": "actor",
@@ -165,7 +168,7 @@
                           "hidden": true
                         }
                       },
-                      "type": {
+                      "recipe": {
                         "title": "recipe",
                         "type": "string",
                         "default": "",
@@ -183,6 +186,7 @@
                   },
                   {
                     "title": "VFC",
+                    "type": "object",
                     "properties": {
                       "actor": {
                         "title": "actor",
@@ -192,12 +196,9 @@
                           "hidden": true
                         }
                       },
-                      "type": {
+                      "recipe": {
                         "title": "recipe",
                         "type": "string",
-                        "required": [
-                          "payload"
-                        ],
                         "default": "",
                         "enum": [
                           "ModifyConfig"
@@ -212,6 +213,7 @@
                   },
                   {
                     "title": "CDS",
+                    "type": "object",
                     "properties": {
                       "actor": {
                         "title": "actor",
@@ -221,17 +223,21 @@
                           "hidden": true
                         }
                       },
-                      "type": {
+                      "recipe": {
                         "title": "recipe",
                         "type": "object",
-                        "required": [
-                          "payload"
-                        ],
                         "anyOf": [
                           {
                             "title": "user-defined",
+                            "type": "object",
                             "properties": {
-                              "type": {
+                              "recipe": {
+                                "title": "recipe",
+                                "type": "string",
+                                "default": "user-defined",
+                                "format": "textarea"
+                              },
+                              "payload": {
                                 "title": "Payload (YAML)",
                                 "type": "string",
                                 "default": "",
-- 
cgit 1.2.3-korg