openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Add validation for rotued networks disabled"

This commit is contained in:
Zuul 2018-03-01 23:44:27 +00:00 committed by Gerrit Code Review
parent 34979944bc 79b1d0b249
commit 6ad29d2330
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
instack_undercloud/tests/test_validator.py
View File

@ -36,6 +36,7 @@ class TestValidator(base.BaseTestCase):
cfg.StrOpt('gateway'),
cfg.BoolOpt('masquerade')]
self.conf.register_opts(self.opts, group=self.grp0)
self.grp1 = cfg.OptGroup(name='subnet1', title='subnet1')
self.conf.config(cidr='192.168.24.0/24',
dhcp_start='192.168.24.5', dhcp_end='192.168.24.24',
inspection_iprange='192.168.24.100,192.168.24.120',
@ -238,3 +239,36 @@ class TestValidator(base.BaseTestCase):
ipxe_enabled=True)
self.assertRaises(validator.FailedValidation,
undercloud._validate_architecure_options)
@mock.patch('netifaces.interfaces')
def test_validate_routed_networks_not_enabled_pass(self, ifaces_mock):
ifaces_mock.return_value = ['eth0', 'eth1']
self.conf.config(enable_routed_networks=False)
self.conf.config(subnets=['ctlplane-subnet'])
undercloud._validate_network()
@mock.patch('netifaces.interfaces')
def test_validate_routed_networks_not_enabled_fail(self, ifaces_mock):
ifaces_mock.return_value = ['eth0', 'eth1']
self.conf.config(enable_routed_networks=False)
self.conf.config(subnets=['ctlplane-subnet', 'subnet1'])
self.assertRaises(validator.FailedValidation,
undercloud._validate_network)
@mock.patch('netifaces.interfaces')
def test_validate_routed_networks_enabled_pass(self, ifaces_mock):
ifaces_mock.return_value = ['eth0', 'eth1']
self.conf.config(enable_routed_networks=True)
self.conf.config(subnets=['ctlplane-subnet', 'subnet1'])
self.conf.register_opts(self.opts, group=self.grp1)
self.conf.config(cidr='192.168.24.0/24',
dhcp_start='192.168.24.5', dhcp_end='192.168.24.24',
inspection_iprange='192.168.24.100,192.168.24.120',
gateway='192.168.24.1', masquerade=True,
group='ctlplane-subnet')
self.conf.config(cidr='192.168.10.0/24', dhcp_start='192.168.10.10',
dhcp_end='192.168.10.99',
inspection_iprange='192.168.10.100,192.168.10.189',
gateway='192.168.10.254', masquerade=True,
group='subnet1')
undercloud._validate_network()

5
instack_undercloud/undercloud.py
View File

@ -786,6 +786,11 @@ def _validate_network():
LOG.error('Undercloud configuration validation failed: %s', message)
raise validator.FailedValidation(message)
if (len(CONF.subnets) > 1 and not CONF.enable_routed_networks):
message = ('Multiple subnets specified: %s but routed networks are '
'not enabled.' % CONF.subnets)
error_handler(message)
params = {opt.name: CONF[opt.name] for opt in _opts}
# Get parameters of "local_subnet", pass to validator to ensure parameters
# such as "local_ip", "undercloud_public_host" and "undercloud_admin_host"