From dc0ff1997e7cbd13fd02b70a0e9e89cf2e4ad8aa Mon Sep 17 00:00:00 2001
From: Ray Milkey <ray@onlab.us>
Date: Wed, 4 Nov 2015 13:49:52 -0800
Subject: [PATCH] Refactoring of utility methods

- removed unused API to fetch IP addresses
- renamed system health API to match other APIs

Change-Id: I16f9a1e6e40fd93fb5c0444ab826e2c8738c14ed
---
 .../openflow/controller/impl/Controller.java  | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
index 9d3551562a..69c0616553 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
@@ -114,23 +114,6 @@ public class Controller {
         return FACTORY13;
     }
 
-
-    public Map<String, String> getControllerNodeIPs() {
-        // We return a copy of the mapping so we can guarantee that
-        // the mapping return is the same as one that will be (or was)
-        // dispatched to IHAListeners
-        HashMap<String, String> retval = new HashMap<>();
-        synchronized (controllerNodeIPsCache) {
-            retval.putAll(controllerNodeIPsCache);
-        }
-        return retval;
-    }
-
-
-    public long getSystemStartTime() {
-        return (this.systemStartTime);
-    }
-
     // **************
     // Initialization
     // **************
@@ -281,11 +264,15 @@ public class Controller {
     }
 
 
-    public Long getUptime() {
+    public Long getSystemUptime() {
         RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
         return rb.getUptime();
     }
 
+    public long getSystemStartTime() {
+        return (this.systemStartTime);
+    }
+
     /**
      * Forward to the driver-manager to get an IOFSwitch instance.
      *