Turn TapiNetworkModelListenerImpl into a Component

[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 77e28e650f4f469d10c74af13afcd534371cbb83..8c9a568fddd79ddbf2b389594f56404f462b3f6b 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -35,6 +35,11 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
     <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" />
+    <reference id="tapiNetworkUtilsImpl"
+        interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService" />
+    <reference id="tapiNetworkModelListenerImpl"
+        interface="org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener" />
 
     <bean id="tapiListener"
           class="org.opendaylight.transportpce.tapi.utils.TapiListener">
@@ -53,18 +58,6 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <argument ref="dataBroker" />
     </bean>
 
-    <bean id="tapiNetworkModelListenerImpl" class="org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl">
-        <argument ref="networkTransactionImpl" />
-        <argument ref="notificationPublishService" />
-    </bean>
-
-    <bean id="tapiNetworkModelService" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelServiceImpl">
-        <argument ref="tapilinkDiscoveryImpl" />
-        <argument ref="networkTransactionImpl" />
-        <argument ref="tapiLink" />
-        <argument ref="notificationPublishService" />
-    </bean>
-
     <bean id="tapiNetconfTopologyListener" class="org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener">
         <argument ref="tapiNetworkModelService" />
     </bean>
@@ -74,11 +67,6 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <argument ref="networkTransactionImpl" />
     </bean>
 
-    <bean id="tapiNetworkUtilsImpl" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkUtilsImpl">
-        <argument ref="networkTransactionImpl" />
-        <argument ref="tapiLink" />
-    </bean>
-
     <bean id="tapiProvider"
           class="org.opendaylight.transportpce.tapi.impl.TapiProvider"
           init-method="init" destroy-method="close">
@@ -102,13 +90,4 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
     <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>