diff options
Diffstat (limited to 'src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java')
-rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java index deb4e55..7fdcdaa 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java @@ -117,10 +117,7 @@ public class PostSoProcessor { private ResponseEntity<CreateServiceInstanceResponse> postSORequest( ServiceOrderItem serviceOrderItem, ServiceOrderInfo serviceOrderInfo) { RequestDetails requestDetails = - buildSoRequest( - serviceOrderItem, serviceOrderInfo.getServiceOrderItemInfos() - .get(serviceOrderItem.getId()).getCatalogResponse(), - serviceOrderInfo.getSubscriberInfo()); + buildSoRequest(serviceOrderItem,serviceOrderInfo); MSOPayload msoPayload = new MSOPayload(requestDetails); ResponseEntity<CreateServiceInstanceResponse> response = null; @@ -186,16 +183,15 @@ public class PostSoProcessor { * Build SO CREATE request from the ServiceOrder and catalog informations from SDC * * @param orderItem - * @param sdcInfos - * @param subscriberInfo + * @param serviceOrderInfo * @return */ - private RequestDetails buildSoRequest(ServiceOrderItem orderItem, Map<String, Object> sdcInfos, - SubscriberInfo subscriberInfo) { + private RequestDetails buildSoRequest(ServiceOrderItem orderItem,ServiceOrderInfo serviceOrderInfo) { RequestDetails requestDetails = new RequestDetails(); - requestDetails.setSubscriberInfo(subscriberInfo); - + requestDetails.setSubscriberInfo( serviceOrderInfo.getSubscriberInfo()); + Map<String, Object> sdcInfos=serviceOrderInfo.getServiceOrderItemInfos() + .get(orderItem.getId()).getCatalogResponse(); ModelInfo modelInfo = new ModelInfo(); modelInfo.setModelType("service"); modelInfo.setModelInvariantId((String) sdcInfos.get("invariantUUID")); @@ -217,13 +213,14 @@ public class PostSoProcessor { requestParameters.setUserParams(retrieveUserParamsFromServiceCharacteristics( orderItem.getService().getServiceCharacteristic())); requestParameters.setaLaCarte(true); + requestParameters.setTestApi("GR_API"); requestDetails.setRequestParameters(requestParameters); CloudConfiguration cloudConfiguration = new CloudConfiguration(lcpCloudRegionId, tenantId, cloudOwner); requestDetails.setCloudConfiguration(cloudConfiguration); OwningEntity owningEntity = new OwningEntity(); - owningEntity.setOwningEntityId(soOwningEntityId); + owningEntity.setOwningEntityId(serviceOrderInfo.getOwningEntityId()); owningEntity.setOwningEntityName(soOwningEntityName); requestDetails.setOwningEntity(owningEntity); |