import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
throws SdcToscaParserException {
Map<String, Object> resouceRequest = new HashMap<>();
-
+ List<Map<String, Object>> param = new ArrayList<>();
String csarpath = null;
try {
csarpath = getCsarFromUuid(serviceUuid);
Property property = resourceProperties.get(key);
Object value = getValue(property.getValue(), serviceInputs, serInput);
- resouceRequest.put(key, value);
+ HashMap<String, Object> parameter = new HashMap<>();
+ parameter.put("name", key);
+ parameter.put("value", value);
+ param.add(parameter);
}
}
+ resouceRequest.put("param", param);
return resouceRequest;
}
* ============LICENSE_END=========================================================\r
*/\r
\r
-package org.openecomp.mso.bpmn.infrastructure.scripts;\r
+package org.openecomp.mso.bpmn.infrastructure.scripts\r
+\r
+import org.json.JSONObject\r
+import org.json.XML;\r
\r
import static org.apache.commons.lang3.StringUtils.*;\r
import groovy.xml.XmlUtil\r
String serviceType = resourceInputObj.getServiceType()\r
String serviceModelInvariantUuid = resourceInputObj.getServiceModelInfo().getModelInvariantUuid()\r
String serviceModelUuid = resourceInputObj.getServiceModelInfo().getModelUuid()\r
- String serviceModelVersion = resourceInputObj.getServiceModelInfo().getModelName()\r
- String serviceModelName = resourceInputObj.getServiceModelInfo().getModelVersion()\r
+ String serviceModelVersion = resourceInputObj.getServiceModelInfo().getModelVersion()\r
+ String serviceModelName = resourceInputObj.getServiceModelInfo().getModelName()\r
String globalCustomerId = resourceInputObj.getGlobalSubscriberId()\r
String modelInvariantUuid = resourceInputObj.getResourceModelInfo().getModelInvariantUuid();\r
String modelCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()\r
String resourceInputPrameters = resourceInputObj.getResourceParameters()\r
String netowrkInputParametersJson = jsonUtil.getJsonValue(resourceInputPrameters, "requestInputs")\r
//here convert json string to xml string\r
- String netowrkInputParameters = jsonUtil.json2xml(netowrkInputParametersJson)\r
+ String netowrkInputParameters = XML.toString(new JSONObject(netowrkInputParametersJson))\r
// 1. prepare assign topology via SDNC Adapter SUBFLOW call\r
String sndcTopologyCreateRequest =\r
"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"\r
<order-version></order-version>\r
</request-information>\r
<service-information>\r
- <service-id>${sdnc_service_id}</service-id>\r
+ <service-id>${serviceInstanceId}</service-id>\r
<subscription-service-type>${serviceType}</subscription-service-type>\r
<ecomp-model-information>\r
<model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>\r