From 38713207b817ed4700f630748c681116338d32f0 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Fri, 28 Jul 2017 11:29:23 -0700
Subject: Merging in bug fixes

Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-100
---
 .../resources/OSGI-INF/blueprint/blueprint.xml     | 33 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF')

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 44cef767d..887029263 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,25 +29,48 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="requestHandlerBean" class="org.openecomp.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
+    <bean id="vnfRequestHandlerBean" class="org.openecomp.appc.requesthandler.impl.RequestHandlerImpl" scope="singleton" >
     	<property name="commandExecutor" ref="commandExecutorRef" />
-        <property name="requestValidator" ref="requestValidatorBean" />
+        <property name="requestValidator" ref="vnfRequestValidatorBean" />
         <property name="lockManager" ref="lockManagerRef" />
         <property name="workingStateManager" ref="workingStateManagerBean"/>
         <property name="transactionRecorder" ref="transactionRecorderRef" />
-        <property name="aaiService" ref="aaiServiceRef" />
     </bean>
 
-    <bean id="requestValidatorBean" class="org.openecomp.appc.requesthandler.impl.RequestValidatorImpl" scope="singleton" >
+    <bean id="vmRequestHandlerBean" class="org.openecomp.appc.requesthandler.impl.VMRequestHandlerImpl" scope="singleton" >
+        <property name="commandExecutor" ref="commandExecutorRef" />
+        <property name="requestValidator" ref="vmRequestValidatorBean" />
+        <property name="transactionRecorder" ref="transactionRecorderRef" />
+    </bean>
+
+    <bean id="vnfRequestValidatorBean" class="org.openecomp.appc.requesthandler.impl.RequestValidatorImpl" scope="singleton" >
         <property name="lifecyclemanager" ref="lifecyclemanagerRef" />
         <property name="workflowManager" ref="workflowManagerRef" />
         <property name="workingStateManager" ref="workingStateManagerBean" />
         <property name="lcmStateManager" ref="lcmStateManagerBean" />
     </bean>
 
+    <bean id="vmRequestValidatorBean" class="org.openecomp.appc.requesthandler.impl.VMRequestValidatorImpl" scope="singleton">
+        <property name="workflowManager" ref="workflowManagerRef" />
+        <property name="lcmStateManager" ref="lcmStateManagerBean" />
+    </bean>
+
     <bean id="lcmStateManagerBean" class="org.openecomp.appc.requesthandler.impl.LCMStateManagerImpl" scope="singleton" />
 
-    <service id="requestHandlerService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="requestHandlerBean"/>
+    <service id="vmRequestHandlerService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="vmRequestHandlerBean">
+        <service-properties>
+            <entry key="level">
+                <value type="java.lang.String">VM</value>
+            </entry>
+        </service-properties>
+    </service>
+    <service id="vnfRequestHandlerService" interface="org.openecomp.appc.requesthandler.RequestHandler" ref="vnfRequestHandlerBean">
+        <service-properties>
+            <entry key="level">
+                <value type="java.lang.String">VNF</value>
+            </entry>
+        </service-properties>
+    </service>
     <service id="lcmStateManagerService" interface="org.openecomp.appc.requesthandler.LCMStateManager" ref="lcmStateManagerBean"/>
     <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" />
-- 
cgit 1.2.3-korg