Fix Update Create Resource Status Error

Fix Update Create Resource Status Error

Change-Id: I230c7986b72e27e4c59fbeb129c1b39bb500a86b
Issue-ID:SO-337
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

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 8d820bc..2c2143c 100644 (file)
--- 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 e8bfcf5..34cb4f1 100644 (file)
--- 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!");
     }