Deprecate volume_service_name argument
We forgot about it while removing all methods related to Volume API. Change-Id: I465b91a17e2633ae876c0011bc8af6ec475c8d48
This commit is contained in:
parent
2e5576dafc
commit
0bdd24518e
@ -138,7 +138,6 @@ def _construct_http_client(api_version=None,
|
|||||||
user_domain_name=None,
|
user_domain_name=None,
|
||||||
user_id=None,
|
user_id=None,
|
||||||
username=None,
|
username=None,
|
||||||
volume_service_name=None,
|
|
||||||
**kwargs):
|
**kwargs):
|
||||||
if not session:
|
if not session:
|
||||||
if not auth and auth_token:
|
if not auth and auth_token:
|
||||||
@ -331,6 +330,7 @@ def Client(version, username=None, password=None, project_id=None,
|
|||||||
_check_arguments(kwargs, "Ocata", "proxy_tenant_id")
|
_check_arguments(kwargs, "Ocata", "proxy_tenant_id")
|
||||||
_check_arguments(kwargs, "Ocata", "proxy_token")
|
_check_arguments(kwargs, "Ocata", "proxy_token")
|
||||||
_check_arguments(kwargs, "Ocata", "connection_pool")
|
_check_arguments(kwargs, "Ocata", "connection_pool")
|
||||||
|
_check_arguments(kwargs, "Ocata", "volume_service_name")
|
||||||
|
|
||||||
api_version, client_class = _get_client_class_and_version(version)
|
api_version, client_class = _get_client_class_and_version(version)
|
||||||
kwargs.pop("direct_use", None)
|
kwargs.pop("direct_use", None)
|
||||||
|
@ -231,7 +231,6 @@ class SecretsHelper(object):
|
|||||||
self.client.endpoint_type,
|
self.client.endpoint_type,
|
||||||
self.client.service_type,
|
self.client.service_type,
|
||||||
self.client.service_name,
|
self.client.service_name,
|
||||||
self.client.volume_service_name,
|
|
||||||
]
|
]
|
||||||
for (index, key) in enumerate(keys):
|
for (index, key) in enumerate(keys):
|
||||||
if key is None:
|
if key is None:
|
||||||
@ -671,10 +670,8 @@ class OpenStackComputeShell(object):
|
|||||||
insecure = args.insecure
|
insecure = args.insecure
|
||||||
service_type = args.service_type
|
service_type = args.service_type
|
||||||
service_name = args.service_name
|
service_name = args.service_name
|
||||||
volume_service_name = args.volume_service_name
|
|
||||||
endpoint_override = args.endpoint_override
|
endpoint_override = args.endpoint_override
|
||||||
os_cache = args.os_cache
|
os_cache = args.os_cache
|
||||||
cert = args.os_cert
|
|
||||||
cacert = args.os_cacert
|
cacert = args.os_cacert
|
||||||
cert = args.os_cert
|
cert = args.os_cert
|
||||||
timeout = args.timeout
|
timeout = args.timeout
|
||||||
@ -762,7 +759,6 @@ class OpenStackComputeShell(object):
|
|||||||
region_name=os_region_name, endpoint_type=endpoint_type,
|
region_name=os_region_name, endpoint_type=endpoint_type,
|
||||||
extensions=self.extensions, service_type=service_type,
|
extensions=self.extensions, service_type=service_type,
|
||||||
service_name=service_name, auth_token=auth_token,
|
service_name=service_name, auth_token=auth_token,
|
||||||
volume_service_name=volume_service_name,
|
|
||||||
timings=args.timings, endpoint_override=endpoint_override,
|
timings=args.timings, endpoint_override=endpoint_override,
|
||||||
os_cache=os_cache, http_log_debug=args.debug,
|
os_cache=os_cache, http_log_debug=args.debug,
|
||||||
cacert=cacert, cert=cert, timeout=timeout,
|
cacert=cacert, cert=cert, timeout=timeout,
|
||||||
@ -830,7 +826,6 @@ class OpenStackComputeShell(object):
|
|||||||
region_name=os_region_name, endpoint_type=endpoint_type,
|
region_name=os_region_name, endpoint_type=endpoint_type,
|
||||||
extensions=self.extensions, service_type=service_type,
|
extensions=self.extensions, service_type=service_type,
|
||||||
service_name=service_name, auth_token=auth_token,
|
service_name=service_name, auth_token=auth_token,
|
||||||
volume_service_name=volume_service_name,
|
|
||||||
timings=args.timings, endpoint_override=endpoint_override,
|
timings=args.timings, endpoint_override=endpoint_override,
|
||||||
os_cache=os_cache, http_log_debug=args.debug,
|
os_cache=os_cache, http_log_debug=args.debug,
|
||||||
cacert=cacert, cert=cert, timeout=timeout,
|
cacert=cacert, cert=cert, timeout=timeout,
|
||||||
|
@ -98,7 +98,6 @@ class Client(object):
|
|||||||
user_domain_name=None,
|
user_domain_name=None,
|
||||||
user_id=None,
|
user_id=None,
|
||||||
username=None,
|
username=None,
|
||||||
volume_service_name=None,
|
|
||||||
**kwargs):
|
**kwargs):
|
||||||
"""Initialization of Client object.
|
"""Initialization of Client object.
|
||||||
|
|
||||||
@ -134,7 +133,6 @@ class Client(object):
|
|||||||
:param str user_domain_name: Name of user domain
|
:param str user_domain_name: Name of user domain
|
||||||
:param str user_id: User ID
|
:param str user_id: User ID
|
||||||
:param str username: Username
|
:param str username: Username
|
||||||
:param str volume_service_name: Volume Service Name
|
|
||||||
"""
|
"""
|
||||||
if direct_use:
|
if direct_use:
|
||||||
raise exceptions.Forbidden(
|
raise exceptions.Forbidden(
|
||||||
@ -256,7 +254,6 @@ class Client(object):
|
|||||||
user_domain_name=user_domain_name,
|
user_domain_name=user_domain_name,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
username=username,
|
username=username,
|
||||||
volume_service_name=volume_service_name,
|
|
||||||
**kwargs)
|
**kwargs)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- CLI argument for volume_service_name was deprecated long time ago. All
|
||||||
|
novaclient's methods for communication with Volume API were deprecated and
|
||||||
|
removed. There is no need to leave **volume_service_name** argument of
|
||||||
|
novaclient.client.Client entry-point since it is not used anywhere,
|
||||||
|
so it is removed now.
|
Loading…
Reference in New Issue
Block a user