From 73b3ddc0e02e8f8f449947847d528e95f65e4836 Mon Sep 17 00:00:00 2001 From: HemaTG Date: Sat, 12 Mar 2016 21:03:48 +0530 Subject: [PATCH 1/1] Fix for gettunnelinterfacename RPC,removed whitesp Change-Id: Id379d373dab7274c2a72942b81cf12f04afeb628 Signed-off-by: HemaTG --- .../vpnservice/itm/rpc/ItmManagerRpcService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/rpc/ItmManagerRpcService.java b/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/rpc/ItmManagerRpcService.java index cd9bb447..32b4f2a5 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/rpc/ItmManagerRpcService.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/rpc/ItmManagerRpcService.java @@ -90,8 +90,8 @@ public class ItmManagerRpcService implements ItmRpcService { BigInteger destinationDpn = input.getDestinationDpid() ; InstanceIdentifier path = InstanceIdentifier.create( TunnelList.class) - .child(InternalTunnel.class, new InternalTunnelKey(destinationDpn, sourceDpn)); - + .child(InternalTunnel.class, new InternalTunnelKey(sourceDpn,destinationDpn)); + Optional tnl = ItmUtils.read(LogicalDatastoreType.CONFIGURATION, path, dataBroker); if( tnl != null && tnl.isPresent()) @@ -179,8 +179,8 @@ public class ItmManagerRpcService implements ItmRpcService { IpAddress destinationIp = input.getDestinationIp() ; InstanceIdentifier path = InstanceIdentifier.create( ExternalTunnelList.class) - .child(ExternalTunnel.class, new ExternalTunnelKey(destinationIp, sourceDpn)); - + .child(ExternalTunnel.class, new ExternalTunnelKey(destinationIp, sourceDpn)); + Optional ext = ItmUtils.read(LogicalDatastoreType.CONFIGURATION, path, dataBroker); if( ext != null && ext.isPresent()) @@ -193,13 +193,13 @@ public class ItmManagerRpcService implements ItmRpcService { }else { resultBld = RpcResultBuilder.failed(); } - + return Futures.immediateFuture(resultBld.build()); } @Override public Future> createTerminatingServiceActions(final CreateTerminatingServiceActionsInput input) { - LOG.info("create terminatingServiceAction on DpnId = {} for service id {} and instructions {}", input.getDpnId() , input.getServiceId(), input.getInstruction()); + LOG.info("create terminatingServiceAction on DpnId = {} for service id {} and instructions {}", input.getDpnId() , input.getServiceId(), input.getInstruction()); final SettableFuture> result = SettableFuture.create(); int serviceId = input.getServiceId() ; List mkMatches = new ArrayList(); -- 2.36.6