X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Frenderer-blueprint.xml;h=2bae23d8363c34527b55c0a0623ad3b9608ace9b;hb=08fd8ea395fe53fb00dec92e4113903c0821da4f;hp=0196d940016702e8f9788bb6fafe45e1b699bcd4;hpb=f7b35753e247ecdec626a953dac89334f0101a54;p=transportpce.git

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 0196d9400..2bae23d83 100644
--- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
+++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
@@ -20,9 +20,7 @@ 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"/>
@@ -37,8 +35,12 @@ 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="openRoadmInterface710"
+        class="org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface710">
+    <argument ref="portMapping"/>
+    <argument ref="openRoadmInterfaces"/>
   </bean>
 
   <bean id="openRoadmOtnInterface"
@@ -52,6 +54,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="mappingUtils"/>
     <argument ref="openRoadmInterface121"/>
     <argument ref="openRoadmInterface221"/>
+    <argument ref="openRoadmInterface710"/>
     <argument ref="openRoadmOtnInterface"/>
   </bean>
 
@@ -78,17 +81,11 @@ 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" />
   </bean>
 
@@ -103,8 +100,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"/>