cleanup logs

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -2091,13 +2091,13 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
         public void run() {
             boolean updatePortChannel = portChannelConfigChanged;
             portChannelConfigChanged = false;
-            
+
             if (updatePortChannel) {
                 readPortChannelConfigFromStorage();
             }
 
             try { 
-                log.debug("DeviceUpdateWorker: cleaning up attachment points");
+                log.debug("DeviceUpdateWorker: cleaning up attachment points.");
                 for (IOFSwitch sw  : devMgrMaps.getSwitches()) {
                     // If the set of devices connected to the switches we 
                     // re-iterate a max of 3 times - WHY? TODO
@@ -2105,7 +2105,6 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
                     while (maxIter > 0) {
                         try {
                             for (Device d: devMgrMaps.getDevicesOnASwitch(sw)) {
-                                log.debug("Cleanup APs for device {}", HexString.toHexString(d.getDataLayerAddressAsLong()));
                                 Device dCopy = new Device(d);
                                 cleanupAttachmentPoints(dCopy);
                                 for (DeviceAttachmentPoint dap : 
@@ -2117,6 +2116,7 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
                                     // Delete from memory after storage,
                                     // otherwise an exception will
                                     // leave stale attachment points on storage.
+                                    log.debug("Remove AP {} from storage for device {}", dap, dCopy.getDlAddrString());
                                     removeAttachmentPointFromStorage(dCopy.getDlAddrString(),
                                         HexString.toHexString(dap.getSwitchPort().getSw().getId()),
                                         dap.getSwitchPort().getPort().toString());
@@ -2135,8 +2135,6 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
                                 "attempted three times and failed.");
                     }
                 }
-                log.debug("DeviceUpdateWorker: finished cleaning up device " +
-                          "attachment points");
             } catch (StorageException e) {
                 log.error("DeviceUpdateWorker had a storage exception, " +
                         "Floodlight exiting");

src/main/java/net/floodlightcontroller/routing/ForwardingBase.java

@@ -169,7 +169,7 @@ public abstract class ForwardingBase implements IOFMessageListener, IDeviceManag
                 fm.getMatch().setInputPort(link.getDstPort());
                 try {
                     counterStore.updatePktOutFMCounterStore(sw, fm);
-                    if (log.isDebugEnabled()) {
+                    if (log.isTraceEnabled()) {
                         log.debug("Pushing Route flowmod routeIndx={} sw={} inPort={} outPort={}",
                                   new Object[] { routeIndx, sw, fm.getMatch().getInputPort(), 
                                                  ((OFActionOutput)fm.getActions().get(0)).getPort() });
@@ -228,7 +228,7 @@ public abstract class ForwardingBase implements IOFMessageListener, IDeviceManag
 
         try {
             counterStore.updatePktOutFMCounterStore(sw, fm);
-            if (log.isDebugEnabled()) {
+            if (log.isTraceEnabled()) {
                 log.debug("pushRoute flowmod sw={} inPort={} outPort={}",
                       new Object[] { sw, fm.getMatch().getInputPort(), 
                                     ((OFActionOutput)fm.getActions().get(0)).getPort() });
@@ -284,7 +284,7 @@ public abstract class ForwardingBase implements IOFMessageListener, IDeviceManag
             }
         }
         
-        if (log.isDebugEnabled()) {
+        if (log.isTraceEnabled()) {
             log.debug("PacketOut srcSwitch={} match={} pi={}", new Object[] {sw, match, pi});
         }
         

src/main/java/net/floodlightcontroller/topology/TopologyInstance.java

@@ -103,14 +103,14 @@ public class TopologyInstance {
     }
 
     public void printTopology() {
-        log.info("-----------------------------------------------");
-        log.info("Links: {}",this.switchPortLinks);
-        log.info("broadcastDomainPorts: {}", broadcastDomainPorts);
-        log.info("tunnelPorts: {}", tunnelPorts);
-        log.info("clusters: {}", clusters);
-        log.info("destinationRootedTrees: {}", destinationRootedTrees);
-        log.info("clusterBroadcastNodePorts: {}", clusterBroadcastNodePorts);
-        log.info("-----------------------------------------------");
+        log.debug("-----------------------------------------------");
+        log.debug("Links: {}",this.switchPortLinks);
+        log.debug("broadcastDomainPorts: {}", broadcastDomainPorts);
+        log.debug("tunnelPorts: {}", tunnelPorts);
+        log.debug("clusters: {}", clusters);
+        log.debug("destinationRootedTrees: {}", destinationRootedTrees);
+        log.debug("clusterBroadcastNodePorts: {}", clusterBroadcastNodePorts);
+        log.debug("-----------------------------------------------");
     }
 
     protected void addLinksToClusters() {