Merge changes from topic "nbinotification"

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

diff --git a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
index 1ae0718773b94c03374a3fb415ba80e46b308c15..5813d31abca9f5ca8fc7e13a2c6f458f123a0a87 100644 (file)
--- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
@@ -31,9 +31,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <reference id="rendererServiceOperations"
              interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
 
-    <reference id="networkModelWavelengthService"
-           interface="org.opendaylight.transportpce.renderer.NetworkModelWavelengthService" />
-
     <bean id="serviceDatastoreOperation" class="org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl">
         <argument ref="dataBroker"/>
       </bean>
@@ -50,14 +47,21 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
         <argument ref="notificationPublishService" />
     </bean>
 
-    <bean id="serviceHandlerImpl" class="org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperationsImpl">
+    <bean id="networkModelListener" class="org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl">
+        <argument ref="notificationPublishService" />
+        <argument ref="serviceDatastoreOperation" />
+    </bean>
+
+    <bean id="serviceHandlerImpl" class="org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl">
         <argument ref="dataBroker"/>
         <argument ref="pathComputationService" />
         <argument ref="notificationPublishService" />
         <argument ref="rendererServiceOperations" />
-        <argument ref="networkModelWavelengthService" />
         <argument ref="pceListener" />
         <argument ref="rendererListener" />
+        <argument ref="networkModelListener" />
+        <argument ref="serviceDatastoreOperation" />
+        <argument value="ServiceHandler" />
     </bean>
 
     <bean id="provider"
@@ -66,13 +70,14 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
         <argument ref="rpcService" />
         <argument ref="dataBroker" />
         <argument ref="notificationService" />
-        <argument ref="notificationPublishService" />
-        <argument ref="pathComputationService" />
-        <argument ref="rendererServiceOperations" />
-        <argument ref="networkModelWavelengthService" />
+        <argument ref="serviceDatastoreOperation" />
+        <argument ref="pceListener" />
+        <argument ref="rendererListener" />
+        <argument ref="networkModelListener" />
+        <argument ref="serviceHandlerImpl" />
     </bean>
 
     <service ref="serviceHandlerImpl"
-        interface="org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations"/>
+        interface="org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService"/>
 
 </blueprint>