Refactor: update transportpce yang models

[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 0196d940016702e8f9788bb6fafe45e1b699bcd4..071e5114e8eb0765bf42c94664008602eb6b4d19 100644 (file)
--- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
+++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
@@ -20,12 +20,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <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"/>
+      interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService"/>
 
   <bean id="openRoadmInterface121"
         class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121">
@@ -37,22 +35,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221">
     <argument ref="portMapping"/>
     <argument ref="openRoadmInterfaces"/>
-    <argument ref="FixedFlexImpl"/>
-    <argument ref="FlexGridImpl"/>
   </bean>
 
-  <bean id="openRoadmOtnInterface"
+  <bean id="openRoadmInterface710"
+        class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface710">
+    <argument ref="portMapping"/>
+    <argument ref="openRoadmInterfaces"/>
+  </bean>
+
+  <bean id="openRoadmOtnInterface221"
         class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221">
     <argument ref="portMapping"/>
     <argument ref="openRoadmInterfaces"/>
   </bean>
 
+  <bean id="openRoadmOtnInterface710"
+    class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface710">
+    <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="openRoadmInterface221"/>
-    <argument ref="openRoadmOtnInterface"/>
+    <argument ref="openRoadmInterface710"/>
+    <argument ref="openRoadmOtnInterface221"/>
+    <argument ref="openRoadmOtnInterface710"/>
   </bean>
 
   <bean id="deviceRenderer" class="org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServiceImpl" >
@@ -78,18 +88,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="otnDeviceRenderer" />
   </bean>
 
-  <bean id="networkModelWavelengthService"
-        class="org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl">
-    <argument ref="dataBroker" />
-  </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" />
+    <argument ref="portMapping" />
   </bean>
 
   <bean id="rendererProvider" class="org.opendaylight.transportpce.renderer.RendererProvider"
@@ -103,8 +108,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
            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"/>