diff options
| author |   subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-04-19 07:06:28 +0000 |
|---|---|---|
| committer | subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-04-19 08:48:42 +0000 |
| commit | 918d29898fcd0a93e8ce0b1d73e28d007f56c71b (patch) | |
| tree | 964c165d8f9db609ded59056f21e306533151bee /bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp | |
| parent | 45ec1c516b5f5217dbfb8bdcf9f04d187e013d21 (diff) | |
Fix SDNC request structure
Fix SDNC requst structure for e2e service.
Following is current body for request:
{
"GENERIC-RESOURCE-API:input": {
"GENERIC-RESOURCE-API:sdnc-request-header": {
"GENERIC-RESOURCE-API:svc-request-id": "7b1e36ae-6691-4676-993b-4d173bad45cd",
"GENERIC-RESOURCE-API:svc-action": "assign"
},
"GENERIC-RESOURCE-API:request-information": {
"GENERIC-RESOURCE-API:request-id": "7b1e36ae-6691-4676-993b-4d173bad45cd",
"GENERIC-RESOURCE-API:request-action": "CreateServiceInstance"
},
"GENERIC-RESOURCE-API:service-information": {
"GENERIC-RESOURCE-API:service-id": "VOLTE_SERVICE_ID",
"GENERIC-RESOURCE-API:subscription-service-type": "example-service-type",
"GENERIC-RESOURCE-API:onap-model-information": {
"GENERIC-RESOURCE-API:model-invariant-uuid": "4a09419a-c9fd-4a53-b1bd-b49603169ca1",
"GENERIC-RESOURCE-API:model-uuid": "1bd0eae6-2dcc-4461-9ae6-56d641f369d6",
"GENERIC-RESOURCE-API:model-name": "voLTE_HUAWEI_01:null"
},
"GENERIC-RESOURCE-API:service-instance-id": "1ff52068-6622-440c-964f-5774d91a956a",
"GENERIC-RESOURCE-API:global-customer-id": "test_custormer"
},
"GENERIC-RESOURCE-API:service-request-input": {
"GENERIC-RESOURCE-API:service-instance-name": "ONAP_223531"
}
}
}
Change-Id: I5098f3f8e11e0e1dad30b53fbf1db13aeac87f78
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp')
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy index 7ccc1b0046..6f41879e7d 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy @@ -20,6 +20,7 @@ package org.openecomp.mso.bpmn.infrastructure.scripts +import org.codehaus.jackson.map.ObjectMapper import org.openecomp.mso.bpmn.infrastructure.properties.BPMNProperties import java.util.ArrayList @@ -146,7 +147,28 @@ public class DoCreateResources extends AbstractServiceTaskProcessor execution.setVariable("sequencedResourceList", sequencedResourceList) utils.log("INFO", "sequencedResourceList: " + sequencedResourceList, isDebugEnabled) utils.log("INFO", "======== COMPLETED sequenceResoure Process ======== ", isDebugEnabled) - } + } + + public prepareServiceTopologyRequest(DelegateExecution execution) { + + def isDebugEnabled = execution.getVariable("isDebugLogEnabled") + utils.log("INFO", "======== Start prepareServiceTopologyRequest Process ======== ", isDebugEnabled) + + String serviceDecompose = execution.getVariable("serviceDecomposition") + + execution.setVariable("operationType", "create") + execution.setVariable("resourceType", "") + + String serviceInvariantUuid = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelInvariantUuid") + String serviceUuid = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelUuid") + String serviceModelName = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelName") + + execution.setVariable("modelInvariantUuid", serviceInvariantUuid) + execution.setVariable("modelUuid", serviceUuid) + execution.setVariable("serviceModelName", serviceModelName) + + utils.log("INFO", "======== End prepareServiceTopologyRequest Process ======== ", isDebugEnabled) + } public void getCurrentResoure(DelegateExecution execution){ def isDebugEnabled=execution.getVariable("isDebugLogEnabled") |