فهرست منبع

Include auth_url when connecting

Nuwan Goonasekera 9 سال پیش
والد
کامیت
8d510d487b
2فایلهای تغییر یافته به همراه17 افزوده شده و 2 حذف شده
  1. 6 2
      cloudbridge/cloud/providers/openstack/provider.py
  2. 11 0
      test/test_security_service.py

+ 6 - 2
cloudbridge/cloud/providers/openstack/provider.py

@@ -184,6 +184,7 @@ class OpenStackCloudProvider(BaseCloudProvider):
 
         nova = nova_client.Client(
                 api_version, session=self._keystone_session,
+                auth_url=self.auth_url,
                 region_name=region_name,
                 service_name=service_name,
                 http_log_debug=True if self.config.debug_mode else False)
@@ -217,6 +218,7 @@ class OpenStackCloudProvider(BaseCloudProvider):
             os.environ.get('OS_VOLUME_API_VERSION', 2))
 
         return cinder_client.Client(api_version,
+                                    auth_url=self.auth_url,
                                     session=self._keystone_session,
                                     region_name=self.region_name)
 
@@ -234,9 +236,11 @@ class OpenStackCloudProvider(BaseCloudProvider):
 
     def _connect_swift(self):
         """Get an OpenStack Swift (object store) client object cloud."""
-        return swift_client.Connection(session=self._keystone_session)
+        return swift_client.Connection(authurl=self.auth_url,
+                                       session=self._keystone_session)
 
     def _connect_neutron(self):
         """Get an OpenStack Neutron (networking) client object cloud."""
-        return neutron_client.Client(session=self._keystone_session,
+        return neutron_client.Client(auth_url=self.auth_url,
+                                     session=self._keystone_session,
                                      region_name=self.region_name)

+ 11 - 0
test/test_security_service.py

@@ -186,6 +186,17 @@ class CloudSecurityServiceTestCase(ProviderTestBase):
             self.assertFalse(
                 sg != sg,
                 "The same security groups should still be equal?")
+            json_repr = json.dumps(
+                {"description": name, "name": name, "id": sg.id,
+                 "network_id": None, "rules":
+                    [{"from_port": 1111, "group": "", "cidr_ip": "0.0.0.0/0",
+                      "parent": sg.id, "to_port": 1111, "ip_protocol": "tcp",
+                      "id": sg.rules[0].id}]},
+                sort_keys=True)
+            self.assertTrue(
+                sg.to_json() == json_repr,
+                "JSON sec group representation {0} does not match expected {1}"
+                .format(sg.to_json(), json_repr))
 
         sgl = self.provider.security.security_groups.list()
         found_sg = [g for g in sgl if g.name == name]