Convert FrequenciesServiceImpl into Component

[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 4e7296c51f316b6b374d08d6ed046310d9c6ac4f..3badba5d478c5f121f1215ea207e18563fe12cd8 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,64 +3,57 @@
 <!-- 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="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
     <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
     <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
-
-    <bean id="openRoadmFactory" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory">
-        <argument ref="mappingUtils" />
-        <argument ref="openRoadmTopology22" />
-    </bean>
-
-    <bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
-        <argument ref="networkTransactionImpl" />
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
+    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+    <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+    <reference id="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
 
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
         <argument ref="networkTransactionImpl" />
         <argument ref="linkDiscoveryImpl" />
-        <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmFactory" />
         <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="openRoadmFactory" />
+        <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="deviceTransactionManager" />
+        <argument ref="portMapping" />
     </bean>
 
     <bean id="networkutilsServiceImpl" class="org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl">
         <argument ref="dataBroker" />
-        <argument ref="openRoadmFactory" />
     </bean>
 
     <bean id="linkDiscoveryImpl" class="org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery">
         <argument ref="dataBroker" />
         <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmFactory" />
         <argument ref="networkTransactionImpl" />
    </bean>
 
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />
-
 </blueprint>