CLAMP should not display all CDS workflow properties

CLAMP should not display all CDS workflow properties

Issue-ID: CLAMP-856
Signed-off-by: root1 <vidyashree.rama@huawei.com>
(cherry picked from commit 2d9f989e0d37002c758bdf66a3f25fcfdac35b62)
Change-Id: Icc07decf95a4e8977cd9559373bde9053ef6b8bb
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

4 files changed, 44 insertions, 69 deletions

diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json b/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
index 7e78bb062..2b6493176 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
+++ b/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
@@ -1,57 +1,29 @@
 {
   "inputs": {
-    "resolution-key": {
-      "required": true,
-      "type": "string"
-    },
     "modify-config-properties": {
-      "vpg_onap_private_ip_0": {
-        "description": "",
-        "required": false,
-        "type": "string",
-        "status": "",
-        "constraints": [
-          {}
-        ],
-        "entry_schema": {
-          "type": ""
+      "type": "object",
+      "properties": {
+        "service-instance-id": {
+          "type": "string",
+          "input-param": true
+        },
+        "update-active-streams": {
+          "description": "",
+          "required": false,
+          "type": "string",
+          "input-param": true,
+          "status": "",
+          "constraints": [
+            {}
+          ],
+          "entry_schema": {
+            "type": "dt-data"
+          }
+        },
+        "generic-vnf.vnf-id": {
+          "type": "string",
+          "input-param": true
         }
-      },
-      "service-instance.service-instance-id": {
-        "type": "string"
-      },
-      "vnf-id": {
-        "type": "string"
-      },
-      "data": {
-        "description": "",
-        "required": false,
-        "type": "string",
-        "status": "",
-        "constraints": [
-          {}
-        ],
-        "entry_schema": {
-          "type": "dt-data"
-        }
-      },
-      "service-instance-id": {
-        "type": "string"
-      },
-      "update-active-streams": {
-        "description": "",
-        "required": false,
-        "type": "string",
-        "status": "",
-        "constraints": [
-          {}
-        ],
-        "entry_schema": {
-          "type": "dt-data"
-        }
-      },
-      "generic-vnf.vnf-id": {
-        "type": "string"
       }
     }
   }
diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json b/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
index e46da6760..115d79b1f 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
+++ b/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
@@ -51,12 +51,14 @@
           }
         },
         "service-instance-id": {
-          "type": "string"
+          "type": "string",
+          "input-param": true
         },
         "update-active-streams": {
           "description": "",
           "required": false,
           "type": "string",
+          "input-param": true,
           "status": "",
           "constraints": [
             {}
@@ -66,7 +68,8 @@
           }
         },
         "generic-vnf.vnf-id": {
-          "type": "string"
+          "type": "string",
+          "input-param": true
         }
       },
       "derived_from": "tosca.datatypes.Dynamic"
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
index 5b373a45e..07d851f38 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
+++ b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
@@ -1,12 +1,5 @@
 {
   "inputs": {
-    "template-prefix": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
     "template-prefix-with-complex-type": {
       "type": "list",
       "properties": {
@@ -14,6 +7,7 @@
           "description": "",
           "required": false,
           "type": "string",
+          "input-param": true,
           "status": "",
           "constraints": [
             {}
@@ -25,16 +19,20 @@
       }
     },
     "resource-assignment-properties": {
-      "private1-prefix-id": {
-        "description": "",
-        "required": false,
-        "type": "string",
-        "status": "",
-        "constraints": [
-          {}
-        ],
-        "entry_schema": {
-          "type": ""
+      "type": "object",
+      "properties": {
+        "private1-prefix-id": {
+          "description": "",
+          "required": false,
+          "type": "string",
+          "input-param": true,
+          "status": "",
+          "constraints": [
+            {}
+          ],
+          "entry_schema": {
+            "type": ""
+          }
         }
       }
     }
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
index d0f78cf1d..7f76c6cae 100644
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
+++ b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
@@ -45,6 +45,7 @@
           "description": "",
           "required": false,
           "type": "string",
+          "input-param": true,
           "status": "",
           "constraints": [
             {}
@@ -64,6 +65,7 @@
           "description": "",
           "required": false,
           "type": "string",
+          "input-param": true,
           "status": "",
           "constraints": [
             {}