From e2832876e927d6316fd9a8590dd448dcd8c40387 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 30 Nov 2021 22:41:56 -0800 Subject: [PATCH] Workaround for oslo_serialization bug 1515231 We shall not use jsonutils.load. Instead, read the file and the use jsonutils.loads. Change-Id: I3df9f8ecf477fa52a77990abfe83dd43326b61b1 --- vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py b/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py index 934efaee27..0185b60fbc 100644 --- a/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py +++ b/vmware_nsx/shell/admin/plugins/nsxp/resources/migration.py @@ -251,7 +251,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 = {} @@ -323,7 +324,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)