Fix a dumb transformation mistake with LOG vars

Change-Id: I14ff4a3ab673367fd8d8b3f2d718003606b613e7
Signed-off-by: Donald Hunter <donaldh@cisco.com>

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/EvcAddCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcAddCommand.java
index 9eb722384ba449e63410366a6cc3af00d1651d0d..cb25e850db3e778b2c06a0bdd3d388ad426abc22 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/EvcAddCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcAddCommand.java
@@ -29,7 +29,7 @@ import com.google.common.base.Optional;
 
 public class EvcAddCommand extends AbstractCommand<Link> {
 
-    private static final Logger LO = LoggerFactory.getLogger(EvcAddCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EvcAddCommand.class);
 
     public EvcAddCommand(final DataBroker dataBroker, final DataTreeModification<Link> newEvcLink) {
         super(dataBroker, newEvcLink);
@@ -45,14 +45,14 @@ public class EvcAddCommand extends AbstractCommand<Link> {
             if (evc != null) {
                 // For now, we assume that there is 1 uni per source/destination
                 if ((evc.getUniDest() == null) || evc.getUniDest().isEmpty()) {
-                    LO.error("Destination UNI cannot be null.");
+                    LOG.error("Destination UNI cannot be null.");
                     return;
                 }
                 if ((evc.getUniSource() == null) || evc.getUniSource().isEmpty()) {
-                    LO.error("Source UNI cannot be null.");
+                    LOG.error("Source UNI cannot be null.");
                     return;
                 }
-                LO.info("New EVC created, source IP: {} destination IP {}.",
+                LOG.info("New EVC created, source IP: {} destination IP {}.",
                         evc.getUniSource().iterator().next().getIpAddress().getIpv4Address(),
                         evc.getUniDest().iterator().next().getIpAddress().getIpv4Address());
                 InstanceIdentifier<Node> sourceUniIid;
@@ -156,13 +156,13 @@ public class EvcAddCommand extends AbstractCommand<Link> {
                                     destinationUniIid,
                                     dataBroker);
                         } else {
-                            LO.info("Unable to retrieve the source and/or destination bridge.");
+                            LOG.info("Unable to retrieve the source and/or destination bridge.");
                         }
                     } else {
-                        LO.info("Uname to retrieve the source and/or destination ovsdbNode.");
+                        LOG.info("Uname to retrieve the source and/or destination ovsdbNode.");
                     }
                 } else {
-                    LO.info("Unable to retrieve the source and/or destination Uni.");
+                    LOG.info("Unable to retrieve the source and/or destination Uni.");
                 }
             }
         }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/EvcRemoveCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcRemoveCommand.java
