openstack
/
python-troveclient
Code Issues Proposed changes

Merge "cluster create passing availability zone incorrectly"

This commit is contained in:
Jenkins 2015-12-04 23:35:00 +00:00 committed by Gerrit Code Review
parent d820a44e34 6619050101
commit 7af776d06f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
troveclient/tests/test_v1_shell.py
View File

@ -283,13 +283,13 @@ class ShellTest(utils.TestCase):
'flavorRef': '2', 'flavorRef': '2',
'volume': {'size': '2'}, 'volume': {'size': '2'},
'nics': [{'net-id': 'some-id'}], 'nics': [{'net-id': 'some-id'}],
'availability-zone': '2' 'availability_zone': '2'
}, },
{ {
'flavorRef': '2', 'flavorRef': '2',
'volume': {'size': '2'}, 'volume': {'size': '2'},
'nics': [{'net-id': 'some-id'}], 'nics': [{'net-id': 'some-id'}],
'availability-zone': '2' 'availability_zone': '2'
}], }],
'datastore': {'version': '7.1', 'type': 'vertica'}, 'datastore': {'version': '7.1', 'type': 'vertica'},
'name': 'test-clstr1'}}) 'name': 'test-clstr1'}})

2
troveclient/v1/shell.py
View File

@ -603,7 +603,7 @@ def do_cluster_create(cs, args):
availability_zones = _get_availability_zones(instance_str) availability_zones = _get_availability_zones(instance_str)
if availability_zones: if availability_zones:
instance_info["availability-zone"] = availability_zones instance_info["availability_zone"] = availability_zones
instances.append(instance_info) instances.append(instance_info)