summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute/v2/fakes.py
diff options
context:
space:
mode:
authorxiexs <xiexs@cn.fujitsu.com>2015-11-10 02:39:28 -0500
committerxiexs <xiexs@cn.fujitsu.com>2015-11-11 23:47:02 -0500
commit8b23c2690c90a6cafc58f8a72f04c8e33234ce37 (patch)
tree601f994b5e724d9ac81a45ccc71f853c3307219d /openstackclient/tests/compute/v2/fakes.py
parent6611f3781be44e7981f319073b2cb737bc0d0d0c (diff)
downloadpython-openstackclient-8b23c2690c90a6cafc58f8a72f04c8e33234ce37.tar.gz
Split the vol_id from a dev mapping
Add a split into the dev mapping to get the right vol_id. Change-Id: I1a7bf6351491b1321c5ca0fa4a27f29825400eaf Closes-Bug: #1514394
Diffstat (limited to 'openstackclient/tests/compute/v2/fakes.py')
-rw-r--r--openstackclient/tests/compute/v2/fakes.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
index 08eb5afa..13db0c01 100644
--- a/openstackclient/tests/compute/v2/fakes.py
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -20,6 +20,7 @@ from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils
+from openstackclient.tests.volume.v2 import fakes as volume_fakes
server_id = 'serv1'
@@ -80,6 +81,8 @@ QUOTA = {
QUOTA_columns = tuple(sorted(QUOTA))
QUOTA_data = tuple(QUOTA[x] for x in sorted(QUOTA))
+block_device_mapping = 'vda=' + volume_fakes.volume_name + ':::0'
+
class FakeComputev2Client(object):
def __init__(self, **kwargs):
@@ -95,6 +98,8 @@ class FakeComputev2Client(object):
self.flavors.resource_class = fakes.FakeResource(None, {})
self.quotas = mock.Mock()
self.quotas.resource_class = fakes.FakeResource(None, {})
+ self.volumes = mock.Mock()
+ self.volumes.resource_class = fakes.FakeResource(None, {})
self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint']
@@ -122,3 +127,8 @@ class TestComputev2(utils.TestCommand):
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
+
+ self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
+ endpoint=fakes.AUTH_URL,
+ token=fakes.AUTH_TOKEN,
+ )