Remove python warnings (yaml.load)

It updates refstack_defcore and vmtp to conform with yaml [1].

[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-smoke-latest-refstack_defcore-run/186/console

Change-Id: I38e7a8d4c294c27f01c3e7385c4b716522a40334
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/opnfv_tests/openstack/refstack/refstack.py b/functest/opnfv_tests/openstack/refstack/refstack.py
index c709e56..814cb25 100644 (file)
--- a/functest/opnfv_tests/openstack/refstack/refstack.py
+++ b/functest/opnfv_tests/openstack/refstack/refstack.py
@@ -37,7 +37,7 @@ class Refstack(tempest.TempestCommon):
                         yaml_data, grp.group(1), grp.group(2))
                 except Exception:  # pylint: disable=broad-except
                     self.__logger.warning("Cannot parse %s", line)
-        return yaml.load(yaml_data)
+        return yaml.full_load(yaml_data)
 
     def _extract_tempest_data(self):
         olddir = os.getcwd()
@@ -60,7 +60,7 @@ class Refstack(tempest.TempestCommon):
                     yaml_data2, grp.group(1), grp.group(2))
             except Exception:  # pylint: disable=broad-except
                 self.__logger.warning("Cannot parse %s. skipping it", line)
-        return yaml.load(yaml_data2)
+        return yaml.full_load(yaml_data2)
 
     def generate_test_list(self, **kwargs):
         self.backup_tempest_config(self.conf_file, '/etc')

diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index 3462ec0..883f35d 100644 (file)
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -107,7 +107,7 @@ class Vmtp(singlevm.VmReady2):
         output = subprocess.check_output(cmd)
         self.__logger.info("%s\n%s", " ".join(cmd), output)
         with open(self.config, "w+") as conf:
-            vmtp_conf = yaml.load(output)
+            vmtp_conf = yaml.full_load(output)
             vmtp_conf["private_key_file"] = self.privkey_filename
             vmtp_conf["public_key_file"] = self.pubkey_filename
             vmtp_conf["image_name"] = str(self.image.name)