Correct typo for function name
Change 'retrive' to 'retrieve' for some function name Change-Id: Ia6a16615641d81c63a8d64cd8a7f0e3fe35e8d82
This commit is contained in:
Jay Lau (Guangya Liu)
parent
ce918d5689
commit
d0785caf3c
|
|
@ -37,21 +37,21 @@ kubernetes_opts = [
|
|||
cfg.CONF.register_opts(kubernetes_opts, group='kubernetes')
|
||||
|
||||
|
||||
def _retrive_bay(ctxt, obj):
|
||||
def _retrieve_bay(ctxt, obj):
|
||||
bay_uuid = obj.bay_uuid
|
||||
return objects.Bay.get_by_uuid(ctxt, bay_uuid)
|
||||
|
||||
|
||||
def _retrive_baymodel(ctxt, obj):
|
||||
def _retrieve_baymodel(ctxt, obj):
|
||||
return objects.BayModel.get_by_uuid(ctxt, obj.baymodel_id)
|
||||
|
||||
|
||||
def _retrive_k8s_master_url(ctxt, obj):
|
||||
def _retrieve_k8s_master_url(ctxt, obj):
|
||||
apiserver_port = cfg.CONF.kubernetes.k8s_port
|
||||
if hasattr(obj, 'bay_uuid'):
|
||||
obj = _retrive_bay(ctxt, obj)
|
||||
obj = _retrieve_bay(ctxt, obj)
|
||||
|
||||
baymodel = _retrive_baymodel(ctxt, obj)
|
||||
baymodel = _retrieve_baymodel(ctxt, obj)
|
||||
if baymodel.apiserver_port is not None:
|
||||
apiserver_port = baymodel.apiserver_port
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ def _retrive_k8s_master_url(ctxt, obj):
|
|||
def _object_has_stack(ctxt, obj):
|
||||
osc = clients.OpenStackClients(ctxt)
|
||||
if hasattr(obj, 'bay_uuid'):
|
||||
obj = _retrive_bay(ctxt, obj)
|
||||
obj = _retrieve_bay(ctxt, obj)
|
||||
|
||||
stack = osc.heat().stacks.get(obj.stack_id)
|
||||
if (stack.stack_status == 'DELETE_COMPLETE' or
|
||||
|
|
@ -91,7 +91,7 @@ class Handler(object):
|
|||
|
||||
def service_create(self, ctxt, service):
|
||||
LOG.debug("service_create")
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, service)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, service)
|
||||
# trigger a kubectl command
|
||||
status = self.kube_cli.service_create(k8s_master_url, service)
|
||||
if not status:
|
||||
|
|
@ -117,7 +117,7 @@ class Handler(object):
|
|||
def service_delete(self, ctxt, uuid):
|
||||
LOG.debug("service_delete")
|
||||
service = objects.Service.get_by_uuid(ctxt, uuid)
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, service)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, service)
|
||||
if _object_has_stack(ctxt, service):
|
||||
# trigger a kubectl command
|
||||
status = self.kube_cli.service_delete(k8s_master_url, service.name)
|
||||
|
|
@ -137,7 +137,7 @@ class Handler(object):
|
|||
# Pod Operations
|
||||
def pod_create(self, ctxt, pod):
|
||||
LOG.debug("pod_create")
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, pod)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, pod)
|
||||
# trigger a kubectl command
|
||||
status = self.kube_cli.pod_create(k8s_master_url, pod)
|
||||
# TODO(yuanying): Is this correct location of updating status?
|
||||
|
|
@ -172,7 +172,7 @@ class Handler(object):
|
|||
LOG.debug("pod_delete ")
|
||||
# trigger a kubectl command
|
||||
pod = objects.Pod.get_by_uuid(ctxt, uuid)
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, pod)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, pod)
|
||||
if _object_has_stack(ctxt, pod):
|
||||
status = self.kube_cli.pod_delete(k8s_master_url, pod.name)
|
||||
if not status:
|
||||
|
|
@ -191,7 +191,7 @@ class Handler(object):
|
|||
# Replication Controller Operations
|
||||
def rc_create(self, ctxt, rc):
|
||||
LOG.debug("rc_create")
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, rc)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, rc)
|
||||
# trigger a kubectl command
|
||||
status = self.kube_cli.rc_create(k8s_master_url, rc)
|
||||
if not status:
|
||||
|
|
@ -213,7 +213,7 @@ class Handler(object):
|
|||
def rc_delete(self, ctxt, uuid):
|
||||
LOG.debug("rc_delete ")
|
||||
rc = objects.ReplicationController.get_by_uuid(ctxt, uuid)
|
||||
k8s_master_url = _retrive_k8s_master_url(ctxt, rc)
|
||||
k8s_master_url = _retrieve_k8s_master_url(ctxt, rc)
|
||||
if _object_has_stack(ctxt, rc):
|
||||
# trigger a kubectl command
|
||||
status = self.kube_cli.pod_delete(k8s_master_url, rc.name)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class TestKube(base.BaseTestCase):
|
|||
return objects.BayModel({})
|
||||
|
||||
@patch('magnum.objects.Bay.get_by_uuid')
|
||||
def test_retrive_bay_from_pod(self,
|
||||
def test_retrieve_bay_from_pod(self,
|
||||
mock_bay_get_by_uuid):
|
||||
expected_context = 'context'
|
||||
expected_bay_uuid = 'bay_uuid'
|
||||
|
|
@ -57,14 +57,14 @@ class TestKube(base.BaseTestCase):
|
|||
pod = self.mock_pod()
|
||||
pod.bay_uuid = expected_bay_uuid
|
||||
|
||||
kube._retrive_bay(expected_context, pod)
|
||||
kube._retrieve_bay(expected_context, pod)
|
||||
|
||||
mock_bay_get_by_uuid.assert_called_once_with(expected_context,
|
||||
expected_bay_uuid)
|
||||
|
||||
@patch('magnum.objects.Bay.get_by_uuid')
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
def test_retrive_k8s_master_url_from_pod(self,
|
||||
def test_retrieve_k8s_master_url_from_pod(self,
|
||||
mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid):
|
||||
expected_context = 'context'
|
||||
|
|
@ -83,7 +83,7 @@ class TestKube(base.BaseTestCase):
|
|||
mock_bay_get_by_uuid.return_value = bay
|
||||
mock_baymodel_get_by_uuid.return_value = baymodel
|
||||
|
||||
actual_master_address = kube._retrive_k8s_master_url(expected_context,
|
||||
actual_master_address = kube._retrieve_k8s_master_url(expected_context,
|
||||
pod)
|
||||
self.assertEqual("http://%s:%d" % (expected_master_address,
|
||||
expected_apiserver_port),
|
||||
|
|
@ -91,7 +91,7 @@ class TestKube(base.BaseTestCase):
|
|||
|
||||
@patch('magnum.objects.Bay.get_by_uuid')
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
def test_retrive_k8s_master_url_without_baymodel_apiserver_port(self,
|
||||
def test_retrieve_k8s_master_url_without_baymodel_apiserver_port(self,
|
||||
mock_baymodel_get_by_uuid,
|
||||
mock_bay_get_by_uuid):
|
||||
expected_context = 'context'
|
||||
|
|
@ -111,49 +111,49 @@ class TestKube(base.BaseTestCase):
|
|||
mock_bay_get_by_uuid.return_value = bay
|
||||
mock_baymodel_get_by_uuid.return_value = baymodel
|
||||
|
||||
actual_master_address = kube._retrive_k8s_master_url(expected_context,
|
||||
actual_master_address = kube._retrieve_k8s_master_url(expected_context,
|
||||
resource)
|
||||
self.assertEqual("%s://%s:%d" % (expected_protocol,
|
||||
expected_master_address,
|
||||
expected_apiserver_port),
|
||||
actual_master_address)
|
||||
|
||||
@patch('magnum.conductor.handlers.kube._retrive_k8s_master_url')
|
||||
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')
|
||||
def test_pod_create_with_success(self,
|
||||
mock_retrive_k8s_master_url):
|
||||
mock_retrieve_k8s_master_url):
|
||||
expected_master_url = 'master_address'
|
||||
expected_pod = self.mock_pod()
|
||||
expected_pod.create = mock.MagicMock()
|
||||
|
||||
mock_retrive_k8s_master_url.return_value = expected_master_url
|
||||
mock_retrieve_k8s_master_url.return_value = expected_master_url
|
||||
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
|
||||
mock_kube_cli.pod_create.return_value = True
|
||||
|
||||
self.kube_handler.pod_create({}, expected_pod)
|
||||
self.assertEqual('pending', expected_pod.status)
|
||||
|
||||
@patch('magnum.conductor.handlers.kube._retrive_k8s_master_url')
|
||||
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')
|
||||
def test_pod_create_with_fail(self,
|
||||
mock_retrive_k8s_master_url):
|
||||
mock_retrieve_k8s_master_url):
|
||||
expected_master_url = 'master_address'
|
||||
expected_pod = self.mock_pod()
|
||||
expected_pod.create = mock.MagicMock()
|
||||
|
||||
mock_retrive_k8s_master_url.return_value = expected_master_url
|
||||
mock_retrieve_k8s_master_url.return_value = expected_master_url
|
||||
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
|
||||
mock_kube_cli.pod_create.return_value = False
|
||||
|
||||
self.kube_handler.pod_create({}, expected_pod)
|
||||
self.assertEqual('failed', expected_pod.status)
|
||||
|
||||
@patch('magnum.conductor.handlers.kube._retrive_k8s_master_url')
|
||||
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')
|
||||
def test_service_create_with_success(self,
|
||||
mock_retrive_k8s_master_url):
|
||||
mock_retrieve_k8s_master_url):
|
||||
expected_master_url = 'master_address'
|
||||
expected_service = self.mock_service()
|
||||
expected_service.create = mock.MagicMock()
|
||||
|
||||
mock_retrive_k8s_master_url.return_value = expected_master_url
|
||||
mock_retrieve_k8s_master_url.return_value = expected_master_url
|
||||
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
|
||||
mock_kube_cli.service_create.return_value = True
|
||||
|
||||
|
|
@ -161,14 +161,14 @@ class TestKube(base.BaseTestCase):
|
|||
mock_kube_cli.service_create.assert_called_once_with(
|
||||
expected_master_url, expected_service)
|
||||
|
||||
@patch('magnum.conductor.handlers.kube._retrive_k8s_master_url')
|
||||
@patch('magnum.conductor.handlers.kube._retrieve_k8s_master_url')
|
||||
def test_rc_create_with_success(self,
|
||||
mock_retrive_k8s_master_url):
|
||||
mock_retrieve_k8s_master_url):
|
||||
expected_master_url = 'master_address'
|
||||
expected_rc = self.mock_rc()
|
||||
expected_rc.create = mock.MagicMock()
|
||||
|
||||
mock_retrive_k8s_master_url.return_value = expected_master_url
|
||||
mock_retrieve_k8s_master_url.return_value = expected_master_url
|
||||
with patch.object(self.kube_handler, 'kube_cli') as mock_kube_cli:
|
||||
mock_kube_cli.rc_create.return_value = True
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue