Skip to content

Commit d41d715

Browse files
ianwianw
committed
Replace bypass_url with os_endpoint
The --bypass-url argument was removed with I3b951cc4eb3adff23f3d2cbe674971816261ef56 so this name does not make sense now. Replace with os_endpoint. Change-Id: Ifa889cc2e885e9c621c8494995b2020195b696ca
1 parent 9c5a850 commit d41d715

6 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎cinderclient/client.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def __init__(self, user, password, projectid, auth_url=None,
277277
proxy_tenant_id=None, proxy_token=None, region_name=None,
278278
endpoint_type='publicURL', service_type=None,
279279
service_name=None, volume_service_name=None,
280-
bypass_url=None, retries=None,
280+
os_endpoint=None, retries=None,
281281
http_log_debug=False, cacert=None,
282282
auth_system='keystone', auth_plugin=None, api_version=None,
283283
logger=None, user_domain_name='Default',
@@ -304,11 +304,12 @@ def __init__(self, user, password, projectid, auth_url=None,
304304
self.service_type = service_type
305305
self.service_name = service_name
306306
self.volume_service_name = volume_service_name
307-
self.bypass_url = bypass_url.rstrip('/') if bypass_url else bypass_url
307+
self.os_endpoint = os_endpoint.rstrip('/') \
308+
if os_endpoint else os_endpoint
308309
self.retries = int(retries or 0)
309310
self.http_log_debug = http_log_debug
310311

311-
self.management_url = self.bypass_url or None
312+
self.management_url = self.os_endpoint or None
312313
self.auth_token = None
313314
self.proxy_token = proxy_token
314315
self.proxy_tenant_id = proxy_tenant_id
@@ -484,7 +485,7 @@ def get_volume_api_version_from_endpoint(self):
484485
try:
485486
version = get_volume_api_from_url(self.management_url)
486487
except exceptions.UnsupportedVersion as e:
487-
if self.management_url == self.bypass_url:
488+
if self.management_url == self.os_endpoint:
488489
msg = (_("Invalid url was specified in --os-endpoint %s")
489490
% six.text_type(e))
490491
else:
@@ -588,8 +589,8 @@ def authenticate(self):
588589
# existing token? If so, our actual endpoints may
589590
# be different than that of the admin token.
590591
if self.proxy_token:
591-
if self.bypass_url:
592-
self.set_management_url(self.bypass_url)
592+
if self.os_endpoint:
593+
self.set_management_url(self.os_endpoint)
593594
else:
594595
self._fetch_endpoints_from_auth(admin_url)
595596
# Since keystone no longer returns the user token
@@ -608,8 +609,8 @@ def authenticate(self):
608609
auth_url = auth_url + '/v2.0'
609610
self._v2_or_v3_auth(auth_url)
610611

611-
if self.bypass_url:
612-
self.set_management_url(self.bypass_url)
612+
if self.os_endpoint:
613+
self.set_management_url(self.os_endpoint)
613614
elif not self.management_url:
614615
raise exceptions.Unauthorized('Cinder Client')
615616

@@ -689,7 +690,7 @@ def _construct_http_client(username=None, password=None, project_id=None,
689690
region_name=None, endpoint_type='publicURL',
690691
service_type='volume',
691692
service_name=None, volume_service_name=None,
692-
bypass_url=None, retries=None,
693+
os_endpoint=None, retries=None,
693694
http_log_debug=False,
694695
auth_system='keystone', auth_plugin=None,
695696
cacert=None, tenant_id=None,
@@ -700,7 +701,7 @@ def _construct_http_client(username=None, password=None, project_id=None,
700701
if session:
701702
kwargs.setdefault('user_agent', 'python-cinderclient')
702703
kwargs.setdefault('interface', endpoint_type)
703-
kwargs.setdefault('endpoint_override', bypass_url)
704+
kwargs.setdefault('endpoint_override', os_endpoint)
704705

705706
return SessionClient(session=session,
706707
auth=auth,
@@ -728,7 +729,7 @@ def _construct_http_client(username=None, password=None, project_id=None,
728729
service_type=service_type,
729730
service_name=service_name,
730731
volume_service_name=volume_service_name,
731-
bypass_url=bypass_url,
732+
os_endpoint=os_endpoint,
732733
retries=retries,
733734
http_log_debug=http_log_debug,
734735
cacert=cacert,

‎cinderclient/shell.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ def main(self, argv):
718718
service_type=service_type,
719719
service_name=service_name,
720720
volume_service_name=volume_service_name,
721-
bypass_url=os_endpoint,
721+
os_endpoint=os_endpoint,
722722
retries=options.retries,
723723
http_log_debug=args.debug,
724724
insecure=insecure,

‎cinderclient/tests/unit/test_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ def test_construct_http_client_endpoint_url(
4949
os_endpoint = 'http://example.com/'
5050
httpclient_mock.return_value = None
5151
cinderclient.client._construct_http_client(
52-
bypass_url=os_endpoint)
52+
os_endpoint=os_endpoint)
5353
self.assertTrue(httpclient_mock.called)
5454
self.assertEqual(os_endpoint,
55-
httpclient_mock.call_args[1].get('bypass_url'))
55+
httpclient_mock.call_args[1].get('os_endpoint'))
5656
session_mock.assert_not_called()
5757

5858
def test_log_req(self):

‎cinderclient/tests/unit/test_http.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def get_authed_client(retries=0, **kwargs):
110110
def get_authed_endpoint_url(retries=0):
111111
cl = client.HTTPClient("username", "password",
112112
"project_id", "auth_test",
113-
bypass_url="volume/v100/", retries=retries)
113+
os_endpoint="volume/v100/", retries=retries)
114114
cl.auth_token = "token"
115115
return cl
116116

@@ -333,7 +333,7 @@ def test_post_call():
333333

334334
def test_os_endpoint_url(self):
335335
cl = get_authed_endpoint_url()
336-
self.assertEqual("volume/v100", cl.bypass_url)
336+
self.assertEqual("volume/v100", cl.os_endpoint)
337337
self.assertEqual("volume/v100", cl.management_url)
338338

339339
def test_auth_failure(self):

‎cinderclient/v2/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def __init__(self, username=None, api_key=None, project_id=None,
5555
proxy_tenant_id=None, proxy_token=None, region_name=None,
5656
endpoint_type='publicURL', extensions=None,
5757
service_type='volumev2', service_name=None,
58-
volume_service_name=None, bypass_url=None, retries=0,
58+
volume_service_name=None, os_endpoint=None, retries=0,
5959
http_log_debug=False, cacert=None, auth_system='keystone',
6060
auth_plugin=None, session=None, api_version=None,
6161
logger=None, **kwargs):
@@ -114,7 +114,7 @@ def __init__(self, username=None, api_key=None, project_id=None,
114114
service_type=service_type,
115115
service_name=service_name,
116116
volume_service_name=volume_service_name,
117-
bypass_url=bypass_url,
117+
os_endpoint=os_endpoint,
118118
retries=retries,
119119
http_log_debug=http_log_debug,
120120
cacert=cacert,

‎cinderclient/v3/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(self, username=None, api_key=None, project_id=None,
6161
proxy_tenant_id=None, proxy_token=None, region_name=None,
6262
endpoint_type='publicURL', extensions=None,
6363
service_type='volumev3', service_name=None,
64-
volume_service_name=None, bypass_url=None, retries=0,
64+
volume_service_name=None, os_endpoint=None, retries=0,
6565
http_log_debug=False, cacert=None, auth_system='keystone',
6666
auth_plugin=None, session=None, api_version=None,
6767
logger=None, **kwargs):
@@ -125,7 +125,7 @@ def __init__(self, username=None, api_key=None, project_id=None,
125125
service_type=service_type,
126126
service_name=service_name,
127127
volume_service_name=volume_service_name,
128-
bypass_url=bypass_url,
128+
os_endpoint=os_endpoint,
129129
retries=retries,
130130
http_log_debug=http_log_debug,
131131
cacert=cacert,

0 commit comments

Comments
 (0)