Update Renderer Module

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

diff --git a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
index a65c62477aacbc87897fda980cd51d5e79e40287..c28990fae460a48a03cfd327771b79ad43e1d540 100644 (file)
--- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
+++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
@@ -8,8 +8,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
 
     <reference id="mountPointService" interface="org.opendaylight.controller.md.sal.binding.api.MountPointService" />
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="default" />
@@ -20,25 +20,57 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <argument value="15000" />
     </bean>
 
+    <bean id="mappingUtils" class="org.opendaylight.transportpce.common.mapping.MappingUtilsImpl" >
+        <argument ref="dataBroker" />
+    </bean>
+
+    <bean id="openRoadmInterfaces121" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121" >
+        <argument ref="deviceTransactionManager" />
+    </bean>
+
+    <bean id="openRoadmInterfaces22" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl22" >
+        <argument ref="deviceTransactionManager" />
+    </bean>
+
     <bean id="openRoadmInterfaces" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl" >
         <argument ref="deviceTransactionManager" />
+        <argument ref="mappingUtils" />
+        <argument ref="openRoadmInterfaces121" />
+        <argument ref="openRoadmInterfaces22" />
     </bean>
 
-    <bean id="portMapping" class="org.opendaylight.transportpce.common.mapping.PortMappingImpl" >
+    <bean id="portMapping22" class="org.opendaylight.transportpce.common.mapping.PortMappingVersion22" >
         <argument ref="dataBroker" />
         <argument ref="deviceTransactionManager" />
         <argument ref="openRoadmInterfaces" />
     </bean>
 
-    <bean id="mappingUtils" class="org.opendaylight.transportpce.common.mapping.MappingUtilsImpl" >
+    <bean id="requestProcessor" class="org.opendaylight.transportpce.common.network.RequestProcessor" scope="singleton" >
         <argument ref="dataBroker" />
     </bean>
 
-    <bean id="crossConnect121" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl1_2_1" >
+    <bean id="networkTransactionImpl" class="org.opendaylight.transportpce.common.network.NetworkTransactionImpl">
+        <argument ref="requestProcessor" />
+    </bean>
+
+    <bean id="portMapping121" class="org.opendaylight.transportpce.common.mapping.PortMappingVersion121" >
+        <argument ref="dataBroker" />
         <argument ref="deviceTransactionManager" />
+        <argument ref="openRoadmInterfaces" />
     </bean>
 
-    <bean id="crossConnect22" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl2_2" >
+    <bean id="portMapping" class="org.opendaylight.transportpce.common.mapping.PortMappingImpl" >
+        <argument ref="dataBroker" />
+        <argument ref="mappingUtils" />
+        <argument ref="portMapping22" />
+        <argument ref="portMapping121" />
+    </bean>
+
+    <bean id="crossConnect121" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121" >
+        <argument ref="deviceTransactionManager" />
+    </bean>
+
+    <bean id="crossConnect22" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl22" >
         <argument ref="deviceTransactionManager" />
     </bean>
 
@@ -49,24 +81,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <argument ref="crossConnect22" />
     </bean>
 
-    <bean id="requestProcessor" class="org.opendaylight.transportpce.common.network.RequestProcessor" scope="singleton" >
-        <argument ref="dataBroker" />
-    </bean>
-
-    <bean id="networkTransactionImpl" class="org.opendaylight.transportpce.common.network.NetworkTransactionImpl">
-        <argument ref="requestProcessor" />
-    </bean>
-
-    <bean id="FixedFlexImpl" class="org.opendaylight.transportpce.common.FixedFlex.FixedFlexImpl" >
+    <bean id="FixedFlexImpl" class="org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl" >
     </bean>
 
     <service ref="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
+
     <service ref="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
-    <service ref="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
+
     <service ref="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
+
     <service ref="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
-    <service ref="crossConnect" interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
-    <service ref="FixedFlexImpl" interface="org.opendaylight.transportpce.common.FixedFlex.FixedFlexInterface"/>
 
+    <service ref="crossConnectImpl" interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
+
+    <service ref="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
+
+    <service ref="FixedFlexImpl" interface="org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface"/>
 
-</blueprint>
+</blueprint>
\ No newline at end of file