"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "sahara/tests/unit/utils/test_cinder.py" between
sahara-14.0.0.tar.gz and sahara-15.0.0.tar.gz

About: OpenStack Sahara provides an ability to provision, start, shutdown, scale Hadoop cluster on OpenStack.
The "Xena" series (latest release).

test_cinder.py  (sahara-14.0.0)	:	test_cinder.py  (sahara-15.0.0)
skipping to change at line 34		skipping to change at line 34
from sahara.utils.openstack import cinder		from sahara.utils.openstack import cinder
CONF = cfg.CONF		CONF = cfg.CONF
class TestCinder(test_base.SaharaTestCase):		class TestCinder(test_base.SaharaTestCase):
def setup_context(self, username="test_user", tenant_id="tenant_1",		def setup_context(self, username="test_user", tenant_id="tenant_1",
token="test_auth_token", tenant_name='test_tenant',		token="test_auth_token", tenant_name='test_tenant',
**kwargs):		**kwargs):
self.override_config('os_region_name', 'RegionOne')		self.override_config('os_region_name', 'RegionOne')
# Fake service_catalog with both volumev2
# and volumev3 services available
service_catalog = '''[		service_catalog = '''[
{ "type": "volumev2",
"endpoints": [ { "region": "RegionOne",
"internalURL": "http://localhost/" } ] },
{ "type": "volumev3",		{ "type": "volumev3",
"endpoints": [ { "region": "RegionOne",		"endpoints": [ { "region": "RegionOne",
"internalURL": "http://localhost/" } ] }]'''		"internalURL": "http://localhost/" } ] }]'''
super(TestCinder, self).setup_context(		super(TestCinder, self).setup_context(
username=username, tenant_id=tenant_id, token=token,		username=username, tenant_id=tenant_id, token=token,
tenant_name=tenant_name, service_catalog=service_catalog, **kwargs)		tenant_name=tenant_name, service_catalog=service_catalog, **kwargs)
@mock.patch('sahara.utils.openstack.keystone.auth')		@mock.patch('sahara.utils.openstack.keystone.auth')
@mock.patch('cinderclient.v3.client.Client')		@mock.patch('cinderclient.v3.client.Client')
@mock.patch('cinderclient.v2.client.Client')		def test_get_cinder_client_api_v3(self, patched3, auth):
def test_get_cinder_client_api_v2(self, patched2, patched3, auth):
self.override_config('api_version', 2, group='cinder')
patched2.return_value = FakeCinderClient(2)
patched3.return_value = FakeCinderClient(3)
client = cinder.client()
self.assertEqual(2, client.client.api_version)
@mock.patch('sahara.utils.openstack.keystone.auth')
@mock.patch('cinderclient.v3.client.Client')
@mock.patch('cinderclient.v2.client.Client')
def test_get_cinder_client_api_v3(self, patched2, patched3, auth):
self.override_config('api_version', 3, group='cinder')		self.override_config('api_version', 3, group='cinder')
patched2.return_value = FakeCinderClient(2)
patched3.return_value = FakeCinderClient(3)		patched3.return_value = FakeCinderClient(3)
client = cinder.client()		client = cinder.client()
self.assertEqual(3, client.client.api_version)		self.assertEqual(3, client.client.api_version)
def test_cinder_bad_api_version(self):		def test_cinder_bad_api_version(self):
self.override_config('api_version', 1, group='cinder')		self.override_config('api_version', 1, group='cinder')
cinder.validate_config()		cinder.validate_config()
# Check bad version falls back to latest supported version		# Check bad version falls back to latest supported version
End of changes. 4 change blocks.
19 lines changed or deleted		1 lines changed or added

---