X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fresources%2Ftosca%2Fmodel-properties.json;h=1c0fe24b48167bc8215b24767b20f3cbfdfb0136;hb=2d9f989e0d37002c758bdf66a3f25fcfdac35b62;hp=688a09ab4613ae2e3610842a0142499e1f4cb7e8;hpb=17edc3c718345d4e2e1b045ccec776dab300abbb;p=clamp.git

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
+												}
+											}
+										}
 									}
 								}
 							}
-						} 
-				 	}
+						}
+					}
 				}
 			}
 		},