diff --git a/blazar/tests/utils/openstack/test_neutron.py b/blazar/tests/utils/openstack/test_neutron.py index 34beb51e..5beb7140 100644 --- a/blazar/tests/utils/openstack/test_neutron.py +++ b/blazar/tests/utils/openstack/test_neutron.py @@ -33,11 +33,13 @@ class TestBlazarNeutronClient(tests.TestCase): def test_client_from_kwargs(self): kwargs = { - 'auth_url': 'http://foo:8080/identity/v3' + 'auth_url': 'http://foo:8080/identity/v3', + 'region_name': 'RegionTwo' } client = neutron.BlazarNeutronClient(**kwargs) self.assertEqual("http://foo:8080/identity/v3", client.neutron.httpclient.session.auth.auth_url) + self.assertEqual("RegionTwo", client.neutron.httpclient.region_name) class TestFloatingIPPool(tests.TestCase): diff --git a/blazar/utils/openstack/neutron.py b/blazar/utils/openstack/neutron.py index 33e37d71..9b2778d6 100644 --- a/blazar/utils/openstack/neutron.py +++ b/blazar/utils/openstack/neutron.py @@ -43,6 +43,7 @@ class BlazarNeutronClient(object): project_domain_name = kwargs.pop('project_domain_name', CONF.os_admin_project_domain_name) auth_url = kwargs.pop('auth_url', None) + region_name = kwargs.pop('region_name', CONF.os_region_name) if auth_url is None: auth_url = "%s://%s:%s/%s/%s" % (CONF.os_auth_protocol, @@ -58,7 +59,8 @@ class BlazarNeutronClient(object): user_domain_name=user_domain_name, project_domain_name=project_domain_name) sess = session.Session(auth=auth) - self.neutron = neutron_client.Client(session=sess) + self.neutron = neutron_client.Client( + session=sess, region_name=region_name) class FloatingIPPool(BlazarNeutronClient):