commit 64ced00e42a6a2f12e3bfdc3f9e3c9276107cbe5
author Ningning Xia <nxia@google.com> Wed May 16 17:36:20 2018 -0700
committer Ningning Xia <nxia@chromium.org> Sat May 19 00:40:17 2018 +0000
tree 2a7ec1835f67ceb5ce376b70a5bf1b3955933a00
parent ef35cb53f92200c964eda241903900d969880e1e

Verify and convert labels in option parser.

Verify labels, convert label list to label map, and raise errors
if necessary earlier. This allows label verification without cloning
skylab_inventory.

BUG=chromium:840039
TEST='atest host --skylab' with '-l'
CQ-DEPEND=CL:1063165

Change-Id: I7a3d2495e297bcf83d581f438d855ef9a7662c7d
Reviewed-on: https://chromium-review.googlesource.com/1063172
Tested-by: Ningning Xia <nxia@chromium.org>
Commit-Queue: Ningning Xia <nxia@chromium.org>
Reviewed-by: Ningning Xia <nxia@chromium.org>

cli/host.py

diff --git a/cli/host.py b/cli/host.py
index a5642e1..6afe415 100644
--- a/cli/host.py
+++ b/cli/host.py
@@ -184,6 +184,7 @@
 
         self.locked = options.locked
         self.unlocked = options.unlocked
+        self.label_map = None
 
         if self.skylab:
             if options.user or options.acl or options.status:
@@ -193,6 +194,9 @@
             if self.full_output and self.hostnames_only:
                 self.invalid_syntax('--full-output is conflicted with '
                                     '--hostnames-only.')
+
+            if self.labels:
+                self.label_map = device.convert_to_label_map(self.labels)
         else:
             if options.full_output:
                 self.invalid_syntax('--full_output is only supported with '
@@ -212,7 +216,7 @@
             lab,
             'duts',
             self.environment,
-            labels=self.labels,
+            label_map=self.label_map,
             hostnames=self.hosts,
             locked=self.locked,
             unlocked=self.unlocked)
@@ -482,13 +486,17 @@
 
         self._parse_lock_options(options)
 
-        if (self.skylab and
-            (options.protection or options.acls or options.alist or
-             options.platform)):
+        self.label_map = None
+        if self.skylab:
             # TODO(nxia): drop these flags when all hosts are migrated to skylab
-            self.invalid_syntax(
-                    '--protection, --acls, --alist or --platform is not '
-                    'supported with --skylab.')
+            if (options.protection or options.acls or options.alist or
+                options.platform):
+                self.invalid_syntax(
+                        '--protection, --acls, --alist or --platform is not '
+                        'supported with --skylab.')
+
+            if self.labels:
+                self.label_map = device.convert_to_label_map(self.labels)
 
         if options.protection:
             self.data['protection'] = options.protection
@@ -658,7 +666,7 @@
                         unlock_lock_id=self.unlock_lock_id,
                         attributes=self.attributes,
                         remove_labels=self.remove_labels,
-                        labels=self.labels)
+                        label_map=self.label_map)
                 successes.append(hostname)
             except device.SkylabDeviceActionError as e:
                 print('Cannot modify host %s: %s' % (hostname, e))