Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not use RpcService in TPCE renderer module
[transportpce.git]
/
renderer
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
renderer
/
rpcs
/
TransportPCEServicePathRPCImpl.java
diff --git
a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
index 73629ec779e0cf5d6058fdd3c80af5adc4881792..0ec15420269b0d8ea45ddd6e264b51de255dee87 100644
(file)
--- a/
renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
+++ b/
renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
@@
-7,18
+7,25
@@
*/
package org.opendaylight.transportpce.renderer.rpcs;
*/
package org.opendaylight.transportpce.renderer.rpcs;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.transportpce.renderer.ModelMappingUtils;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
import org.opendaylight.transportpce.renderer.ModelMappingUtils;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDelete;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequest;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererService;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererService;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.Rpc;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-29,15
+36,27
@@
public class TransportPCEServicePathRPCImpl implements TransportpceRendererServi
private static final Logger LOG = LoggerFactory.getLogger(TransportPCEServicePathRPCImpl.class);
private final RendererServiceOperations rendererServiceOperations;
private static final Logger LOG = LoggerFactory.getLogger(TransportPCEServicePathRPCImpl.class);
private final RendererServiceOperations rendererServiceOperations;
+ private Registration reg;
@Activate
@Activate
- public TransportPCEServicePathRPCImpl(@Reference RendererServiceOperations rendererServiceOperations) {
+ public TransportPCEServicePathRPCImpl(@Reference RendererServiceOperations rendererServiceOperations,
+ @Reference RpcProviderService rpcProviderService) {
this.rendererServiceOperations = rendererServiceOperations;
this.rendererServiceOperations = rendererServiceOperations;
+ this.reg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+ .put(ServiceImplementationRequest.class, this::serviceImplementationRequest)
+ .put(ServiceDelete.class, this::serviceDelete)
+ .build());
LOG.debug("TransportPCEServicePathRPCImpl instantiated");
}
LOG.debug("TransportPCEServicePathRPCImpl instantiated");
}
+ @Deactivate
+ public void close() {
+ this.reg.close();
+ LOG.info("TransportPCEServicePathRPCImpl Closed");
+ }
+
@Override
@Override
- public ListenableFuture<RpcResult<ServiceDeleteOutput>> serviceDelete(ServiceDeleteInput input) {
+ public
final
ListenableFuture<RpcResult<ServiceDeleteOutput>> serviceDelete(ServiceDeleteInput input) {
String serviceName = input.getServiceName();
LOG.info("Calling RPC service delete request {}", serviceName);
ServiceDeleteOutput output = null;
String serviceName = input.getServiceName();
LOG.info("Calling RPC service delete request {}", serviceName);
ServiceDeleteOutput output = null;
@@
-50,7
+69,7
@@
public class TransportPCEServicePathRPCImpl implements TransportpceRendererServi
}
@Override
}
@Override
- public ListenableFuture<RpcResult<ServiceImplementationRequestOutput>> serviceImplementationRequest(
+ public
final
ListenableFuture<RpcResult<ServiceImplementationRequestOutput>> serviceImplementationRequest(
ServiceImplementationRequestInput input) {
String serviceName = input.getServiceName();
LOG.info("Calling RPC service impl request {}", serviceName);
ServiceImplementationRequestInput input) {
String serviceName = input.getServiceName();
LOG.info("Calling RPC service impl request {}", serviceName);
@@
-62,4
+81,8
@@
public class TransportPCEServicePathRPCImpl implements TransportpceRendererServi
}
return ModelMappingUtils.createServiceImplementationRpcResponse(output);
}
}
return ModelMappingUtils.createServiceImplementationRpcResponse(output);
}
+
+ public Registration getRegisteredRpc() {
+ return reg;
+ }
}
}