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"/>
<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" />
<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>