Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java

@@ -211,6 +211,17 @@ public interface IFloodlightProviderService extends
     */
    public void setAlwaysClearFlowsOnSwAdd(boolean value);
    
+   /**
+    * Get controller memory information
+    */
+   public Map<String, Long> getMemory();
+
+   /**
+    * returns the uptime of this controller.
+    * @return
+    */
+   public Long getUptime();
+   
    /**
     * Adds an OFSwitch driver
     * @param desc The starting portion of switch's manufacturer string

src/main/java/net/floodlightcontroller/core/internal/Controller.java

@@ -19,6 +19,8 @@ package net.floodlightcontroller.core.internal;
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.net.InetSocketAddress;
 import java.nio.channels.ClosedChannelException;
 import java.util.ArrayList;
@@ -199,9 +201,6 @@ public class Controller implements IFloodlightProviderService,
     protected RoleChanger roleChanger;
     protected SingletonTask roleChangeDamper;
 
-    // Start time of the controller
-    protected long systemStartTime;
-
     // Flag to always flush flow table on switch reconnect (HA or otherwise)
     protected boolean alwaysClearFlowsOnSwAdd = false;
 
@@ -1791,7 +1790,6 @@ public class Controller implements IFloodlightProviderService,
         this.notifiedRole = this.role;
         this.roleChanger = new RoleChanger(this);
         initVendorMessages();
-        this.systemStartTime = System.currentTimeMillis();
 
         String option = configParams.get("flushSwitchesOnReconnect");
 
@@ -1972,7 +1970,8 @@ public class Controller implements IFloodlightProviderService,
 
     @Override
     public long getSystemStartTime() {
-        return (this.systemStartTime);
+        RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
+        return rb.getStartTime();
     }
 
     @Override
@@ -1984,6 +1983,21 @@ public class Controller implements IFloodlightProviderService,
         return this.alwaysClearFlowsOnSwAdd;
     }
 
+    @Override
+    public Map<String, Long> getMemory() {
+        Map<String, Long> m = new HashMap<String, Long>();
+        Runtime runtime = Runtime.getRuntime();
+        m.put("total", runtime.totalMemory());
+        m.put("free", runtime.freeMemory());
+        return m;
+    }
+
+    @Override
+    public Long getUptime() {
+        RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
+        return rb.getUptime();
+    }
+
     @Override
     public void addOFSwitchDriver(String description, IOFSwitchDriver driver) {
         IOFSwitchDriver existingDriver = switchBindingMap.get(description);

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

@@ -23,25 +23,24 @@ import org.restlet.resource.ServerResource;
 
 
 public class SystemUptimeResource extends ServerResource {
-	
-	public class UptimeRest {
-		long systemUptimeMsec;
-
-		public long getSystemUptimeMsec() {
-			return systemUptimeMsec;
-		}
-	}
-	
-	@Get("json")
-	public UptimeRest retrieve() {
-		IFloodlightProviderService floodlightProvider = 
-			(IFloodlightProviderService)getContext().getAttributes().
-			get(IFloodlightProviderService.class.getCanonicalName());
-		
-		UptimeRest uptime = new UptimeRest();
-		uptime.systemUptimeMsec = 
-		   System.currentTimeMillis() - floodlightProvider.getSystemStartTime();
-		
-		return (uptime);
-	}
+
+    public class UptimeRest {
+        long systemUptimeMsec;
+
+        public long getSystemUptimeMsec() {
+            return systemUptimeMsec;
+        }
+    }
+
+    @Get("json")
+    public UptimeRest retrieve() {
+        IFloodlightProviderService floodlightProvider =
+            (IFloodlightProviderService)getContext().getAttributes().
+            get(IFloodlightProviderService.class.getCanonicalName());
+
+        UptimeRest uptime = new UptimeRest();
+        uptime.systemUptimeMsec = floodlightProvider.getUptime();
+
+        return (uptime);
+    }
 }

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

@@ -418,7 +418,9 @@ public class Device implements IDevice {
         if (apMap == null || apMap.isEmpty()) {
             apList.add(newAP);
             attachmentPoints = apList;
-            return true;
+            // there are no old attachment points - we should not treat this
+            // as a device moved.
+            return false;
         }
 
         long id = topology.getL2DomainId(sw);

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

@@ -794,7 +794,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
         if (srcEntity == null)
             return Command.STOP;
 
-        // Learn from ARP packet.
+        // Learn from ARP packet for special VRRP settings.
         // In VRRP settings, the source MAC address and sender MAC
         // addresses can be different.  In such cases, we need to learn
         // the IP to MAC mapping of the VRRP IP address.  The source
@@ -1036,6 +1036,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
                           (learnap ? (int)inPort : null),
                           new Date());
     }
+
     /**
      * Look up a {@link Device} based on the provided {@link Entity}. We first
      * check the primary index. If we do not find an entry there we classify
@@ -1076,9 +1077,10 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
      * the given source device.  The source device is important since
      * there could be ambiguity in the destination device without the
      * attachment point information.
-     * @param source the source device.  The returned destination will be
-     * in the same entity class as the source.
-     * @param dstEntity the entity to look up
+     * @param reference  the source device's entity class.
+     *                   The returned destination will be
+     *                   in the same entity class as the source.
+     * @param dstEntity  the entity to look up
      * @return an {@link Device} or null if no device is found.
      */
     protected Device findDestByEntity(IEntityClass reference,
@@ -1107,7 +1109,6 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
         return deviceMap.get(deviceKey);
     }
 
