diff options
author | 2017-08-18 16:07:56 +0000 | |
---|---|---|
committer | 2017-08-18 20:16:17 +0000 | |
commit | 7fec0d41c1fdfdb0eef04c6df8fb4b5368a975a5 (patch) | |
tree | e18d5951fc7888f68af1c2f059234ab6bbd7978a /appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources | |
parent | 5b7590935559fe9e286a703dc662a60b47b7ed1a (diff) |
Fix ExecutionQueue cannot be cleaned
Fix that LCM Requests in Execution Queue continue after Stop OAM
request sent.
Fix that Appc-Ansible bundle cannot be fully stopped because
of NPE.
Issue-Id: APPC-159
Change-Id: I8f0a3a79a5c572ad84e66f71b4ddb47118704302
Signed-off-by: Hao Kuang <Hao.Kuang@amdocs.com>
Diffstat (limited to 'appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources')
-rw-r--r-- | appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index f84e97207..5474dcc6f 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -31,27 +31,36 @@ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> <bean id="commandExecutorBean" class="org.openecomp.appc.executor.impl.CommandExecutorImpl" scope="singleton" init-method="initialize"> + <property name="executionQueueService" ref="ExecutionQueueServiceRef"/> <property name="executionTaskFactory" ref="CommandExecutionTaskFactory"/> <property name="expiredMessageHandler" ref="expiredMessageHandlerBean"/> </bean> - <bean id="CommandExecutionTaskFactory" class="org.openecomp.appc.executor.impl.CommandTaskFactory" scope="singleton" > - <property name="vnfRequestHandler" ref="vnfRequestHandlerService" /> + <bean id="CommandExecutionTaskFactory" class="org.openecomp.appc.executor.impl.CommandTaskFactory" + scope="singleton"> + <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/> <property name="vmRequestHandler" ref="vmRequestHandlerService"/> - <property name="workflowManager" ref="WorkFlowManagerRef" /> - <property name="lifecyclemanager" ref="LifecyclemanagerRef" /> + <property name="workflowManager" ref="WorkFlowManagerRef"/> + <property name="lifecyclemanager" ref="LifecyclemanagerRef"/> </bean> <bean id="expiredMessageHandlerBean" class="org.openecomp.appc.executor.impl.ExpiredMessageHandler" scope="singleton"> - <property name="vnfRequestHandler" ref="vnfRequestHandlerService" /> + <property name="vnfRequestHandler" ref="vnfRequestHandlerService"/> <property name="vmRequestHandler" ref="vmRequestHandlerService"/> </bean> - <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.workflow.WorkFlowManager" /> - <reference id="vnfRequestHandlerService" availability="optional" activation="eager" interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VNF)" /> - <reference id="vmRequestHandlerService" availability="optional" activation="eager" interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VM)" /> - <reference id="LifecyclemanagerRef" availability="mandatory" activation="eager" interface="org.openecomp.appc.lifecyclemanager.LifecycleManager" /> + <reference id="WorkFlowManagerRef" availability="mandatory" activation="eager" + interface="org.openecomp.appc.workflow.WorkFlowManager"/> + <reference id="vnfRequestHandlerService" availability="optional" activation="eager" + interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VNF)"/> + <reference id="vmRequestHandlerService" availability="optional" activation="eager" + interface="org.openecomp.appc.requesthandler.RequestHandler" filter="(level=VM)"/> + <reference id="LifecyclemanagerRef" availability="mandatory" activation="eager" + interface="org.openecomp.appc.lifecyclemanager.LifecycleManager"/> + <reference id="ExecutionQueueServiceRef" availability="mandatory" activation="eager" + interface="org.openecomp.appc.executionqueue.ExecutionQueueService"/> - <service id="commandExecutorService" interface="org.openecomp.appc.executor.CommandExecutor" ref="commandExecutorBean"/> + <service id="commandExecutorService" interface="org.openecomp.appc.executor.CommandExecutor" + ref="commandExecutorBean"/> </blueprint> |