diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2012-05-16 11:25:34 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2012-05-16 11:44:18 -0500 |
| commit | 90f9f1dfa086f24975b4a11df9c7b46a07c430af (patch) | |
| tree | 82c638fa2541561d427d4e35ba91b89055761d32 /openstackclient/compute | |
| parent | d6a27627464a36f86ce63a81c733132231064536 (diff) | |
| download | python-openstackclient-90f9f1dfa086f24975b4a11df9c7b46a07c430af.tar.gz | |
Clean up tenant and server
* remove '_' from class names
* add class name to log instances
* some cleanups to HACKING
Change-Id: I1f6334318ee0d7d83cd3cea0e71ba4f05dd2b5c5
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 201e29f7..ab7ef93e 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -44,14 +44,14 @@ def _format_servers_list_networks(server): return '; '.join(output) -class List_Server(command.OpenStackCommand, lister.Lister): - "List server command." +class ListServer(command.OpenStackCommand, lister.Lister): + """List server command""" api = 'compute' - log = logging.getLogger(__name__) + log = logging.getLogger(__name__ + '.ListServer') def get_parser(self, prog_name): - parser = super(List_Server, self).get_parser(prog_name) + parser = super(ListServer, self).get_parser(prog_name) parser.add_argument( '--reservation-id', help='only return instances that match the reservation', @@ -125,14 +125,14 @@ class List_Server(command.OpenStackCommand, lister.Lister): ) -class Show_Server(command.OpenStackCommand, show.ShowOne): - "Show server command." +class ShowServer(command.OpenStackCommand, show.ShowOne): + """Show server command""" api = 'compute' - log = logging.getLogger(__name__) + log = logging.getLogger(__name__ + '.ShowServer') def get_parser(self, prog_name): - parser = super(Show_Server, self).get_parser(prog_name) + parser = super(ShowServer, self).get_parser(prog_name) parser.add_argument( 'server', metavar='<server>', @@ -164,7 +164,4 @@ class Show_Server(command.OpenStackCommand, show.ShowOne): # Remove a couple of values that are long and not too useful info.pop('links', None) - - columns = sorted(info.keys()) - values = [info[c] for c in columns] - return (columns, values) + return zip(*sorted(info.iteritems())) |