From e20e2dfa6539c9b7d168043c752aa10962693d56 Mon Sep 17 00:00:00 2001 From: vamahaja Date: Thu, 16 Jan 2020 10:26:58 +0530 Subject: Fix 'yaml.load' which gives warnings As per documenton [1], 'yaml.load(raw_data)' is deprecated and suggested to use parameter 'Loader=yaml.FullLoader'. Fix such instances of yaml.load in functions - oc_get_yaml, get_events and enable_pvc_resize [1] 'https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation' Change-Id: I1fc5544f6f7f12b55e420486b4460f26db214139 Signed-off-by: vamahaja --- openshift-storage-libs/openshiftstoragelibs/openshift_ops.py | 5 +++-- .../openshiftstoragelibs/openshift_storage_libs.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py index da8225a5..1835d9ca 100644 --- a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py @@ -567,7 +567,7 @@ def oc_get_yaml(ocp_node, rtype, name=None, raise_on_error=True): cmd.append(name) out = command.cmd_run( cmd, hostname=ocp_node, raise_on_error=raise_on_error) - return yaml.load(out) if out else {} + return yaml.load(out, Loader=yaml.FullLoader) if out else {} def oc_get_pvc(ocp_node, name): @@ -1460,7 +1460,8 @@ def get_events(hostname, cmd = "oc get events -o yaml" if openshift_version.get_openshift_version() >= '3.9': cmd += " --field-selector %s" % ",".join(field_selector or "''") - objects = yaml.load(command.cmd_run(cmd, hostname=hostname))['items'] + get_objects = command.cmd_run(cmd, hostname=hostname) + objects = yaml.load(get_objects, Loader=yaml.FullLoader)['items'] if openshift_version.get_openshift_version() >= '3.9': return objects diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py index ea37ee3d..5005a91e 100644 --- a/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py @@ -75,7 +75,7 @@ def enable_pvc_resize(master_node): raise ExecutionError(err_msg) with conn.builtin.open(MASTER_CONFIG_FILEPATH, 'r') as f: - data = yaml.load(f) + data = yaml.load(f, Loader=yaml.FullLoader) dict_add = data['admissionConfig']['pluginConfig'] if "PersistentVolumeClaimResize" in dict_add: g.log.info("master-config.yaml file is already edited") -- cgit