From 17f1c84f7e52e516f6a9cf958862832c6811ea08 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 20 Jun 2018 10:08:54 -0400 Subject: [PATCH] Reduce minimum mgmt ip range for subcloud For Distributed Cloud, reduce minimum mgmt ip range upon subcloud add from 8 to 5. Story: 2002869 Task: 22819 Change-Id: I05e8ddfbf4adfe723d75a4553905bf05ea107a07 Signed-off-by: Jack Ding --- .../configutilities/configutilities/common/validator.py | 9 ++++++++- .../controllerconfig/controllerconfig/regionconfig.py | 2 +- .../controllerconfig/controllerconfig/systemconfig.py | 8 +++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configutilities/configutilities/configutilities/common/validator.py b/configutilities/configutilities/configutilities/common/validator.py index fa8e9ff04e..e38b44f5a1 100755 --- a/configutilities/configutilities/configutilities/common/validator.py +++ b/configutilities/configutilities/configutilities/common/validator.py @@ -346,9 +346,16 @@ class ConfigValidator(object): # Management network configuration mgmt_prefix = NETWORK_PREFIX_NAMES[self.naming_type][MGMT_TYPE] self.mgmt_network = Network() + + if self.config_type == SUBCLOUD_CONFIG: + min_addresses = 5 + else: + min_addresses = 8 + try: self.mgmt_network.parse_config(self.conf, self.config_type, - MGMT_TYPE, min_addresses=8, + MGMT_TYPE, + min_addresses=min_addresses, multicast_addresses=16, naming_type=self.naming_type) except ConfigFail: diff --git a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py index 7ae7f3e773..421bdbe513 100755 --- a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py +++ b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py @@ -553,7 +553,7 @@ def configure_region(config_file, config_type=REGION_CONFIG): # Bring up management interface to allow us to reach Region 1 print "Configuring management interface... ", - configure_management_interface(region_config) + configure_management_interface(region_config, config_type=config_type) print "DONE" # Get token from keystone diff --git a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py index 7fe831e4e1..3b0a37d448 100644 --- a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py +++ b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py @@ -54,9 +54,15 @@ def configure_management_interface(region_config, config_type=REGION_CONFIG): naming_type = HP_NAMES else: naming_type = DEFAULT_NAMES + + if config_type == SUBCLOUD_CONFIG: + min_addresses = 5 + else: + min_addresses = 8 try: mgmt_network.parse_config(region_config, config_type, MGMT_TYPE, - min_addresses=8, naming_type=naming_type) + min_addresses=min_addresses, + naming_type=naming_type) except ConfigFail: raise except Exception as e: