summaryrefslogtreecommitdiff
path: root/openstackclient/compute/v2
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2012-05-10 16:25:31 -0500
committerDean Troyer <dtroyer@gmail.com>2012-05-11 12:08:05 -0500
commit5378322906a636bc2b9685e7403950549ef213f5 (patch)
tree8732f15445641e36c44d501f959d81b59a415dc2 /openstackclient/compute/v2
parent712a8c7f9c5c89071f7f3d87a8d4484921581cf6 (diff)
downloadpython-openstackclient-5378322906a636bc2b9685e7403950549ef213f5.tar.gz
Add tenant CRUD commands
* add {create|delete|set} tenant commands * move get_XXXX_properties() to common.utils.get_item_properties() add mixed_case_fields as an optional arg Change-Id: I7b3bd9cefb08e39730886b31213cbe422b5a8453
Diffstat (limited to 'openstackclient/compute/v2')
-rw-r--r--openstackclient/compute/v2/server.py26
1 files changed, 1 insertions, 25 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 69bfc7e8..1b6dbcbb 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -44,30 +44,6 @@ def _format_servers_list_networks(server):
return '; '.join(output)
-def get_server_properties(server, fields, formatters={}):
- """Return a tuple containing the server properties.
-
- :param server: a single Server resource
- :param fields: tuple of strings with the desired field names
- :param formatters: dictionary mapping field names to callables
- to format the values
- """
- row = []
- mixed_case_fields = ['serverId']
-
- for field in fields:
- if field in formatters:
- row.append(formatters[field](server))
- else:
- if field in mixed_case_fields:
- field_name = field.replace(' ', '_')
- else:
- field_name = field.lower().replace(' ', '_')
- data = getattr(server, field_name, '')
- row.append(data)
- return tuple(row)
-
-
class List_Server(command.OpenStackCommand, lister.Lister):
"List server command."
@@ -142,7 +118,7 @@ class List_Server(command.OpenStackCommand, lister.Lister):
columns = ('ID', 'Name', 'Status', 'Networks')
data = nova_client.servers.list(search_opts=search_opts)
return (columns,
- (get_server_properties(
+ (utils.get_item_properties(
s, columns,
formatters={'Networks': _format_servers_list_networks},
) for s in data),