Change code in appc dispatcher for new LCMs in R6

Also introduce some minor improvements to robustness, efficiency, & formatting.

Issue-ID: APPC-1789
Signed-off-by: Dunietz, Irwin <id1681@att.com>
Change-Id: I82d970c2f7cde6c8dab1222af86ea70ce93b7e50

2 files changed, 62 insertions, 56 deletions

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandExecutorImpl.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandExecutorImpl.java
index 9c12f4741..4c7698cb1 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandExecutorImpl.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandExecutorImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * ================================================================================
@@ -11,15 +11,14 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
  * ============LICENSE_END=========================================================
  */
 
@@ -29,6 +28,7 @@ package org.onap.appc.executor.impl;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.commons.lang.ObjectUtils;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
 import org.onap.appc.exceptions.APPCException;
 import org.onap.appc.executionqueue.ExecutionQueueService;
 import org.onap.appc.executor.CommandExecutor;
@@ -54,7 +54,7 @@ public class CommandExecutorImpl implements CommandExecutor {
      * <p>Used through blueprint.
      */
     public void initialize() {
-        logger.info("initialization started of CommandExecutorImpl");
+        logger.info("initialization of CommandExecutorImpl started");
     }
 
     public void setExecutionQueueService(ExecutionQueueService executionQueueService) {
@@ -78,24 +78,27 @@ public class CommandExecutorImpl implements CommandExecutor {
      */
     @Override
     public void executeCommand (CommandExecutorInput commandExecutorInput) throws APPCException{
-        logger.trace("Entering to executeCommand with CommandExecutorInput = "+ ObjectUtils.toString(commandExecutorInput));
+        logger.trace("Entering executeCommand with CommandExecutorInput = "
+                + ObjectUtils.toString(commandExecutorInput));
         CommandTask commandTask;
         try {
-            commandTask= getCommandTask(requestHandler, workflowManager);
+            commandTask = getCommandTask(requestHandler, workflowManager);
             commandTask.setCommandRequest(new CommandRequest(commandExecutorInput));
             long remainingTTL = getRemainingTTL(commandTask.getCommandRequest());
-            logger.trace("Queuing request with CommandRequest = "+ ObjectUtils.toString(commandTask.getCommandRequest()));
-            executionQueueService.putMessage(commandTask,remainingTTL, TimeUnit.MILLISECONDS);
+            logger.trace("Queuing request with CommandRequest = "
+                    + ObjectUtils.toString(commandTask.getCommandRequest()));
+            executionQueueService.putMessage(commandTask, remainingTTL, TimeUnit.MILLISECONDS);
         } catch (Exception e) {
-            logger.error("Exception: "+e.getMessage());
+            logger.error("Exception: " + e.getMessage());
             throw new APPCException(e);
         }
         logger.trace("Exiting from executeCommand");
     }
 
     private long getRemainingTTL(CommandRequest request) {
-        Date requestTimestamp = request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getCommonHeader().getTimeStamp();
-        int ttl = request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getCommonHeader().getFlags().getTtl();
+        CommonHeader hdr = request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getCommonHeader();
+        Date requestTimestamp = hdr.getTimeStamp();
+        int ttl = hdr.getFlags().getTtl();
         return ttl*1000 + requestTimestamp.getTime() - System.currentTimeMillis();
     }
 
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java
index cfd4ff8d0..8cf5930f7 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * ================================================================================
@@ -11,15 +11,15 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * ============LICENSE_END=========================================================
  */
 
@@ -30,27 +30,29 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.net.InetAddress;
 import java.util.UUID;
+import org.onap.appc.domainmodel.lcm.CommonHeader;
+import org.onap.appc.domainmodel.lcm.RequestContext;
+import org.onap.appc.domainmodel.lcm.ResponseContext;
+import org.onap.appc.domainmodel.lcm.RuntimeContext;
 import org.onap.appc.domainmodel.lcm.Status;
 import org.onap.appc.domainmodel.lcm.VNFOperation;
 import org.onap.appc.executor.impl.objects.CommandRequest;
 import org.onap.appc.logging.LoggingConstants;
 import org.onap.appc.requesthandler.RequestHandler;
-import org.onap.appc.domainmodel.lcm.RuntimeContext;
 import org.onap.appc.workflow.WorkFlowManager;
 import org.onap.appc.workflow.objects.WorkflowRequest;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.adaptors.aai.AAIRequest;
 import org.onap.ccsdk.sli.adaptors.aai.AAIService;
 import org.onap.ccsdk.sli.adaptors.aai.AAIServiceException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 import org.slf4j.MDC;
 
 
-
 /**
  * This abstract class is base class for all Command tasks. All command task must inherit this class.
  */
@@ -81,8 +83,7 @@ public class CommandTask implements Runnable {
         this.requestHandler = requestHandler;
     }
 
-    public CommandTask(RequestHandler requestHandler,
-                       WorkFlowManager workflowManager){
+    public CommandTask(RequestHandler requestHandler, WorkFlowManager workflowManager) {
         this.requestHandler = requestHandler;
         this.workflowManager = workflowManager;
         getAAIservice();
@@ -104,19 +105,21 @@ public class CommandTask implements Runnable {
 
     @Override
     public void run() {
-        logger.debug("Starting execution of command :" + commandRequest);
+        logger.debug("Starting execution of command: " + commandRequest);
         setInitialLogProperties(commandRequest);
         final RuntimeContext runtimeContext = commandRequest.getCommandExecutorInput().getRuntimeContext();
 
         WorkflowRequest workflowRequest = new WorkflowRequest();
-        workflowRequest.setRequestContext(runtimeContext.getRequestContext());
-        workflowRequest.setResponseContext(runtimeContext.getResponseContext());
+        final RequestContext reqContext = runtimeContext.getRequestContext();
+        workflowRequest.setRequestContext(reqContext);
+        final ResponseContext respContext = runtimeContext.getResponseContext();
+        workflowRequest.setResponseContext(respContext);
         workflowRequest.setVnfContext(runtimeContext.getVnfContext());
-        logger.debug("Executing workflow :" + workflowRequest);
+        logger.debug("Executing workflow: " + workflowRequest);
         workflowManager.executeWorkflow(workflowRequest);
-        logger.debug("Completed execution workflow with response:"+ commandRequest.getCommandExecutorInput().getRuntimeContext().getResponseContext());
+        logger.debug("Completed execution workflow with response: " + respContext);
         try {
-            if (VNFOperation.Terminate ==  commandRequest.getCommandExecutorInput().getRuntimeContext().getRequestContext().getAction())
+            if (VNFOperation.Terminate == reqContext.getAction())
                 updateAAIForTerminate(commandRequest);
         } catch (AAIServiceException e) {
             logger.error("Exception = " + e);
@@ -124,36 +127,37 @@ public class CommandTask implements Runnable {
             Status updatedStatus = new Status();
             updatedStatus.setCode(401);
             updatedStatus.setMessage("Failed to update VNF status in A&AI");
-            commandRequest.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(updatedStatus);
+            respContext.setStatus(updatedStatus);
             throw new RuntimeException(e);
-        }finally {
-            requestHandler.onRequestExecutionEnd(commandRequest.getCommandExecutorInput().getRuntimeContext());
+        } finally {
+            requestHandler.onRequestExecutionEnd(runtimeContext);
             clearRequestLogProperties();
         }
     }
 
     private void updateAAIForTerminate(CommandRequest commandRequest) throws AAIServiceException {
-        final int statusCode = commandRequest.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus().getCode();
+        final RuntimeContext runtimeContext = commandRequest.getCommandExecutorInput().getRuntimeContext();
+        final int statusCode = runtimeContext.getResponseContext().getStatus().getCode();
 
-        logger.debug("Workflow Execution Status = "+ statusCode);
+        logger.debug("Workflow Execution Status = " + statusCode);
         if (statusCode == 100 || statusCode == 400) {
+            String id = runtimeContext.getVnfContext().getId();
             SvcLogicContext ctx = new SvcLogicContext();
-            ctx = getVnfdata(commandRequest.getCommandExecutorInput().getRuntimeContext().getVnfContext().getId(), "vnf", ctx);
-            deleteGenericVnfData(commandRequest.getCommandExecutorInput().getRuntimeContext().getVnfContext().getId(),
-                    ctx.getAttribute("vnf.resource-version"));
+            ctx = getVnfdata(id, "vnf", ctx);
+            deleteGenericVnfData(id, ctx.getAttribute("vnf.resource-version"));
         }
     }
 
-    private SvcLogicContext getVnfdata(String vnf_id, String prefix,SvcLogicContext ctx) {
-        String key="generic-vnf.vnf-id = '" + vnf_id + "'" + " AND http-header.Real-Time = 'true'";
+    private SvcLogicContext getVnfdata(String vnf_id, String prefix, SvcLogicContext ctx) {
+        String key = "generic-vnf.vnf-id = '" + vnf_id + "'" + " AND http-header.Real-Time = 'true'";
         logger.debug("inside getVnfdata=== " + key);
         try {
-            SvcLogicResource.QueryStatus response = aaiService.query("generic-vnf", false, null, key,prefix, null, ctx);
-            if(SvcLogicResource.QueryStatus.NOT_FOUND.equals(response)){
+            SvcLogicResource.QueryStatus response =
+                    aaiService.query("generic-vnf", false, null, key, prefix, null, ctx);
+            if (SvcLogicResource.QueryStatus.NOT_FOUND.equals(response)) {
                 logger.warn("VNF " + vnf_id + " not found while updating A&AI");
                 throw new RuntimeException("VNF not found for vnf_id = " + vnf_id);
-            }
-            else if(SvcLogicResource.QueryStatus.FAILURE.equals(response)){
+            } else if (SvcLogicResource.QueryStatus.FAILURE.equals(response)) {
                 throw new RuntimeException("Error Querying AAI with vnfID = " + vnf_id);
             }
             logger.info("AAIResponse: " + response.toString());
@@ -166,24 +170,24 @@ public class CommandTask implements Runnable {
 
 
     private void setInitialLogProperties(CommandRequest request) {
-        String reqId = request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getCommonHeader().getRequestId();
+        RequestContext reqContext = request.getCommandExecutorInput().getRuntimeContext().getRequestContext();
+        CommonHeader reqHdr = reqContext.getCommonHeader();
+        String reqId = reqHdr.getRequestId();
 
         try {
             MDC.put(Configuration.MDC_KEY_REQUEST_ID, UUID.fromString(reqId).toString());
             //reaching here without exception means existing RequestId is
-            //valid UUID as per ECOMP logging standards
+            //valid UUID as per ONAP logging standards
         } catch (Exception e) {
             String reqIdUUID = UUID.randomUUID().toString();
             MDC.put(Configuration.MDC_KEY_REQUEST_ID, reqIdUUID);
             logger.info("Replaced invalid requestID of " + reqId + ".  New value is " + reqIdUUID + ".");
         }
-        if (request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getActionIdentifiers().getServiceInstanceId() != null) {
-            MDC.put(Configuration.MDC_SERVICE_INSTANCE_ID, 
-                    request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getActionIdentifiers().getServiceInstanceId());
-            MDC.put(LoggingConstants.MDCKeys.PARTNER_NAME, 
-                    request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getCommonHeader().getOriginatorId());
-            MDC.put(Configuration.MDC_SERVICE_NAME, 
-                    request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getAction().name());
+        String svcInstanceId = reqContext.getActionIdentifiers().getServiceInstanceId();
+        if (svcInstanceId != null) {
+            MDC.put(Configuration.MDC_SERVICE_INSTANCE_ID, svcInstanceId);
+            MDC.put(LoggingConstants.MDCKeys.PARTNER_NAME, reqHdr.getOriginatorId());
+            MDC.put(Configuration.MDC_SERVICE_NAME, reqContext.getAction().name());
         }
         try {
             MDC.put(Configuration.MDC_SERVER_FQDN, InetAddress.getLocalHost().getCanonicalHostName());
@@ -191,11 +195,10 @@ public class CommandTask implements Runnable {
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
-        MDC.put(Configuration.MDC_INSTANCE_UUID, ""); // make instanse_UUID generation once during APPC-instance deploying
+        MDC.put(Configuration.MDC_INSTANCE_UUID, ""); // confine instance_UUID generation to APPC-instance deployment
     }
 
-    private void clearRequestLogProperties()
-    {
+    private void clearRequestLogProperties() {
         try {
             MDC.remove(Configuration.MDC_KEY_REQUEST_ID);
             MDC.remove(Configuration.MDC_SERVICE_INSTANCE_ID);
@@ -213,7 +216,7 @@ public class CommandTask implements Runnable {
             AAIRequest request = aaiService.getRequestFromResource("generic-vnf");
             request.addRequestProperty("generic-vnf.vnf-id", vnf_id);
             response = aaiService.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
+        } catch (AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
             logger.warn("deleteGenericVnfData", exc);