Fix LUQueryInstances fields.
authorIustin Pop <iustin@google.com>
Thu, 12 Feb 2009 17:03:33 +0000 (17:03 +0000)
committerIustin Pop <iustin@google.com>
Thu, 12 Feb 2009 17:03:33 +0000 (17:03 +0000)
The query fields are now regular expressions. We need to quote the dots,
otherwise invalid fields will be accepted but they will lose special
formatting in the cli scripts.

Reviewed-by: imsnah

lib/cmdlib.py

index 13480c6..6ebdd8c 100644 (file)
@@ -3141,11 +3141,11 @@ class LUQueryInstances(NoHooksLU):
                                     "disk_template", "ip", "mac", "bridge",
                                     "sda_size", "sdb_size", "vcpus", "tags",
                                     "network_port", "beparams",
-                                    "(disk).(size)/([0-9]+)",
-                                    "(disk).(sizes)", "disk_usage",
-                                    "(nic).(mac|ip|bridge)/([0-9]+)",
-                                    "(nic).(macs|ips|bridges)",
-                                    "(disk|nic).(count)",
+                                    r"(disk)\.(size)/([0-9]+)",
+                                    r"(disk)\.(sizes)", "disk_usage",
+                                    r"(nic)\.(mac|ip|bridge)/([0-9]+)",
+                                    r"(nic)\.(macs|ips|bridges)",
+                                    r"(disk|nic)\.(count)",
                                     "serial_no", "hypervisor", "hvparams",] +
                                   ["hv/%s" % name
                                    for name in constants.HVS_PARAMETERS] +