openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Exceptions constraints improved"

This commit is contained in:
Zuul 2021-04-27 16:52:11 +00:00 committed by Gerrit Code Review
parent 8bb2985669 64994c781b
commit cdac934316
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/network_environment.py
View File

@ -76,7 +76,7 @@ def open_network_environment_files(netenv_path, template_files):
try: try:
network_data = yaml_safe_load(template_files[netenv_path]) network_data = yaml_safe_load(template_files[netenv_path])
except Exception as e: except IOError as e:
return ({}, {}, ["Can't open network environment file '{}': {}" return ({}, {}, ["Can't open network environment file '{}': {}"
.format(netenv_path, e)]) .format(netenv_path, e)])
nic_configs = [] nic_configs = []
@ -89,7 +89,7 @@ def open_network_environment_files(netenv_path, template_files):
nic_configs.append(( nic_configs.append((
nic_name, nic_config_path, nic_name, nic_config_path,
yaml_safe_load(template_files[nic_config_path]))) yaml_safe_load(template_files[nic_config_path])))
except Exception as e: except IOError as e:
errors.append( errors.append(
"Can't open the resource '{}' reference file '{}': {}" "Can't open the resource '{}' reference file '{}': {}"
.format(nic_name, nic_config_path, e)) .format(nic_name, nic_config_path, e))
@ -254,7 +254,7 @@ def check_allocation_pools_pairing(filedata, pools):
pool_objs.append(netaddr.IPRange( pool_objs.append(netaddr.IPRange(
netaddr.IPAddress(dict_range['start']), netaddr.IPAddress(dict_range['start']),
netaddr.IPAddress(dict_range['end']))) netaddr.IPAddress(dict_range['end'])))
except Exception: except (ValueError, TypeError, KeyError, netaddr.AddrFormatError):
errors.append("Invalid format of the IP range in {}: {}" errors.append("Invalid format of the IP range in {}: {}"
.format(poolitem, dict_range)) .format(poolitem, dict_range))
continue continue
@ -268,7 +268,7 @@ def check_allocation_pools_pairing(filedata, pools):
errors.append('The {} CIDR is not specified for {}.' errors.append('The {} CIDR is not specified for {}.'
.format(subnet_item, poolitem)) .format(subnet_item, poolitem))
continue continue
except Exception: except (netaddr.AddrFormatError, ValueError):
errors.append('Invalid IP network: {}'.format(network)) errors.append('Invalid IP network: {}'.format(network))
continue continue
@ -323,7 +323,7 @@ def check_static_ip_pool_collision(static_ips, pools):
try: try:
ip_range = netaddr.IPRange(allocation_range['start'], ip_range = netaddr.IPRange(allocation_range['start'],
allocation_range['end']) allocation_range['end'])
except Exception: except (netaddr.AddrFormatError, TypeError, KeyError):
errors.append("Invalid format of the IP range in {}: {}" errors.append("Invalid format of the IP range in {}: {}"
.format(pool_name, allocation_range)) .format(pool_name, allocation_range))
continue continue
@ -398,7 +398,7 @@ def check_static_ip_in_cidr(networks, static_ips):
for name, cidr in six.iteritems(networks): for name, cidr in six.iteritems(networks):
try: try:
network_ranges[name] = netaddr.IPNetwork(cidr) network_ranges[name] = netaddr.IPNetwork(cidr)
except Exception: except (netaddr.AddrFormatError, ValueError):
errors.append("Network '{}' has an invalid CIDR: '{}'" errors.append("Network '{}' has an invalid CIDR: '{}'"
.format(name, cidr)) .format(name, cidr))
for role, services in six.iteritems(static_ips): for role, services in six.iteritems(static_ips):
@ -514,7 +514,7 @@ def main():
try: try:
warnings = validate_node_pool_size(plan_env_path, ip_pools_path, warnings = validate_node_pool_size(plan_env_path, ip_pools_path,
template_files) template_files)
except Exception as e: except IOError as e:
errors.append("{}".format(e)) errors.append("{}".format(e))
if errors: if errors:

4
library/switch_vlans.py
View File

@ -74,7 +74,7 @@ def open_network_environment_files(netenv_path, template_files):
try: try:
network_data = yaml_safe_load(template_files[netenv_path]) network_data = yaml_safe_load(template_files[netenv_path])
except Exception as e: except IOError as e:
return ({}, {}, ["Can't open network environment file '{}': {}" return ({}, {}, ["Can't open network environment file '{}': {}"
.format(netenv_path, e)]) .format(netenv_path, e)])
nic_configs = [] nic_configs = []
@ -87,7 +87,7 @@ def open_network_environment_files(netenv_path, template_files):
nic_configs.append(( nic_configs.append((
nic_name, nic_config_path, nic_name, nic_config_path,
yaml_safe_load(template_files[nic_config_path]))) yaml_safe_load(template_files[nic_config_path])))
except Exception as e: except IOError as e:
errors.append( errors.append(
"Can't open the resource '{}' reference file '{}': {}" "Can't open the resource '{}' reference file '{}': {}"
.format(nic_name, nic_config_path, e)) .format(nic_name, nic_config_path, e))