Merge "OpenShift: Add configured subnets to the detected"
This commit is contained in:
commit
ed018fd688
|
@ -79,12 +79,17 @@ class OpenShiftNodesSubnets(base.NodesSubnetsDriver):
|
|||
|
||||
def get_nodes_subnets(self, raise_on_empty=False):
|
||||
with lockutils.lock('kuryr-machine-add'):
|
||||
if not self.subnets and raise_on_empty:
|
||||
# We add any hardcoded ones from config anyway.
|
||||
result = self.subnets
|
||||
if CONF.pod_vif_nested.worker_nodes_subnets:
|
||||
result = result.union(
|
||||
set(CONF.pod_vif_nested.worker_nodes_subnets))
|
||||
if not result and raise_on_empty:
|
||||
raise exceptions.ResourceNotReady(
|
||||
'OpenShift Machines does not exist or are not yet '
|
||||
'handled. Cannot determine worker nodes subnets.')
|
||||
|
||||
return list(self.subnets)
|
||||
return list(result)
|
||||
|
||||
def add_node(self, machine):
|
||||
subnet_id = self._get_subnet_from_machine(machine)
|
||||
|
|
|
@ -100,6 +100,8 @@ class TestOpenShiftNodesSubnetsDriver(test_base.TestCase):
|
|||
},
|
||||
"status": {}
|
||||
}
|
||||
cfg.CONF.set_override('worker_nodes_subnets', [],
|
||||
group='pod_vif_nested')
|
||||
|
||||
def test_get_nodes_subnets(self):
|
||||
subnets = ['subnet1', 'subnet2']
|
||||
|
@ -108,6 +110,16 @@ class TestOpenShiftNodesSubnetsDriver(test_base.TestCase):
|
|||
driver.subnets.add(subnet)
|
||||
self.assertCountEqual(subnets, driver.get_nodes_subnets())
|
||||
|
||||
def test_get_nodes_subnets_with_config(self):
|
||||
subnets = ['subnet1', 'subnet2']
|
||||
cfg.CONF.set_override('worker_nodes_subnets', ['subnet3', 'subnet2'],
|
||||
group='pod_vif_nested')
|
||||
driver = node_subnets.OpenShiftNodesSubnets()
|
||||
for subnet in subnets:
|
||||
driver.subnets.add(subnet)
|
||||
self.assertCountEqual(['subnet1', 'subnet2', 'subnet3'],
|
||||
driver.get_nodes_subnets())
|
||||
|
||||
def test_get_nodes_subnets_not_raise(self):
|
||||
driver = node_subnets.OpenShiftNodesSubnets()
|
||||
self.assertEqual([], driver.get_nodes_subnets())
|
||||
|
|
Loading…
Reference in New Issue