fix deprecated openroadm interfaces/objects

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

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 eb73927bdd17cad79ba9d17f0ca00ed48bef6777..de182178d6f6e308f6ffd3b43c76cecd29254595 100644 (file)
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -6,9 +6,8 @@
 <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">
 
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-        odl:type="default" />
-    <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default" />
+    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
     <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
     <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
     <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
@@ -16,21 +15,19 @@
 
     <bean id="openRoadmFactory" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory">
         <argument ref="mappingUtils" />
-        <argument ref="openRoadmTopology121" />
         <argument ref="openRoadmTopology22" />
+        <argument ref="openRoadmOtnTopology22" />
     </bean>
 
-    <bean id="openRoadmTopology121" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology121">
+    <bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
         <argument ref="networkTransactionImpl" />
-        <argument ref="deviceTransactionManager" />
     </bean>
 
-    <bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
+    <bean id="openRoadmOtnTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22">
         <argument ref="networkTransactionImpl" />
         <argument ref="deviceTransactionManager" />
     </bean>
 
-
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
         <argument ref="networkTransactionImpl" />
         <argument ref="linkDiscoveryImpl" />
@@ -43,7 +40,7 @@
         init-method="init" destroy-method="close">
         <argument ref="networkTransactionImpl" />
         <argument ref="dataBroker" />
-        <argument ref="rpcProviderRegistry" />
+        <argument ref="rpcProviderService" />
         <argument ref="networkutilsServiceImpl" />
         <argument ref="netconfTopologyListener" />
         <argument ref="openRoadmFactory" />