Merge "Fix bug when creating SRG termination points"

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

diff --git a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
index e92e99cfab76c0476be7bd653842ad82f1db9e87..a44df320738ecf15f3a98bcc6432078ae625c5cc 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -26,7 +26,7 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="serviceHandlerService"
-          interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService" />
+          interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService" />
 
     <reference id="networkTransactionImpl"
           interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
@@ -38,6 +38,11 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
           class="org.opendaylight.transportpce.tapi.utils.TapiListener">
     </bean>
 
+    <bean id="tapiLink"
+          class="org.opendaylight.transportpce.tapi.utils.TapiLink">
+        <argument ref="networkTransactionImpl" />
+    </bean>
+
     <bean id="tapiPceListener" class="org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl">
         <argument ref="dataBroker" />
     </bean>
@@ -53,14 +58,21 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
     <bean id="tapiNetworkModelService" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelServiceImpl">
         <argument ref="tapilinkDiscoveryImpl" />
         <argument ref="networkTransactionImpl" />
+        <argument ref="tapiLink" />
     </bean>
 
     <bean id="tapiNetconfTopologyListener" class="org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener">
         <argument ref="tapiNetworkModelService" />
     </bean>
 
+    <bean id="tapiOrLinkListener" class="org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener">
+        <argument ref="tapiLink" />
+        <argument ref="networkTransactionImpl" />
+    </bean>
+
     <bean id="tapiNetworkUtilsImpl" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkUtilsImpl">
         <argument ref="networkTransactionImpl" />
+        <argument ref="tapiLink" />
     </bean>
 
     <bean id="tapiProvider"
@@ -79,6 +91,7 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <argument ref="tapiRendererListener" />
         <argument ref="tapiServiceHandlerListener" />
         <argument ref="notificationService" />
+        <argument ref="tapiOrLinkListener" />
     </bean>
 
     <bean id="tapiPortMappingListener" class="org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener">
@@ -88,6 +101,7 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
     <bean id="tapilinkDiscoveryImpl" class="org.opendaylight.transportpce.tapi.R2RTapiLinkDiscovery">
         <argument ref="networkTransactionImpl" />
         <argument ref="deviceTransactionManager" />
+        <argument ref="tapiLink" />
     </bean>
 
     <service ref="tapiNetworkModelService" interface="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService" />