openstack
/
heat
Code Issues Proposed changes

Move cinder api version tests 

Move cinder api version tests to cinder
test module.

Change-Id: I587ac80468092d2d4e28f00b5d7448eebd4d52f5
This commit is contained in:
Rabi Mishra 2016-07-27 10:00:14 +05:30
parent cd125f328e
commit 2d61ac7763
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
heat/tests/clients/test_cinder_client.py
View File

@ -134,6 +134,27 @@ class VolumeBackupConstraintTest(common.HeatTestCase):
self.assertFalse(self.constraint.validate("bar", self.ctx))
class CinderClientAPIVersionTest(common.HeatTestCase):
def test_cinder_api_v1_and_v2(self):
self.stub_auth()
ctx = utils.dummy_context()
client = ctx.clients.client('cinder')
self.assertEqual(2, client.volume_api_version)
def test_cinder_api_v1_only(self):
self.stub_auth(only_services=['volume'])
ctx = utils.dummy_context()
client = ctx.clients.client('cinder')
self.assertEqual(1, client.volume_api_version)
def test_cinder_api_v2_only(self):
self.stub_auth(only_services=['volumev2'])
ctx = utils.dummy_context()
client = ctx.clients.client('cinder')
self.assertEqual(2, client.volume_api_version)
class CinderClientPluginExtensionsTest(CinderClientPluginTest):
"""Tests for extensions in cinderclient."""

21
heat/tests/clients/test_clients.py
View File

@ -1031,24 +1031,3 @@ class TestIsNotFound(common.HeatTestCase):
iue = self.is_unprocessable_entity
if iue != client_plugin.is_unprocessable_entity(e):
raise
class ClientAPIVersionTest(common.HeatTestCase):
def test_cinder_api_v1_and_v2(self):
self.stub_auth()
ctx = utils.dummy_context()
client = clients.Clients(ctx).client('cinder')
self.assertEqual(2, client.volume_api_version)
def test_cinder_api_v1_only(self):
self.stub_auth(only_services=['volume'])
ctx = utils.dummy_context()
client = clients.Clients(ctx).client('cinder')
self.assertEqual(1, client.volume_api_version)
def test_cinder_api_v2_only(self):
self.stub_auth(only_services=['volumev2'])
ctx = utils.dummy_context()
client = clients.Clients(ctx).client('cinder')
self.assertEqual(2, client.volume_api_version)