OTN Renderer Consolidation

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

diff --git a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
index 868ebb21c2355bf2853d9e815dd2c6f3e99bd1e3..94ca0af794a29ac82a868ea86d7405bdcae3d50c 100644 (file)
--- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
+++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
@@ -11,12 +11,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 
-  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+ <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
         odl:type="default" />
   <reference id="notificationPublishService"
-        interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
         odl:type="default" />
-  <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
+  <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
   <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
   <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
@@ -33,18 +33,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="openRoadmInterfaces"/>
   </bean>
 
-  <bean id="openRoadmInterface22"
-        class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface22">
+  <bean id="openRoadmInterface221"
+        class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221">
     <argument ref="portMapping"/>
     <argument ref="openRoadmInterfaces"/>
     <argument ref="FixedFlexImpl"/>
   </bean>
 
+  <bean id="openRoadmOtnInterface"
+        class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221">
+    <argument ref="portMapping"/>
+    <argument ref="openRoadmInterfaces"/>
+  </bean>
+
   <bean id="openRoadmInterfaceFactory"
         class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory">
     <argument ref="mappingUtils"/>
     <argument ref="openRoadmInterface121"/>
-    <argument ref="openRoadmInterface22"/>
+    <argument ref="openRoadmInterface221"/>
+    <argument ref="openRoadmOtnInterface"/>
   </bean>
 
   <bean id="deviceRenderer" class="org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServiceImpl" >
@@ -56,8 +63,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="portMapping" />
   </bean>
 
+  <bean id="otnDeviceRenderer" class="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererServiceImpl" >
+    <argument ref="openRoadmInterfaceFactory" />
+    <argument ref="crossConnect" />
+    <argument ref="openRoadmInterfaces" />
+    <argument ref="deviceTransactionManager" />
+  </bean>
+
     <bean id="deviceRendererRPCImpl" class="org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl" >
     <argument ref="deviceRenderer" />
+    <argument ref="otnDeviceRenderer" />
   </bean>
 
   <bean id="networkModelWavelengthService"
@@ -75,7 +90,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <bean id="rendererProvider" class="org.opendaylight.transportpce.renderer.RendererProvider"
         init-method="init" destroy-method="close">
-    <argument ref="rpcProviderRegistry" />
+    <argument ref="rpcProviderService" />
     <argument ref="deviceRendererRPCImpl" />
     <argument ref="rendererServiceOperations" />
   </bean>
@@ -85,8 +100,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <service ref="rendererServiceOperations"
            interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
-
   <service ref="networkModelWavelengthService"
            interface="org.opendaylight.transportpce.renderer.NetworkModelWavelengthService" />
-
 </blueprint>