summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorMORITA Kazutaka <morita.kazutaka@gmail.com>2011-05-25 16:27:28 +0900
committerMORITA Kazutaka <morita.kazutaka@gmail.com>2011-05-25 16:27:28 +0900
commit17abaeafaf3fed2847e4377a16b47771eb663304 (patch)
tree78511424d13738a154003ea8f235d423e8f10d29 /nova
parent6f010bd28983c0d7cc956a52934b1b6460ef3955 (diff)
Fix wrong call of the volume api create()
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/contrib/volumes.py2
-rw-r--r--nova/tests/test_quota.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/contrib/volumes.py b/nova/api/openstack/contrib/volumes.py
index 18de2ec71..b22bd2846 100644
--- a/nova/api/openstack/contrib/volumes.py
+++ b/nova/api/openstack/contrib/volumes.py
@@ -135,7 +135,7 @@ class VolumeController(wsgi.Controller):
vol = env['volume']
size = vol['size']
LOG.audit(_("Create volume of %s GB"), size, context=context)
- new_volume = self.volume_api.create(context, size,
+ new_volume = self.volume_api.create(context, size, None,
vol.get('display_name'),
vol.get('display_description'))
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 7ace2ad7d..990068fae 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -228,6 +228,7 @@ class QuotaTestCase(test.TestCase):
volume.API().create,
self.context,
size=10,
+ snapshot_id=None,
name='',
description='')
for volume_id in volume_ids:
@@ -241,6 +242,7 @@ class QuotaTestCase(test.TestCase):
volume.API().create,
self.context,
size=10,
+ snapshot_id=None,
name='',
description='')
for volume_id in volume_ids: