summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-11-14 11:46:33 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-14 11:46:33 +0000
commit0a1806148329bc34ebad2939e7d108c5c365aabe (patch)
tree09f84e844764b8627985c8e8fa627c3088cf38ac
parent20342473a31a147007f126e3ce81d63b8806a502 (diff)
parentc53034a3a23a824cdb0ee2a90c20655302e21df1 (diff)
Merge "Fix Update Create Resource Status Error"
-rw-r--r--adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java2
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
index 8d820bcf01..2c2143c32e 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
@@ -365,7 +365,7 @@ public class VfcManager {
nsOperInfo.setErrorCode(String.valueOf(rsp.getStatus()));
- if(RequestsDbConstant.OperationType.CREATE.equals(nsOperInfo.getOperType())) {
+ if(RequestsDbConstant.OperationType.CREATE.equalsIgnoreCase(nsOperInfo.getOperType())) {
nsOperInfo.setStatus(RequestsDbConstant.Status.FINISHED);
}
(RequestsDatabase.getInstance()).updateResOperStatus(nsOperInfo);
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
index e8bfcf5caa..34cb4f1043 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
@@ -65,6 +65,7 @@ public class SdncNetworkTopologyOperationTask extends AbstractSdncOperationTask
} else {
Send2SdncDirectly(HeaderUtil.DefaulAuth, inputEntity);
}
+ updateProgress(execution, RequestsDbConstant.Status.FINISHED, null, RequestsDbConstant.Progress.ONE_HUNDRED, "execute finished!");
logger.info("SdncNetworkTopologyOperationTask.sendRestrequestAndHandleResponse end!");
}
@@ -95,7 +96,7 @@ public class SdncNetworkTopologyOperationTask extends AbstractSdncOperationTask
logger.info("exception: SdncNetworkTopologyOperationTask.saveOutput fail!");
throw new Exception("");
}
- updateProgress(execution, RequestsDbConstant.Status.FINISHED, null, RequestsDbConstant.Progress.ONE_HUNDRED, "execute finished!");
+
logger.info("SdncNetworkTopologyOperationTask.saveOutput end!");
}