Merge changes I4e542ffd,Ibb86da2d

* changes:
  Fix Null Point Exception
  Fix Delete workflow sent msg to vfc adatper failed

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index 0bdead4..0b404d7 100644 (file)
--- a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -313,6 +313,9 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
             String resourceTemplateUUIDs) throws MsoRequestsDbException{
         String[] resourceLst = resourceTemplateUUIDs.split(":");
         for(String resource: resourceLst){
+            if("".equals(resource)){
+                continue;
+            }
             ResourceOperationStatus resourceStatus = new ResourceOperationStatus();
             resourceStatus.setOperationId(operationId);
             resourceStatus.setServiceId(serviceId);

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 11e31ef..dbefb6c 100644 (file)
--- 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
@@ -430,4 +430,11 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
         }
            utils.log("INFO", "Prepare VFC Request finished", isDebugEnabled)
        }
+       
+          /**
+     * post config request.
+     */
+       public void postConfigRequest(execution){
+           //now do noting
+       }
 }

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
index 996173e..b5ceb7a 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
@@ -46,11 +46,10 @@ import org.openecomp.mso.rest.APIResponse;
  */\r
 public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProcessor {\r
 \r
-    String deleteUrl = "/vfc/vfcadapters/v1/ns/{nsInstanceId}"\r
-            \r
-    String terminateUrl = "/vfcvfcadatpers/v1/ns/{nsInstanceId}/terminate"\r
+\r
+    String vfcUrl = "/vfc/rest/v1/vfcadapter"\r
     \r
-    String queryJobUrl = "/vfc/vfcadatpers/v1/jobs/{jobId}"\r
+    String host = "http://mso.mso.testlab.openecomp.org:8080"\r
     \r
     ExceptionUtil exceptionUtil = new ExceptionUtil()\r
 \r
@@ -75,14 +74,20 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
             utils.log("INFO", "serviceId:" + serviceId, isDebugEnabled)\r
             String operationId = execution.getVariable("operationId")\r
             utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)\r
-            String nodeTemplateUUID = execution.getVariable("resourceTemplateUUID")\r
+            String nodeTemplateUUID = execution.getVariable("resourceTemplateId")\r
             utils.log("INFO", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)\r
             String nsInstanceId = execution.getVariable("resourceInstanceId")\r
             utils.log("INFO", "nsInstanceId:" + nsInstanceId, isDebugEnabled)\r
-            String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""\r
-                  + serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId\r
-                  +"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";\r
+            execution.setVariable("nsInstanceId",nsInstanceId)\r
+            String nsOperationKey = """{\r
+            "globalSubscriberId":"${globalSubscriberId}",\r
+            "serviceType":"${serviceType}",\r
+            "serviceId":"${serviceId}",\r
+            "operationId":"${operationId}",\r
+            "nodeTemplateUUID":"${nodeTemplateUUID}"\r
+             }"""\r
             execution.setVariable("nsOperationKey", nsOperationKey);\r
+            utils.log("INFO", "nsOperationKey:" + nsOperationKey, isDebugEnabled)\r
         } catch (BpmnError e) {\r
             throw e;\r
         } catch (Exception ex){\r
@@ -99,9 +104,9 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void deleteNetworkService(Execution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", " *** deleteNetworkService  start *** ", isDebugEnabled)\r
-        String nsOperationKey = excution.getVariable("nsOperationKey");\r
-        String url = deleteUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) \r
-        APIResponse apiResponse = deleteRequest(url, reqBody)\r
+        String nsOperationKey = execution.getVariable("nsOperationKey");\r
+        String url = host + vfcUrl + "/ns/" + execution.getVariable("nsInstanceId") \r
+        APIResponse apiResponse = deleteRequest(execution, url, nsOperationKey)\r
         String returnCode = apiResponse.getStatusCode()\r
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()\r
         String operationStatus = "error";\r
@@ -120,15 +125,15 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", " *** terminateNetworkService  start *** ", isDebugEnabled)\r
         String nsOperationKey = execution.getVariable("nsOperationKey") \r
-        String url = terminateUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) \r
-        APIResponse apiResponse = postRequest(url, reqBody)\r
+        String url =  host + vfcUrl + "/ns/" + execution.getVariable("nsInstanceId") + "/terminate"\r
+        APIResponse apiResponse = postRequest(execution, url, nsOperationKey)\r
         String returnCode = apiResponse.getStatusCode()\r
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()\r
         String jobId = "";\r
         if(returnCode== "200"){\r
             jobId =  jsonUtil.getJsonValue(aaiResponseAsString, "jobId")\r
         }\r