-
     /**
      * Look up a {@link Device} within a particular entity class based on
      * the provided {@link Entity}.
@@ -1707,6 +1708,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
         return new Device(device, entity, insertionpoint);
     }
 
+    //not used
     protected Device allocateDevice(Device device, Set <Entity> entities) {
         List <AttachmentPoint> newPossibleAPs =
                 new ArrayList<AttachmentPoint>();
@@ -1737,7 +1739,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
     }
 
     // *********************
-    // IEntityClassListener
+    // ITopologyListener
     // *********************
 
     /**

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

 /**
-*    Copyright 2012 Big Switch Networks, Inc. 
+*    Copyright 2012 Big Switch Networks, Inc.
 *    Originally created by David Erickson, Stanford University
-* 
+*
 *    Licensed under the Apache License, Version 2.0 (the "License"); you may
 *    not use this file except in compliance with the License. You may obtain
 *    a copy of the License at
@@ -31,7 +31,7 @@ public class DeviceUniqueIndex extends DeviceIndex {
     /**
      * The index
      */
-    private ConcurrentHashMap<IndexedEntity, Long> index;
+    private final ConcurrentHashMap<IndexedEntity, Long> index;
 
     /**
      * Construct a new device index using the provided key fields
@@ -51,10 +51,10 @@ public class DeviceUniqueIndex extends DeviceIndex {
         final Long deviceKey = findByEntity(entity);
         if (deviceKey != null)
             return Collections.<Long>singleton(deviceKey).iterator();
-        
+
         return Collections.<Long>emptySet().iterator();
     }
-    
+
     @Override
     public Iterator<Long> getAll() {
         return index.values().iterator();
@@ -68,15 +68,15 @@ public class DeviceUniqueIndex extends DeviceIndex {
 
             Long ret = index.putIfAbsent(ie, deviceKey);
             if (ret != null && !ret.equals(deviceKey)) {
-                // If the return value is non-null, then fail the insert 
-                // (this implies that a device using this entity has 
+                // If the return value is non-null, then fail the insert
+                // (this implies that a device using this entity has
                 // already been created in another thread).
                 return false;
             }
         }
         return true;
     }
-    
+
     @Override
     public void updateIndex(Entity entity, Long deviceKey) {
         IndexedEntity ie = new IndexedEntity(keyFields, entity);

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

@@ -54,4 +54,6 @@ public interface IRoutingDecision {
     public void setMulticastInterfaces(List<SwitchPort> lspt);
     public Integer getWildcards();
     public void setWildcards(Integer wildcards);
+    public short getHardTimeout();
+    public void setHardTimeout(short hardTimeout);
 }

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

@@ -29,6 +29,7 @@ public class RoutingDecision implements IRoutingDecision {
 
     protected RoutingAction action;
     protected Integer wildcards;
+    protected short hardTimeout;
     protected SwitchPort srcPort;
     protected IDevice srcDevice;
     protected List<IDevice> destDevices;
@@ -46,6 +47,7 @@ public class RoutingDecision implements IRoutingDecision {
                 Collections.synchronizedList(new ArrayList<SwitchPort>());
         this.action = action;
         this.wildcards = null;
+        this.hardTimeout = ForwardingBase.FLOWMOD_DEFAULT_HARD_TIMEOUT;
     }
     
     @Override
@@ -100,6 +102,16 @@ public class RoutingDecision implements IRoutingDecision {
         this.wildcards = wildcards;
     }
    
+    @Override
+    public short getHardTimeout() {
+        return hardTimeout;
+    }
+
+    @Override
+    public void setHardTimeout(short hardTimeout) {
+        this.hardTimeout = hardTimeout;
+    }
+
     @Override
     public void addToContext(FloodlightContext cntx) {
         rtStore.put(cntx, IRoutingDecision.CONTEXT_DECISION, this);

src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java

@@ -17,6 +17,8 @@
 
 package net.floodlightcontroller.core.test;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -361,4 +363,18 @@ public class MockFloodlightProvider implements IFloodlightModule, IFloodlightPro
         return null;
     }
 
+    @Override
+    public Map<String, Long> getMemory() {
+        Map<String, Long> m = new HashMap<String, Long>();
+        Runtime runtime = Runtime.getRuntime();
+        m.put("total", runtime.totalMemory());
+        m.put("free", runtime.freeMemory());
+        return m;
+    }
+
+    @Override
+    public Long getUptime() {
+        RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
+        return rb.getUptime();
+    }
 }