x/cloudcafe
Code Issues Proposed changes

Merge "Fix deprecated imports in Identity clients"

Browse Source
This commit is contained in:
Jenkins 2013-12-23 20:23:07 +00:00 committed by Gerrit Code Review
commit 952c232257
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudcafe/extensions/rax_auth/v2_0/tokens_api/client.py
View File

@ -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,

4
cloudcafe/identity/v2_0/extensions_api/client.py
View File

@ -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):
"""

4
cloudcafe/identity/v2_0/tenants_api/client.py
View File

@ -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):
"""

4
cloudcafe/identity/v2_0/tokens_api/client.py
View File

@ -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)