Merge "add field in SO Request"

diff --combined src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
index 1d1ef36,0821e82..d623b89
--- 1/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
--- 2/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
@@@ -13,12 -13,27 +13,12 @@@
   */
  package org.onap.nbi.apis.serviceorder.workflow;
  
 -import java.io.IOException;
 -import java.util.ArrayList;
 -import java.util.Arrays;
 -import java.util.Date;
 -import java.util.LinkedHashMap;
 -import java.util.List;
  import org.onap.nbi.apis.serviceorder.SoClient;
  import org.onap.nbi.apis.serviceorder.model.ServiceCharacteristic;
  import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
  import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
  import org.onap.nbi.apis.serviceorder.model.StateType;
 -import org.onap.nbi.apis.serviceorder.model.consumer.CloudConfiguration;
 -import org.onap.nbi.apis.serviceorder.model.consumer.CreateServiceInstanceResponse;
 -import org.onap.nbi.apis.serviceorder.model.consumer.GetRequestStatusResponse;
 -import org.onap.nbi.apis.serviceorder.model.consumer.ModelInfo;
 -import org.onap.nbi.apis.serviceorder.model.consumer.RequestDetails;
 -import org.onap.nbi.apis.serviceorder.model.consumer.RequestInfo;
 -import org.onap.nbi.apis.serviceorder.model.consumer.RequestParameters;
 -import org.onap.nbi.apis.serviceorder.model.consumer.RequestState;
 -import org.onap.nbi.apis.serviceorder.model.consumer.SubscriberInfo;
 -import org.onap.nbi.apis.serviceorder.model.consumer.UserParams;
 +import org.onap.nbi.apis.serviceorder.model.consumer.*;
  import org.onap.nbi.apis.serviceorder.model.orchestrator.ExecutionTask;
  import org.onap.nbi.apis.serviceorder.model.orchestrator.ServiceOrderInfo;
  import org.onap.nbi.apis.serviceorder.model.orchestrator.ServiceOrderInfoJson;
@@@ -34,9 -49,6 +34,9 @@@ import org.springframework.http.Respons
  import org.springframework.stereotype.Service;
  import org.springframework.util.CollectionUtils;
  
 +import java.io.IOException;
 +import java.util.*;
 +
  @Service
  public class SOTaskProcessor {
  
@@@ -103,7 -115,7 +103,7 @@@
                  updateServiceOrderItem(response.getBody(), serviceOrderItem);
  
                  if (response.getStatusCode() != HttpStatus.CREATED || response.getBody() == null
 -                        || response.getBody().getRequestReference() == null) {
 +                        || response.getBody().getRequestReferences() == null) {
                      serviceOrderItem.setState(StateType.FAILED);
                  } else {
                      serviceOrderItem.setState(StateType.INPROGRESS);
@@@ -135,15 -147,14 +135,15 @@@
          RequestDetails requestDetails = buildSoRequest(serviceOrderItem,
                  serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()).getCatalogResponse(),
                  serviceOrderInfo.getSubscriberInfo());
 +        MSOPayload msoPayload = new MSOPayload(requestDetails);
          ResponseEntity<CreateServiceInstanceResponse> response = null;
  
          switch (serviceOrderItem.getAction()) {
              case ADD:
 -                response = soClient.callCreateServiceInstance(requestDetails);
 +                response = soClient.callCreateServiceInstance(msoPayload);
                  break;
              case DELETE:
 -                response = soClient.callDeleteServiceInstance(requestDetails, serviceOrderItem.getService().getId());
 +                response = soClient.callDeleteServiceInstance(msoPayload, serviceOrderItem.getService().getId());
                  break;
              default:
                  break;
@@@ -246,6 -257,7 +246,7 @@@
          modelInfo.setModelType("service");
          modelInfo.setModelInvariantId((String) sdcInfos.get("invariantUUID"));
          modelInfo.setModelNameVersionId(orderItem.getService().getServiceSpecification().getId());
+         modelInfo.setModelVersionId(orderItem.getService().getServiceSpecification().getId());
          modelInfo.setModelName((String) sdcInfos.get("name"));
          modelInfo.setModelVersion((String) sdcInfos.get("version"));
          requestDetails.setModelInfo(modelInfo);
@@@ -254,7 -266,6 +255,7 @@@
          requestInfo.setInstanceName(orderItem.getService().getName());
          requestInfo.setSource("VID");
          requestInfo.setSuppressRollback(false);
 +        requestInfo.setRequestorId("NBI");
          requestDetails.setRequestInfo(requestInfo);
  
          RequestParameters requestParameters = new RequestParameters();
@@@ -301,8 -312,8 +302,8 @@@
              ServiceOrderItem orderItem) {
  
          if (createServiceInstanceResponse != null && !orderItem.getState().equals(StateType.FAILED)) {
 -            orderItem.getService().setId(createServiceInstanceResponse.getRequestReference().getInstanceId());
 -            orderItem.setRequestId(createServiceInstanceResponse.getRequestReference().getRequestId());
 +            orderItem.getService().setId(createServiceInstanceResponse.getRequestReferences().getInstanceId());
 +            orderItem.setRequestId(createServiceInstanceResponse.getRequestReferences().getRequestId());
          }
      }