Minimal refactor of renderer to prepare flexgrid

[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..d994e85ac675995fcae4d3f318e106428443ace1 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,18 +11,18 @@ 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"
-        odl:type="default" />
+ <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
   <reference id="notificationPublishService"
-        interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
-        odl:type="default" />
-  <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
+        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+  <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" />
   <reference id="crossConnect" interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
   <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils"/>
   <reference id="FixedFlexImpl" interface="org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface"/>
+  <reference id="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService"/>
+  <reference id="FlexGridImpl" interface="org.opendaylight.transportpce.common.fixedflex.FlexGridInterface"/>
 
   <odl:rpc-service id="olmService"
       interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService"/>
@@ -33,18 +33,26 @@ 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"/>
+    <argument ref="FlexGridImpl"/>
+  </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" >
@@ -54,39 +62,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="openRoadmInterfaces" />
     <argument ref="crossConnect" />
     <argument ref="portMapping" />
+    <argument ref="networkModelService" />
   </bean>
 
-    <bean id="deviceRendererRPCImpl" class="org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl" >
-    <argument ref="deviceRenderer" />
+  <bean id="otnDeviceRenderer" class="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererServiceImpl" >
+    <argument ref="openRoadmInterfaceFactory" />
+    <argument ref="crossConnect" />
+    <argument ref="openRoadmInterfaces" />
+    <argument ref="deviceTransactionManager" />
+    <argument ref="networkModelService" />
   </bean>
 
-  <bean id="networkModelWavelengthService"
-        class="org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl">
-    <argument ref="dataBroker" />
+    <bean id="deviceRendererRPCImpl" class="org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl" >
+    <argument ref="deviceRenderer" />
+    <argument ref="otnDeviceRenderer" />
   </bean>
 
   <bean id="rendererServiceOperations" class="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl" >
     <argument ref="deviceRenderer" />
+    <argument ref="otnDeviceRenderer"/>
     <argument ref="olmService" />
     <argument ref="dataBroker" />
-    <argument ref="networkModelWavelengthService" />
     <argument ref="notificationPublishService" />
   </bean>
 
   <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>
 
   <service ref="deviceRenderer"
            interface="org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService" />
-
   <service ref="rendererServiceOperations"
            interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
-
-  <service ref="networkModelWavelengthService"
-           interface="org.opendaylight.transportpce.renderer.NetworkModelWavelengthService" />
+  <service ref="otnDeviceRenderer"
+            interface="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService"/>
 
 </blueprint>