Merge "Fix Result Code Check Error"

2 files changed, 5 insertions, 5 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index ca67d5dcdd..4d661c489a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -358,7 +358,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
             String resourcesStr = jsonUtil.getJsonValue(incomingRequest, "service.parameters.resources")  
             List<String> resourceList = jsonUtil.StringArrayToList(execution, resourcesStr)   
             for(String resource : resourceList){
-                    resourceTemplateUUIDs  = resourceTemplateUUIDs + jsonUtil.getJsonValue(resource, "resourceDefId") + ":"
+                    resourceTemplateUUIDs  = resourceTemplateUUIDs + jsonUtil.getJsonValue(resource, "resourceId") + ":"
             }           
 
             def dbAdapterEndpoint = "http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter"
@@ -415,7 +415,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
         for(String resource : resourceList){
             String resourceName = jsonUtil.getJsonValue(resource, "resourceName")  
             if(StringUtils.containsIgnoreCase(resourceName, resourceType)){
-                String resourceUUID  = jsonUtil.getJsonValue(resource, "resourceDefId")
+                String resourceUUID  = jsonUtil.getJsonValue(resource, "resourceId")
                 String resourceParameters = jsonUtil.getJsonValue(resource, "nsParameters")                
                 execution.setVariable("resourceUUID", resourceUUID)
                 execution.setVariable("resourceParameters", resourceParameters)
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
index 2e62abd6f5..827cbf5783 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
@@ -134,7 +134,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
         String returnCode = apiResponse.getStatusCode()

         String aaiResponseAsString = apiResponse.getResponseBodyAsString()

         String nsInstanceId = "";

-        if(returnCode== "200"){

+        if(returnCode== "200" || returnCode == "201"){

             nsInstanceId =  jsonUtil.getJsonValue(aaiResponseAsString, "nsInstanceId")

         }

         execution.setVariable("nsInstanceId", nsInstanceId)

@@ -163,7 +163,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
         String returnCode = apiResponse.getStatusCode()

         String aaiResponseAsString = apiResponse.getResponseBodyAsString()

         String jobId = "";

-        if(returnCode== "200"){

+        if(returnCode== "200"|| returnCode == "201"){

             jobId =  jsonUtil.getJsonValue(aaiResponseAsString, "jobId")

         }

         execution.setVariable("jobId", jobId)

@@ -183,7 +183,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
         String returnCode = apiResponse.getStatusCode()

         String aaiResponseAsString = apiResponse.getResponseBodyAsString()

         String operationStatus = "error"

-        if(returnCode== "200"){

+        if(returnCode== "200"|| returnCode == "201"){

             operationStatus = jsonUtil.getJsonValue(aaiResponseAsString, "responseDescriptor.status")

         }

         execution.setVariable("operationStatus", operationStatus)