Remove "deprecated" internal method
This method says it's deprecated but it's an internal method, so there's no need to deprecate it, just remove it. Change-Id: I916b4a5c9dc2320a4bff7f966fd0c7d5a4957ff9
This commit is contained in:
@@ -156,11 +156,6 @@ class Manager(object):
|
|||||||
resp, body = self.client.head(url, **kwargs)
|
resp, body = self.client.head(url, **kwargs)
|
||||||
return resp.status_code == 204
|
return resp.status_code == 204
|
||||||
|
|
||||||
def _create(self, url, body, response_key, return_raw=False, **kwargs):
|
|
||||||
"""Deprecated. Use `_post` instead.
|
|
||||||
"""
|
|
||||||
return self._post(url, body, response_key, return_raw, **kwargs)
|
|
||||||
|
|
||||||
def _post(self, url, body, response_key, return_raw=False, **kwargs):
|
def _post(self, url, body, response_key, return_raw=False, **kwargs):
|
||||||
"""Create an object.
|
"""Create an object.
|
||||||
|
|
||||||
@@ -338,7 +333,7 @@ class CrudManager(Manager):
|
|||||||
@filter_kwargs
|
@filter_kwargs
|
||||||
def create(self, **kwargs):
|
def create(self, **kwargs):
|
||||||
url = self.build_url(dict_args_in_out=kwargs)
|
url = self.build_url(dict_args_in_out=kwargs)
|
||||||
return self._create(
|
return self._post(
|
||||||
url,
|
url,
|
||||||
{self.key: kwargs},
|
{self.key: kwargs},
|
||||||
self.key)
|
self.key)
|
||||||
|
@@ -35,7 +35,7 @@ class CredentialsManager(base.ManagerWithFind):
|
|||||||
|
|
||||||
params = {'tenant_id': tenant_id}
|
params = {'tenant_id': tenant_id}
|
||||||
|
|
||||||
return self._create('/users/%s/credentials/OS-EC2' % user_id,
|
return self._post('/users/%s/credentials/OS-EC2' % user_id,
|
||||||
params, "credential")
|
params, "credential")
|
||||||
|
|
||||||
def list(self, user_id):
|
def list(self, user_id):
|
||||||
|
@@ -39,7 +39,7 @@ class EndpointManager(base.ManagerWithFind):
|
|||||||
'publicurl': publicurl,
|
'publicurl': publicurl,
|
||||||
'adminurl': adminurl,
|
'adminurl': adminurl,
|
||||||
'internalurl': internalurl}}
|
'internalurl': internalurl}}
|
||||||
return self._create('/endpoints', body, 'endpoint')
|
return self._post('/endpoints', body, 'endpoint')
|
||||||
|
|
||||||
def delete(self, id):
|
def delete(self, id):
|
||||||
"""Delete an endpoint."""
|
"""Delete an endpoint."""
|
||||||
|
@@ -36,7 +36,7 @@ class RoleManager(base.ManagerWithFind):
|
|||||||
def create(self, name):
|
def create(self, name):
|
||||||
"""Create a role."""
|
"""Create a role."""
|
||||||
params = {"role": {"name": name}}
|
params = {"role": {"name": name}}
|
||||||
return self._create('/OS-KSADM/roles', params, "role")
|
return self._post('/OS-KSADM/roles', params, "role")
|
||||||
|
|
||||||
def delete(self, role):
|
def delete(self, role):
|
||||||
"""Delete a role."""
|
"""Delete a role."""
|
||||||
|
@@ -40,7 +40,7 @@ class ServiceManager(base.ManagerWithFind):
|
|||||||
body = {"OS-KSADM:service": {'name': name,
|
body = {"OS-KSADM:service": {'name': name,
|
||||||
'type': service_type,
|
'type': service_type,
|
||||||
'description': description}}
|
'description': description}}
|
||||||
return self._create("/OS-KSADM/services", body, "OS-KSADM:service")
|
return self._post("/OS-KSADM/services", body, "OS-KSADM:service")
|
||||||
|
|
||||||
def delete(self, id):
|
def delete(self, id):
|
||||||
"""Delete a service."""
|
"""Delete a service."""
|
||||||
|
@@ -93,7 +93,7 @@ class TenantManager(base.ManagerWithFind):
|
|||||||
if k not in params['tenant']:
|
if k not in params['tenant']:
|
||||||
params['tenant'][k] = v
|
params['tenant'][k] = v
|
||||||
|
|
||||||
return self._create('/tenants', params, "tenant")
|
return self._post('/tenants', params, "tenant")
|
||||||
|
|
||||||
def list(self, limit=None, marker=None):
|
def list(self, limit=None, marker=None):
|
||||||
"""Get a list of tenants.
|
"""Get a list of tenants.
|
||||||
@@ -145,7 +145,7 @@ class TenantManager(base.ManagerWithFind):
|
|||||||
body['tenant'][k] = v
|
body['tenant'][k] = v
|
||||||
|
|
||||||
# Keystone's API uses a POST rather than a PUT here.
|
# Keystone's API uses a POST rather than a PUT here.
|
||||||
return self._create("/tenants/%s" % tenant_id, body, "tenant")
|
return self._post("/tenants/%s" % tenant_id, body, "tenant")
|
||||||
|
|
||||||
def delete(self, tenant):
|
def delete(self, tenant):
|
||||||
"""Delete a tenant."""
|
"""Delete a tenant."""
|
||||||
|
@@ -61,10 +61,10 @@ class TokenManager(base.Manager):
|
|||||||
# no endpoint that can satisfy the request (eg an unscoped token) then
|
# no endpoint that can satisfy the request (eg an unscoped token) then
|
||||||
# issue it against the auth_url.
|
# issue it against the auth_url.
|
||||||
try:
|
try:
|
||||||
token_ref = self._create(*args, **kwargs)
|
token_ref = self._post(*args, **kwargs)
|
||||||
except exceptions.EndpointNotFound:
|
except exceptions.EndpointNotFound:
|
||||||
kwargs['endpoint_filter'] = {'interface': auth.AUTH_INTERFACE}
|
kwargs['endpoint_filter'] = {'interface': auth.AUTH_INTERFACE}
|
||||||
token_ref = self._create(*args, **kwargs)
|
token_ref = self._post(*args, **kwargs)
|
||||||
|
|
||||||
return token_ref
|
return token_ref
|
||||||
|
|
||||||
|
@@ -100,7 +100,7 @@ class UserManager(base.ManagerWithFind):
|
|||||||
"tenantId": tenant_id,
|
"tenantId": tenant_id,
|
||||||
"email": email,
|
"email": email,
|
||||||
"enabled": enabled}}
|
"enabled": enabled}}
|
||||||
return self._create('/users', params, "user", log=not bool(password))
|
return self._post('/users', params, "user", log=not bool(password))
|
||||||
|
|
||||||
def delete(self, user):
|
def delete(self, user):
|
||||||
"""Delete a user."""
|
"""Delete a user."""
|
||||||
|
@@ -31,7 +31,7 @@ class EC2Manager(base.ManagerWithFind):
|
|||||||
|
|
||||||
# NOTE(jamielennox): Yes, this uses tenant_id as a key even though we
|
# NOTE(jamielennox): Yes, this uses tenant_id as a key even though we
|
||||||
# are in the v3 API.
|
# are in the v3 API.
|
||||||
return self._create('/users/%s/credentials/OS-EC2' % user_id,
|
return self._post('/users/%s/credentials/OS-EC2' % user_id,
|
||||||
body={'tenant_id': project_id},
|
body={'tenant_id': project_id},
|
||||||
response_key="credential")
|
response_key="credential")
|
||||||
|
|
||||||
|
@@ -73,7 +73,7 @@ class UserManager(base.CrudManager):
|
|||||||
enabled=enabled,
|
enabled=enabled,
|
||||||
**kwargs)
|
**kwargs)
|
||||||
|
|
||||||
return self._create('/users', {'user': user_data}, 'user',
|
return self._post('/users', {'user': user_data}, 'user',
|
||||||
log=not bool(password))
|
log=not bool(password))
|
||||||
|
|
||||||
@renames.renamed_kwarg('project', 'default_project', version='1.7.0',
|
@renames.renamed_kwarg('project', 'default_project', version='1.7.0',
|
||||||
|
Reference in New Issue
Block a user