Cleaned-up CLI commands.
diff --git a/cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java b/cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java
index 1e921b4..020179e 100644
--- a/cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java
@@ -1,11 +1,11 @@
package org.onlab.onos.cli;
import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.net.Comparators;
import org.onlab.onos.cluster.ClusterService;
import org.onlab.onos.cluster.ControllerNode;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
@@ -20,19 +20,11 @@
private static final String FMT =
"id=%s, ip=%s, state=%s %s";
- protected static final Comparator<ControllerNode> ID_COMPARATOR =
- new Comparator<ControllerNode>() {
- @Override
- public int compare(ControllerNode ci1, ControllerNode ci2) {
- return ci1.id().toString().compareTo(ci2.id().toString());
- }
- };
-
@Override
protected void execute() {
ClusterService service = get(ClusterService.class);
List<ControllerNode> nodes = newArrayList(service.getNodes());
- Collections.sort(nodes, ID_COMPARATOR);
+ Collections.sort(nodes, Comparators.NODE_COMPARATOR);
ControllerNode self = service.getLocalNode();
for (ControllerNode node : nodes) {
print(FMT, node.id(), node.ip(),