E2EServiceInstance Update API bugs fix

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064300
Issue-ID: SO-578
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index 08fe0f8..8d3a643 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -533,7 +533,7 @@ public class E2EServiceInstances {
        private Response updateE2EserviceInstances(String requestJSON, Action action,\r
                        HashMap<String, String> instanceIdMap, String version) {\r
 \r
-               String requestId = instanceIdMap.get("serviceId");\r
+               String requestId = UUIDChecker.generateUUID(msoLogger);\r
                long startTime = System.currentTimeMillis();\r
                msoLogger.debug("requestId is: " + requestId);\r
                E2EServiceInstanceRequest e2eSir = null;\r
@@ -627,7 +627,7 @@ public class E2EServiceInstances {
 \r
                String serviceInstanceType = e2eSir.getService().getServiceType();\r
 \r
-               String serviceId = "";\r
+               String serviceId = instanceIdMap.get("serviceId");\r
                RequestClient requestClient = null;\r
                HttpResponse response = null;\r
 \r
@@ -675,6 +675,7 @@ public class E2EServiceInstances {
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.InternalError,\r
                                        "Null response from BPMN");\r
                        msoLogger.debug(END_OF_THE_TRANSACTION + (String) getBPMNResp.getEntity());\r
+                       this.createOperationStatusRecordForError(action, requestId);\r
                        return getBPMNResp;\r
                }\r
 \r
@@ -707,9 +708,8 @@ public class E2EServiceInstances {
 \r
                if (curStatus != null && curStatus.getResult() != null && curStatus.getResult().equalsIgnoreCase("processing")) {\r
                        String chkMessage = "Error: Locked instance - This " + requestScope + " (" + requestId + ") "\r
-                                       + "now being worked with a status of " + curStatus.getProgress() + " (ServiceName - "\r
-                                       + curStatus.getServiceName()\r
-                                       + "). The existing request must finish or be cleaned up before proceeding.";\r
+                                       + "now being worked with a status of " + curStatus.getResult() \r
+                                       + ". The latest workflow of instance must be finished or cleaned up.";\r
 \r
                        Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_CONFLICT,\r
                                        MsoException.ServiceException, chkMessage, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR, null);\r