Rename "k8s_master_url" to a better name
As k8s ha masters have been refined in [1], rename "k8s_master_url" to a better name "k8s_api_endpoint". [1]: https://review.openstack.org/#/c/204261 Change-Id: Iecdfda410b6c82a5ae4fa575eeb222f91f21ef5a Closes-Bug: #1477301
This commit is contained in:
parent
1dfd21e1a7
commit
03450e5907
|
@ -37,15 +37,15 @@ class K8sAPI(ApivbetaApi.ApivbetaApi):
|
|||
|
||||
def __init__(self, context, obj):
|
||||
# retrieve the URL of the k8s API endpoint
|
||||
k8s_master_url = self._retrieve_k8s_master_url(context, obj)
|
||||
k8s_api_endpoint = self._retrieve_k8s_api_endpoint(context, obj)
|
||||
|
||||
# build a connection with Kubernetes master
|
||||
client = swagger.ApiClient(k8s_master_url)
|
||||
client = swagger.ApiClient(k8s_api_endpoint)
|
||||
|
||||
super(K8sAPI, self).__init__(client)
|
||||
|
||||
@staticmethod
|
||||
def _retrieve_k8s_master_url(context, obj):
|
||||
def _retrieve_k8s_api_endpoint(context, obj):
|
||||
apiserver_port = cfg.CONF.kubernetes.k8s_port
|
||||
if hasattr(obj, 'bay_uuid'):
|
||||
obj = utils.retrieve_bay(context, obj)
|
||||
|
|
|
@ -22,9 +22,9 @@ from magnum.tests import base
|
|||
|
||||
class TestK8sAPI(base.TestCase):
|
||||
|
||||
def _test_retrieve_k8s_master_url(self, mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid,
|
||||
apiserver_port=None):
|
||||
def _test_retrieve_k8s_api_endpoint(self, mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid,
|
||||
apiserver_port=None):
|
||||
expected_context = 'context'
|
||||
expected_api_address = 'api_address'
|
||||
expected_baymodel_id = 'e74c40e0-d825-11e2-a28f-0800200c9a61'
|
||||
|
@ -45,31 +45,31 @@ class TestK8sAPI(base.TestCase):
|
|||
mock_bay_get_by_uuid.return_value = bay
|
||||
mock_baymodel_get_by_uuid.return_value = baymodel
|
||||
|
||||
actual_api_address = k8s_api.K8sAPI._retrieve_k8s_master_url(
|
||||
actual_api_endpoint = k8s_api.K8sAPI._retrieve_k8s_api_endpoint(
|
||||
expected_context, resource)
|
||||
self.assertEqual("%s://%s:%d" % (expected_protocol,
|
||||
expected_api_address,
|
||||
expected_apiserver_port),
|
||||
actual_api_address)
|
||||
actual_api_endpoint)
|
||||
|
||||
@patch('magnum.objects.Bay.get_by_uuid')
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
def test_retrieve_k8s_master_url(
|
||||
def test_retrieve_k8s_api_endpoint(
|
||||
self,
|
||||
mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid):
|
||||
self._test_retrieve_k8s_master_url(mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid,
|
||||
apiserver_port=9999)
|
||||
self._test_retrieve_k8s_api_endpoint(mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid,
|
||||
apiserver_port=9999)
|
||||
|
||||
@patch('magnum.objects.Bay.get_by_uuid')
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
def test_retrieve_k8s_master_url_without_baymodel_apiserver_port(
|
||||
def test_retrieve_k8s_api_endpoint_without_baymodel_apiserver_port(
|
||||
self,
|
||||
mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid):
|
||||
self._test_retrieve_k8s_master_url(mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid)
|
||||
self._test_retrieve_k8s_api_endpoint(mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid)
|
||||
|
||||
@patch('magnum.conductor.k8s_api.K8sAPI')
|
||||
def test_create_k8s_api(self, mock_k8s_api_cls):
|
||||
|
|
Loading…
Reference in New Issue