Convert TapiNetworkModelServiceImpl to 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 419993e791bc2d26152023cf308e8b63af672076..ea27da793f4bff55be35c83c6d0196172424e483 100644 (file)
--- 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"/>
@@ -36,16 +34,13 @@ 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" />
 
     <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>
@@ -64,13 +59,6 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <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>
@@ -108,13 +96,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>