X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Fnetworkmodel-blueprint.xml;h=ad8e86175a6358a1300dd119ca4597ae182b45dd;hb=2c74d3b1109043024a1e251766ed6fcc39ffedf1;hp=81681b44b7a3f0a9a7a77eebd7708d2d35eeab1f;hpb=03990b8d83db699a59a85b3484a9a5c1b8c87448;p=transportpce.git

diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index 81681b44b..ad8e86175 100644
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -10,50 +10,55 @@
         odl:type="default" />
     <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
     <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="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
+    <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
 
-    <bean id="openRoadmTopology" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology">
-        <argument ref="dataBroker" />
+    <bean id="openRoadmFactory" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory">
+        <argument ref="mappingUtils" />
+        <argument ref="openRoadmTopology121" />
+        <argument ref="openRoadmTopology22" />
+    </bean>
+
+    <bean id="openRoadmTopology121" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology121">
+        <argument ref="networkTransactionImpl" />
+        <argument ref="deviceTransactionManager" />
+    </bean>
+
+    <bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
+        <argument ref="networkTransactionImpl" />
         <argument ref="deviceTransactionManager" />
     </bean>
 
+
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
-        <argument ref="dataBroker" />
-        <argument ref="linkDiscoveryImpl" />
+        <argument ref="networkTransactionImpl" />
         <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
         <argument ref="portMapping" />
     </bean>
 
     <bean id="provider" class="org.opendaylight.transportpce.networkmodel.NetworkModelProvider"
         init-method="init" destroy-method="close">
+        <argument ref="networkTransactionImpl" />
         <argument ref="dataBroker" />
         <argument ref="rpcProviderRegistry" />
         <argument ref="networkutilsServiceImpl" />
         <argument ref="netconfTopologyListener" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
     </bean>
 
     <bean id="netconfTopologyListener" class="org.opendaylight.transportpce.networkmodel.NetConfTopologyListener">
         <argument ref="networkModelService" />
         <argument ref="dataBroker" />
-        <argument ref="linkDiscoveryImpl" />
         <argument ref="deviceTransactionManager" />
     </bean>
 
     <bean id="networkutilsServiceImpl" class="org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl">
         <argument ref="dataBroker" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
     </bean>
 
-    <bean id="linkDiscoveryImpl" class="org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery">
-        <argument ref="dataBroker" />
-        <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
-        <argument ref="openRoadmInterfaces" />
-   </bean>
-
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />
 
 </blueprint>