Fix feature issues

[transportpce.git] / olm / src / main / resources / OSGI-INF / blueprint / olm-blueprint.xml

diff --git a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
index dee2972ff9576364112e86fee5e8a8982fee0e24..2e00ba6c8b6206813fdc445fccd774d28bfadef0 100644 (file)
--- a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
+++ b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
@@ -37,9 +37,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
   <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
 
-  <bean id="olmPowerServiceImpl"
-        class="org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl"
-        init-method="init" destroy-method="close">
+  <bean id="powerMgmt" class="org.opendaylight.transportpce.olm.power.PowerMgmtImpl" >
+    <argument ref="dataBroker" />
+    <argument ref="openRoadmInterfaces" />
+    <argument ref="crossConnect" />
+    <argument ref="deviceTransactionManager" />
+    <argument value="${timer1}"/>
+    <argument value="${timer2}"/>
+  </bean>
+
+  <bean id="olmPowerServiceImpl" class="org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl">
     <argument ref="dataBroker" />
     <argument ref="powerMgmt" />
     <argument ref="deviceTransactionManager" />
@@ -48,22 +55,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="openRoadmInterfaces" />
   </bean>
 
-  <bean id="powerMgmt" class="org.opendaylight.transportpce.olm.power.PowerMgmtImpl" >
-    <argument ref="dataBroker" />
-    <argument ref="openRoadmInterfaces" />
-    <argument ref="crossConnect" />
-    <argument ref="deviceTransactionManager" />
-    <argument value="${timer1}"/>
-    <argument value="${timer2}"/>
+  <bean id="olmPowerServiceRpcImpl" class="org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl">
+    <argument ref="olmPowerServiceImpl" />
   </bean>
 
-  <bean id="provider"
-        class="org.opendaylight.transportpce.olm.OlmProvider"
+  <bean id="provider" class="org.opendaylight.transportpce.olm.OlmProvider"
         init-method="init" destroy-method="close">
     <argument ref="rpcProviderService" />
-    <argument ref="olmPowerServiceImpl" />
+    <argument ref="olmPowerServiceRpcImpl" />
   </bean>
 
-  <service ref="olmPowerServiceImpl"
-        interface="org.opendaylight.transportpce.olm.service.OlmPowerService"/>
-</blueprint>
+  <service ref="olmPowerServiceRpcImpl"
+           interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService"/>
+  </blueprint>