From c785ab9c27e42f02f500cc9ce54915a7aec7ed1c Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 7 Sep 2017 13:56:04 +0200 Subject: [PATCH] Log enhancements and fixes for VPP renderer Change-Id: Idcfa502603cd0cfd9975cb79ba71070bc63d84e6 Signed-off-by: Michal Cmarada --- .../renderer/vpp/iface/InterfaceManager.java | 21 ++++++++----------- .../iface/VppEndpointLocationProvider.java | 2 +- .../renderer/vpp/routing/RoutingManager.java | 2 +- .../vpp/util/MountedDataBrokerProvider.java | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java index e0e7b4252..f136e2722 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/InterfaceManager.java @@ -133,9 +133,8 @@ public class InterfaceManager implements AutoCloseable { } LOG.info(message); } catch (InterruptedException | ExecutionException e) { - // TODO Auto-generated catch block - LOG.error("Failed to process changed vpp endpoint - before: {}, after {}: ", event.getBefore(), - event.getBefore()); + LOG.error("Failed to process changed vpp endpoint. before: {}, after: {}.Exception: {} ", event.getBefore(), + event.getAfter(), e); } } @@ -262,19 +261,17 @@ public class InterfaceManager implements AutoCloseable { return deleteIfaceOnVpp(ifaceWithoutBdCommand, vppNodeIid, vppEndpoint); } - private ListenableFuture deleteIfaceOnVpp(AbstractInterfaceCommand deleteIfaceWithoutBdCommand, InstanceIdentifier vppIid, - VppEndpoint vppEndpoint) { - InterfaceBuilder intfBuilder = deleteIfaceWithoutBdCommand.getInterfaceBuilder(); - final boolean transactionState = GbpNetconfTransaction.netconfSyncedDelete(vppIid, - deleteIfaceWithoutBdCommand, GbpNetconfTransaction.RETRY_COUNT); + private ListenableFuture deleteIfaceOnVpp(AbstractInterfaceCommand interfaceCommand, + InstanceIdentifier vppIid, VppEndpoint vppEndpoint) { + final boolean transactionState = GbpNetconfTransaction.netconfSyncedDelete(vppIid, interfaceCommand, + GbpNetconfTransaction.RETRY_COUNT); if (transactionState) { - LOG.debug("Delete interface on VPP command was successful: VPP: {} Command: {}", vppIid, - deleteIfaceWithoutBdCommand); - AccessListWrapper.removeAclsForInterface(vppIid, new InterfaceKey(intfBuilder.getName())); + LOG.debug("Delete interface on VPP command was successful: VPP: {} Command: {}", vppIid, interfaceCommand); + AccessListWrapper.removeAclsForInterface(vppIid, new InterfaceKey(interfaceCommand.getName())); return vppEndpointLocationProvider.deleteLocationForVppEndpoint(vppEndpoint); } else { final String message = "Delete interface on VPP command was not successful: VPP: " + vppIid - + " Command: " + deleteIfaceWithoutBdCommand; + + " Command: " + interfaceCommand; LOG.warn(message); return Futures.immediateFailedFuture(new VppRendererProcessingException(message)); } diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/VppEndpointLocationProvider.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/VppEndpointLocationProvider.java index 5c93e268c..b5e1f4732 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/VppEndpointLocationProvider.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/iface/VppEndpointLocationProvider.java @@ -352,4 +352,4 @@ public class VppEndpointLocationProvider .collect(Collectors.toList()); } }; -} \ No newline at end of file +} diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/routing/RoutingManager.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/routing/RoutingManager.java index 164af17a4..5caedab31 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/routing/RoutingManager.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/routing/RoutingManager.java @@ -179,7 +179,7 @@ public class RoutingManager { LOG.trace("Submitting routing for routing command: {}, nodeId: {}", routing, nodeIid); Optional mountPointDataBroker = mountDataProvider.resolveDataBrokerForMountPoint(nodeIid); - if (mountPointDataBroker.isPresent()) { + if (!mountPointDataBroker.isPresent()) { throw new IllegalStateException("Cannot find data broker for mount point " + nodeIid); } LOG.info("Routing was created for forwarding. Routing: {}, for node: {}", routing, nodeIid); diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/MountedDataBrokerProvider.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/MountedDataBrokerProvider.java index 0065554b6..ffc2fa653 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/MountedDataBrokerProvider.java +++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/MountedDataBrokerProvider.java @@ -76,10 +76,10 @@ public class MountedDataBrokerProvider { } } catch (TimeoutException e) { LOG.warn("Mountpoint not obtained within {} seconds. Iid: {}", NODE_CONNECTION_TIMER, iidToMountPoint, e); - return null; + return Optional.absent(); } catch (ExecutionException | InterruptedException e) { LOG.warn("Error while getting mountpoint. Iid: {}", iidToMountPoint, e); - return null; + return Optional.absent(); } } -- 2.36.6