From 2d9f989e0d37002c758bdf66a3f25fcfdac35b62 Mon Sep 17 00:00:00 2001
From: root1 <vidyashree.rama@huawei.com>
Date: Tue, 11 Aug 2020 18:44:29 +0530
Subject: 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>
Change-Id: I98fc46c9c9ba574a3606740921d74743cb6f38ea
---
 src/test/resources/tosca/model-properties-cds.json |  23 +-
 .../tosca/model-properties-operational-policy.json | 353 ++++++++++++++++++++
 src/test/resources/tosca/model-properties.json     | 358 +++++++++++----------
 .../new-converter/tosca_apex_with_metadata.json    |  12 +-
 .../tosca/operational-policy-json-schema.json      | 168 +++++-----
 src/test/resources/tosca/resource-details-cds.json | 336 +++++++++++++++++++
 src/test/resources/tosca/resource-details.json     | 354 ++++++++++----------
 7 files changed, 1172 insertions(+), 432 deletions(-)
 create mode 100644 src/test/resources/tosca/model-properties-operational-policy.json
 create mode 100644 src/test/resources/tosca/resource-details-cds.json

(limited to 'src/test/resources/tosca')

diff --git a/src/test/resources/tosca/model-properties-cds.json b/src/test/resources/tosca/model-properties-cds.json
index 591840b4..fea65843 100644
--- a/src/test/resources/tosca/model-properties-cds.json
+++ b/src/test/resources/tosca/model-properties-cds.json
@@ -62,16 +62,19 @@
 									}
 								},
 								"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",
+											"status": "",
+											"constraints": [
+												{}
+											],
+											"entry_schema": {
+												"type": ""
+											}
 										}
 									}
 								}
