Merge "Remove XML related code from RestClient"
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 1df8896..576fc26 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -76,18 +76,6 @@
TYPE = "json"
- # This is used by _parse_resp method
- # Redefine it for purposes of your xml service client
- # List should contain top-xml_tag-names of data, which is like list/array
- # For example, in keystone it is users, roles, tenants and services
- # All of it has children with same tag-names
- list_tags = []
-
- # This is used by _parse_resp method too
- # Used for selection of dict-like xmls,
- # like metadata for Vms in nova, and volumes in cinder
- dict_tags = ["metadata", ]
-
LOG = logging.getLogger(__name__)
def __init__(self, auth_provider):
@@ -495,9 +483,8 @@
# (and occasionally swift) are using.
TXT_ENC = ['text/plain', 'text/html', 'text/html; charset=utf-8',
'text/plain; charset=utf-8']
- XML_ENC = ['application/xml', 'application/xml; charset=utf-8']
- if ctype.lower() in JSON_ENC or ctype.lower() in XML_ENC:
+ if ctype.lower() in JSON_ENC:
parse_resp = True
elif ctype.lower() in TXT_ENC:
parse_resp = False
@@ -569,13 +556,10 @@
if (not isinstance(resp_body, collections.Mapping) or
'retry-after' not in resp):
return True
- if self._get_type() is "json":
- over_limit = resp_body.get('overLimit', None)
- if not over_limit:
- return True
- return 'exceed' in over_limit.get('message', 'blabla')
- elif self._get_type() is "xml":
- return 'exceed' in resp_body.get('message', 'blabla')
+ over_limit = resp_body.get('overLimit', None)
+ if not over_limit:
+ return True
+ return 'exceed' in over_limit.get('message', 'blabla')
def wait_for_resource_deletion(self, id):
"""Waits for a resource to be deleted."""
diff --git a/tempest/services/identity/json/identity_client.py b/tempest/services/identity/json/identity_client.py
index e76c1bd..281464c 100644
--- a/tempest/services/identity/json/identity_client.py
+++ b/tempest/services/identity/json/identity_client.py
@@ -26,10 +26,6 @@
self.service = CONF.identity.catalog_type
self.endpoint_url = 'adminURL'
- # Needed for xml service client
- self.list_tags = ["roles", "tenants", "users", "services",
- "extensions"]
-
def has_admin_extensions(self):
"""
Returns True if the KSADM Admin Extensions are supported
@@ -335,9 +331,6 @@
body=None):
"""A simple HTTP request interface."""
if headers is None:
- # Always accept 'json', for TokenClientXML too.
- # Because XML response is not easily
- # converted to the corresponding JSON one
headers = self.get_headers(accept_type="json")
elif extra_headers:
try: