aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-10-31 10:23:56 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-31 10:23:56 +0000
commitb26afdb43584672e5ddefa8d8a078185dca663d9 (patch)
tree78a5e39fb0d86c23fcb70e1c8533e6b3630fc7b0 /bpmn/MSOInfrastructureBPMN
parent7ea6122f021a317b29237a83b6753797804f7c8a (diff)
parent33758ea549f72864806420803fbca64041448943 (diff)
Merge "Fix Result Code Check Error"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN')
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy6
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)