summaryrefslogtreecommitdiffstats
path: root/appc-dispatcher/appc-command-executor
diff options
context:
space:
mode:
Diffstat (limited to 'appc-dispatcher/appc-command-executor')
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandExecutorInput.java16
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java5
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java6
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java4
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java3
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java9
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java6
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java16
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java10
9 files changed, 30 insertions, 45 deletions
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandExecutorInput.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandExecutorInput.java
index 4cb5f1b99..07565a249 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandExecutorInput.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/CommandExecutorInput.java
@@ -24,26 +24,22 @@ package org.openecomp.appc.executor.objects;
import org.openecomp.appc.domainmodel.lcm.RuntimeContext;
public class CommandExecutorInput {
- private RuntimeContext runtimeContext ;
- private int ttl;
+ private final RuntimeContext runtimeContext ;
+ private final int ttl;
+ public CommandExecutorInput(RuntimeContext runtimeContext, int ttl) {
+ this.runtimeContext = runtimeContext;
+ this.ttl = ttl;
+ }
public RuntimeContext getRuntimeContext() {
return runtimeContext;
}
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
- }
-
public int getTtl() {
return ttl;
}
- public void setTtl(int ttl) {
- this.ttl = ttl;
- }
-
@Override
public String toString() {
return "CommandExecutorInput{" +
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
index 4e3a40e75..14bd8152c 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/src/main/java/org/openecomp/appc/executor/objects/LCMCommandStatus.java
@@ -23,6 +23,7 @@ package org.openecomp.appc.executor.objects;
import org.apache.commons.lang3.StringUtils;
+import org.openecomp.appc.domainmodel.lcm.Status;
import org.openecomp.appc.util.MessageFormatter;
import java.util.Map;
@@ -108,5 +109,9 @@ public enum LCMCommandStatus {
", responseMessage='" + responseMessage + '\'' +
'}';
}
+
+ public Status toStatus(Params params) {
+ return new Status(responseCode, getFormattedMessage(params));
+ }
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
index 60a951722..e351cfe12 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandExecutorImpl.java
@@ -118,7 +118,7 @@ public class CommandExecutorImpl implements CommandExecutor {
logger.trace("Entering to enqueRequest with CommandRequest = "+ ObjectUtils.toString(request));
}
try {
- CommandTask commandTask = getMessageExecutor(request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getAction().name());
+ CommandTask<? extends CommandRequest> commandTask = getMessageExecutor(request.getCommandExecutorInput().getRuntimeContext().getRequestContext().getAction().name());
commandTask.setCommandRequest(request);
long remainingTTL = getRemainingTTL(request);
executionQueueService.putMessage(commandTask,remainingTTL, TimeUnit.MILLISECONDS);
@@ -138,11 +138,11 @@ public class CommandExecutorImpl implements CommandExecutor {
return ttl*1000 + requestTimestamp.getTime() - System.currentTimeMillis();
}
- private CommandTask getMessageExecutor(String action){
+ private CommandTask<? extends CommandRequest> getMessageExecutor(String action){
if (logger.isTraceEnabled()) {
logger.trace("Entering to getMessageExecutor with command = "+ action);
}
- CommandTask executionTask = executionTaskFactory.getExecutionTask(action);
+ CommandTask<? extends CommandRequest> executionTask = executionTaskFactory.getExecutionTask(action);
if (logger.isTraceEnabled()) {
logger.trace("Exiting from getMessageExecutor");
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
index 6418002c2..0037434ff 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTask.java
@@ -119,8 +119,4 @@ public abstract class CommandTask<M> implements Runnable {
this.onRequestCompletion(commandRequest,commandResponse);
}
- public static void fillStatus(Status status, LCMCommandStatus lcmCommandStatus, Params params) {
- status.setCode(lcmCommandStatus.getResponseCode());
- status.setMessage(lcmCommandStatus.getFormattedMessage(params));
- }
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
index 610f0bca3..d01722062 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
@@ -23,6 +23,7 @@ package org.openecomp.appc.executor.impl;
import org.openecomp.appc.domainmodel.lcm.VNFOperation;
+import org.openecomp.appc.executor.impl.objects.CommandRequest;
import org.openecomp.appc.lifecyclemanager.LifecycleManager;
import org.openecomp.appc.requesthandler.RequestHandler;
import org.openecomp.appc.workflow.WorkFlowManager;
@@ -53,7 +54,7 @@ public class CommandTaskFactory {
}
- public synchronized CommandTask getExecutionTask(String action){
+ public synchronized CommandTask<? extends CommandRequest> getExecutionTask(String action){
if (VNFOperation.Sync.toString().equals(action) || VNFOperation.Audit.toString().equals(action)){
return new LCMReadonlyCommandTask(requestHandler,workflowManager);
}else {
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
index 6e64a546b..9f7c13513 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMCommandTask.java
@@ -147,22 +147,19 @@ public class LCMCommandTask extends CommandTask<LCMCommandRequest> {
isAAIUpdated= postVnfdata(vnfId, nextState,"onRequestExecutionStart",ctx);
} catch (NoTransitionDefinedException e) {
logger.error("Error getting Next State for AAI Update: " + e.getMessage(), e);
- Status status = request.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus();
Params params = new Params().addParam("actionName",e.event).addParam("currentState",e.currentState);
- fillStatus(status, LCMCommandStatus.NO_TRANSITION_DEFINE_FAILURE, params);
+ request.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(LCMCommandStatus.NO_TRANSITION_DEFINE_FAILURE.toStatus(params));
isAAIUpdated = false;
} catch (UnstableVNFException e) {
logger.error(e.getMessage(), e);
- Status status = request.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus();
Params params = new Params().addParam("vnfId",vnfId);
- fillStatus(status, LCMCommandStatus.UNSTABLE_VNF_FAILURE, params);
+ request.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(LCMCommandStatus.UNSTABLE_VNF_FAILURE.toStatus(params));
isAAIUpdated = false;
}catch (Exception e) {
logger.error("Error before Request Execution starts.", e);
- Status status = request.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus();
String errorMsg = StringUtils.isEmpty(e.getMessage()) ? e.toString() : e.getMessage();
Params params = new Params().addParam("errorMsg",errorMsg);
- fillStatus(status, LCMCommandStatus.UNEXPECTED_FAILURE, params);
+ request.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(LCMCommandStatus.UNEXPECTED_FAILURE.toStatus(params));
isAAIUpdated = false;
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
index 137a2e4b5..201662a6c 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/LCMReadonlyCommandTask.java
@@ -67,15 +67,13 @@ public class LCMReadonlyCommandTask extends CommandTask<LCMReadOnlyCommandReques
super.execute();
} catch (UnstableVNFException e) {
logger.error(e.getMessage(), e);
- Status status = request.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus();
Params params = new Params().addParam("vnfId",vnfId);
- fillStatus(status, LCMCommandStatus.UNSTABLE_VNF_FAILURE, params);
+ request.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(LCMCommandStatus.UNSTABLE_VNF_FAILURE.toStatus(params));
}catch (Exception e) {
logger.error("Error during runing LCMReadonlyCommandTask.", e);
- Status status = request.getCommandExecutorInput().getRuntimeContext().getResponseContext().getStatus();
String errorMsg = StringUtils.isEmpty(e.getMessage()) ? e.toString() : e.getMessage();
Params params = new Params().addParam("errorMsg",errorMsg);
- fillStatus(status, LCMCommandStatus.UNEXPECTED_FAILURE, params);
+ request.getCommandExecutorInput().getRuntimeContext().getResponseContext().setStatus(LCMCommandStatus.UNEXPECTED_FAILURE.toStatus(params));
}
}
}
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 0504c3998..1e46393d3 100644
--- 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
@@ -132,8 +132,7 @@ public class TestCommandExecutionTask {
@Test
public void testFactory(){
- CommandTask task;
- task = factory.getExecutionTask("Configure");
+ CommandTask<? extends CommandRequest> task = factory.getExecutionTask("Configure");
assertEquals(LCMCommandTask.class,task.getClass() );
task = factory.getExecutionTask("Sync");
assertEquals(LCMReadonlyCommandTask.class,task.getClass() );
@@ -192,9 +191,7 @@ public class TestCommandExecutionTask {
requestContext.setAction(action);
runtimeContext.setRpcName(action.name().toLowerCase());
commonHeader.setApiVer(API_VERSION);
- Status status = new Status();
- status.setCode(100);
- responseContext.setStatus(status);
+ responseContext.setStatus(new Status(100, null));
commonHeader.setRequestId(responseId);
responseContext.setPayload(payload);
commonHeader.setTimestamp(new Date());
@@ -247,7 +244,7 @@ public class TestCommandExecutionTask {
ResponseContext responseContext = createResponseContextWithSuObjects();
wfResponse.setResponseContext(responseContext);
responseContext.setPayload("");
- wfResponse.getResponseContext().getStatus().setCode(100);
+ wfResponse.getResponseContext().setStatus(new Status(100, null));
return wfResponse;
}
@@ -275,10 +272,8 @@ public class TestCommandExecutionTask {
}
private CommandExecutorInput createCommandExecutorInputWithSubObjects() {
- CommandExecutorInput commandExecutorInput = new CommandExecutorInput();
RuntimeContext runtimeContext = createRuntimeContextWithSubObjects();
- commandExecutorInput.setRuntimeContext(runtimeContext);
- return commandExecutorInput;
+ return new CommandExecutorInput(runtimeContext, 0);
}
private RuntimeContext createRuntimeContextWithSubObjects() {
@@ -301,9 +296,8 @@ public class TestCommandExecutionTask {
ResponseContext responseContext = new ResponseContext();
CommonHeader commonHeader = new CommonHeader();
Flags flags = new Flags();
- Status status = new Status();
responseContext.setCommonHeader(commonHeader);
- responseContext.setStatus(status);
+ responseContext.setStatus(new Status(0, null));
commonHeader.setFlags(flags);
return responseContext;
}
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
index 473e14e88..ae8755226 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutor.java
@@ -78,8 +78,8 @@ public class TestCommandExecutor {
commandExecutor.setExecutionQueueService(executionQueueService);
LCMCommandTask lcmCommandTask = Mockito.mock(LCMCommandTask.class);
LCMReadonlyCommandTask LCMReadonlyCommandTask = Mockito.mock(LCMReadonlyCommandTask.class);
- Mockito.when(executionTaskFactory.getExecutionTask("Configure")).thenReturn(lcmCommandTask);
- Mockito.when(executionTaskFactory.getExecutionTask("Sync")).thenReturn(LCMReadonlyCommandTask);
+ Mockito.doReturn(lcmCommandTask).when(executionTaskFactory).getExecutionTask("Configure");
+ Mockito.doReturn(LCMReadonlyCommandTask).when(executionTaskFactory).getExecutionTask("Sync");
// Mockito.when(executionQueueService.putMessage((Runnable) Mockito.anyObject(),Mockito.anyLong(),(TimeUnit)Mockito.anyObject())).thenReturn(true);
}
@@ -135,10 +135,8 @@ public class TestCommandExecutor {
}
private CommandExecutorInput createCommandExecutorInputWithSubObjects() {
- CommandExecutorInput commandExecutorInput = new CommandExecutorInput();
RuntimeContext runtimeContext = new RuntimeContext();
- commandExecutorInput.setRuntimeContext(runtimeContext);
- RequestContext requestContext = new RequestContext();
+ RequestContext requestContext = new RequestContext();
runtimeContext.setRequestContext(requestContext);
CommonHeader commonHeader = new CommonHeader();
requestContext.setCommonHeader(commonHeader);
@@ -148,7 +146,7 @@ public class TestCommandExecutor {
requestContext.setActionIdentifiers(actionIdentifiers);
VNFContext vnfContext = new VNFContext();
runtimeContext.setVnfContext(vnfContext);
- return commandExecutorInput;
+ return new CommandExecutorInput(runtimeContext, 0);
}