Merging in bug fixes

[appc.git] / appc-dispatcher / appc-command-executor / appc-command-executor-core / src / test / java / org / openecomp / appc / executor / TestCommandExecutionTask.java

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
index ee28fa8..460f0e7 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
@@ -123,16 +123,23 @@ public class TestCommandExecutionTask {
                factory = new CommandTaskFactory();
                factory.setLifecyclemanager(lifecyclemanager);
                factory.setWorkflowManager(workflowManager);
-               factory.setRequestHandler(requestHandler);
+               factory.setVnfRequestHandler(requestHandler);
                Mockito.when(workflowManager.executeWorkflow((WorkflowRequest)anyObject())).thenReturn(getWorkflowResponse () );
        }
 
 
        @Test
        public void testFactory(){
-               CommandTask task = factory.getExecutionTask("Configure", null);
+               CommandTask task;
+               Instant timeStamp = Instant.now();
+               String requestId = "1";
+               RuntimeContext commandExecutorInputConfigure = pouplateCommandExecutorInput("FIREWALL", 30, "1.0",
+                               timeStamp, API_VERSION, requestId, ORIGINATOR_ID, "2", VNFOperation.Configure,"15","") ;
+               task = factory.getExecutionTask(commandExecutorInputConfigure);
                assertEquals(LCMCommandTask.class,task.getClass() );
-               task = factory.getExecutionTask("Sync", null);
+               RuntimeContext commandExecutorInputSync = pouplateCommandExecutorInput("FIREWALL", 30, "1.0",
+                               timeStamp, API_VERSION, requestId, ORIGINATOR_ID, "2", VNFOperation.Sync,"15","") ;
+               task = factory.getExecutionTask(commandExecutorInputSync);
                assertEquals(LCMReadonlyCommandTask.class,task.getClass() );
 
        }
@@ -215,6 +222,22 @@ public class TestCommandExecutionTask {
        }
 
 
+       private RuntimeContext getConfigCommandRequest(String vnfType , Integer ttl , Instant timeStamp, String requestId,
+                                                                                                                         Map<String,Object> flags, VNFOperation command , String vnfId, String vnfVersion ){
+
+               RuntimeContext commandExecutorInput = pouplateCommandExecutorInput(vnfType, ttl, vnfVersion, timeStamp, API_VERSION, requestId, ORIGINATOR_ID, "", command, vnfId, "");
+
+               return commandExecutorInput;
+       }
+
+       private RuntimeContext getLCMCommandRequest(String vnfType , Integer ttl ,Instant timeStamp, String requestId,
+                                                                                                  Map<String,Object> flags, VNFOperation command , String vnfId, String vnfVersion ){
+
+               RuntimeContext commandExecutorInput = pouplateCommandExecutorInput(vnfType, ttl, vnfVersion, timeStamp, API_VERSION, requestId, ORIGINATOR_ID, "", command, vnfId, "");
+
+               return commandExecutorInput;
+       }
+
        public WorkflowResponse getWorkflowResponse (){
                WorkflowResponse wfResponse = new WorkflowResponse();
                ResponseContext responseContext = createResponseContextWithSuObjects();
@@ -275,4 +298,3 @@ public class TestCommandExecutionTask {
        }
 
 }
-