ONOS-542 Added ability for app bundle to carry it's own artifacts, including feature repo. Fixed onos-package script. Added JSON output to CLI.
Change-Id: If4f2c774d3fc2d68c0a8e91b3084b99d7c75d927
diff --git a/cli/src/main/java/org/onosproject/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java
index 764b227..6efb139 100644
--- a/cli/src/main/java/org/onosproject/cli/Comparators.java
+++ b/cli/src/main/java/org/onosproject/cli/Comparators.java
@@ -18,6 +18,7 @@
import java.util.Comparator;
import org.onosproject.cluster.ControllerNode;
+import org.onosproject.core.Application;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Element;
@@ -43,6 +44,13 @@
}
};
+ public static final Comparator<Application> APP_COMPARATOR = new Comparator<Application>() {
+ @Override
+ public int compare(Application app1, Application app2) {
+ return app1.id().id() - app2.id().id();
+ }
+ };
+
public static final Comparator<ElementId> ELEMENT_ID_COMPARATOR = new Comparator<ElementId>() {
@Override
public int compare(ElementId id1, ElementId id2) {