b90ca1b9b9
For a while we were using a dirty hack to call Octavia API - i.e. we were mocking python-neutronclient to use a session pointing to Octavia endpoint. This was a workaround to save some effort that was needed to introduce python-octaviaclient dependency. As Kuryr is strongly tied to Kubernetes version it is serving, we should try to limit its dependency on OpenStack versions. E.g. we should be able to cooperate with various versions of Octavia. openstacksdk is a tool that is designed to do exactly that, adding abstraction layer that hides differences between APIs and as last resort allowing doing bare HTTP calls, while taking care of all the Keystone stuff for us. This commit removes the ugly workaround mentioned in first paragraph and switches all the LBaaS v2 calls to use openstacksdk's Octavia proxy. Also some leftovers from LBaaS v2 removal are cleaned up, e.g. logic behind not using cascade deletion or workaround for LbaaS v2 issues with pools. Implements: blueprint switch-to-openstacksdk Change-Id: Ic0bb56f90fe9effcdcb2ae5db96b8a1ec19738df
49 lines
1.8 KiB
Python
49 lines
1.8 KiB
Python
# Copyright (c) 2016 Mirantis, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from kuryr_kubernetes import clients
|
|
from kuryr_kubernetes.tests import base as test_base
|
|
|
|
|
|
class TestK8sClient(test_base.TestCase):
|
|
|
|
@mock.patch('openstack.connection.Connection')
|
|
@mock.patch('kuryr_kubernetes.config.CONF')
|
|
@mock.patch('kuryr_kubernetes.k8s_client.K8sClient')
|
|
@mock.patch('kuryr.lib.utils.get_neutron_client')
|
|
def test_setup_clients(self, m_neutron, m_k8s, m_cfg, m_openstack):
|
|
k8s_api_root = 'http://127.0.0.1:1234'
|
|
|
|
neutron_mock = mock.Mock()
|
|
openstacksdk_mock = mock.Mock()
|
|
openstacksdk_mock.load_balancer = mock.Mock()
|
|
k8s_dummy = object()
|
|
|
|
m_cfg.kubernetes.api_root = k8s_api_root
|
|
m_neutron.return_value = neutron_mock
|
|
m_k8s.return_value = k8s_dummy
|
|
m_openstack.return_value = openstacksdk_mock
|
|
|
|
clients.setup_clients()
|
|
|
|
m_k8s.assert_called_with(k8s_api_root)
|
|
self.assertIs(k8s_dummy, clients.get_kubernetes_client())
|
|
self.assertIs(neutron_mock, clients.get_neutron_client())
|
|
self.assertIs(openstacksdk_mock, clients.get_openstacksdk())
|
|
self.assertIs(openstacksdk_mock.load_balancer,
|
|
clients.get_loadbalancer_client())
|