openstack/python-novaclient
Code Issues Proposed changes

Fixed description for block_device_mapping parameter

Browse Source
This commit is contained in:
Gaurav Gupta 2011-10-26 10:57:08 -07:00
parent c37a8b3371
commit 98cbe4620e
2 changed files with 17 additions and 18 deletions
novaclient/v1_1
base.pyservers.py

6
novaclient/v1_1/base.py

@ -51,8 +51,8 @@ class BootingManagerWithFind(base.ManagerWithFind):
:param key_name: (optional extension) name of keypair to inject into
the instance
:param availability_zone: The :class:`Zone`.
:param block_device_mapping: A list of dict of block device mappingsi
for this server.
:param block_device_mapping: A dict of block device mappings for this
server.
"""
body = {"server": {
"name": name,
@ -101,7 +101,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
if availability_zone:
body["server"]["availability_zone"] = availability_zone
# Block device mappings are passed as a list of dictionaries
if block_device_mapping:
bdm = body['server']['block_device_mapping'] = []

29
novaclient/v1_1/servers.py

@ -355,10 +355,9 @@ class ServerManager(local_base.BootingManagerWithFind):
:param key_name: (optional extension) name of previously created
keypair to inject into the instance.
:param availability_zone: The :class:`Zone`.
:param block_device_mapping: (optional extension) A list of dict of
block device mappings for this server.
:param block_device_mapping: (optional extension) A dict of block device
mappings for this server.
"""
print block_device_mapping
if not min_count:
min_count = 1
if not max_count:
@ -367,20 +366,20 @@ class ServerManager(local_base.BootingManagerWithFind):
min_count = max_count
if block_device_mapping:
return self._boot("/os-volumes_boot", "server",
name, image, flavor,
meta=meta, files=files, userdata=userdata,
zone_blob=zone_blob, reservation_id=reservation_id,
min_count=min_count, max_count=max_count,
security_groups=security_groups, key_name=key_name,
availability_zone=availability_zone,
block_device_mapping=block_device_mapping)
name, image, flavor,
meta=meta, files=files, userdata=userdata,
zone_blob=zone_blob, reservation_id=reservation_id,
min_count=min_count, max_count=max_count,
security_groups=security_groups, key_name=key_name,
availability_zone=availability_zone,
block_device_mapping=block_device_mapping)
else:
return self._boot("/servers", "server", name, image, flavor,
meta=meta, files=files, userdata=userdata,
zone_blob=zone_blob, reservation_id=reservation_id,
min_count=min_count, max_count=max_count,
security_groups=security_groups, key_name=key_name,
availability_zone=availability_zone)
meta=meta, files=files, userdata=userdata,
zone_blob=zone_blob, reservation_id=reservation_id,
min_count=min_count, max_count=max_count,
security_groups=security_groups, key_name=key_name,
availability_zone=availability_zone)
def update(self, server, name=None):
"""