Rename EventHistoryTopologySwitch to EventHistorySwitch

src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologySwitch.java → src/main/java/net/floodlightcontroller/core/internal/EventHistorySwitch.java

@@ -14,7 +14,7 @@
  *    under the License.
  **/
 
-package net.floodlightcontroller.linkdiscovery.internal;
+package net.floodlightcontroller.core.internal;
 
 import net.floodlightcontroller.core.web.serializers.DPIDSerializer;
 import net.floodlightcontroller.core.web.serializers.IPv4Serializer;
@@ -27,15 +27,15 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
  * @author subrata
  *
  */
-public class EventHistoryTopologySwitch {
+public class EventHistorySwitch {
     // The following fields are not stored as String to save memory
-    // They should be converted to appropriate human-readable strings by 
+    // They should be converted to appropriate human-readable strings by
     // the front end (e.g. in cli in Python)
     public long     dpid;
     public int  ipv4Addr;
     public int    l4Port;
     public String   reason;
-    
+
     @JsonProperty("Switch")
     @JsonSerialize(using=DPIDSerializer.class)
     public long getDpid() {
@@ -54,6 +54,4 @@ public class EventHistoryTopologySwitch {
     public String getReason() {
         return reason;
     }
-    
-    
 }

src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java

@@ -16,8 +16,8 @@
 
 package net.floodlightcontroller.core.web;
 
+import net.floodlightcontroller.core.internal.EventHistorySwitch;
 import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
-import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologySwitch;
 import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
 import net.floodlightcontroller.util.EventHistory;
 
@@ -31,7 +31,7 @@ import org.restlet.resource.ServerResource;
 public class EventHistoryTopologySwitchResource extends ServerResource {
 
     @Get("json")
-    public EventHistory<EventHistoryTopologySwitch> handleEvHistReq() {
+    public EventHistory<EventHistorySwitch> handleEvHistReq() {
 
         // Get the event history count. Last <count> events would be returned
         String evHistCount = (String)getRequestAttributes().get("count");
@@ -47,7 +47,7 @@ public class EventHistoryTopologySwitchResource extends ServerResource {
            (LinkDiscoveryManager)getContext().getAttributes().
                get(ILinkDiscoveryService.class.getCanonicalName());
 
-        return new EventHistory<EventHistoryTopologySwitch>(
+        return new EventHistory<EventHistorySwitch>(
                                 topoManager.evHistTopologySwitch, count);
     }
 }

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -53,6 +53,7 @@ import net.floodlightcontroller.core.IOFSwitchListener;
 import net.floodlightcontroller.core.annotations.LogMessageCategory;
 import net.floodlightcontroller.core.annotations.LogMessageDoc;
 import net.floodlightcontroller.core.annotations.LogMessageDocs;
+import net.floodlightcontroller.core.internal.EventHistorySwitch;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.IFloodlightModule;
@@ -1991,7 +1992,7 @@ public class LinkDiscoveryManager implements IOFMessageListener,
         this.quarantineQueue = new LinkedBlockingQueue<NodePortTuple>();
         this.maintenanceQueue = new LinkedBlockingQueue<NodePortTuple>();
 
-        this.evHistTopologySwitch = new EventHistory<EventHistoryTopologySwitch>(EVENT_HISTORY_SIZE);
+        this.evHistTopologySwitch = new EventHistory<EventHistorySwitch>(EVENT_HISTORY_SIZE);
         this.evHistTopologyLink = new EventHistory<EventHistoryTopologyLink>(EVENT_HISTORY_SIZE);
         this.evHistTopologyCluster = new EventHistory<EventHistoryTopologyCluster>(EVENT_HISTORY_SIZE);
         this.ignoreMACSet = Collections.newSetFromMap(
@@ -2151,10 +2152,10 @@ public class LinkDiscoveryManager implements IOFMessageListener,
     /**
      *  Topology Manager event history
      */
-    public EventHistory<EventHistoryTopologySwitch> evHistTopologySwitch;
+    public EventHistory<EventHistorySwitch> evHistTopologySwitch;
     public EventHistory<EventHistoryTopologyLink> evHistTopologyLink;
     public EventHistory<EventHistoryTopologyCluster> evHistTopologyCluster;
-    public EventHistoryTopologySwitch evTopoSwitch;
+    public EventHistorySwitch evTopoSwitch;
     public EventHistoryTopologyLink evTopoLink;
     public EventHistoryTopologyCluster evTopoCluster;
 
@@ -2163,7 +2164,7 @@ public class LinkDiscoveryManager implements IOFMessageListener,
      */
     private void evHistTopoSwitch(long switchDPID, EvAction actn, String reason) {
         if (evTopoSwitch == null) {
-            evTopoSwitch = new EventHistoryTopologySwitch();
+            evTopoSwitch = new EventHistorySwitch();
         }
         evTopoSwitch.dpid = switchDPID;