start add of --image, --flavor, --status, and --host options to 'list…

…' command. also fix up differences with --name and --display_name compared to how nova implementation turned out
openstack · Aug 12, 2011 · dcd5544 · dcd5544
1 parent d14d2b0
commit dcd5544
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 18 deletions.
diff --git a/novaclient/v1_0/shell.py b/novaclient/v1_0/shell.py
@@ -452,21 +452,37 @@ def do_ipgroup_delete(cs, args):
     metavar='<ip6_regexp>',
     default=None,
     help='Search with regular expression match by IPv6 address')
-@utils.arg('--server_name',
-    dest='server_name',
-    metavar='<name_regexp>',
-    default=None,
-    help='Search with regular expression match by server name')
 @utils.arg('--name',
-    dest='display_name',
+    dest='name',
     metavar='<name_regexp>',
     default=None,
-    help='Search with regular expression match by display name')
+    help='Search with regular expression match by name')
 @utils.arg('--instance_name',
-    dest='name',
+    dest='instance_name',
     metavar='<name_regexp>',
     default=None,
     help='Search with regular expression match by instance name')
+@utils.arg('--status',
+    dest='status',
+    metavar='<status>',
+    default=None,
+    help='Search by server status')
+@utils.arg('--flavor',
+    dest='flavor',
+    metavar='<flavor>',
+    type=int,
+    default=None,
+    help='Search by flavor ID')
+@utils.arg('--image',
+    dest='image',
+    metavar='<image>',
+    default=None,
+    help='Search by image ID')
+@utils.arg('--host',
+    dest='host',
+    metavar='<hostname>',
+    default=None,
+    help="Search by instances by hostname to which they are assigned")
 def do_list(cs, args):
     """List active servers."""
     recurse_zones = args.recurse_zones
@@ -477,7 +493,6 @@ def do_list(cs, args):
             'ip': args.ip,
             'ip6': args.ip6,
             'name': args.name,
-            'server_name': args.server_name,
             'display_name': args.display_name}
     if recurse_zones:
         to_print = ['UUID', 'Name', 'Status', 'Public IP', 'Private IP']

diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
@@ -279,21 +279,37 @@ def do_image_delete(cs, args):
     metavar='<ip6_regexp>',
     default=None,
     help='Search with regular expression match by IPv6 address')
-@utils.arg('--server_name',
-    dest='server_name',
-    metavar='<name_regexp>',
-    default=None,
-    help='Search with regular expression match by server name')
 @utils.arg('--name',
-    dest='display_name',
+    dest='name',
     metavar='<name_regexp>',
     default=None,
-    help='Search with regular expression match by display name')
+    help='Search with regular expression match by name')
 @utils.arg('--instance_name',
-    dest='name',
+    dest='instance_name',
     metavar='<name_regexp>',
     default=None,
     help='Search with regular expression match by instance name')
+@utils.arg('--status',
+    dest='status',
+    metavar='<status>',
+    default=None,
+    help='Search by server status')
+@utils.arg('--flavor',
+    dest='flavor',
+    metavar='<flavor>',
+    type=int,
+    default=None,
+    help='Search by flavor ID')
+@utils.arg('--image',
+    dest='image',
+    metavar='<image>',
+    default=None,
+    help='Search by image ID')
+@utils.arg('--host',
+    dest='host',
+    metavar='<hostname>',
+    default=None,
+    help='Search instances by hostname to which they are assigned')
 def do_list(cs, args):
     """List active servers."""
     recurse_zones = args.recurse_zones
@@ -304,7 +320,6 @@ def do_list(cs, args):
             'ip': args.ip,
             'ip6': args.ip6,
             'name': args.name,
-            'server_name': args.server_name,
             'display_name': args.display_name}
 
     if recurse_zones: