Replace Unified* services with MembershipService for subgroup membership
Change-Id: Iabff173ce3501d1ed300513cac445bb712614bd9
diff --git a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
index 5a55c99..a0967b3 100644
--- a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
@@ -22,8 +22,8 @@
import org.apache.karaf.shell.commands.Command;
import org.joda.time.DateTime;
import org.onlab.util.Tools;
+import org.onosproject.cluster.ClusterAdminService;
import org.onosproject.cluster.ControllerNode;
-import org.onosproject.cluster.MembershipAdminService;
import org.onosproject.core.Version;
import org.onosproject.utils.Comparators;
@@ -32,7 +32,6 @@
import static com.google.common.collect.Lists.newArrayList;
-
/**
* Lists all controller cluster nodes.
*/
@@ -44,7 +43,7 @@
@Override
protected void execute() {
- MembershipAdminService service = get(MembershipAdminService.class);
+ ClusterAdminService service = get(ClusterAdminService.class);
List<ControllerNode> nodes = newArrayList(service.getNodes());
Collections.sort(nodes, Comparators.NODE_COMPARATOR);
if (outputJson()) {
@@ -68,7 +67,7 @@
}
// Produces JSON structure.
- private JsonNode json(MembershipAdminService service, List<ControllerNode> nodes) {
+ private JsonNode json(ClusterAdminService service, List<ControllerNode> nodes) {
ObjectMapper mapper = new ObjectMapper();
ArrayNode result = mapper.createArrayNode();
ControllerNode self = service.getLocalNode();