Browse Source

Workaround for oslo_serialization bug 1515231

We shall not use jsonutils.load.
Instead, read the file and the use jsonutils.loads.

Change-Id: I3df9f8ecf477fa52a77990abfe83dd43326b61b1
changes/44/819844/1
Salvatore Orlando 6 months ago committed by Salvatore Orlando
parent
commit
cb72125ef7
  1. 6
      vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py

6
vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py

@ -245,7 +245,8 @@ def patch_routers_without_gateway(resource, event, trigger, **kwargs):
# Open state file, if exists, read data
try:
with open(state_filename) as f:
state_data = jsonutils.load(f)
data = f.read()
state_data = jsonutils.loads(data)
except FileNotFoundError:
LOG.debug("State file not created yet")
state_data = {}
@ -316,7 +317,8 @@ def restore_routers_without_gateway(resource, event, trigger, **kwargs):
# Fail if file does not exist
try:
with open(state_filename) as f:
state_data = jsonutils.load(f)
data = f.read()
state_data = jsonutils.loads(data)
except FileNotFoundError:
LOG.error("State file %s was not found. Aborting", state_filename)
sys.exit(1)

Loading…
Cancel
Save