Refactored code in an attempt to break dependency cycles
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java
index 3418aa0..032fb05 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java
@@ -4,8 +4,8 @@
import org.apache.karaf.shell.commands.Command;
import org.onlab.onos.cli.AbstractShellCommand;
import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.net.MastershipRole;
import org.onlab.onos.net.device.DeviceMastershipAdminService;
+import org.onlab.onos.net.device.DeviceMastershipRole;
import static org.onlab.onos.net.DeviceId.deviceId;
@@ -31,7 +31,7 @@
@Override
protected void execute() {
DeviceMastershipAdminService service = get(DeviceMastershipAdminService.class);
- MastershipRole mastershipRole = MastershipRole.valueOf(role.toUpperCase());
+ DeviceMastershipRole mastershipRole = DeviceMastershipRole.valueOf(role.toUpperCase());
service.setRole(new NodeId(node), deviceId(uri), mastershipRole);
}
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java b/cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java
index b540fca..4319e19 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java
@@ -2,7 +2,7 @@
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.net.MastershipRole;
+import org.onlab.onos.net.device.DeviceMastershipRole;
import java.util.List;
import java.util.SortedSet;
@@ -16,9 +16,9 @@
// Delegate string completer
StringsCompleter delegate = new StringsCompleter();
SortedSet<String> strings = delegate.getStrings();
- strings.add(MastershipRole.MASTER.toString().toLowerCase());
- strings.add(MastershipRole.STANDBY.toString().toLowerCase());
- strings.add(MastershipRole.NONE.toString().toLowerCase());
+ strings.add(DeviceMastershipRole.MASTER.toString().toLowerCase());
+ strings.add(DeviceMastershipRole.STANDBY.toString().toLowerCase());
+ strings.add(DeviceMastershipRole.NONE.toString().toLowerCase());
// Now let the completer do the work for figuring out what to offer.
return delegate.complete(buffer, cursor, candidates);