0719ca7b2a
In case the kuryrnetwork_population handler is enabled and a Namespace creation was triggered, it's possible that the kuryrnetwork_population handler attempts to do its job before the KuryrNetwork handles the CR update with status field. This commit fixes this race by skipping the event for the kuryrnetwork_population when no 'status' is present and modifying the event to be handled on a on_present operation since the on_added would only be triggered once. Closes-bug: 1916544 Change-Id: I7221c67990a3dd6974ea362d209390c716540ceb
113 lines
4.6 KiB
Python
113 lines
4.6 KiB
Python
# Copyright 2020, Inc.
|
|
#
|
|
# 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.
|
|
|
|
from unittest import mock
|
|
|
|
from kuryr_kubernetes.controller.drivers import base as drivers
|
|
from kuryr_kubernetes.controller.drivers import namespace_subnet as subnet_drv
|
|
from kuryr_kubernetes.controller.drivers import node_subnets
|
|
from kuryr_kubernetes.controller.drivers import utils as driver_utils
|
|
from kuryr_kubernetes.controller.drivers import vif_pool
|
|
from kuryr_kubernetes.controller.handlers import kuryrnetwork_population
|
|
from kuryr_kubernetes.tests import base as test_base
|
|
from kuryr_kubernetes import utils
|
|
|
|
|
|
class TestKuryrNetworkPopulationHandler(test_base.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestKuryrNetworkPopulationHandler, self).setUp()
|
|
|
|
self._project_id = mock.sentinel.project_id
|
|
self._subnets = mock.sentinel.subnets
|
|
self._kuryrnet_crd = {
|
|
'metadata': {
|
|
'name': 'test-namespace',
|
|
},
|
|
'spec': {
|
|
'nsName': 'test-namespace',
|
|
'projectId': 'test-project',
|
|
'nsLabels': {},
|
|
},
|
|
'status': {
|
|
'subnetId': 'test-subnet'
|
|
}
|
|
}
|
|
|
|
self._handler = mock.MagicMock(
|
|
spec=kuryrnetwork_population.KuryrNetworkPopulationHandler)
|
|
# NOTE(ltomasbo): The KuryrNet handler is associated to the usage of
|
|
# namespace subnet driver,
|
|
self._handler._drv_subnets = mock.Mock(
|
|
spec=subnet_drv.NamespacePodSubnetDriver)
|
|
self._handler._drv_vif_pool = mock.MagicMock(
|
|
spec=vif_pool.MultiVIFPool)
|
|
self._handler._drv_nodes_subnets = mock.MagicMock(
|
|
spec=node_subnets.ConfigNodesSubnets)
|
|
|
|
self._get_namespace_subnet = (
|
|
self._handler._drv_subnets.get_namespace_subnet)
|
|
self._set_vif_driver = self._handler._drv_vif_pool.set_vif_driver
|
|
self._populate_pool = self._handler._drv_vif_pool.populate_pool
|
|
self._patch_kuryrnetwork_crd = self._handler._patch_kuryrnetwork_crd
|
|
|
|
self._get_namespace_subnet.return_value = self._subnets
|
|
|
|
@mock.patch.object(drivers.VIFPoolDriver, 'get_instance')
|
|
@mock.patch.object(drivers.PodSubnetsDriver, 'get_instance')
|
|
def test_init(self, m_get_subnet_driver, m_get_vif_pool_driver):
|
|
subnet_driver = mock.sentinel.subnet_driver
|
|
vif_pool_driver = mock.Mock(spec=vif_pool.MultiVIFPool)
|
|
|
|
m_get_subnet_driver.return_value = subnet_driver
|
|
m_get_vif_pool_driver.return_value = vif_pool_driver
|
|
|
|
handler = kuryrnetwork_population.KuryrNetworkPopulationHandler()
|
|
|
|
self.assertEqual(subnet_driver, handler._drv_subnets)
|
|
self.assertEqual(vif_pool_driver, handler._drv_vif_pool)
|
|
|
|
@mock.patch.object(driver_utils, 'get_annotations')
|
|
@mock.patch.object(driver_utils, 'get_namespace')
|
|
@mock.patch.object(utils, 'get_nodes_ips')
|
|
def test_on_present(self, m_get_nodes_ips, m_get_ns, m_get_ann):
|
|
m_get_nodes_ips.return_value = ['node-ip']
|
|
m_get_ns.return_value = mock.sentinel.ns
|
|
m_get_ann.return_value = self._kuryrnet_crd['metadata']['name']
|
|
|
|
kuryrnetwork_population.KuryrNetworkPopulationHandler.on_present(
|
|
self._handler, self._kuryrnet_crd)
|
|
|
|
self._get_namespace_subnet.assert_called_once_with(
|
|
self._kuryrnet_crd['spec']['nsName'],
|
|
self._kuryrnet_crd['status']['subnetId'])
|
|
self._populate_pool.assert_called_once_with(
|
|
'node-ip', self._kuryrnet_crd['spec']['projectId'], self._subnets,
|
|
[])
|
|
self._patch_kuryrnetwork_crd.assert_called_once()
|
|
|
|
def test_on_added_no_subnet(self):
|
|
kns = self._kuryrnet_crd.copy()
|
|
del kns['status']
|
|
kuryrnetwork_population.KuryrNetworkPopulationHandler.on_added(
|
|
self._handler, kns)
|
|
self._get_namespace_subnet.assert_not_called()
|
|
|
|
def test_on_added_populated(self):
|
|
kns = self._kuryrnet_crd.copy()
|
|
kns['status'] = {'populated': True}
|
|
kuryrnetwork_population.KuryrNetworkPopulationHandler.on_added(
|
|
self._handler, kns)
|
|
self._get_namespace_subnet.assert_not_called()
|