Merge into master from pull request #183:

system uptime support (https://github.com/floodlight/floodlight/pull/183)

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

@@ -191,5 +191,12 @@ public interface IFloodlightProviderService extends IFloodlightService {
     * @return
     */
    public Map<String, Object> getControllerInfo(String type);
+   
+   
+   /**
+    * Return the controller uptime in  milliseconds
+    * @return
+    */
+   public long getSystemUptime();
 
 }

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

@@ -174,6 +174,9 @@ public class Controller implements IFloodlightProviderService,
     // If the controller isn't configured to support roles, then this is null.
     protected Role role;
     
+    // Start time of the controller
+    protected long systemStartTime;
+    
     // Storage table names
     protected static final String CONTROLLER_TABLE_NAME = "controller_controller";
     protected static final String CONTROLLER_ID = "id";
@@ -1926,6 +1929,7 @@ public class Controller implements IFloodlightProviderService,
         setConfigParams(configParams);
         this.role = getInitialRole(configParams);
         initVendorMessages();
+        this.systemStartTime = System.currentTimeMillis();
     }
     
     /**
@@ -2096,4 +2100,11 @@ public class Controller implements IFloodlightProviderService,
         }
     }
 
+	@Override
+	public long getSystemUptime() {
+		return (System.currentTimeMillis() - this.systemStartTime);
+	}
+    
+    
+
 }

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

@@ -59,6 +59,7 @@ public class CoreWebRoutable implements RestletRoutable {
         router.attach("/controller/summary/json", ControllerSummaryResource.class);
         router.attach("/role/json", ControllerRoleResource.class);
         router.attach("/health/json", HealthCheckResource.class);
+        router.attach("/system/uptime/json", SystemUptimeResource.class);
         return router;
     }
 }

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

+package net.floodlightcontroller.core.web;
+
+import net.floodlightcontroller.core.IFloodlightProviderService;
+import org.restlet.resource.Get;
+import org.restlet.resource.ServerResource;
+
+public class SystemUptimeResource extends ServerResource {
+	@Get("json")
+	public long retrieve() {
+		IFloodlightProviderService floodlightProvider = 
+			(IFloodlightProviderService)getContext().getAttributes().
+			get(IFloodlightProviderService.class.getCanonicalName());
+		return floodlightProvider.getSystemUptime();
+	}
+}

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

@@ -291,4 +291,12 @@ public class MockFloodlightProvider implements IFloodlightModule, IFloodlightPro
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	@Override
+	public long getSystemUptime() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	
+	
 }