index f5c392ade1389cca31a38fe9f981c4bdd517e5be..8e7457bfcec2a12444ea156e142f57de73fdd179 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/EvcRemoveCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcRemoveCommand.java
@@ -29,7 +29,7 @@ import com.google.common.base.Optional;
 
 public class EvcRemoveCommand extends AbstractCommand<Link> {
 
-    private static final Logger LO = LoggerFactory.getLogger(EvcRemoveCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EvcRemoveCommand.class);
 
     public EvcRemoveCommand(final DataBroker dataBroker, final DataTreeModification<Link> removedEvcLink) {
         super(dataBroker, removedEvcLink);
@@ -66,7 +66,7 @@ public class EvcRemoveCommand extends AbstractCommand<Link> {
                 }
             }
         } else {
-            LO.info("EvcAugmentation is null");
+            LOG.info("EvcAugmentation is null");
         }
         MdsalUtils.deleteNode(dataBroker, removedEvcIid, LogicalDatastoreType.OPERATIONAL);
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java
index 4fb52f17679d9ac27b68af056b87b58af256f43e..94dbe49025625f9f221d5d1ce6b6b89ae3d90157 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java
@@ -36,7 +36,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class EvcUpdateCommand extends AbstractCommand<Link> {
 
-    private static final Logger LO = LoggerFactory.getLogger(EvcUpdateCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EvcUpdateCommand.class);
 
     public EvcUpdateCommand(final DataBroker dataBroker, final DataTreeModification<Link> updatedEvcLink) {
         super(dataBroker, updatedEvcLink);
@@ -51,17 +51,17 @@ public class EvcUpdateCommand extends AbstractCommand<Link> {
             // FIXME: For now, we assume that there is 1 uni per
             // source/destination
             if ((evc.getUniDest() == null) || evc.getUniDest().isEmpty()) {
-                LO.error("Destination UNI cannot be null.");
+                LOG.error("Destination UNI cannot be null.");
                 return;
             }
             if ((evc.getUniSource() == null) || evc.getUniSource().isEmpty()) {
-                LO.error("Source UNI cannot be null.");
+                LOG.error("Source UNI cannot be null.");
                 return;
             }
 
             final Ipv4Address laterUni1Ip = evc.getUniSource().iterator().next().getIpAddress().getIpv4Address();
             final Ipv4Address laterUni2Ip = evc.getUniDest().iterator().next().getIpAddress().getIpv4Address();
-            LO.trace("New EVC created, source IP: {} destination IP {}.", laterUni1Ip, laterUni2Ip);
+            LOG.trace("New EVC created, source IP: {} destination IP {}.", laterUni1Ip, laterUni2Ip);
 
             final ReadTransaction readTransac = dataBroker.newReadOnlyTransaction();
             final CheckedFuture<Optional<Link>, ReadFailedException> retFormerEvc =
@@ -81,7 +81,7 @@ public class EvcUpdateCommand extends AbstractCommand<Link> {
                     } else if (formerUni1ip.equals(laterUni2Ip)) {
                         // do nothing
                     } else {
-                        LO.info("{} is not part of the EVC, removing configuration", formerUni1ip);
+                        LOG.info("{} is not part of the EVC, removing configuration", formerUni1ip);
                         final InstanceIdentifier<?> formerUniIID =
                                 UnimgrMapper.getUniIid(dataBroker, new IpAddress(formerUni1ip),
                                         LogicalDatastoreType.OPERATIONAL);
@@ -94,7 +94,7 @@ public class EvcUpdateCommand extends AbstractCommand<Link> {
                     } else if (formerUni2ip.equals(laterUni2Ip)) {
                         // do nothing
                     } else {
-                        LO.info("{} is not part of the EVC, removing configuration", formerUni2ip);
+                        LOG.info("{} is not part of the EVC, removing configuration", formerUni2ip);
                         final InstanceIdentifier<?> formerUniIID =
                                 UnimgrMapper.getUniIid(dataBroker, new IpAddress(formerUni2ip),
                                         LogicalDatastoreType.OPERATIONAL);
@@ -104,7 +104,7 @@ public class EvcUpdateCommand extends AbstractCommand<Link> {
                     }
                 }
             } catch (final InterruptedException | ExecutionException e) {
-                LO.error("Failed to retrieve former EVC {}", evcKey, e);
+                LOG.error("Failed to retrieve former EVC {}", evcKey, e);
             }
 
             InstanceIdentifier<Node> sourceUniIid;
@@ -223,13 +223,13 @@ public class EvcUpdateCommand extends AbstractCommand<Link> {
                                 destinationUniIid,
                                 dataBroker);
                     } else {
-                        LO.info("Unable to retrieve the source and/or destination bridge.");
+                        LOG.info("Unable to retrieve the source and/or destination bridge.");
                     }
                 } else {
-                    LO.info("Unable to retrieve the source and/or destination ovsdbNode.");
+                    LOG.info("Unable to retrieve the source and/or destination ovsdbNode.");
                 }
             } else {
-                LO.info("Unable to retrieve the source and/or destination Uni.");
+                LOG.info("Unable to retrieve the source and/or destination Uni.");
             }
         }
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/OvsNodeAddCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/OvsNodeAddCommand.java
index c73b397a453ccef5294e98c79bf873f3977f1be9..3f38c17d7e1ec82d8b53c7bd2bb8eae1581bc4b0 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/OvsNodeAddCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/OvsNodeAddCommand.java
@@ -30,7 +30,7 @@ import com.google.common.base.Optional;
 
 public class OvsNodeAddCommand extends AbstractCommand<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(OvsNodeAddCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OvsNodeAddCommand.class);
 
     public OvsNodeAddCommand(final DataBroker dataBroker, final DataTreeModification<Node> newOvsNode) {
         super(dataBroker, newOvsNode);
@@ -42,7 +42,7 @@ public class OvsNodeAddCommand extends AbstractCommand<Node> {
         final OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsNode.getAugmentation(OvsdbNodeAugmentation.class);
         final InstanceIdentifier<Node> ovsdbIid = dataObject.getRootPath().getRootIdentifier();
         if (ovsdbNodeAugmentation != null) {
-            LO.info("Received an OVSDB node create {}",
+            LOG.info("Received an OVSDB node create {}",
                     ovsdbNodeAugmentation.getConnectionInfo()
                                          .getRemoteIp()
                                          .getIpv4Address()
@@ -100,7 +100,7 @@ public class OvsNodeAddCommand extends AbstractCommand<Node> {
                     }
                 }
             } else {
-                LO.info("Received a new OVSDB node connection from {}"
+                LOG.info("Received a new OVSDB node connection from {}"
                         + ovsdbNodeAugmentation.getConnectionInfo()
                                 .getRemoteIp().getIpv4Address());
             }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/UniAddCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniAddCommand.java
index d1006138650342db506b6479472481dae7d1ce99..e753981adad1efd7090fd072ed949137135cb192 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/UniAddCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniAddCommand.java
@@ -28,7 +28,7 @@ import com.google.common.base.Optional;
 
 public class UniAddCommand extends AbstractCommand<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(UniAddCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UniAddCommand.class);
 
     public UniAddCommand(final DataBroker dataBroker, final DataTreeModification<Node> newUniNode) {
         super(dataBroker, newUniNode);
@@ -42,7 +42,7 @@ public class UniAddCommand extends AbstractCommand<Node> {
             final Node uniNode = dataObject.getRootNode().getDataAfter();
             final UniAugmentation uni = uniNode.getAugmentation(UniAugmentation.class);
             if (uni != null) {
-                LO.info("New UNI created {}.", uni.getIpAddress().getIpv4Address());
+                LOG.info("New UNI created {}.", uni.getIpAddress().getIpv4Address());
                 // We assume the ovs is in active mode tcp:ipAddress:6640
                 if (uni.getOvsdbNodeRef() != null) {
                     final OvsdbNodeRef ovsdbNodeRef = uni.getOvsdbNodeRef();
@@ -50,14 +50,14 @@ public class UniAddCommand extends AbstractCommand<Node> {
                                                                        LogicalDatastoreType.OPERATIONAL,
                                                                        ovsdbNodeRef.getValue());
                     if (!optionalNode.isPresent()) {
-                        LO.info("Invalid OVSDB node instance identifier specified, "
+                        LOG.info("Invalid OVSDB node instance identifier specified, "
                                + "attempting to retrieve the node.");
                         final Optional<Node> optionalOvsdbNode = OvsdbUtils.findOvsdbNode(dataBroker,
                                                                                      uni);
                         Node ovsdbNode;
                         if (optionalOvsdbNode.isPresent()) {
                             ovsdbNode = optionalOvsdbNode.get();
-                            LO.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
+                            LOG.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
                             // Update QoS entries to ovsdb if speed is configured to UNI node
                             if (uni.getSpeed() != null) {
                                 OvsdbUtils.createQoSForOvsdbNode(dataBroker, uni);
@@ -70,7 +70,7 @@ public class UniAddCommand extends AbstractCommand<Node> {
                         } else {
                             ovsdbNode = OvsdbUtils.createOvsdbNode(dataBroker,
                                                                     uni);
-                            LO.info("Could not retrieve the OVSDB node,"
+                            LOG.info("Could not retrieve the OVSDB node,"
                                    + " created a new one: {}", ovsdbNode.getNodeId());
                             UniUtils.updateUniNode(LogicalDatastoreType.CONFIGURATION,
                                                       uniKey,
@@ -88,7 +88,7 @@ public class UniAddCommand extends AbstractCommand<Node> {
                     if (optionalOvsdbNode.isPresent()) {
                         ovsdbNode = optionalOvsdbNode.get();
                         final InstanceIdentifier<Node> ovsdbIid = UnimgrMapper.getOvsdbNodeIid(ovsdbNode.getNodeId());
-                        LO.info("Retrieved the OVSDB node");
+                        LOG.info("Retrieved the OVSDB node");
                         // Update QoS entries to ovsdb if speed is configured to UNI node
                         if (uni.getSpeed() != null) {
                             OvsdbUtils.createQoSForOvsdbNode(dataBroker, uni);
@@ -107,7 +107,7 @@ public class UniAddCommand extends AbstractCommand<Node> {
                         ovsdbNode = OvsdbUtils.createOvsdbNode(dataBroker,
                                                                 uni);
                         if (ovsdbNode != null) {
-                            LO.info("Could not retrieve the OVSDB node,"
+                            LOG.info("Could not retrieve the OVSDB node,"
                                     + "created a new one: {}", ovsdbNode.getNodeId());
                             UniUtils.updateUniNode(LogicalDatastoreType.CONFIGURATION,
                                                        uniKey,

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/UniRemoveCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniRemoveCommand.java
index d2dc580f4240a81ce3a367745c4f91d59ca9a6f5..5b0a4fd0f0012552919aad26d6cf3ae214b834f9 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/UniRemoveCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniRemoveCommand.java
@@ -32,7 +32,7 @@ import com.google.common.base.Optional;
 
 public class UniRemoveCommand extends AbstractCommand<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(UniRemoveCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UniRemoveCommand.class);
 
     public UniRemoveCommand(final DataBroker dataBroker, final DataTreeModification<Node> removedUniNode) {
         super(dataBroker, removedUniNode);
@@ -53,7 +53,7 @@ public class UniRemoveCommand extends AbstractCommand<Node> {
                         ovsdbNodeIid);
                 if (optionalNode.isPresent()) {
                     final Node ovsdbNode = optionalNode.get();
-                    LO.info("Delete QoS and Queues entries");
+                    LOG.info("Delete QoS and Queues entries");
                     List<QosEntries> qosList = ovsdbNode
                             .getAugmentation(OvsdbNodeAugmentation.class)
                             .getQosEntries();
@@ -73,7 +73,7 @@ public class UniRemoveCommand extends AbstractCommand<Node> {
                         InstanceIdentifier<Queues> queuesIid = UnimgrMapper.getOvsdbQueuesIid(ovsdbNode, queuesKey);
                         MdsalUtils.deleteNode(dataBroker, queuesIid, LogicalDatastoreType.CONFIGURATION);
                     }
-                    LO.info("Delete bride node");
+                    LOG.info("Delete bride node");
                     final InstanceIdentifier<Node> bridgeIid = UnimgrMapper.getOvsdbBridgeNodeIid(ovsdbNode);
                     MdsalUtils.deleteNode(dataBroker, bridgeIid, LogicalDatastoreType.CONFIGURATION);
                 }
@@ -84,10 +84,10 @@ public class UniRemoveCommand extends AbstractCommand<Node> {
                     MdsalUtils.deleteNode(dataBroker, iidUni, LogicalDatastoreType.OPERATIONAL);
                 }
             } else {
-                LO.info("Received Uni Augmentation has null ovsdb node ref: {}", removedUniIid);
+                LOG.info("Received Uni Augmentation has null ovsdb node ref: {}", removedUniIid);
             }
         } else {
-            LO.info("Received Uni Augmentation is null: {}", removedUniIid);
+            LOG.info("Received Uni Augmentation is null: {}", removedUniIid);
         }
     }
 }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java
index b107177e65e49cd425bcc9993a0cbc4ff4e9ae82..6e0b2a7a9635f6082be0b8c9c00e3d2701476eb4 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java
@@ -27,7 +27,7 @@ import com.google.common.base.Preconditions;
 
 public class UniUpdateCommand extends AbstractCommand<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(UniUpdateCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UniUpdateCommand.class);
 
     public UniUpdateCommand(final DataBroker dataBroker, final DataTreeModification<Node> updatedUniNode) {
         super(dataBroker, updatedUniNode);
@@ -50,13 +50,13 @@ public class UniUpdateCommand extends AbstractCommand<Node> {
                             formerUniIp, updatedUniIp, uniKey);
             Node ovsdbNode;
             if (updatedUni.getOvsdbNodeRef() != null) {
-                LO.info("OVSDB NODE ref retreive for updated UNI {}", updatedUni.getOvsdbNodeRef());
+                LOG.info("OVSDB NODE ref retreive for updated UNI {}", updatedUni.getOvsdbNodeRef());
                 final OvsdbNodeRef ovsdbNodeRef = updatedUni.getOvsdbNodeRef();
                 final Optional<Node> optOvsdbNode =
                         MdsalUtils.readNode(dataBroker,LogicalDatastoreType.OPERATIONAL, ovsdbNodeRef.getValue());
                 if (optOvsdbNode.isPresent()) {
                     ovsdbNode = optOvsdbNode.get();
-                    LO.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
+                    LOG.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
                     // Update QoS entries to ovsdb if speed is configured to UNI node
                     if (updatedUni.getSpeed() != null) {
                         OvsdbUtils.createQoSForOvsdbNode(dataBroker, updatedUni);
@@ -66,7 +66,7 @@ public class UniUpdateCommand extends AbstractCommand<Node> {
                 }  else {
                     // This should never happen, because on creation,
                     // the UNI is assigned and OVSDB node
-                    LO.error("OVSDB node not found for UNI {}, but got OVSDB ref {}", uniKey,
+                    LOG.error("OVSDB node not found for UNI {}, but got OVSDB ref {}", uniKey,
                             updatedUni.getOvsdbNodeRef());
                     return;
                 }
@@ -74,7 +74,7 @@ public class UniUpdateCommand extends AbstractCommand<Node> {
                 final Optional<Node> optOvsdbNode = OvsdbUtils.findOvsdbNode(dataBroker, updatedUni);
                 if (optOvsdbNode.isPresent()) {
                     ovsdbNode = optOvsdbNode.get();
-                    LO.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
+                    LOG.info("Retrieved the OVSDB node {}", ovsdbNode.getNodeId());
                     // Update QoS entries to ovsdb if speed is configured to UNI node
                     if (updatedUni.getSpeed() != null) {
                         OvsdbUtils.createQoSForOvsdbNode(dataBroker, updatedUni);
@@ -84,11 +84,11 @@ public class UniUpdateCommand extends AbstractCommand<Node> {
                 } else {
                     // This should never happen, because on creation,
                     // the UNI is assigned and OVSDB node
-                    LO.error("OVSDB node not found for UNI {}", uniKey);
+                    LOG.error("OVSDB node not found for UNI {}", uniKey);
                     return;
                 }
             }
-            LO.info("UNI {} updated", uniKey);
+            LOG.info("UNI {} updated", uniKey);
         }
     }
 }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataTreeChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataTreeChangeListener.java
index 8028d076293ad81ff661ae2eb714b297e9362b66..96765219e31f2d691507b38408204a4ea3a2329b 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataTreeChangeListener.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataTreeChangeListener.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 public class EvcDataTreeChangeListener extends UnimgrDataTreeChangeListener<Link> {
 
-    private static final Logger LO = LoggerFactory.getLogger(EvcDataTreeChangeListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EvcDataTreeChangeListener.class);
     private final  ListenerRegistration<EvcDataTreeChangeListener> listener;
 
     public EvcDataTreeChangeListener(final DataBroker dataBroker) {
@@ -35,13 +35,13 @@ public class EvcDataTreeChangeListener extends UnimgrDataTreeChangeListener<Link
         final DataTreeIdentifier<Link> dataTreeIid =
                 new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, getEvcTopologyPath());
         listener = dataBroker.registerDataTreeChangeListener(dataTreeIid, this);
-        LO.info("EvcDataTreeChangeListener created and registered");
+        LOG.info("EvcDataTreeChangeListener created and registered");
     }
 
     @Override
     public void add(final DataTreeModification<Link> newDataObject) {
         if (newDataObject.getRootPath() != null && newDataObject.getRootNode() != null) {
-            LO.info("evc link {} created", newDataObject.getRootNode().getIdentifier());
+            LOG.info("evc link {} created", newDataObject.getRootNode().getIdentifier());
             final EvcAddCommand evcAddCmd = new EvcAddCommand(dataBroker, newDataObject);
             evcAddCmd.execute();
         }
@@ -63,7 +63,7 @@ public class EvcDataTreeChangeListener extends UnimgrDataTreeChangeListener<Link
     @Override
     public void remove(final DataTreeModification<Link> removedDataObject) {
         if (removedDataObject.getRootPath() != null && removedDataObject.getRootNode() != null) {
-            LO.info("evc link {} deleted", removedDataObject.getRootNode().getIdentifier());
+            LOG.info("evc link {} deleted", removedDataObject.getRootNode().getIdentifier());
             final EvcRemoveCommand evcRemovedCmd = new EvcRemoveCommand(dataBroker, removedDataObject);
             evcRemovedCmd.execute();
         }
@@ -72,7 +72,7 @@ public class EvcDataTreeChangeListener extends UnimgrDataTreeChangeListener<Link
     @Override
     public void update(final DataTreeModification<Link> modifiedDataObject) {
         if (modifiedDataObject.getRootPath() != null && modifiedDataObject.getRootNode() != null) {
-            LO.info("evc link {} updated", modifiedDataObject.getRootNode().getIdentifier());
+            LOG.info("evc link {} updated", modifiedDataObject.getRootNode().getIdentifier());
             final EvcUpdateCommand evcUpdateCmd = new EvcUpdateCommand(dataBroker, modifiedDataObject);
             evcUpdateCmd.execute();
         }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/OvsNodeDataTreeChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/OvsNodeDataTreeChangeListener.java
index 44a5c89ab228c1336ce68d0ed95405143596a063..e54d50c5824ead63b7b5f8c2532988faccaaa83c 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/OvsNodeDataTreeChangeListener.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/OvsNodeDataTreeChangeListener.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
 
 public class OvsNodeDataTreeChangeListener extends UnimgrDataTreeChangeListener<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(OvsNodeDataTreeChangeListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OvsNodeDataTreeChangeListener.class);
     private final ListenerRegistration<OvsNodeDataTreeChangeListener> listener;
 
     public OvsNodeDataTreeChangeListener(final DataBroker dataBroker) {
@@ -34,13 +34,13 @@ public class OvsNodeDataTreeChangeListener extends UnimgrDataTreeChangeListener<
         final DataTreeIdentifier<Node> dataTreeIid =
                 new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, nodePath);
         listener = dataBroker.registerDataTreeChangeListener(dataTreeIid, this);
-        LO.info("ovsNodeDataTreeChangeListener created and registered");
+        LOG.info("ovsNodeDataTreeChangeListener created and registered");
     }
 
     @Override
     public void add(final DataTreeModification<Node> newDataObject) {
         if (newDataObject.getRootPath() != null && newDataObject.getRootNode() != null) {
-            LO.info("ovs node {} created", newDataObject.getRootNode().getIdentifier());
+            LOG.info("ovs node {} created", newDataObject.getRootNode().getIdentifier());
             final OvsNodeAddCommand ovsNodeAddCmd = new OvsNodeAddCommand(dataBroker, newDataObject);
             ovsNodeAddCmd.execute();
         }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataTreeChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataTreeChangeListener.java
index 900c633bea96e61f613a607e579346fd011730d7..4ec33b6f188e545046a2c4d4947125669e559e66 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataTreeChangeListener.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataTreeChangeListener.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 public class UniDataTreeChangeListener extends UnimgrDataTreeChangeListener<Node> {
 
-    private static final Logger LO = LoggerFactory.getLogger(UniDataTreeChangeListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UniDataTreeChangeListener.class);
     private final ListenerRegistration<UniDataTreeChangeListener> listener;
 
 
@@ -37,13 +37,13 @@ public class UniDataTreeChangeListener extends UnimgrDataTreeChangeListener<Node
         final DataTreeIdentifier<Node> dataTreeIid =
                 new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, uniPath);
         listener = dataBroker.registerDataTreeChangeListener(dataTreeIid, this);
-        LO.info("UniDataTreeChangeListener created and registered");
+        LOG.info("UniDataTreeChangeListener created and registered");
     }
 
     @Override
     public void add(final DataTreeModification<Node> newDataObject) {
         if (newDataObject.getRootPath() != null && newDataObject.getRootNode() != null) {
-            LO.info("uni node {} created", newDataObject.getRootNode().getIdentifier());
+            LOG.info("uni node {} created", newDataObject.getRootNode().getIdentifier());
             final UniAddCommand uniAddCmd = new UniAddCommand(dataBroker, newDataObject);
             uniAddCmd.execute();
         }
@@ -66,7 +66,7 @@ public class UniDataTreeChangeListener extends UnimgrDataTreeChangeListener<Node
     @Override
     public void remove(final DataTreeModification<Node> removedDataObject) {
         if (removedDataObject.getRootPath() != null && removedDataObject.getRootNode() != null) {
-            LO.info("uni node {} deleted", removedDataObject.getRootNode().getIdentifier());
+            LOG.info("uni node {} deleted", removedDataObject.getRootNode().getIdentifier());
             final UniRemoveCommand uniRemoveCmd = new UniRemoveCommand(dataBroker, removedDataObject);
             uniRemoveCmd.execute();
         }
@@ -75,7 +75,7 @@ public class UniDataTreeChangeListener extends UnimgrDataTreeChangeListener<Node
     @Override
     public void update(final DataTreeModification<Node> modifiedDataObject) {
         if (modifiedDataObject.getRootPath() != null && modifiedDataObject.getRootNode() != null) {
-            LO.info("uni node {} updated", modifiedDataObject.getRootNode().getIdentifier());
+            LOG.info("uni node {} updated", modifiedDataObject.getRootNode().getIdentifier());
             final UniUpdateCommand uniUpdateCmd = new UniUpdateCommand(dataBroker, modifiedDataObject);
             uniUpdateCmd.execute();
         }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java
index 4aa1104354414d75da39de3050965094ef77d9b0..cd7c219e878e714c2e5cb7b8c0c23bba2ce2cd0c 100755 (executable)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java
@@ -44,14 +44,14 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUnimgrConsoleProvider {
 
-    private static final Logger LO = LoggerFactory.getLogger(UnimgrProvider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UnimgrProvider.class);
     private DataBroker dataBroker;
     private EvcDataTreeChangeListener evcListener;
     private OvsNodeDataTreeChangeListener ovsListener;
     private UniDataTreeChangeListener uniListener;
 
     public UnimgrProvider(DataBroker dataBroker) {
-        LO.info("Unimgr provider initialized");
+        LOG.info("Unimgr provider initialized");
         this.dataBroker = dataBroker;
     }
 
@@ -100,7 +100,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
                 transaction.cancel();
             }
         } catch (final Exception e) {
-            LO.error("Error initializing unimgr topology", e);
+            LOG.error("Error initializing unimgr topology", e);
         }
     }
 
@@ -117,7 +117,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
                 transaction.cancel();
             }
         } catch (final Exception e) {
-            LO.error("Error initializing unimgr topology {}", e);
+            LOG.error("Error initializing unimgr topology {}", e);
         }
     }
 
@@ -135,7 +135,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
      * Initialization method for UnimgrProvider, used by blueprint.
      */
     public void init() {
-        LO.info("UnimgrProvider Session Initiated");
+        LOG.info("UnimgrProvider Session Initiated");
 
         // Register the data trees change listener
         uniListener = new UniDataTreeChangeListener(dataBroker);
@@ -156,7 +156,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
 
     @Override
     public void close() throws Exception {
-        LO.info("UnimgrProvider Closed");
+        LOG.info("UnimgrProvider Closed");
         uniListener.close();
         evcListener.close();
         ovsListener.close();
@@ -191,7 +191,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
     public boolean updateUni(final UniAugmentation uni) {
         // Remove the old UNI with IpAdress and create a new one with updated informations
         if (uni != null) {
-            LO.trace("UNI updated {}.", uni.getIpAddress().getIpv4Address());
+            LOG.trace("UNI updated {}.", uni.getIpAddress().getIpv4Address());
             final InstanceIdentifier<?> uniIID = UnimgrMapper.getUniIid(dataBroker,
                     uni.getIpAddress(), LogicalDatastoreType.OPERATIONAL);
             Node ovsdbNode;
@@ -201,7 +201,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni
                         LogicalDatastoreType.OPERATIONAL, ovsdbNodeRef.getValue()).get();
 
                 UniUtils.updateUniNode(LogicalDatastoreType.OPERATIONAL, uniIID, uni, ovsdbNode, dataBroker);
-                LO.trace("UNI updated {}.", uni.getIpAddress().getIpv4Address());
+                LOG.trace("UNI updated {}.", uni.getIpAddress().getIpv4Address());
             } else {
                 final Optional<Node> optionalOvsdbNode = OvsdbUtils.findOvsdbNode(dataBroker, uni);
                 ovsdbNode = optionalOvsdbNode.get();

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
index 4de72ce40ae92d80112bb67ec2c259702759b082..af22b3de6e90e6e875cb1711d72e7d3d8a56b403 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
@@ -44,7 +44,7 @@ import com.google.common.util.concurrent.Futures;
  * @author marek.ryznar@amartus.com
  */
 public class AbstractNodeHandler implements DataTreeChangeListener<Topology> {
-    private static final Logger LO = LoggerFactory.getLogger(AbstractNodeHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractNodeHandler.class);
     private static final InstanceIdentifier NRP_TOPOLOGY_SYSTEM_IID = InstanceIdentifier
             .create(Context.class)
             .augmentation(Context1.class)
@@ -102,12 +102,12 @@ public class AbstractNodeHandler implements DataTreeChangeListener<Topology> {
 
             @Override
             public void onSuccess(@Nullable Void result) {
-                LO.info("Abstract TAPI node upadate successful");
+                LOG.info("Abstract TAPI node upadate successful");
             }
 
             @Override
             public void onFailure(Throwable t) {
-                LO.warn("Abstract TAPI node upadate failed due to an error", t);
+                LOG.warn("Abstract TAPI node upadate failed due to an error", t);
             }
         });
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java
index a45107603fb7314a7caed5b2563c52b068bfa514..cbee9b3bd9bc092a281d40d17c6e1c1a96403ef2 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * @author bartosz.michalik@amartus.com [modifications]
  */
 public class ActivationDriverRepoServiceImpl implements ActivationDriverRepoService {
-    private static final Logger LO = LoggerFactory.getLogger(ActivationDriverRepoServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActivationDriverRepoServiceImpl.class);
 
     private final Collection<ActivationDriverBuilder> builders;
 
@@ -41,7 +41,7 @@ public class ActivationDriverRepoServiceImpl implements ActivationDriverRepoServ
     }
 
     public ActivationDriverRepoServiceImpl(List<ActivationDriverBuilder> builders) {
-        LO.debug("Activation drivers initialized");
+        LOG.debug("Activation drivers initialized");
         this.builders = builders;
     }
 
@@ -61,11 +61,11 @@ public class ActivationDriverRepoServiceImpl implements ActivationDriverRepoServ
     }
 
     public void bind(ActivationDriverBuilder builder) {
-        LO.debug("builder {} bound", builder);
+        LOG.debug("builder {} bound", builder);
     }
 
     public void unbind(ActivationDriverBuilder builder) {
-        LO.debug("builder {} unbound", builder);
+        LOG.debug("builder {} unbound", builder);
     }
 
     @Override

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationTransaction.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationTransaction.java
index 7a53b597dd9291eae6735ad94e669b795dadd6b9..7e634942e340d9391813c013bd55e7235bf134bd 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationTransaction.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationTransaction.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
  * @author krzysztof.bijakowski@amartus.com [modifications]
  */
 public class ActivationTransaction {
-    private static final Logger LO = LoggerFactory.getLogger(ActivationTransaction.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActivationTransaction.class);
 
     private List<ActivationDriver> drivers = new ArrayList<>();
 
@@ -44,12 +44,12 @@ public class ActivationTransaction {
                 d.activate();
             }
             commit();
-            LO.info("Activate transaction successful");
+            LOG.info("Activate transaction successful");
 
             return Result.success();
         } catch (Exception e) {
             //XXX add transaction identification ???
-            LO.warn("Rolling back activate transaction ", e);
+            LOG.warn("Rolling back activate transaction ", e);
             rollback();
 
             return Result.fail(e.getMessage(), e);
@@ -67,13 +67,13 @@ public class ActivationTransaction {
             for (ActivationDriver d: drivers) {
                 d.deactivate();
             }
-            LO.info("Deactivate transaction successful");
+            LOG.info("Deactivate transaction successful");
             commit();
 
             return Result.success();
         } catch (Exception e) {
             //XXX add transaction identification ???
-            LO.warn("Rolling back deactivate transaction ", e);
+            LOG.warn("Rolling back deactivate transaction ", e);
             rollback();
 
             return Result.fail(e.getMessage(), e);

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/CapabilitiesService.java b/impl/src/main/java/org/opendaylight/unimgr/utils/CapabilitiesService.java
index dc25fa90680cf1bab9b1e88d1a10ab9e6512f6c2..d6833f9a1803298cff6da9728e27354ee46e5a7b 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/CapabilitiesService.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/CapabilitiesService.java
@@ -117,7 +117,7 @@ public class CapabilitiesService {
         }
     }
 
-    private static final Logger LO = LoggerFactory.getLogger(CapabilitiesService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CapabilitiesService.class);
 
     private DataBroker dataBroker;
 
@@ -146,7 +146,7 @@ public class CapabilitiesService {
         try {
             result = nodeFuture.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.error("Unable to read node with Iid {}", nodeIid, e);
+            LOG.error("Unable to read node with Iid {}", nodeIid, e);
         }
 
         return result;

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/EvcUtils.java b/impl/src/main/java/org/opendaylight/unimgr/utils/EvcUtils.java
index 93a19f0b9b3e24a4b2223e6ee387a7c59ca0b5ab..d71a7ce414c6062bd3307096d5831d81c4dce839 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/EvcUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/EvcUtils.java
@@ -41,7 +41,7 @@ import com.google.common.base.Optional;
 
 public class EvcUtils {
 
-    private static final Logger LO = LoggerFactory.getLogger(EvcUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EvcUtils.class);
 
     /**
      * Delete EVC data from configuration datastore.
@@ -87,7 +87,7 @@ public class EvcUtils {
                 }
             }
         } else {
-            LO.info("Unable to retrieve UNI from the EVC.");
+            LOG.info("Unable to retrieve UNI from the EVC.");
         }
     }
 
@@ -174,10 +174,10 @@ public class EvcUtils {
                 transaction.submit();
                 return true;
             } else {
-                LO.info("EvcLink is not present: " + optionalEvcLink.get().getKey());
+                LOG.info("EvcLink is not present: " + optionalEvcLink.get().getKey());
             }
         } else {
-            LO.info("Invalid instance identifiers for sourceUni and destUni.");
+            LOG.info("Invalid instance identifiers for sourceUni and destUni.");
         }
         return false;
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/MdsalUtils.java b/impl/src/main/java/org/opendaylight/unimgr/utils/MdsalUtils.java
index 594efc880ae0820ff7377988cb64c4c68ff44911..43e28ab2188a7fdbe12931d4eb85458dd8433124 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/MdsalUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/MdsalUtils.java
@@ -36,7 +36,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class MdsalUtils {
 
-    private static final Logger LO = LoggerFactory.getLogger(MdsalUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MdsalUtils.class);
 
     private MdsalUtils() {
         throw new AssertionError("Instantiating utility class.");
@@ -63,11 +63,11 @@ public class MdsalUtils {
             if (optionalDataObject.isPresent()) {
                 result = optionalDataObject.get();
             } else {
-                LO.debug("{}: Failed to read {}",
+                LOG.debug("{}: Failed to read {}",
                         Thread.currentThread().getStackTrace()[1], path);
             }
         } catch (final ReadFailedException e) {
-            LO.warn("Failed to read {} ", path, e);
+            LOG.warn("Failed to read {} ", path, e);
         }
         transaction.close();
         return result;
@@ -91,7 +91,7 @@ public class MdsalUtils {
         try {
             optionalDataObject = future.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.warn("Failed to read {} ", path, e);
+            LOG.warn("Failed to read {} ", path, e);
         }
 
         transaction.close();
@@ -114,7 +114,7 @@ public class MdsalUtils {
         try {
             return nodeFuture.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.error("Unable to read node with Iid {}", nodeIid, e);
+            LOG.error("Unable to read node with Iid {}", nodeIid, e);
         }
         return Optional.absent();
     }
@@ -136,7 +136,7 @@ public class MdsalUtils {
         try {
             return nodeFuture.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.info("Unable to read node with Iid {}", nodeIid, e);
+            LOG.info("Unable to read node with Iid {}", nodeIid, e);
         }
         return Optional.absent();
     }
@@ -150,7 +150,7 @@ public class MdsalUtils {
     public static boolean deleteNode(DataBroker dataBroker,
                                   InstanceIdentifier<?> genericNode,
                                   LogicalDatastoreType store) {
-        LO.info("Received a request to delete node {}", genericNode);
+        LOG.info("Received a request to delete node {}", genericNode);
         boolean result = false;
         final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
         transaction.delete(store, genericNode);
@@ -158,7 +158,7 @@ public class MdsalUtils {
             transaction.submit().checkedGet();
             result = true;
         } catch (final TransactionCommitFailedException e) {
-            LO.error("Unable to remove node with Iid {} from store {}", genericNode, store, e);
+            LOG.error("Unable to remove node with Iid {} from store {}", genericNode, store, e);
         }
         return result;
     }
@@ -179,7 +179,7 @@ public class MdsalUtils {
         try {
             return linkFuture.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.info("Unable to read node with Iid {}", linkIid, e);
+            LOG.info("Unable to read node with Iid {}", linkIid, e);
         }
         return Optional.absent();
     }
@@ -205,7 +205,7 @@ public class MdsalUtils {
         try {
             return topologyFuture.checkedGet();
         } catch (final ReadFailedException e) {
-            LO.info("Unable to read topology with Iid {}", topologyInstanceId, e);
+            LOG.info("Unable to read topology with Iid {}", topologyInstanceId, e);
         }
         return Optional.absent();
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java b/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java
index 49c9bef06c79c3608d562a58bcc6dcb955f311dc..1aeba88023547c103d0888ae384a2189ecd2ac61 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java
@@ -22,7 +22,7 @@ import java.util.function.Supplier;
 
 public class NullAwareDatastoreGetter<T> {
 
-    private static final Logger LO = LoggerFactory.getLogger(NullAwareDatastoreGetter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NullAwareDatastoreGetter.class);
 
     private Optional<T> dataOptional;
 
@@ -75,9 +75,9 @@ public class NullAwareDatastoreGetter<T> {
 
     private void logDataOptionalStatus(Function <?, ?> function) {
         if(dataOptional.isPresent()) {
-            LO.trace("Before collection of: " + function.toString() + ", currently collected data is non-null: " + dataOptional.get().toString());
+            LOG.trace("Before collection of: " + function.toString() + ", currently collected data is non-null: " + dataOptional.get().toString());
         } else {
-            LO.debug("Null value encountered during collection of: " + function.toString());
+            LOG.debug("Null value encountered during collection of: " + function.toString());
         }
     }
 }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/OvsdbUtils.java b/impl/src/main/java/org/opendaylight/unimgr/utils/OvsdbUtils.java
index 58d6d056f96b2d94c94638ba22c42fcc66eb1d02..3e83d55563c8b381141a7117d9d6846d87a7a836 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/OvsdbUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/OvsdbUtils.java
@@ -92,7 +92,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class OvsdbUtils {
 
-    private static final Logger LO = LoggerFactory.getLogger(OvsdbUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OvsdbUtils.class);
 
     private OvsdbUtils() {
         throw new AssertionError("Instantiating utility class.");
@@ -109,7 +109,7 @@ public class OvsdbUtils {
             Node ovsdbNode,
             UniAugmentation uni,
             String bridgeName) {
-        LO.info("Creating a bridge on node {}", ovsdbNode.getNodeId().getValue());
+        LOG.info("Creating a bridge on node {}", ovsdbNode.getNodeId().getValue());
         final InstanceIdentifier<Node> ovsdbNodeIid = uni.getOvsdbNodeRef().getValue().firstIdentifierOf(Node.class);
         if (ovsdbNodeIid != null) {
             final NodeBuilder bridgeNodeBuilder = new NodeBuilder();
@@ -129,7 +129,7 @@ public class OvsdbUtils {
             transaction.put(LogicalDatastoreType.CONFIGURATION, bridgeIid, bridgeNodeBuilder.build());
             transaction.submit();
         } else {
-            LO.info("OvsdbNodeRef is null");
+            LOG.info("OvsdbNodeRef is null");
         }
     }
 
@@ -144,7 +144,7 @@ public class OvsdbUtils {
             InstanceIdentifier<Node> ovsdbNodeIid,
             UniAugmentation uni,
             String bridgeName) {
-        LO.info("Creating a bridge on node {}", ovsdbNodeIid);
+        LOG.info("Creating a bridge on node {}", ovsdbNodeIid);
         if (ovsdbNodeIid != null) {
             final NodeBuilder bridgeNodeBuilder = new NodeBuilder();
             final Optional<Node> optionalOvsdbNode = MdsalUtils.readNode(dataBroker,
@@ -173,7 +173,7 @@ public class OvsdbUtils {
                 transaction.submit();
             }
         } else {
-            LO.info("OvsdbNodeRef is null");
+            LOG.info("OvsdbNodeRef is null");
         }
     }
 
@@ -224,7 +224,7 @@ public class OvsdbUtils {
         if (source.getSpeed() != null) {
             final Uuid qosUuid = getQosUuid(dataBroker, source);
             //tpAugmentationBuilder.setQos(getQosUuid(dataBroker, source));
-            LO.info("Updating Qos {} to termination point {}", qosUuid , bridgeName);
+            LOG.info("Updating Qos {} to termination point {}", qosUuid , bridgeName);
         }
         final TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid));
@@ -294,9 +294,9 @@ public class OvsdbUtils {
             final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
             transaction.put(LogicalDatastoreType.CONFIGURATION, ovsdbNodeIid, nodeData);
             transaction.submit();
-            LO.info("Created and submitted a new OVSDB node {}", nodeData.getNodeId());
+            LOG.info("Created and submitted a new OVSDB node {}", nodeData.getNodeId());
         } catch (final Exception e) {
-            LO.error("Exception while creating OvsdbNodeAugmentation, Uni is null. Node Id: {}", ovsdbNodeId, e);
+            LOG.error("Exception while creating OvsdbNodeAugmentation, Uni is null. Node Id: {}", ovsdbNodeId, e);
         }
     }
 
@@ -322,10 +322,10 @@ public class OvsdbUtils {
             final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
             transaction.put(LogicalDatastoreType.CONFIGURATION, ovsdbNodeIid, nodeData);
             transaction.submit();
-            LO.info("Created and submitted a new OVSDB node {}", nodeData.getNodeId());
+            LOG.info("Created and submitted a new OVSDB node {}", nodeData.getNodeId());
             return nodeData;
         } catch (final Exception e) {
-            LO.error("Exception while creating OvsdbNodeAugmentation, Uni is null. Node Id: {}", ovsdbNodeId, e);
+            LOG.error("Exception while creating OvsdbNodeAugmentation, Uni is null. Node Id: {}", ovsdbNodeId, e);
         }
         return null;
     }
@@ -387,13 +387,13 @@ public class OvsdbUtils {
             try {
                 Thread.sleep(UnimgrConstants.OVSDB_UPDATE_TIMEOUT);
             } catch (final InterruptedException e) {
-                LO.warn("Interrupted while waiting after OVSDB node augmentation {}", ovsdbNodeId, e);
+                LOG.warn("Interrupted while waiting after OVSDB node augmentation {}", ovsdbNodeId, e);
             }
             try {
                 future.checkedGet();
-                LO.trace("Update qos and queues to ovsdb for node {} {}", ovsdbNodeId, ovsdbNodeAugmentationIid);
+                LOG.trace("Update qos and queues to ovsdb for node {} {}", ovsdbNodeId, ovsdbNodeAugmentationIid);
             } catch (final TransactionCommitFailedException e) {
-                LO.warn("Failed to put {} ", ovsdbNodeAugmentationIid, e);
+                LOG.warn("Failed to put {} ", ovsdbNodeAugmentationIid, e);
             }
             updateQosEntries(dataBroker, uni);
         }
@@ -480,7 +480,7 @@ public class OvsdbUtils {
             final List<QosEntries> qosList = optionalNode.get()
                     .getAugmentation(OvsdbNodeAugmentation.class)
                     .getQosEntries();
-            LO.trace("QOS entries list {} for node {}", qosList, ovsdbNodeId);
+            LOG.trace("QOS entries list {} for node {}", qosList, ovsdbNodeId);
             QosEntriesKey qosEntryKey = null;
             for (final QosEntries qosEntry : qosList) {
                 qosEntryKey = qosEntry.getKey();
@@ -506,9 +506,9 @@ public class OvsdbUtils {
             final CheckedFuture<Void, TransactionCommitFailedException> future = transaction.submit();
             try {
                 future.checkedGet();
-                LO.info("Update qos-entries to ovsdb for node {} {}", ovsdbNodeId, queueIid);
+                LOG.info("Update qos-entries to ovsdb for node {} {}", ovsdbNodeId, queueIid);
             } catch (final TransactionCommitFailedException e) {
-                LO.warn("Failed to put {} ", queueIid, e);
+                LOG.warn("Failed to put {} ", queueIid, e);
             }
         }
     }
@@ -527,7 +527,7 @@ public class OvsdbUtils {
         Optional<Node> optionalNode;
         if (UniUtils.getSpeed(sourceUniAugmentation.getSpeed().getSpeed())
                 .equals(UniUtils.getSpeed(evc.getIngressBw().getSpeed()))) {
-            LO.info("Source UNI speed matches EVC ingress BW");
+            LOG.info("Source UNI speed matches EVC ingress BW");
         } else {
             // update Uni's ovsdbNodeRef qos-entries and queues for max-rate to match EVC ingress BW
             optionalNode = findOvsdbNode(dataBroker, sourceUniAugmentation);
@@ -539,7 +539,7 @@ public class OvsdbUtils {
 
         if (UniUtils.getSpeed(destinationUniAugmentation.getSpeed().getSpeed())
                 .equals(UniUtils.getSpeed(evc.getIngressBw().getSpeed()))) {
-            LO.info("Destination UNI speed matches EVC ingress BW");
+            LOG.info("Destination UNI speed matches EVC ingress BW");
         } else {
             // update Uni's ovsdbNodeRef qos-entries and queues for max-rate to match EVC ingress BW
             optionalNode = findOvsdbNode(dataBroker, destinationUniAugmentation);
@@ -557,7 +557,7 @@ public class OvsdbUtils {
         final List<QosEntries> qosList = optionalOvsdbNode.get()
                 .getAugmentation(OvsdbNodeAugmentation.class)
                 .getQosEntries();
-        LO.trace("QOS entries list {} for node {}", qosList, ovsdbNodeId);
+        LOG.trace("QOS entries list {} for node {}", qosList, ovsdbNodeId);
         QosEntriesKey qosEntryKey = null;
         for (final QosEntries qosEntry : qosList) {
             qosEntryKey = qosEntry.getKey();
@@ -574,9 +574,9 @@ public class OvsdbUtils {
         final CheckedFuture<Void, TransactionCommitFailedException> future = transaction.submit();
         try {
             future.checkedGet();
-            LO.info("Update qos-entries max-rate to ovsdb for node {} {}", ovsdbNodeId, qosOtherConfigIid);
+            LOG.info("Update qos-entries max-rate to ovsdb for node {} {}", ovsdbNodeId, qosOtherConfigIid);
         } catch (final TransactionCommitFailedException e) {
-            LO.warn("Failed to put {}", qosOtherConfigIid, e);
+            LOG.warn("Failed to put {}", qosOtherConfigIid, e);
         }
     }
 
@@ -603,9 +603,9 @@ public class OvsdbUtils {
         final CheckedFuture<Void, TransactionCommitFailedException> future = transaction.submit();
         try {
             future.checkedGet();
-            LO.info("Update queues max-rate to ovsdb for node {} {}", ovsdbNodeId, queuesOtherConfigIid);
+            LOG.info("Update queues max-rate to ovsdb for node {} {}", ovsdbNodeId, queuesOtherConfigIid);
         } catch (final TransactionCommitFailedException e) {
-            LO.warn("Failed to put {} ", queuesOtherConfigIid, e);
+            LOG.warn("Failed to put {} ", queuesOtherConfigIid, e);
         }
     }
 
@@ -697,7 +697,7 @@ public class OvsdbUtils {
         if (uni.getSpeed() != null) {
             final Uuid qosUuid = getQosUuid(dataBroker, uni);
             //tpAugmentationBuilder.setQos(getQosUuid(dataBroker, uni));
-            LO.info("Updating Qos {} to termination point {}", qosUuid , bridgeName);
+            LOG.info("Updating Qos {} to termination point {}", qosUuid , bridgeName);
         }
         final TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid));
@@ -749,7 +749,7 @@ public class OvsdbUtils {
             future.checkedGet();
             result = true;
         } catch (final TransactionCommitFailedException e) {
-            LO.warn("Failed to delete {} ", path, e);
+            LOG.warn("Failed to delete {} ", path, e);
         }
         return result;
     }
@@ -856,7 +856,7 @@ public class OvsdbUtils {
                         .getRemoteIp()
                         .getIpv4Address()
                         .equals(uni.getIpAddress().getIpv4Address())) {
-                    LO.info("Found ovsdb node");
+                    LOG.info("Found ovsdb node");
                     optionalOvsdb = Optional.of(ovsdbNode);
                     return optionalOvsdb;
                 }
@@ -899,7 +899,7 @@ public class OvsdbUtils {
             final Ipv4Address ipv4 = new Ipv4Address(ip);
             return new IpAddress(ipv4);
         } catch (final UnknownHostException e) {
-            LO.info("Unable to retrieve controller's ip address, using loopback. {}", e);
+            LOG.info("Unable to retrieve controller's ip address, using loopback. {}", e);
         }
         return new IpAddress(UnimgrConstants.LOCAL_IP);
     }

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/UniUtils.java b/impl/src/main/java/org/opendaylight/unimgr/utils/UniUtils.java
index 645f95f92ae27ace93cbddbe26d224ed169b7489..e7e51d46c34cf432e65692c0a2830ac7369f6d7b 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/UniUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/UniUtils.java
@@ -44,7 +44,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class UniUtils {
 
-    private static final Logger LO = LoggerFactory.getLogger(UniUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UniUtils.class);
 
     private UniUtils() {
         throw new AssertionError("Instantiating utility class.");
@@ -72,9 +72,9 @@ public class UniUtils {
             final CheckedFuture<Void, TransactionCommitFailedException> future = transaction.submit();
             future.checkedGet();
             result = true;
-            LO.info("Created and submitted a new Uni node {}", nodeData.getNodeId());
+            LOG.info("Created and submitted a new Uni node {}", nodeData.getNodeId());
         } catch (final Exception e) {
-            LO.error("Exception while creating Uni Node, Uni Node Id: {}", uniNodeId, e);
+            LOG.error("Exception while creating Uni Node, Uni Node Id: {}", uniNodeId, e);
         }
         return result;
     }
@@ -101,7 +101,7 @@ public class UniUtils {
             for (final Node uniNode : uniNodes) {
                 final UniAugmentation uniAugmentation = uniNode.getAugmentation(UniAugmentation.class);
                 if (uniAugmentation.getIpAddress().equals(ipAddress)) {
-                    LO.info("Found Uni node");
+                    LOG.info("Found Uni node");
                     return Optional.of(uniNode);
                 }
             }