openstack
/
deb-python-zaqarclient
Code Issues Proposed changes

Fix flavor creation issue with CLI 

This issue was introduced by the renaming of pool to pool group. The
parameter name wasn't changed in https://review.openstack.org/#/c/276603/

Closes-Bug: #1679881

Change-Id: Id9de48ff1d687f77c2f4d9e75b66b042e19ad226
This commit is contained in:
Fei Long Wang 2017-04-05 14:28:45 +12:00
parent cbc572fdde
commit 79fa9447c7
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zaqarclient/queues/v1/cli.py
View File

@ -482,16 +482,12 @@ class CreateFlavor(command.ShowOne):
client = self.app.client_manager.messaging
# FIXME(flwang): For now, we still use `pool` though it's not really
# correct since it's representing `pool_group` actually. But given we
# will remove pool group soon and get a 1:n mapping for flavor:pool,
# so let's keep it as it's, just for now.
kwargs = {'capabilities': parsed_args.capabilities}
data = client.flavor(parsed_args.flavor_name,
pool=parsed_args.pool_group,
pool_group=parsed_args.pool_group,
**kwargs)
columns = ('Name', 'Pool', 'Capabilities')
columns = ('Name', 'Pool Group', 'Capabilities')
return columns, utils.get_item_properties(data, columns)
@ -535,7 +531,7 @@ class ShowFlavor(command.ShowOne):
client = self.app.client_manager.messaging
flavor_data = client.flavor(parsed_args.flavor_name,
auto_create=False).get()
columns = ('Name', 'Pool', 'Capabilities')
columns = ('Name', 'Pool Group', 'Capabilities')
return columns, utils.get_dict_properties(flavor_data, columns)
@ -574,10 +570,8 @@ class ListFlavors(command.Lister):
data = client.flavors(**kwargs)
columns = ("Name", 'Pool')
if parsed_args.detailed:
columns = ("Name", 'Pool', 'Capabilities')
return (columns,
(utils.get_item_properties(s, columns) for s in data))

8
zaqarclient/queues/v2/cli.py
View File

@ -242,19 +242,15 @@ class CreateFlavor(cli.CreateFlavor):
client = self.app.client_manager.messaging
# FIXME(flwang): For now, we still use `pool` though it's not really
# correct since it's representing `pool_group` actually. But given we
# will remove pool group soon and get a 1:n mapping for flavor:pool,
# so let's keep it as it's, just for now.
kwargs = {}
if parsed_args.capabilities != {}:
raise AttributeError("<--capabilities> option is only\
available in client api version < 2")
data = client.flavor(parsed_args.flavor_name,
pool=parsed_args.pool_group,
pool_group=parsed_args.pool_group,
**kwargs)
columns = ('Name', 'Pool', 'Capabilities')
columns = ('Name', 'Pool Group', 'Capabilities')
return columns, utils.get_item_properties(data, columns)