x/vmware-nsx
Code Issues Proposed changes

[Admin utils] Specify path for redistribution state file

Browse Source 
The admin utility is currently storing the state in the local
directory, which might not be ideal in several cases

Change-Id: Iad85386a012aafc3db0a8b0737fb38bbaf09b0e9
This commit is contained in:
Salvatore Orlando 2021-12-02 12:02:29 -08:00
parent 63b33c48e2
commit 7ebf0ed1e0
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py
View File

@ -84,16 +84,22 @@ def migration_tier0_redistribute(resource, event, trigger, **kwargs):
properties = admin_utils.parse_multi_keyval_opt(kwargs['property']) properties = admin_utils.parse_multi_keyval_opt(kwargs['property'])
action = properties.get('action') action = properties.get('action')
tier0string = properties.get('tier0s') tier0string = properties.get('tier0s')
if not tier0string or not action: state_filename = properties.get('state-file')
if not tier0string or not action or not state_filename:
LOG.error("%s", errmsg) LOG.error("%s", errmsg)
return return
tier0s = tier0string.split(",") tier0s = tier0string.split(",")
nsxpolicy = p_utils.get_connected_nsxpolicy() nsxpolicy = p_utils.get_connected_nsxpolicy()
file_name = "tier0_redistribution_conf.json"
if action.lower() == 'disable': if action.lower() == 'disable':
orig_conf_map = {} try:
f = open(state_filename, "r")
orig_conf_map = jsonutils.loads(f.read())
f.close()
except Exception:
LOG.info("State file %s not found:", state_filename)
orig_conf_map = {}
for tier0 in tier0s: for tier0 in tier0s:
# get the current config # get the current config
try: try:
@ -107,48 +113,42 @@ def migration_tier0_redistribute(resource, event, trigger, **kwargs):
tier0) tier0)
continue continue
fixed_conf = copy.deepcopy(orig_conf) fixed_conf = copy.deepcopy(orig_conf)
if ((not orig_conf['bgp_enabled'] and if (not (orig_conf['bgp_enabled'] or
not orig_conf['ospf_enabled']) or orig_conf['ospf_enabled'] or
not orig_conf.get('redistribution_rules')): orig_conf.get('redistribution_rules'))):
# Already disabled # Already disabled
LOG.info("Tier0 %s route redistribution config was not " LOG.info("Tier0 %s route redistribution config was not "
"changed because it is disabled", tier0) "changed because it is disabled", tier0)
continue continue
# Check if any of the rules have tier1 flags enabled # Check if any of the rules have tier1 flags enabled
found = False
rule_num = 0 rule_num = 0
for rule in orig_conf['redistribution_rules']: for rule in orig_conf.get('redistribution_rules', []):
fixed_types = [] fixed_types = []
for route_type in rule['route_redistribution_types']: for route_type in rule['route_redistribution_types']:
if route_type.startswith('TIER1'): if not route_type.startswith('TIER1'):
found = True
else:
fixed_types.append(route_type) fixed_types.append(route_type)
fixed_conf['redistribution_rules'][rule_num][ fixed_conf['redistribution_rules'][rule_num][
'route_redistribution_types'] = fixed_types 'route_redistribution_types'] = fixed_types
rule_num = rule_num + 1 rule_num = rule_num + 1
if not found:
LOG.info("Tier0 %s route redistribution config was not "
"changed because there are no Tier1 types", tier0)
continue
# Save the original config so it can be reverted later # Save the original config so it can be reverted later
orig_conf_map[tier0] = orig_conf orig_conf_map[tier0] = orig_conf
fixed_conf['bgp_enabled'] = False
fixed_conf['ospf_enabled'] = False
nsxpolicy.tier0.update_route_redistribution_config( nsxpolicy.tier0.update_route_redistribution_config(
tier0, fixed_conf) tier0, fixed_conf)
LOG.info("Disabled Tier0 %s route redistribution config for " LOG.info("Disabled Tier0 %s route redistribution config for "
"Tier1 routes", tier0) "Tier1 routes", tier0)
f = open(file_name, "w") f = open(state_filename, "w")
f.write("%s" % jsonutils.dumps(orig_conf_map)) f.write("%s" % jsonutils.dumps(orig_conf_map))
f.close() f.close()
elif action.lower() == 'restore': elif action.lower() == 'restore':
try: try:
f = open(file_name, "r") f = open(state_filename, "r")
orig_conf_map = jsonutils.loads(f.read()) orig_conf_map = jsonutils.loads(f.read())
f.close() f.close()
except Exception: except Exception:
LOG.error("Didn't find input file %s", file_name) LOG.warning("State file %s not found:", state_filename)
return sys.exit(1)
for tier0 in tier0s: for tier0 in tier0s:
if tier0 in orig_conf_map: if tier0 in orig_conf_map:
# Restore its original config: # Restore its original config:
@ -165,6 +165,7 @@ def migration_tier0_redistribute(resource, event, trigger, **kwargs):
"changed", tier0) "changed", tier0)
else: else:
LOG.error("%s", errmsg) LOG.error("%s", errmsg)
sys.exit(1)
def _cidrs_overlap(cidr0, cidr1): def _cidrs_overlap(cidr0, cidr1):