diff --git a/src/test/resources/tosca/model-properties-operational-policy.json b/src/test/resources/tosca/model-properties-operational-policy.json
new file mode 100644
index 00000000..2a656852
--- /dev/null
+++ b/src/test/resources/tosca/model-properties-operational-policy.json
@@ -0,0 +1,353 @@
+{
+	"serviceDetails": {
+		"serviceType": "",
+		"namingPolicy": "",
+		"environmentContext": "General_Revenue-Bearing",
+		"serviceEcompNaming": "true",
+		"serviceRole": "",
+		"name": "vLoadBalancerMS",
+		"description": "vLBMS",
+		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+		"ecompGeneratedNaming": "true",
+		"category": "Network L4+",
+		"type": "Service",
+		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+		"instantiationType": "A-la-carte"
+	},
+	"resourceDetails": {
+		"CP": {
+		},
+		"VL": {
+		},
+		"VF": {
+			"vLoadBalancerMS 0": {
+				"resourceVendor": "Test",
+				"resourceVendorModelNumber": "",
+				"name": "vLoadBalancerMS",
+				"description": "vLBMS",
+				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+				"subcategory": "Load Balancer",
+				"category": "Application L4+",
+				"type": "VF",
+				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+				"version": "1.0",
+				"resourceVendorRelease": "1.0",
+				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
+				"controllerProperties": {
+					"sdnc_model_name": "baseconfiguration",
+					"sdnc_model_version": "1.0.0",
+					"workflows": {
+						"resource-assignment": {
+							"inputs": {
+								"resource-assignment-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate": {
+							"inputs": {
+								"activate-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate-restconf": {
+							"inputs": {
+								"activate-restconf-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate-cli": {
+							"inputs": {
+								"activate-cli-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"assign-activate": {
+							"inputs": {
+								"assign-activate-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"imperative-test-wf": {
+							"inputs": {
+								"imperative-test-wf-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"CR": {
+		},
+		"VFC": {
+		},
+		"PNF": {
+		},
+		"Service": {
+		},
+		"CVFC": {
+		},
+		"Service Proxy": {
+		},
+		"Configuration": {
+		},
+		"AllottedResource": {
+		},
+		"VFModule": {
+			"Vloadbalancerms..vpkg..module-1": {
+				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+				"vfModuleModelVersion": "1",
+				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+				"min_vf_module_instances": 0,
+				"vf_module_label": "vpkg",
+				"max_vf_module_instances": 1,
+				"vf_module_type": "Expansion",
+				"isBase": false,
+				"initial_count": 0,
+				"volume_group": false
+			},
+			"Vloadbalancerms..vdns..module-3": {
+				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+				"vfModuleModelVersion": "1",
+				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+				"min_vf_module_instances": 0,
+				"vf_module_label": "vdns",
+				"max_vf_module_instances": 50,
+				"vf_module_type": "Expansion",
+				"isBase": false,
+				"initial_count": 0,
+				"volume_group": false
+			},
+			"Vloadbalancerms..base_template..module-0": {
+				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+				"vfModuleModelVersion": "1",
+				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+				"min_vf_module_instances": 1,
+				"vf_module_label": "base_template",
+				"max_vf_module_instances": 1,
+				"vf_module_type": "Base",
+				"isBase": true,
+				"initial_count": 1,
+				"volume_group": false
+			},
+			"Vloadbalancerms..vlb..module-2": {
+				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+				"vfModuleModelVersion": "1",
+				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+				"min_vf_module_instances": 0,
+				"vf_module_label": "vlb",
+				"max_vf_module_instances": 1,
+				"vf_module_type": "Expansion",
+				"isBase": false,
+				"initial_count": 0,
+				"volume_group": false
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties.json b/src/test/resources/tosca/model-properties.json
index 688a09ab..1c0fe24b 100644
--- a/src/test/resources/tosca/model-properties.json
+++ b/src/test/resources/tosca/model-properties.json
@@ -40,33 +40,38 @@
 						"resource-assignment": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -74,33 +79,38 @@
 						"activate": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -108,33 +118,38 @@
 						"activate-restconf": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -142,33 +157,38 @@
 						"activate-cli": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -176,33 +196,38 @@
 						"assign-activate": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -210,38 +235,43 @@
 						"imperative-test-wf": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
-						} 
-				 	}
+						}
+					}
 				}
 			}
 		},
diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
index f6713aff..4519d5c9 100644
--- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
+++ b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
@@ -94,7 +94,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -123,7 +123,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -152,7 +152,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -181,7 +181,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -210,7 +210,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   },
@@ -239,7 +239,7 @@
                         "title": "data",
                         "type": "string",
                         "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}"
+                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
                       }
                     }
                   }
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
index e8363b46..dc6c32fa 100644
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@ -288,25 +288,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
@@ -358,25 +356,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
@@ -428,25 +424,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
@@ -498,25 +492,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
@@ -568,25 +560,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
@@ -638,25 +628,23 @@
                                         "title": "service-instance-id",
                                         "type": "string"
                                       },
-                                      "vnf-id": {
-                                        "title": "vnf-id",
-                                        "type": "string"
-                                      },
-                                      "action-name": {
-                                        "title": "action-name",
-                                        "type": "string"
-                                      },
-                                      "scope-type": {
-                                        "title": "scope-type",
-                                        "type": "string"
-                                      },
                                       "hostname": {
                                         "title": "hostname",
                                         "type": "string"
                                       },
-                                      "vnf_name": {
-                                        "title": "vnf_name",
-                                        "type": "string"
+                                      "request-info": {
+                                        "title": "request-info",
+                                        "type": "object",
+                                        "properties": {
+                                          "prop1": {
+                                            "title": "prop1",
+                                            "type": "string"
+                                          },
+                                          "prop2": {
+                                            "title": "prop2",
+                                            "type": "string"
+                                          }
+                                        }
                                       }
                                     }
                                   }
diff --git a/src/test/resources/tosca/resource-details-cds.json b/src/test/resources/tosca/resource-details-cds.json
new file mode 100644
index 00000000..d972d0cb
--- /dev/null
+++ b/src/test/resources/tosca/resource-details-cds.json
@@ -0,0 +1,336 @@
+{
+	"CP": {
+	},
+	"VL": {
+	},
+	"VF": {
+		"vLoadBalancerMS 0": {
+			"resourceVendor": "Test",
+			"resourceVendorModelNumber": "",
+			"name": "vLoadBalancerMS",
+			"description": "vLBMS",
+			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+			"subcategory": "Load Balancer",
+			"category": "Application L4+",
+			"type": "VF",
+			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+			"version": "1.0",
+			"resourceVendorRelease": "1.0",
+			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
+				"controllerProperties": {
+					"sdnc_model_name": "baseconfiguration",
+					"sdnc_model_version": "1.0.0",
+					"workflows": {
+						"resource-assignment": {
+							"inputs": {
+								"resource-assignment-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate": {
+							"inputs": {
+								"activate-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate-restconf": {
+							"inputs": {
+								"activate-restconf-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"activate-cli": {
+							"inputs": {
+								"activate-cli-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"assign-activate": {
+							"inputs": {
+								"assign-activate-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						},
+						"imperative-test-wf": {
+							"inputs": {
+								"imperative-test-wf-properties": {
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
+									}
+								}
+							}
+						} 
+				 }
+		}
+		}
+	},
+	"CR": {
+	},
+	"VFC": {
+	},
+	"PNF": {
+	},
+	"Service": {
+	},
+	"CVFC": {
+	},
+	"Service Proxy": {
+	},
+	"Configuration": {
+	},
+	"AllottedResource": {
+	},
+	"VFModule": {
+		"Vloadbalancerms..vpkg..module-1": {
+			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vpkg",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		},
+		"Vloadbalancerms..vdns..module-3": {
+			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vdns",
+			"max_vf_module_instances": 50,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		},
+		"Vloadbalancerms..base_template..module-0": {
+			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+			"min_vf_module_instances": 1,
+			"vf_module_label": "base_template",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Base",
+			"isBase": true,
+			"initial_count": 1,
+			"volume_group": false
+		},
+		"Vloadbalancerms..vlb..module-2": {
+			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vlb",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/tosca/resource-details.json b/src/test/resources/tosca/resource-details.json
index dc47b44d..b55adbf5 100644
--- a/src/test/resources/tosca/resource-details.json
+++ b/src/test/resources/tosca/resource-details.json
@@ -24,33 +24,38 @@
 						"resource-assignment": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -58,33 +63,38 @@
 						"activate": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -92,33 +102,38 @@
 						"activate-restconf": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -126,33 +141,38 @@
 						"activate-cli": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -160,33 +180,38 @@
 						"assign-activate": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
@@ -194,33 +219,38 @@
 						"imperative-test-wf": {
 							"inputs": {
 								"resource-assignment-properties": {
-									"request-id": {
-										"type": "string",
-										"required": true
-									},
-									"service-instance-id": {
-										"type": "string",
-										"required": true
-									},
-									"vnf-id": {
-										"type": "string",
-										"required": true
-									},
-									"action-name": {
-										"type": "string",
-										"required": true
-									},
-									"scope-type": {
-										"type": "string",
-										"required": true
-									},
-									"hostname": {
-										"type": "string",
-										"required": true
-									},
-									"vnf_name": {
-										"type": "string",
-										"required": true
+									"type": "object",
+									"properties": {
+										"request-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"service-instance-id": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"hostname": {
+											"type": "string",
+											"required": true,
+											"input-param": true
+										},
+										"request-info": {
+											"type": "object",
+											"properties": {
+												"prop1": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												},
+												"prop2": {
+													"required": true,
+													"type": "string",
+													"input-param": true
+												}
+											}
+										}
 									}
 								}
 							}
-- 
cgit 1.2.3-korg