commit e312fc7c6c5c2a67e8b31df2d499820fe29b30fb
author Brian Stanke <bstanke@ciena.com> Tue Feb 16 15:07:13 2016 -0500
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 17 15:19:17 2016 +0000
tree 3a0293d408d6e607265873e17057f502b4089894
parent 102013270bc918e36e0d11fc016922ec5c3d037c

ONOS-3658 - Adding CLI commands to display and manage Device Keys.

Change-Id: I98d7d3b7bc9a61f106a6b79b38d7ddaebbfb3288

cli/src/main/java/org/onosproject/cli/Comparators.java

diff --git a/cli/src/main/java/org/onosproject/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java
index 50e79a1..c1c019e 100644
--- a/cli/src/main/java/org/onosproject/cli/Comparators.java
+++ b/cli/src/main/java/org/onosproject/cli/Comparators.java
@@ -19,13 +19,13 @@
 import org.onosproject.core.Application;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.incubator.net.intf.Interface;
+import org.onosproject.incubator.net.key.DeviceKey;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Element;
 import org.onosproject.net.ElementId;
 import org.onosproject.net.Port;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.group.Group;
-
 import org.onosproject.net.statistic.TypedFlowEntryWithLoad;
 import org.onosproject.net.topology.TopologyCluster;
 
@@ -118,8 +118,8 @@
         public int compare(ConnectPoint o1, ConnectPoint o2) {
             int compareId = ELEMENT_ID_COMPARATOR.compare(o1.elementId(), o2.elementId());
             return (compareId != 0) ?
-                compareId :
-                Long.signum(o1.port().toLong() - o2.port().toLong());
+                    compareId :
+                    Long.signum(o1.port().toLong() - o2.port().toLong());
         }
     };
 
@@ -130,8 +130,15 @@
             new Comparator<TypedFlowEntryWithLoad>() {
                 @Override
                 public int compare(TypedFlowEntryWithLoad fe1, TypedFlowEntryWithLoad fe2) {
-                    long delta = fe1.load().rate() -  fe2.load().rate();
+                    long delta = fe1.load().rate() - fe2.load().rate();
                     return delta == 0 ? 0 : (delta > 0 ? -1 : +1);
                 }
             };
+
+    public static final Comparator<DeviceKey> DEVICE_KEY_COMPARATOR = new Comparator<DeviceKey>() {
+        @Override
+        public int compare(DeviceKey deviceKey1, DeviceKey deviceKey2) {
+            return deviceKey1.deviceKeyId().id().toString().compareTo(deviceKey2.deviceKeyId().id().toString());
+        }
+    };
 }