diff options
author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-08 11:44:41 -0400 |
---|---|---|
committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-08 11:44:41 -0400 |
commit | 6d1361c9f41b20b3b95223d76fc4bfd8d6df7782 (patch) | |
tree | 9f9ab56c6cffee5255717fa4d4f6123997531833 | |
parent | 7e5a474d0d42ce88977d418016398c04ee393c72 (diff) | |
download | python-novaclient-6d1361c9f41b20b3b95223d76fc4bfd8d6df7782.tar.gz |
cleaning up boot output; upping version
-rw-r--r-- | docs/conf.py | 4 | ||||
-rw-r--r-- | novaclient/v1_1/shell.py | 16 | ||||
-rw-r--r-- | setup.py | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 21316fc8..722419cb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,9 +45,9 @@ copyright = u'Rackspace, based on work by Jacob Kaplan-Moss' # built documents. # # The short X.Y version. -version = '2.5' +version = '2.6' # The full version, including alpha/beta/rc tags. -release = '2.5.9' +release = '2.6.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py index dfa26a14..5b004c68 100644 --- a/novaclient/v1_1/shell.py +++ b/novaclient/v1_1/shell.py @@ -121,7 +121,21 @@ def do_boot(cs, args): files=files, min_count=min_count, max_count=max_count) - utils.print_dict(server._info) + + info = server._info + + flavor = info.get('flavor', {}) + flavor_id = flavor.get('id', '') + info['flavor'] = _find_flavor(cs, flavor_id).name + + image = info.get('image', {}) + image_id = image.get('id', '') + info['image'] = _find_image(cs, image_id).name + + info.pop('links', None) + info.pop('addresses', None) + + utils.print_dict(info) @utils.arg('--flavor', @@ -12,7 +12,7 @@ if sys.version_info < (2, 6): setup( name = "python-novaclient", - version = "2.6.0", + version = "2.6.1", description = "Client library for OpenStack Nova API", long_description = read('README.rst'), url = 'https://github.com/rackspace/python-novaclient', |