From de1714f659e7529712300a85f43e33a5530e606e Mon Sep 17 00:00:00 2001 From: Daryl Walleck Date: Mon, 23 Dec 2013 10:54:09 -0600 Subject: [PATCH] Fix deprecated imports in Identity clients * Changed all imports in Identity and extension clients to AutoMarshallingHTTPClient Change-Id: I5b89fa1dc2b5747e0c1674c5e7475793d8ad51ca --- cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py | 5 ++--- cloudcafe/identity/v2_0/extensions_api/client.py | 4 ++-- cloudcafe/identity/v2_0/tenants_api/client.py | 4 ++-- cloudcafe/identity/v2_0/tokens_api/client.py | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py b/cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py index 8d4ec2d2..b0b7baa5 100644 --- a/cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py +++ b/cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -from cafe.engine.clients.rest import AutoMarshallingRestClient - +from cafe.engine.http.client import AutoMarshallingHTTPClient from cloudcafe.extensions.rax_auth.v2_0.tokens_api.models.requests. \ auth import Auth as AuthRequest from cloudcafe.extensions.rax_auth.v2_0.tokens_api.models.responses. \ @@ -27,7 +26,7 @@ _version = 'v2.0' _tokens = 'tokens' -class BaseTokenAPI_Client(AutoMarshallingRestClient): +class BaseTokenAPI_Client(AutoMarshallingHTTPClient): def __init__(self, serialize_format, deserialize_format=None): super(BaseTokenAPI_Client, self).__init__(serialize_format, diff --git a/cloudcafe/identity/v2_0/extensions_api/client.py b/cloudcafe/identity/v2_0/extensions_api/client.py index 6e6c5d01..dbe88bfe 100644 --- a/cloudcafe/identity/v2_0/extensions_api/client.py +++ b/cloudcafe/identity/v2_0/extensions_api/client.py @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -from cafe.engine.clients.rest import AutoMarshallingRestClient +from cafe.engine.http.client import AutoMarshallingHTTPClient from cloudcafe.identity.v2_0.common.models.constants import AdminExtensions from cloudcafe.identity.v2_0.extensions_api.models.responses.extensions \ import Extensions @@ -25,7 +25,7 @@ _version = 'v2.0' _admin_extensions = AdminExtensions.OS_KS_ADM -class ExtensionsAPI_Client(AutoMarshallingRestClient): +class ExtensionsAPI_Client(AutoMarshallingHTTPClient): def __init__(self, url=None, auth_token=None, serialized_format=None, deserialized_format=None): """ diff --git a/cloudcafe/identity/v2_0/tenants_api/client.py b/cloudcafe/identity/v2_0/tenants_api/client.py index 633ccaf7..8ce501a7 100644 --- a/cloudcafe/identity/v2_0/tenants_api/client.py +++ b/cloudcafe/identity/v2_0/tenants_api/client.py @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -from cafe.engine.clients.rest import AutoMarshallingRestClient +from cafe.engine.http.client import AutoMarshallingHTTPClient from cloudcafe.identity.v2_0.tenants_api.models.responses.tenant import \ Tenants, Tenant from cloudcafe.identity.v2_0.tenants_api.models.responses.role import \ @@ -29,7 +29,7 @@ _version = 'v2.0' _admin_extensions = AdminExtensions.OS_KS_ADM -class TenantsAPI_Client(AutoMarshallingRestClient): +class TenantsAPI_Client(AutoMarshallingHTTPClient): def __init__(self, url, auth_token, serialize_format=None, deserialize_format=None): """ diff --git a/cloudcafe/identity/v2_0/tokens_api/client.py b/cloudcafe/identity/v2_0/tokens_api/client.py index baede741..8a720012 100644 --- a/cloudcafe/identity/v2_0/tokens_api/client.py +++ b/cloudcafe/identity/v2_0/tokens_api/client.py @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -from cafe.engine.clients.rest import AutoMarshallingRestClient +from cafe.engine.http.client import AutoMarshallingHTTPClient from cloudcafe.identity.v2_0.tokens_api.models.requests.auth import \ Auth as AuthRequest from cloudcafe.identity.v2_0.tokens_api.models.responses.access import \ @@ -26,7 +26,7 @@ _version = 'v2.0' _tokens = 'tokens' -class BaseTokenAPI_Client(AutoMarshallingRestClient): +class BaseTokenAPI_Client(AutoMarshallingHTTPClient): def __init__(self, serialize_format, deserialize_format=None): super(BaseTokenAPI_Client, self).__init__(serialize_format, deserialize_format)