X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fimpl%2FServicehandlerProvider.java;h=1b31874f37a50567ab3ea8e37792cdfa1725ecd0;hb=2a29f9ab006d8806f77b1a1e073b478e5351cc5f;hp=f2b9fbe51b3b06a9bbfacb78aaf3222ed2b8fb3d;hpb=e909d17392274b7af0e8e6d99f80fd021f4ed7a4;p=transportpce.git
diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
index f2b9fbe51..1b31874f3 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java
@@ -8,23 +8,26 @@
package org.opendaylight.transportpce.servicehandler.impl;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.StubpceListener;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.StubrendererListener;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.OrgOpenroadmServiceService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
+import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.TransportpceNetworkmodelListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.TransportpcePceListener;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.TransportpceRendererListener;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Class to register
* Servicehandler Service and Notification.
- *
- * @author Martial Coulibaly on behalf of Orange
+ * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange
*
*/
public class ServicehandlerProvider {
@@ -32,22 +35,31 @@ public class ServicehandlerProvider {
private static final Logger LOG = LoggerFactory.getLogger(ServicehandlerProvider.class);
private final DataBroker dataBroker;
- private final RpcProviderRegistry rpcRegistry;
+ private final RpcProviderService rpcService;
private final NotificationService notificationService;
- private final NotificationPublishService notificationPublishService;
-
- /** Listener register for TransportpceService Notification. */
- private ListenerRegistration stubpcelistenerRegistration;
- private ListenerRegistration stubrendererlistenerRegistration;
- private RpcRegistration rpcRegistration;
+ private ListenerRegistration pcelistenerRegistration;
+ private ListenerRegistration rendererlistenerRegistration;
+ private ListenerRegistration networkmodellistenerRegistration;
+ private ObjectRegistration rpcRegistration;
+ private ServiceDataStoreOperations serviceDataStoreOperations;
+ private PceListenerImpl pceListenerImpl;
+ private RendererListenerImpl rendererListenerImpl;
+ private NetworkModelListenerImpl networkModelListenerImpl;
+ private ServicehandlerImpl servicehandler;
-
- public ServicehandlerProvider(final DataBroker dataBroker, RpcProviderRegistry rpcProviderRegistry,
- NotificationService notificationService, NotificationPublishService notificationPublishService) {
+ public ServicehandlerProvider(final DataBroker dataBroker, RpcProviderService rpcProviderService,
+ NotificationService notificationService, ServiceDataStoreOperations serviceDataStoreOperations,
+ PceListenerImpl pceListenerImpl, RendererListenerImpl rendererListenerImpl,
+ NetworkModelListenerImpl networkModelListenerImpl, ServicehandlerImpl servicehandler) {
this.dataBroker = dataBroker;
- this.rpcRegistry = rpcProviderRegistry;
+ this.rpcService = rpcProviderService;
this.notificationService = notificationService;
- this.notificationPublishService = notificationPublishService;
+ this.serviceDataStoreOperations = serviceDataStoreOperations;
+ this.serviceDataStoreOperations.initialize();
+ this.pceListenerImpl = pceListenerImpl;
+ this.rendererListenerImpl = rendererListenerImpl;
+ this.networkModelListenerImpl = networkModelListenerImpl;
+ this.servicehandler = servicehandler;
}
/**
@@ -55,10 +67,10 @@ public class ServicehandlerProvider {
*/
public void init() {
LOG.info("ServicehandlerProvider Session Initiated");
- final ServicehandlerImpl consumer = new ServicehandlerImpl(dataBroker, rpcRegistry, notificationPublishService);
- stubpcelistenerRegistration = notificationService.registerNotificationListener(consumer);
- stubrendererlistenerRegistration = notificationService.registerNotificationListener(consumer);
- rpcRegistration = rpcRegistry.addRpcImplementation(OrgOpenroadmServiceService.class, consumer);
+ pcelistenerRegistration = notificationService.registerNotificationListener(pceListenerImpl);
+ rendererlistenerRegistration = notificationService.registerNotificationListener(rendererListenerImpl);
+ networkmodellistenerRegistration = notificationService.registerNotificationListener(networkModelListenerImpl);
+ rpcRegistration = rpcService.registerRpcImplementation(OrgOpenroadmServiceService.class, servicehandler);
}
/**
@@ -66,8 +78,10 @@ public class ServicehandlerProvider {
*/
public void close() {
LOG.info("ServicehandlerProvider Closed");
- stubpcelistenerRegistration.close();
- stubrendererlistenerRegistration.close();
+ pcelistenerRegistration.close();
+ rendererlistenerRegistration.close();
+ networkmodellistenerRegistration.close();
rpcRegistration.close();
}
+
}