Fix for gettunnelinterfacename RPC,removed whitesp
[vpnservice.git] / itm / itm-impl / src / main / java / org / opendaylight / vpnservice / itm / rpc / ItmManagerRpcService.java
index cd9bb447ef7ff76f1e0e2a020718555171c7991d..32b4f2a580c114cf1197e7c78d3a81156f6b2e46 100644 (file)
@@ -90,8 +90,8 @@ public class ItmManagerRpcService implements ItmRpcService {
          BigInteger destinationDpn = input.getDestinationDpid() ;
          InstanceIdentifier<InternalTunnel> path = InstanceIdentifier.create(
                  TunnelList.class)
-                     .child(InternalTunnel.class, new InternalTunnelKey(destinationDpn, sourceDpn));      
-         
+                     .child(InternalTunnel.class, new InternalTunnelKey(sourceDpn,destinationDpn));
+
          Optional<InternalTunnel> 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<ExternalTunnel> path = InstanceIdentifier.create(
                 ExternalTunnelList.class)
-                    .child(ExternalTunnel.class, new ExternalTunnelKey(destinationIp, sourceDpn));      
-        
+                    .child(ExternalTunnel.class, new ExternalTunnelKey(destinationIp, sourceDpn));
+
         Optional<ExternalTunnel> 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<RpcResult<java.lang.Void>> 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<RpcResult<Void>> result = SettableFuture.create();
        int serviceId = input.getServiceId() ;
        List<MatchInfo> mkMatches = new ArrayList<MatchInfo>();