commit d40483d52cf793c0f0fe047dd0a4ebfe01857d6e
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:20:30 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:28:45 2014 -0700
tree 7c201fc35f8059c79a1f4906475a21e7c37674dd
parent 74be6c43dfa3c0a062cceb2dcd3f04e4f57b4eb5

Revert "Refactored code in an attempt to break dependency cycles"

This reverts commit 195af6e6b27c23c7beb98f4cd425e7d7ffff1ecd.

cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java

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 032fb05..3418aa0 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);
-        DeviceMastershipRole mastershipRole = DeviceMastershipRole.valueOf(role.toUpperCase());
+        MastershipRole mastershipRole = MastershipRole.valueOf(role.toUpperCase());
         service.setRole(new NodeId(node), deviceId(uri), mastershipRole);
     }