Merge "Remove old deprecated Token clients"

This commit is contained in:
Zuul 2021-05-25 01:41:40 +00:00 committed by Gerrit Code Review
commit 3b56cdb083
3 changed files with 9 additions and 26 deletions

View File

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

View File

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

View File

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