openstack/python-novaclient
Code Issues Proposed changes

Merge "novaclient: Convert v3 boot command with v2.1 spec (security-groups)"

Browse Source
This commit is contained in:
Jenkins 2014-09-17 01:24:37 +00:00 committed by Gerrit Code Review
commit 3cdfc609e5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/tests/v3/test_shell.py
View File

@ -273,8 +273,8 @@ class ShellTest(utils.TestCase):
self.assert_called_anytime( self.assert_called_anytime(
'POST', '/servers', 'POST', '/servers',
{'server': { {'server': {
'os-security-groups:security_groups': [{'name': 'secgroup1'}, 'security_groups': [{'name': 'secgroup1'},
{'name': 'secgroup2'}], {'name': 'secgroup2'}],
'flavor_ref': '1', 'flavor_ref': '1',
'name': 'some-server', 'name': 'some-server',
'image_ref': '1', 'image_ref': '1',

2
novaclient/v3/servers.py
View File

@ -428,7 +428,7 @@ class ServerManager(base.BootingManagerWithFind):
body["server"]["os-multiple-create:max_count"] = max_count body["server"]["os-multiple-create:max_count"] = max_count
if security_groups: if security_groups:
body["server"]["os-security-groups:security_groups"] = \ body["server"]["security_groups"] = \
[{'name': sg} for sg in security_groups] [{'name': sg} for sg in security_groups]
if availability_zone: if availability_zone: