From 4e18c0f79bccba356f15e41ad44024295a1164af Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 18 May 2021 14:38:24 -0500 Subject: [PATCH] Remove old deprecated Token clients TokenClientJSON and V3TokenClientJSON were deprecated very long back so its time to remove them. No one in OpenStack using those - https://codesearch.opendev.org/?q=TokenClientJSON&i=nope&files=&excludeFiles=&repos= Change-Id: If20fa58e64e130e268e1ad7999b0088a0a0c0f9c --- ...precated-old-token-clients-e4c2e654132f1130.yaml | 9 +++++++++ tempest/lib/services/identity/v2/token_client.py | 13 ------------- tempest/lib/services/identity/v3/token_client.py | 13 ------------- 3 files changed, 9 insertions(+), 26 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-old-token-clients-e4c2e654132f1130.yaml diff --git a/releasenotes/notes/remove-deprecated-old-token-clients-e4c2e654132f1130.yaml b/releasenotes/notes/remove-deprecated-old-token-clients-e4c2e654132f1130.yaml new file mode 100644 index 0000000000..9acb8737c8 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-old-token-clients-e4c2e654132f1130.yaml @@ -0,0 +1,9 @@ +--- +prelude: > + Tempest's identity service client TokenClientJSON and V3TokenClientJSON + has been removed. +upgrade: + - | + Tempest's identity service client TokenClientJSON and V3TokenClientJSON + were deprecated since long which are not removed. Please use new service + clients TokenClient and V3TokenClient instead. diff --git a/tempest/lib/services/identity/v2/token_client.py b/tempest/lib/services/identity/v2/token_client.py index 9f10f58361..119115415e 100644 --- a/tempest/lib/services/identity/v2/token_client.py +++ b/tempest/lib/services/identity/v2/token_client.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from oslo_serialization import jsonutils as json from tempest.lib.common import rest_client @@ -125,15 +124,3 @@ class TokenClient(rest_client.RestClient): return body['token']['id'], body else: return body['token']['id'] - - -class TokenClientJSON(TokenClient): - LOG = logging.getLogger(__name__) - - def _warn(self): - self.LOG.warning("%s class was deprecated and renamed to %s", - self.__class__.__name__, 'TokenClient') - - def __init__(self, *args, **kwargs): - self._warn() - super(TokenClientJSON, self).__init__(*args, **kwargs) diff --git a/tempest/lib/services/identity/v3/token_client.py b/tempest/lib/services/identity/v3/token_client.py index 08a8f46fb9..c63966aa59 100644 --- a/tempest/lib/services/identity/v3/token_client.py +++ b/tempest/lib/services/identity/v3/token_client.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from oslo_serialization import jsonutils as json from tempest.lib.common import rest_client @@ -195,15 +194,3 @@ class V3TokenClient(rest_client.RestClient): return token, body['token'] else: return token - - -class V3TokenClientJSON(V3TokenClient): - LOG = logging.getLogger(__name__) - - def _warn(self): - self.LOG.warning("%s class was deprecated and renamed to %s", - self.__class__.__name__, 'V3TokenClient') - - def __init__(self, *args, **kwargs): - self._warn() - super(V3TokenClientJSON, self).__init__(*args, **kwargs)