X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Ftapi-blueprint.xml;h=ea27da793f4bff55be35c83c6d0196172424e483;hb=f4774d83c69f8c4dcb14291e4f9d5827b9c29020;hp=758d66f77fe0c7870d9898e24008eda04e21027d;hpb=e50901c4b06c82b91f136dac09bacce01258d7b2;p=transportpce.git

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 758d66f77..ea27da793 100644
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -9,9 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
 Author: Gilles Thouenon <gilles.thouenon@orange.com>
 -->
-<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">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <reference id="dataBroker"
           interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
@@ -22,49 +20,54 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
     <reference id="notificationService"
                interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
 
+    <reference id="notificationPublishService"
+               interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+
     <reference id="rpcProviderService"
           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" />
 
     <reference id="serviceDatastoreOperation"
                interface="org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations" />
+    <reference id="tapiLink" interface="org.opendaylight.transportpce.tapi.utils.TapiLink" />
+    <reference id="tapiNetworkModelService" interface="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService" />
 
     <bean id="tapiListener"
           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>
 
     <bean id="tapiRendererListener" class="org.opendaylight.transportpce.tapi.listeners.TapiRendererListenerImpl">
         <argument ref="dataBroker" />
+        <argument ref="notificationPublishService" />
     </bean>
 
     <bean id="tapiServiceHandlerListener" class="org.opendaylight.transportpce.tapi.listeners.TapiServiceHandlerListenerImpl">
         <argument ref="dataBroker" />
     </bean>
 
-    <bean id="tapiNetworkModelService" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelServiceImpl">
-        <argument ref="tapilinkDiscoveryImpl" />
+    <bean id="tapiNetworkModelListenerImpl" class="org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl">
         <argument ref="networkTransactionImpl" />
-        <argument ref="tapiLink" />
+        <argument ref="notificationPublishService" />
     </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" />
@@ -86,18 +89,11 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <argument ref="tapiRendererListener" />
         <argument ref="tapiServiceHandlerListener" />
         <argument ref="notificationService" />
+        <argument ref="tapiOrLinkListener" />
+        <argument ref="tapiNetworkModelListenerImpl" />
     </bean>
 
     <bean id="tapiPortMappingListener" class="org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener">
         <argument ref="tapiNetworkModelService" />
     </bean>
-
-    <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" />
-
 </blueprint>