Fix failing tests
diff --git a/libcloud/compute/drivers/cloudwatt.py b/libcloud/compute/drivers/cloudwatt.py
index 6039fbe..3032b67 100644
--- a/libcloud/compute/drivers/cloudwatt.py
+++ b/libcloud/compute/drivers/cloudwatt.py
@@ -47,6 +47,16 @@
self._ex_tenant_id = kwargs.pop("ex_tenant_id")
super(CloudwattAuthConnection, self).__init__(*args, **kwargs)
+ def morph_action_hook(self, action):
+ (_, _, _, request_path) = self._tuple_from_url(self.auth_url)
+
+ if request_path == "":
+ # No path is provided in the auth_url, use action passed to this
+ # method.
+ return action
+
+ return request_path
+
def authenticate(self, force=False):
reqbody = json.dumps(
{
diff --git a/libcloud/compute/drivers/kili.py b/libcloud/compute/drivers/kili.py
index 33ebba2..c846e7f 100644
--- a/libcloud/compute/drivers/kili.py
+++ b/libcloud/compute/drivers/kili.py
@@ -26,7 +26,7 @@
ENDPOINT_ARGS = {"service_type": "compute", "name": "nova", "region": "RegionOne"}
-AUTH_URL = "https://api.kili.io/keystone/v2.0/tokens"
+AUTH_URL = "https://api.kili.io/keystone"
class KiliCloudConnection(OpenStack_1_1_Connection):
diff --git a/libcloud/test/compute/test_kili.py b/libcloud/test/compute/test_kili.py
index ee9baa0..7824a1d 100644
--- a/libcloud/test/compute/test_kili.py
+++ b/libcloud/test/compute/test_kili.py
@@ -23,7 +23,7 @@
kwargs = self.openstack_connection_kwargs()
kwargs["get_endpoint_args"] = ENDPOINT_ARGS
# Remove keystone from the URL path so that the openstack base tests work
- kwargs["ex_force_auth_url"] = "https://api.kili.io/v2.0/tokens"
+ kwargs["ex_force_auth_url"] = "https://api.kili.io/"
kwargs["ex_tenant_name"] = self.tenant_name
return kwargs
