summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-06-15 14:47:18 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-06-15 14:47:18 +0900
commitc7e8f9ff46758ddbeecd049083bece013301bb59 (patch)
tree86cd89fd4a076ef55b522295e3ebc07a9efff144
parent06372798edf744ba28612e2bda688ba3b5f30bb3 (diff)
downloadnova-c7e8f9ff46758ddbeecd049083bece013301bb59.tar.gz
nova-c7e8f9ff46758ddbeecd049083bece013301bb59.tar.xz
nova-c7e8f9ff46758ddbeecd049083bece013301bb59.zip
block_device_mapping: don't use [] as default argument
-rw-r--r--nova/compute/api.py3
-rw-r--r--nova/virt/driver.py2
-rw-r--r--nova/virt/fake.py2
-rw-r--r--nova/virt/hyperv.py2
-rw-r--r--nova/virt/libvirt/connection.py12
-rw-r--r--nova/virt/vmwareapi_conn.py2
-rw-r--r--nova/virt/xenapi_conn.py2
7 files changed, 15 insertions, 10 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index a211bd4bb..3b3bea41b 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -150,12 +150,13 @@ class API(base.Base):
availability_zone=None, user_data=None, metadata={},
injected_files=None,
admin_password=None,
- block_device_mapping=[]):
+ block_device_mapping=None):
"""Create the number and type of instances requested.
Verifies that quota and other arguments are valid.
"""
+ block_device_mapping = block_device_mapping or []
if not instance_type:
instance_type = instance_types.get_default_instance_type()
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 773d60855..6341e81d2 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -61,7 +61,7 @@ class ComputeDriver(object):
"""Return a list of InstanceInfo for all registered VMs"""
raise NotImplementedError()
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
"""Launch a VM for the specified instance"""
raise NotImplementedError()
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 498c5ecbb..ab85de2e4 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -114,7 +114,7 @@ class FakeConnection(driver.ComputeDriver):
info_list.append(self._map_to_instance_info(instance))
return info_list
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
"""
Create a new instance/VM/domain on the virtualization platform.
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 216e90016..23e25e457 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -139,7 +139,7 @@ class HyperVConnection(driver.ComputeDriver):
return instance_infos
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
""" Create a new VM and start it."""
vm = self._lookup(instance.name)
if vm is not None:
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 0d22d6c41..6300d00a8 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -562,9 +562,10 @@ class LibvirtConnection(driver.ComputeDriver):
# NOTE(ilyaalekseyev): Implementation like in multinics
# for xenapi(tr3buchet)
@exception.wrap_exception
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
xml = self.to_xml(instance, False, network_info=network_info,
block_device_mapping=block_device_mapping)
+ block_device_mapping = block_device_mapping or []
self.firewall_driver.setup_basic_filtering(instance, network_info)
self.firewall_driver.prepare_instance_filter(instance, network_info)
self._create_image(instance, xml, network_info=network_info,
@@ -750,7 +751,8 @@ class LibvirtConnection(driver.ComputeDriver):
# TODO(vish): should we format disk by default?
def _create_image(self, inst, libvirt_xml, suffix='', disk_images=None,
- network_info=None, block_device_mapping=[]):
+ network_info=None, block_device_mapping=None):
+ block_device_mapping = block_device_mapping or []
if not network_info:
network_info = netutils.get_network_info(inst)
@@ -951,7 +953,8 @@ class LibvirtConnection(driver.ComputeDriver):
return False
def _prepare_xml_info(self, instance, rescue=False, network_info=None,
- block_device_mapping=[]):
+ block_device_mapping=None):
+ block_device_mapping = block_device_mapping or []
# TODO(adiantum) remove network_info creation code
# when multinics will be completed
if not network_info:
@@ -1006,7 +1009,8 @@ class LibvirtConnection(driver.ComputeDriver):
return xml_info
def to_xml(self, instance, rescue=False, network_info=None,
- block_device_mapping=[]):
+ block_device_mapping=None):
+ block_device_mapping = block_device_mapping or []
# TODO(termie): cache?
LOG.debug(_('instance %s: starting toXML method'), instance['name'])
xml_info = self._prepare_xml_info(instance, rescue, network_info,
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index a36b45d80..3c6345ec8 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -124,7 +124,7 @@ class VMWareESXConnection(driver.ComputeDriver):
"""List VM instances."""
return self._vmops.list_instances()
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
"""Create VM instance."""
self._vmops.spawn(instance)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 8c5e2201e..5fcec1715 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -194,7 +194,7 @@ class XenAPIConnection(driver.ComputeDriver):
def list_instances_detail(self):
return self._vmops.list_instances_detail()
- def spawn(self, instance, network_info=None, block_device_mapping=[]):
+ def spawn(self, instance, network_info=None, block_device_mapping=None):
"""Create VM instance"""
self._vmops.spawn(instance)