AT&T 1712 and 1802 release code

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / openecomp / mso / apihandlerinfra / E2EServiceInstances.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index c51c61e..9f028c1 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -55,12 +55,13 @@ import org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans.E2EServiceInsta
 import org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans.E2EServiceInstanceRequest;\r
 import org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans.E2EUserParam;\r
 import org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans.GetE2EServiceInstanceResponse;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.ModelInfo;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.RequestDetails;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.RequestInfo;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.RequestParameters;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.ServiceInstancesRequest;\r
-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.SubscriberInfo;\r
+import org.openecomp.mso.serviceinstancebeans.ModelInfo;\r
+import org.openecomp.mso.serviceinstancebeans.ModelType;\r
+import org.openecomp.mso.serviceinstancebeans.RequestDetails;\r
+import org.openecomp.mso.serviceinstancebeans.RequestInfo;\r
+import org.openecomp.mso.serviceinstancebeans.RequestParameters;\r
+import org.openecomp.mso.serviceinstancebeans.ServiceInstancesRequest;\r
+import org.openecomp.mso.serviceinstancebeans.SubscriberInfo;\r
 import org.openecomp.mso.db.AbstractSessionFactoryManager;\r
 import org.openecomp.mso.db.catalog.CatalogDatabase;\r
 import org.openecomp.mso.db.catalog.beans.Service;\r
@@ -333,7 +334,7 @@ public class E2EServiceInstances {
                        String serviceInstanceType = e2eDelReq.getServiceType();\r
                        response = requestClient.post(requestId, false,\r
                                        recipeLookupResult.getRecipeTimeout(), action.name(),\r
-                                       serviceId, null, null, null, null, serviceInstanceType,\r
+                                       serviceId, null, null, null, null, null, serviceInstanceType,\r
                                        null, null, null, bpmnRequest, recipeLookupResult.getRecipeParamXsd());\r
 \r
                        msoLogger.recordMetricEvent(subStartTime,\r
@@ -423,7 +424,7 @@ public class E2EServiceInstances {
                mapReqJsonToSvcInstReq(e2eSir, requestJSON);\r
                sir.getRequestDetails().getRequestParameters().setaLaCarte(true);\r
                try {\r
-                       msoRequest.parse(sir, instanceIdMap, action, version);\r
+                       msoRequest.parse(sir, instanceIdMap, action, version, requestJSON);\r
                } catch (Exception e) {\r
                        msoLogger.debug("Validation failed: ", e);\r
                        Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_BAD_REQUEST,\r
@@ -503,7 +504,8 @@ public class E2EServiceInstances {
                        msoLogger.debug("MSO API Handler Posting call to BPEL engine for url: " + requestClient.getUrl());\r
 \r
                        response = requestClient.post(requestId, false, recipeLookupResult.getRecipeTimeout(), action.name(),\r
-                                       serviceId, null, null, null, null, serviceInstanceType, null, null, null, sirRequestJson, recipeLookupResult.getRecipeParamXsd());\r
+                                       serviceId, null, null, null, null, null, serviceInstanceType, null, null, null, sirRequestJson,\r
+                                       recipeLookupResult.getRecipeParamXsd());\r
 \r
                        msoLogger.recordMetricEvent(subStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,\r
                                        "Successfully received response from BPMN engine", "BPMN", recipeLookupResult.getOrchestrationURI(),\r
@@ -618,7 +620,7 @@ public class E2EServiceInstances {
                mapReqJsonToSvcInstReq(e2eSir, requestJSON);\r
                sir.getRequestDetails().getRequestParameters().setaLaCarte(true);\r
                try {\r
-                       msoRequest.parse(sir, instanceIdMap, action, version);\r
+                       msoRequest.parse(sir, instanceIdMap, action, version, requestJSON);\r
                } catch (Exception e) {\r
                        msoLogger.debug("Validation failed: ", e);\r
                        Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_BAD_REQUEST,\r
@@ -757,7 +759,8 @@ public class E2EServiceInstances {
                        msoLogger.debug("MSO API Handler Posting call to BPEL engine for url: " + requestClient.getUrl());\r
 \r
                        response = requestClient.post(requestId, false, recipeLookupResult.getRecipeTimeout(), action.name(),\r
-                                       serviceId, null, null, null, null, serviceInstanceType, null, null, null, sirRequestJson, recipeLookupResult.getRecipeParamXsd());\r
+                                       serviceId, null, null, null, null, null, serviceInstanceType, null, null, null, sirRequestJson,\r
+                                       recipeLookupResult.getRecipeParamXsd());\r
 \r
                        msoLogger.recordMetricEvent(subStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,\r
                                        "Successfully received response from BPMN engine", "BPMN", recipeLookupResult.getOrchestrationURI(),\r
@@ -1021,8 +1024,8 @@ public class E2EServiceInstances {
                List<E2EUserParam> userParams;\r
                // userParams =\r
                // e2eSir.getService().getParameters().getRequestParameters().getUserParams();\r
-               List<Map<String, String>> userParamList = new ArrayList<>();\r
-               Map<String, String> userParamMap = new HashMap<>();\r
+               List<Map<String, Object>> userParamList = new ArrayList<>();\r
+               Map<String, Object> userParamMap = new HashMap<>();\r
                // complete json request updated in the camunda\r
                userParamMap.put("UUIRequest", requestJSON);\r
                userParamMap.put("ServiceInstanceName", e2eSir.getService().getName());\r
@@ -1152,4 +1155,4 @@ public class E2EServiceInstances {
 \r
                return dupServiceName;\r
        }\r
-}
\ No newline at end of file
+}\r