-        execution.setVariable("jobId", nsInstanceId)   \r
+        execution.setVariable("jobId", jobId)   \r
         utils.log("INFO", " *** terminateNetworkService  end *** ", isDebugEnabled)\r
     }\r
 \r
@@ -139,9 +144,9 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", " *** queryNSProgress  start *** ", isDebugEnabled)\r
         String jobId = execution.getVariable("jobId")\r
-        String nsOperationKey = excution.getVariable("nsOperationKey");\r
-        String url = queryJobUrl.replaceAll("{jobId}", execution.getVariable("jobId")) \r
-        APIResponse createRsp = postRequest(url, nsOperationKey)\r
+        String nsOperationKey = execution.getVariable("nsOperationKey");\r
+        String url =  host + vfcUrl + "/jobs/" +  execution.getVariable("jobId") \r
+        APIResponse createRsp = postRequest(execution, url, nsOperationKey)\r
         String returnCode = apiResponse.getStatusCode()\r
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()\r
         String operationProgress = "100"\r
@@ -175,14 +180,14 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      * url: the url of the request\r
      * requestBody: the body of the request\r
      */\r
-    private APIResponse postRequest(String url, String requestBody){\r
+    private APIResponse postRequest(Execution execution, String url, String requestBody){\r
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)\r
         utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)\r
         APIResponse apiResponse = null\r
         try{\r
             RESTConfig config = new RESTConfig(url);\r
-            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");\r
+            RESTClient client = new RESTClient(config).addHeader("Content-Type", "application/json").addHeader("Accept","application/json").addHeader("Authorization","Basic QlBFTENsaWVudDpwYXNzd29yZDEk");;\r
             apiResponse = client.httpPost(requestBody)\r
             utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)\r
             utils.log("INFO", "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)\r
@@ -197,14 +202,14 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      * url: the url of the request\r
      * requestBody: the body of the request\r
      */\r
-    private APIResponse deleteRequest(String url, String requestBody){\r
+    private APIResponse deleteRequest(Execution execution, String url, String requestBody){\r
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", " ======== Started Execute VFC adapter Delete Process ======== ", isDebugEnabled)       \r
-        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled) \r
+        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)\r
         APIResponse apiResponse = null\r
         try{\r
             RESTConfig config = new RESTConfig(url);\r
-            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");\r
+            RESTClient client = new RESTClient(config).addHeader("Content-Type", "application/json").addHeader("Accept","application/json").addHeader("Authorization","Basic QlBFTENsaWVudDpwYXNzd29yZDEk");\r
             apiResponse = client.httpDelete(requestBody)\r
             utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled) \r
             utils.log("INFO", "======== Completed Execute VF-C adapter Delete Process ======== ", isDebugEnabled) \r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
index e39db56..461af11 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
@@ -133,10 +133,10 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
       <bpmn:extensionElements>
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="serviceType" target="serviceType" />
-        <camunda:in source="serviceId" target="serviceId" />
+        <camunda:in source="serviceInstanceId" target="serviceId" />
         <camunda:in source="operationId" target="operationId" />
-        <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" />
-        <camunda:in source="resouceInstanceId" target="resouceInstanceId" />
+        <camunda:in source="resourceTemplateId" target="resourceTemplateId" />
+        <camunda:in source="resourceInstanceId" target="resourceInstanceId" />
         <camunda:in source="resourceType" target="resourceType" />
         <camunda:in source="operationType" target="operationType" />
       </bpmn:extensionElements>

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 f5d068f..f6b30e8 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
@@ -604,15 +604,8 @@ public class E2EServiceInstances {
                                        DelE2ESvcResp jo = mapper.readValue(
                                                        camundaJSONResponseBody, DelE2ESvcResp.class);
                                        String operationId = jo.getOperationId();
-                                       OperationStatus operStatus = chkDuplicateServiceInOperStatus(instanceIdMap
-                                                       .get("serviceId"));
-                                       if (null != operStatus) {
-                                               msoLogger
-                                                               .debug("One task is already in progress state for this service id");
-                                       } else {
-                                               this.createOperationStatusRecord("DELETE", requestId,
+                               this.createOperationStatusRecord("DELETE", requestId,
                                                                operationId);
-                                       }
                                } catch (Exception ex) {
                                        msoLogger.error(MessageEnum.APIH_BPEL_RESPONSE_ERROR,
                                                        requestClient.getUrl(), "", "",