Added a command-line to set device mastership role.

+package org.onlab.onos.cli.net;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.MastershipRole;
+import org.onlab.onos.net.device.DeviceAdminService;
+
+/**
+ * Sets role of the controller node for the given infrastructure device.
+ */
+@Command(scope = "onos", name = "device-role",
+         description = "Sets role of the controller node for the given infrastructure device")
+public class DeviceRoleCommand extends AbstractShellCommand {
+
+    @Argument(index = 0, name = "uri", description = "Device ID",
+              required = true, multiValued = false)
+    String uri = null;
+
+    @Argument(index = 1, name = "role", description = "Mastership role",
+              required = true, multiValued = false)
+    String role = null;
+
+    @Override
+    protected Object doExecute() throws Exception {
+        MastershipRole mastershipRole = MastershipRole.valueOf(role.toUpperCase());
+        getService(DeviceAdminService.class).setRole(DeviceId.deviceId(uri),
+                                                     mastershipRole);
+        return null;
+    }
+
+}

+package org.onlab.onos.cli.net;
+
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.onlab.onos.net.MastershipRole;
+
+import java.util.List;
+import java.util.SortedSet;
+
+/**
+ * Device mastership role completer.
+ */
+public class RoleCompleter implements Completer {
+    @Override
+    public int complete(String buffer, int cursor, List<String> candidates) {
+        // 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());
+
+        // Now let the completer do the work for figuring out what to offer.
+        return delegate.complete(buffer, cursor, candidates);
+    }
+
+}

@@ -16,6 +16,13 @@
                 <ref component-id="deviceIdCompleter"/>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
             </completers>
         </command>
         </command>
+        <command>
+            <action class="org.onlab.onos.cli.net.DeviceRoleCommand"/>
+            <completers>
+                <ref component-id="deviceIdCompleter"/>
+                <ref component-id="roleCompleter"/>
+            </completers>
+        </command>
 
 
         <command>
         <command>
             <action class="org.onlab.onos.cli.net.LinksListCommand"/>
             <action class="org.onlab.onos.cli.net.LinksListCommand"/>
@@ -33,6 +40,7 @@
     </command-bundle>
     </command-bundle>
 
 
     <bean id="deviceIdCompleter" class="org.onlab.onos.cli.net.DeviceIdCompleter"/>
     <bean id="deviceIdCompleter" class="org.onlab.onos.cli.net.DeviceIdCompleter"/>
+    <bean id="roleCompleter" class="org.onlab.onos.cli.net.RoleCompleter"/>
 
 
     <bean id="nameCompleter" class="org.onlab.onos.cli.NameCompleter"/>
     <bean id="nameCompleter" class="org.onlab.onos.cli.NameCompleter"/>
 
 

@@ -139,7 +139,7 @@ public class SimpleDeviceManager
             Device device = event.subject();
             Device device = event.subject();
             DeviceProvider provider = getProvider(device.providerId());
             DeviceProvider provider = getProvider(device.providerId());
             if (provider != null) {
             if (provider != null) {
-                provider.roleChanged(device, newRole);
+                triggerRoleSelection(device, provider);
             }
             }
             post(event);
             post(event);
         }
         }

@@ -143,11 +143,13 @@ public class SimpleDeviceManagerTest {
     }
     }
 
 
     @Test
     @Test
-    public void setRole() {
+    public void setRole() throws InterruptedException {
         connectDevice(DID1, SW1);
         connectDevice(DID1, SW1);
         admin.setRole(DID1, MastershipRole.STANDBY);
         admin.setRole(DID1, MastershipRole.STANDBY);
         validateEvents(DEVICE_ADDED, DEVICE_MASTERSHIP_CHANGED);
         validateEvents(DEVICE_ADDED, DEVICE_MASTERSHIP_CHANGED);
         assertEquals("incorrect role", MastershipRole.STANDBY, service.getRole(DID1));
         assertEquals("incorrect role", MastershipRole.STANDBY, service.getRole(DID1));
+
+        Thread.sleep(200); // FIXME: replace this with more reliable and faster testing means!!!
         assertEquals("incorrect device", DID1, provider.deviceReceived.id());
         assertEquals("incorrect device", DID1, provider.deviceReceived.id());
         assertEquals("incorrect role", MastershipRole.STANDBY, provider.roleReceived);
         assertEquals("incorrect role", MastershipRole.STANDBY, provider.roleReceived);
     }
     }