Remove use of ODL blueprint extensions

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

diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index 81681b44b7a3f0a9a7a77eebd7708d2d35eeab1f..e129842c3c9ef2569fad2a308e322d2549600ccb 100644 (file)
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -3,57 +3,63 @@
 <!-- Copyright © 2016 Orange and others. All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<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.controller.md.sal.binding.api.DataBroker"
-        odl:type="default" />
-    <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />
+    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
     <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
-    <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
     <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
-
-    <bean id="openRoadmTopology" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology">
-        <argument ref="dataBroker" />
-        <argument ref="deviceTransactionManager" />
-    </bean>
+    <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
+    <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
+    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+    <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
 
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
-        <argument ref="dataBroker" />
+        <argument ref="networkTransactionImpl" />
         <argument ref="linkDiscoveryImpl" />
-        <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
         <argument ref="portMapping" />
+        <argument ref="notificationPublishService" />
     </bean>
 
     <bean id="provider" class="org.opendaylight.transportpce.networkmodel.NetworkModelProvider"
         init-method="init" destroy-method="close">
+        <argument ref="networkTransactionImpl" />
         <argument ref="dataBroker" />
-        <argument ref="rpcProviderRegistry" />
+        <argument ref="rpcProviderService" />
         <argument ref="networkutilsServiceImpl" />
         <argument ref="netconfTopologyListener" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="notificationService" />
+        <argument ref="frequenciesService" />
+        <argument ref="portMappingListener" />
+    </bean>
+
+    <bean id="portMappingListener" class="org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener">
+        <argument ref="networkModelService" />
     </bean>
 
     <bean id="netconfTopologyListener" class="org.opendaylight.transportpce.networkmodel.NetConfTopologyListener">
         <argument ref="networkModelService" />
         <argument ref="dataBroker" />
-        <argument ref="linkDiscoveryImpl" />
         <argument ref="deviceTransactionManager" />
+        <argument ref="portMapping" />
     </bean>
 
     <bean id="networkutilsServiceImpl" class="org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl">
         <argument ref="dataBroker" />
-        <argument ref="openRoadmTopology" />
     </bean>
 
     <bean id="linkDiscoveryImpl" class="org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery">
         <argument ref="dataBroker" />
         <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
-        <argument ref="openRoadmInterfaces" />
+        <argument ref="networkTransactionImpl" />
    </bean>
 
+    <bean id="frequenciesService" class="org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl">
+        <argument ref="dataBroker" />
+    </bean>
+
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />
 
+    <service ref="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
+
 </blueprint>