summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorroot1 <vidyashree.rama@huawei.com>2020-08-11 18:44:29 +0530
committerroot1 <vidyashree.rama@huawei.com>2020-08-28 12:01:34 +0530
commit2d9f989e0d37002c758bdf66a3f25fcfdac35b62 (patch)
treef498e3895bd048c9542ec1b0356013481dd5e74a /src/test
parentf095a271b67b3f2be3dbdcd00924cac3dd3209ec (diff)
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
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java4
-rw-r--r--src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json72
-rw-r--r--src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json7
-rw-r--r--src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json32
-rw-r--r--src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json2
-rw-r--r--src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file34
-rw-r--r--src/test/resources/tosca/model-properties-cds.json23
-rw-r--r--src/test/resources/tosca/model-properties-operational-policy.json353
-rw-r--r--src/test/resources/tosca/model-properties.json358
-rw-r--r--src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json12
-rw-r--r--src/test/resources/tosca/operational-policy-json-schema.json168
-rw-r--r--src/test/resources/tosca/resource-details-cds.json336
-rw-r--r--src/test/resources/tosca/resource-details.json354
14 files changed, 1250 insertions, 507 deletions
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index 7f0e57602..f7774214c 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
@@ -128,7 +128,7 @@ public class ToscaConverterWithDictionarySupportItCase {
@Transactional
public final void testMetadataClampPossibleValueWithExecutor() throws IOException, UnknownComponentException {
Service service = new Service(ResourceFileUtil.getResourceAsString("tosca/service-details.json"),
- ResourceFileUtil.getResourceAsString("tosca/resource-details.json"));
+ ResourceFileUtil.getResourceAsString("tosca/resource-details-cds.json"));
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
index b90a28616..4f728b44a 100644
--- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
@@ -37,8 +37,8 @@ public class OperationalPolicyRepresentationBuilderTest {
@Test
public void testOperationalPolicyPayloadConstruction() throws IOException {
- JsonObject jsonModel = new GsonBuilder().create()
- .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
+ JsonObject jsonModel = new GsonBuilder().create().fromJson(ResourceFileUtil
+ .getResourceAsString("tosca/model-properties-operational-policy.json"), JsonObject.class);
Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
jsonModel.get("resourceDetails").getAsJsonObject(), "1.0");
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": [
{}
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file
index 13d3feaaf..9e616dfea 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file
@@ -34,11 +34,13 @@
"properties": {
"request-id": {
"required": true,
- "type": "string"
+ "type": "string",
+ "input-param": true
},
"service-instance-id": {
"required": true,
- "type": "string"
+ "type": "string",
+ "input-param": true
},
"vnf-id": {
"required": true,
@@ -54,7 +56,13 @@
},
"hostname": {
"required": true,
- "type": "string"
+ "type": "string",
+ "input-param": true
+ },
+ "request-info": {
+ "required": true,
+ "type": "dt-request-info-properties",
+ "input-param": true
},
"vnf_name": {
"required": true,
@@ -63,6 +71,26 @@
},
"constraints": null,
"derived_from": "tosca.datatypes.Dynamic"
+ },
+ "dt-request-info-properties": {
+ "description": "This is Dynamically generated data type for workflow activate",
+ "version": "1.0.0",
+ "metadata": null,
+ "attributes": null,
+ "properties": {
+ "prop1": {
+ "required": true,
+ "type": "string",
+ "input-param": true
+ },
+ "prop2": {
+ "required": true,
+ "type": "string",
+ "input-param": true
+ }
+ },
+ "constraints": null,
+ "derived_from": "tosca.datatypes.Dynamic"
}
}
} \ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties-cds.json b/src/test/resources/tosca/model-properties-cds.json
index 591840b49..fea658431 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 000000000..2a6568528
--- /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 688a09ab4..1c0fe24b4 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 f6713aff3..4519d5c9f 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 e8363b468..dc6c32fa7 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 000000000..d972d0cb9
--- /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 dc47b44db..b55adbf52 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
+ }
+ }
+ }
}
}
}