Move otn link update from renderer to SH

[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 0a6bcdfb4f911b9cdb221c1e42218360577aec7d..62a7e640022c5f6c316d574d265e396a58544e97 100644 (file)
--- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
@@ -17,25 +17,20 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="dataBroker"
-          interface="org.opendaylight.mdsal.binding.api.DataBroker"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
     <reference id="notificationService"
-          interface="org.opendaylight.mdsal.binding.api.NotificationService"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
 
     <reference id="notificationPublishService"
-          interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
 
     <reference id="pathComputationService"
           interface="org.opendaylight.transportpce.pce.service.PathComputationService"/>
 
     <reference id="rendererServiceOperations"
              interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
-
-    <reference id="networkModelWavelengthService"
-           interface="org.opendaylight.transportpce.renderer.NetworkModelWavelengthService" />
+    <reference id="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService"/>
 
     <bean id="serviceDatastoreOperation" class="org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl">
         <argument ref="dataBroker"/>
@@ -51,16 +46,24 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <bean id="rendererListener" class="org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl">
         <argument ref="pathComputationService" />
         <argument ref="notificationPublishService" />
+        <argument ref="networkModelService" />
     </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"
@@ -69,13 +72,17 @@ 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"/>
+
+    <service ref="serviceDatastoreOperation"
+             interface="org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations"/>
 
 </blueprint>