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 e4e772c10f622f9d631c67a686eafbb3ec4cf9d2..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,8 +3,7 @@
 <!-- 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.mdsal.binding.api.DataBroker" />
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
@@ -14,6 +13,7 @@
     <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"/>
+    <reference id="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
 
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
         <argument ref="networkTransactionImpl" />
@@ -31,6 +31,11 @@
         <argument ref="netconfTopologyListener" />
         <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">
@@ -50,12 +55,5 @@
         <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>