diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-19 16:51:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-19 16:51:15 +0000 |
| commit | 40925d0cdc63e557ef04569642875cd07b8ed7ce (patch) | |
| tree | 5bff2d016aebc4376197ec0ac4daae344b13e4bd /lib/python/apex | |
| parent | 9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (diff) | |
| parent | 1f5bede73d99f89a3cf1ec5fae7b30cee454b6c8 (diff) | |
Merge "Allows specifying nic order for overcloud nodes in network settings"
Diffstat (limited to 'lib/python/apex')
| -rw-r--r-- | lib/python/apex/common/constants.py | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index 8ed49ff7..dfed33f8 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -15,3 +15,4 @@ API_NETWORK = 'api_network' OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, PRIVATE_NETWORK, PUBLIC_NETWORK, STORAGE_NETWORK, API_NETWORK] DNS_SERVERS = ["8.8.8.8", "8.8.4.4"] +ROLES = ['compute', 'controller'] diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index 50dd15c3..fd6c1455 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -31,6 +31,8 @@ class NetworkSettings: self.settings_obj = yaml.load(network_settings_file) self.network_isolation = network_isolation self.enabled_network_list = [] + self.nics = {'compute': dict(), 'controller': dict()} + self.nics_specified = {'compute': False, 'controller': False} self._validate_input() def _validate_input(self): @@ -63,6 +65,7 @@ class NetworkSettings: start_offset=21, end_offset=21) self._config_optional_settings(network) self.enabled_network_list.append(network) + self._validate_overcloud_nic_order(network) else: logging.info("{} disabled, will collapse with " "admin_network".format(network)) @@ -73,6 +76,51 @@ class NetworkSettings: self.settings_obj['dns_servers'] = self.settings_obj.get( 'dns_servers', constants.DNS_SERVERS) + def _validate_overcloud_nic_order(self, network): + """ + Detects if nic order is specified per profile (compute/controller) + for network + + If nic order is specified in a network for a profile, it should be + specified for every network with that profile other than admin_network + + Duplicate nic names are also not allowed across different networks + + :param network: network to detect if nic order present + :return: None + """ + + for role in constants.ROLES: + interface = role+'_interface' + nic_index = self.get_enabled_networks().index(network) + 1 + if interface in self.settings_obj[network]: + if any(y == self.settings_obj[network][interface] for x, y in + self.nics[role].items()): + raise NetworkSettingsException("Duplicate {} already " + "specified for " + "another network" + .format(self.settings_obj + [network] + [interface])) + self.nics[role][network] = self.settings_obj[network][ + interface] + self.nics_specified[role] = True + logging.info("{} nic order specified for network {" + "}".format(role, network)) + elif self.nics_specified[role]: + logging.error("{} nic order not specified for network {" + "}".format(role, network)) + raise NetworkSettingsException("Must specify {} for all " + "enabled networks (other than " + " admin) or not specify it for " + "any".format(interface)) + else: + logging.info("{} nic order not specified for network {" + "}. Will use logical default " + "nic{}".format(interface, network, nic_index)) + self.nics[role][network] = 'nic' + str(nic_index) + nic_index += 1 + def _config_required_settings(self, network): """ Configures either CIDR or bridged_interface setting |