import yaml
import re
-from .common import constants
-
+from .common.constants import (
+ CONTROLLER,
+ COMPUTE,
+ ADMIN_NETWORK,
+ TENANT_NETWORK,
+ STORAGE_NETWORK,
+ EXTERNAL_NETWORK,
+ API_NETWORK,
+ CONTROLLER_PRE,
+ COMPUTE_PRE,
+ PRE_CONFIG_DIR
+)
+from .network_settings import NetworkSettings
+
+HEAT_NONE = 'OS::Heat::None'
PORTS = '/ports'
# Resources defined by <resource name>: <prefix>
EXTERNAL_RESOURCES = {'OS::TripleO::Network::External': None,
IPV6_FLAGS = ["NovaIPv6", "MongoDbIPv6", "CorosyncIPv6", "CephIPv6",
"RabbitIPv6", "MemcachedIPv6"]
+reg = 'resource_registry'
+param_def = 'parameter_defaults'
+
-class NetworkEnvironment:
+class NetworkEnvironment(dict):
"""
This class creates a Network Environment to be used in TripleO Heat
Templates.
The class builds upon an existing network-environment file and modifies
based on a NetworkSettings object.
"""
- def __init__(self, net_settings, filename):
- with open(filename, 'r') as net_env_fh:
- self.netenv_obj = yaml.load(net_env_fh)
- self._update_net_environment(net_settings)
-
- def _update_net_environment(self, settings_obj):
+ def __init__(self, net_settings, filename, compute_pre_config=False,
+ controller_pre_config=False):
"""
- Updates Network Environment according to Network Settings
- :param: network settings object
- :return: None
+ Create Network Environment according to Network Settings
"""
- if not settings_obj:
- raise NetworkEnvException("Network Settings does not exist")
+ init_dict = {}
+ if isinstance(filename, str):
+ with open(filename, 'r') as net_env_fh:
+ init_dict = yaml.safe_load(net_env_fh)
- net_settings = settings_obj.get_network_settings()
- enabled_networks = settings_obj.get_enabled_networks()
- param_def = 'parameter_defaults'
- reg = 'resource_registry'
- for key, prefix in TENANT_RESOURCES.items():
- if prefix is None:
- prefix = ''
- m = re.split('%s/\w+\.yaml' % prefix, self.netenv_obj[reg][key])
- if m is not None:
- tht_dir = m[0]
- break
- if not tht_dir:
- raise NetworkEnvException('Unable to parse THT Directory')
- admin_cidr = net_settings[constants.ADMIN_NETWORK]['cidr']
+ super().__init__(init_dict)
+ if not isinstance(net_settings, NetworkSettings):
+ raise NetworkEnvException('Invalid Network Settings object')
+
+ self._set_tht_dir()
+
+ nets = net_settings['networks']
+
+ admin_cidr = nets[ADMIN_NETWORK]['cidr']
admin_prefix = str(admin_cidr.prefixlen)
- self.netenv_obj[param_def]['ControlPlaneSubnetCidr'] = admin_prefix
- self.netenv_obj[param_def]['ControlPlaneDefaultRoute'] = \
- net_settings[constants.ADMIN_NETWORK]['provisioner_ip']
- public_cidr = net_settings[constants.PUBLIC_NETWORK]['cidr']
- self.netenv_obj[param_def]['ExternalNetCidr'] = str(public_cidr)
- public_range = net_settings[constants.PUBLIC_NETWORK][
- 'usable_ip_range'].split(',')
- self.netenv_obj[param_def]['ExternalAllocationPools'] = \
- [{'start':
- public_range[0],
- 'end': public_range[1]
- }]
- self.netenv_obj[param_def]['ExternalInterfaceDefaultRoute'] = \
- net_settings[constants.PUBLIC_NETWORK]['gateway']
- self.netenv_obj[param_def]['EC2MetadataIp'] = \
- net_settings[constants.ADMIN_NETWORK]['provisioner_ip']
- self.netenv_obj[param_def]['DnsServers'] = net_settings['dns_servers']
-
- if public_cidr.version == 6:
- postfix = '/external_v6.yaml'
+ self[param_def]['ControlPlaneSubnetCidr'] = admin_prefix
+ self[param_def]['ControlPlaneDefaultRoute'] = \
+ nets[ADMIN_NETWORK]['installer_vm']['ip']
+ self[param_def]['EC2MetadataIp'] = \
+ nets[ADMIN_NETWORK]['installer_vm']['ip']
+ self[param_def]['DnsServers'] = net_settings['dns_servers']
+
+ if EXTERNAL_NETWORK in net_settings.enabled_network_list:
+ external_cidr = net_settings.get_network(EXTERNAL_NETWORK)['cidr']
+ self[param_def]['ExternalNetCidr'] = str(external_cidr)
+ external_vlan = self._get_vlan(net_settings.get_network(
+ EXTERNAL_NETWORK))
+ if isinstance(external_vlan, int):
+ self[param_def]['NeutronExternalNetworkBridge'] = '""'
+ self[param_def]['ExternalNetworkVlanID'] = external_vlan
+ external_range = net_settings.get_network(EXTERNAL_NETWORK)[
+ 'overcloud_ip_range']
+ self[param_def]['ExternalAllocationPools'] = \
+ [{'start': str(external_range[0]),
+ 'end': str(external_range[1])}]
+ self[param_def]['ExternalInterfaceDefaultRoute'] = \
+ net_settings.get_network(EXTERNAL_NETWORK)['gateway']
+
+ if external_cidr.version == 6:
+ postfix = '/external_v6.yaml'
+ else:
+ postfix = '/external.yaml'
else:
- postfix = '/external.yaml'
+ postfix = '/noop.yaml'
- for key, prefix in EXTERNAL_RESOURCES.items():
- if prefix is None:
- prefix = ''
- self.netenv_obj[reg][key] = tht_dir + prefix + postfix
-
-
- if constants.PRIVATE_NETWORK in enabled_networks:
- priv_range = net_settings[constants.PRIVATE_NETWORK][
- 'usable_ip_range'].split(',')
- self.netenv_obj[param_def]['TenantAllocationPools'] = \
- [{'start':
- priv_range[0],
- 'end': priv_range[1]
- }]
- priv_cidr = net_settings[constants.PRIVATE_NETWORK]['cidr']
- self.netenv_obj[param_def]['TenantNetCidr'] = str(priv_cidr)
- if priv_cidr.version == 6:
+ # apply resource registry update for EXTERNAL_RESOURCES
+ self._config_resource_reg(EXTERNAL_RESOURCES, postfix)
+
+ if TENANT_NETWORK in net_settings.enabled_network_list:
+ tenant_range = nets[TENANT_NETWORK]['overcloud_ip_range']
+ self[param_def]['TenantAllocationPools'] = \
+ [{'start': str(tenant_range[0]),
+ 'end': str(tenant_range[1])}]
+ tenant_cidr = nets[TENANT_NETWORK]['cidr']
+ self[param_def]['TenantNetCidr'] = str(tenant_cidr)
+ if tenant_cidr.version == 6:
postfix = '/tenant_v6.yaml'
else:
postfix = '/tenant.yaml'
+
+ tenant_vlan = self._get_vlan(nets[TENANT_NETWORK])
+ if isinstance(tenant_vlan, int):
+ self[param_def]['TenantNetworkVlanID'] = tenant_vlan
else:
postfix = '/noop.yaml'
- for key, prefix in TENANT_RESOURCES.items():
- if prefix is None:
- prefix = ''
- self.netenv_obj[reg][key] = tht_dir + prefix + postfix
-
- if constants.STORAGE_NETWORK in enabled_networks:
- storage_range = net_settings[constants.STORAGE_NETWORK][
- 'usable_ip_range'].split(',')
- self.netenv_obj[param_def]['StorageAllocationPools'] = \
- [{'start':
- storage_range[0],
- 'end':
- storage_range[1]
- }]
- storage_cidr = net_settings[constants.STORAGE_NETWORK]['cidr']
- self.netenv_obj[param_def]['StorageNetCidr'] = str(storage_cidr)
+ # apply resource registry update for TENANT_RESOURCES
+ self._config_resource_reg(TENANT_RESOURCES, postfix)
+
+ if STORAGE_NETWORK in net_settings.enabled_network_list:
+ storage_range = nets[STORAGE_NETWORK]['overcloud_ip_range']
+ self[param_def]['StorageAllocationPools'] = \
+ [{'start': str(storage_range[0]),
+ 'end': str(storage_range[1])}]
+ storage_cidr = nets[STORAGE_NETWORK]['cidr']
+ self[param_def]['StorageNetCidr'] = str(storage_cidr)
if storage_cidr.version == 6:
postfix = '/storage_v6.yaml'
else:
postfix = '/storage.yaml'
+ storage_vlan = self._get_vlan(nets[STORAGE_NETWORK])
+ if isinstance(storage_vlan, int):
+ self[param_def]['StorageNetworkVlanID'] = storage_vlan
else:
postfix = '/noop.yaml'
- for key, prefix in STORAGE_RESOURCES.items():
- if prefix is None:
- prefix = ''
- self.netenv_obj[reg][key] = tht_dir + prefix + postfix
-
- if constants.API_NETWORK in enabled_networks:
- api_range = net_settings[constants.API_NETWORK][
- 'usable_ip_range'].split(',')
- self.netenv_obj[param_def]['InternalApiAllocationPools'] = \
- [{'start':
- api_range[0],
- 'end':
- api_range[1]
- }]
- api_cidr = net_settings[constants.API_NETWORK]['cidr']
- self.netenv_obj[param_def]['InternalApiNetCidr'] = str(api_cidr)
+ # apply resource registry update for STORAGE_RESOURCES
+ self._config_resource_reg(STORAGE_RESOURCES, postfix)
+
+ if API_NETWORK in net_settings.enabled_network_list:
+ api_range = nets[API_NETWORK]['overcloud_ip_range']
+ self[param_def]['InternalApiAllocationPools'] = \
+ [{'start': str(api_range[0]),
+ 'end': str(api_range[1])}]
+ api_cidr = nets[API_NETWORK]['cidr']
+ self[param_def]['InternalApiNetCidr'] = str(api_cidr)
if api_cidr.version == 6:
postfix = '/internal_api_v6.yaml'
else:
postfix = '/internal_api.yaml'
-
-
+ api_vlan = self._get_vlan(nets[API_NETWORK])
+ if isinstance(api_vlan, int):
+ self[param_def]['InternalApiNetworkVlanID'] = api_vlan
else:
postfix = '/noop.yaml'
- for key, prefix in API_RESOURCES.items():
- if prefix is None:
- prefix = ''
- self.netenv_obj[reg][key] = tht_dir + prefix + postfix
+ # apply resource registry update for API_RESOURCES
+ self._config_resource_reg(API_RESOURCES, postfix)
# Set IPv6 related flags to True. Not that we do not set those to False
# when IPv4 is configured, we'll use the default or whatever the user
# may have set.
- if settings_obj.get_ip_addr_family() == 6:
+ if net_settings.get_ip_addr_family() == 6:
for flag in IPV6_FLAGS:
- self.netenv_obj[param_def][flag] = True
+ self[param_def][flag] = True
- def get_netenv_settings(self):
- """
- Getter for netenv settings
- :return: Dictionary of network environment settings
- """
- return self.netenv_obj
+ def _get_vlan(self, network):
+ if isinstance(network['nic_mapping'][CONTROLLER]['vlan'], int):
+ return network['nic_mapping'][CONTROLLER]['vlan']
+ elif isinstance(network['nic_mapping'][COMPUTE]['vlan'], int):
+ return network['nic_mapping'][COMPUTE]['vlan']
+ else:
+ return 'native'
+
+ def _set_tht_dir(self):
+ self.tht_dir = None
+ for key, prefix in TENANT_RESOURCES.items():
+ if prefix is None:
+ prefix = ''
+ m = re.split('%s/\w+\.yaml' % prefix, self[reg][key])
+ if m is not None and len(m) > 1:
+ self.tht_dir = m[0]
+ break
+ if not self.tht_dir:
+ raise NetworkEnvException('Unable to parse THT Directory')
+
+ def _config_resource_reg(self, resources, postfix):
+ for key, prefix in resources.items():
+ if prefix is None:
+ if postfix == '/noop.yaml':
+ self[reg][key] = HEAT_NONE
+ continue
+ prefix = ''
+ self[reg][key] = self.tht_dir + prefix + postfix
class NetworkEnvException(Exception):
Code Review / apex.git / blobdiff