From: Julia Varlamova <jvarlamova@mirantis.com>
Date: Thu, 29 Aug 2013 07:41:34 +0000 (+0400)
Subject: Add kwargs to create_volume in tests/utils.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=091a35080fe63fc7b83de883e8e07e406007f257;p=openstack-build%2Fcinder-build.git

Add kwargs to create_volume in tests/utils.py

Add availability_zone parameter and kwargs to make create_volume
function more flexible in order to use this function in
unit tests.
The goal is to remove inner _create_volume function in:
- db/test_transfers.py
- api/contrib/test_backups.py
- test_gpfs.py
- test_volume_transfer.py
- test_volume.py
and to use create_volume from tests/utils instead.

Change-Id: I2d9456ff3ff1cd945042f19c47e40f9f0ec0fe8a
---

diff --git a/cinder/tests/utils.py b/cinder/tests/utils.py
index 25e34513f..c623f3e7d 100644
--- a/cinder/tests/utils.py
+++ b/cinder/tests/utils.py
@@ -32,7 +32,9 @@ def create_volume(ctxt,
                   display_description='this is a test volume',
                   status='available',
                   migration_status=None,
-                  size=1):
+                  size=1,
+                  availability_zone='fake_az',
+                  **kwargs):
     """Create a volume object in the DB."""
     vol = {}
     vol['size'] = size
@@ -44,6 +46,9 @@ def create_volume(ctxt,
     vol['display_name'] = display_name
     vol['display_description'] = display_description
     vol['attach_status'] = 'detached'
+    vol['availability_zone'] = availability_zone
+    for key in kwargs:
+        vol[key] = kwargs[key]
     return db.volume_create(ctxt, vol)