285456a672
When Octavia stopped needing neutron-lbaasv2 devstack plugin we tried it out with success but we still kept usage the plugin so that our devstack plugin could target older than pike. Unfortunately during this time the proxy became unnecessary and not well maintained and due to our gates still using it, when we tried queens with the supported proxy less Octavia we realized that it fails. This patch addresses it by making the existing neutronclient usage point to the load-balancer endpoint when the proxy is not in place. Change-Id: Iafd74f23bdf336a4d78ba4759f702cf989c8bc30 Closes-Bug: #1763045 Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
44 lines
1.4 KiB
Python
44 lines
1.4 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 fixtures
|
|
import mock
|
|
|
|
from kuryr_kubernetes import k8s_client
|
|
|
|
|
|
class MockK8sClient(fixtures.Fixture):
|
|
def _setUp(self):
|
|
self.client = mock.Mock(k8s_client.K8sClient)
|
|
self.useFixture(fixtures.MockPatch(
|
|
'kuryr_kubernetes.clients.get_kubernetes_client',
|
|
lambda: self.client))
|
|
|
|
|
|
class MockNeutronClient(fixtures.Fixture):
|
|
def _setUp(self):
|
|
self.client = mock.Mock()
|
|
self.useFixture(fixtures.MockPatch(
|
|
'kuryr_kubernetes.clients.get_neutron_client',
|
|
lambda: self.client))
|
|
|
|
|
|
class MockLBaaSClient(fixtures.Fixture):
|
|
def _setUp(self):
|
|
self.client = mock.Mock()
|
|
self.useFixture(fixtures.MockPatch(
|
|
'kuryr_kubernetes.clients.get_loadbalancer_client',
|
|
lambda: self.client))
|