Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Network topology and inventory init
[transportpce.git]
/
renderer
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
renderer
/
RendererProvider.java
diff --git
a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java
b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java
index 4729514532aa0e65c0b0f848ac741bb72c9ef32a..69dad3864565ebef98c839252226ebacf4138ba0 100644
(file)
--- a/
renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java
+++ b/
renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java
@@
-7,15
+7,8
@@
*/
package org.opendaylight.transportpce.renderer;
*/
package org.opendaylight.transportpce.renderer;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
-import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl;
@@
-27,30
+20,17
@@
import org.slf4j.LoggerFactory;
public class RendererProvider {
private static final Logger LOG = LoggerFactory.getLogger(RendererProvider.class);
public class RendererProvider {
private static final Logger LOG = LoggerFactory.getLogger(RendererProvider.class);
- private final DataBroker dataBroker;
- private final MountPointService mountPointService;
private final RpcProviderRegistry rpcProviderRegistry;
private final RpcProviderRegistry rpcProviderRegistry;
- private final PortMapping portMapping;
- private final DeviceTransactionManager deviceTransactionManager;
private RpcRegistration<RendererService> deviceRendererRegistration;
private DeviceRendererRPCImpl deviceRendererRPCImpl;
private RpcRegistration<TransportpceServicepathService> tpceServiceRegistry;
private RendererServiceOperations rendererServiceOperations;
private RpcRegistration<RendererService> deviceRendererRegistration;
private DeviceRendererRPCImpl deviceRendererRPCImpl;
private RpcRegistration<TransportpceServicepathService> tpceServiceRegistry;
private RendererServiceOperations rendererServiceOperations;
- private RendererNotificationsImpl rendererNotificationsImpl;
- private final Set<String> currentMountedDevice;
public RendererProvider(RpcProviderRegistry rpcProviderRegistry, DeviceRendererRPCImpl deviceRendererRPCImpl,
public RendererProvider(RpcProviderRegistry rpcProviderRegistry, DeviceRendererRPCImpl deviceRendererRPCImpl,
- RendererServiceOperations rendererServiceOperations,DataBroker dataBroker,
- MountPointService mountPointService, PortMapping portMapping,
- DeviceTransactionManager deviceTransactionManager) {
+ RendererServiceOperations rendererServiceOperations) {
this.rpcProviderRegistry = rpcProviderRegistry;
this.deviceRendererRPCImpl = deviceRendererRPCImpl;
this.rendererServiceOperations = rendererServiceOperations;
this.rpcProviderRegistry = rpcProviderRegistry;
this.deviceRendererRPCImpl = deviceRendererRPCImpl;
this.rendererServiceOperations = rendererServiceOperations;
- this.dataBroker = dataBroker;
- this.mountPointService = mountPointService;
- this.currentMountedDevice = new HashSet<>();
- this.portMapping = portMapping;
- this.deviceTransactionManager = deviceTransactionManager;
}
/**
}
/**
@@
-64,8
+44,6
@@
public class RendererProvider {
.addRpcImplementation(RendererService.class, this.deviceRendererRPCImpl);
this.tpceServiceRegistry = this.rpcProviderRegistry
.addRpcImplementation(TransportpceServicepathService.class, transportPCEServicePathRPCImpl);
.addRpcImplementation(RendererService.class, this.deviceRendererRPCImpl);
this.tpceServiceRegistry = this.rpcProviderRegistry
.addRpcImplementation(TransportpceServicepathService.class, transportPCEServicePathRPCImpl);
- this.rendererNotificationsImpl = new RendererNotificationsImpl(this.dataBroker, this.mountPointService,
- this.currentMountedDevice,this.portMapping,this.deviceTransactionManager);
}
/**
}
/**
@@
-79,10
+57,6
@@
public class RendererProvider {
if (this.tpceServiceRegistry != null) {
this.tpceServiceRegistry.close();
}
if (this.tpceServiceRegistry != null) {
this.tpceServiceRegistry.close();
}
- // Clean up the RendererNotificationsImpl
- if (this.rendererNotificationsImpl != null) {
- this.rendererNotificationsImpl.close();
- }
}
}
}
}