X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Frun_test.py;fp=osm_nbi%2Ftests%2Frun_test.py;h=b7768bab92803224c778a5a328cdf000550849ba;hp=b7eb98642a06fa37af48c431c4add4e0e57fced2;hb=4cd875d2a38488b5e717258d548eeb8e557ec9a8;hpb=f2af4a100d308e07f355d61b94fb27d1ccc97aa2

diff --git a/osm_nbi/tests/run_test.py b/osm_nbi/tests/run_test.py
index b7eb986..b7768ba 100755
--- a/osm_nbi/tests/run_test.py
+++ b/osm_nbi/tests/run_test.py
@@ -2003,7 +2003,6 @@ class TestFakeVim:
         ]
 
     def run(self, engine, test_osm, manual_check, test_params=None):
-
         vim_bad = self.vim.copy()
         vim_bad.pop("name")
 
@@ -2622,7 +2621,6 @@ class TestDeploy:
         keys=None,
         timeout=0,
     ):
-
         r = engine.test(
             "GET VNFR IDs",
             "GET",
@@ -2783,7 +2781,7 @@ class TestDeploy:
             ns_data.update(self.ns_params)
         if test_params and test_params.get("ns-config"):
             if isinstance(test_params["ns-config"], str):
-                ns_data.update(yaml.load(test_params["ns-config"]), Loader=yaml.Loader)
+                ns_data.update(yaml.safe_load(test_params["ns-config"]))
             else:
                 ns_data.update(test_params["ns-config"])
         self.instantiate(engine, ns_data)
@@ -3349,7 +3347,7 @@ class TestDeployHackfest3Charmed3(TestDeployHackfest3Charmed):
             "2": ["ls -lrt /home/ubuntu/first-touch-2"],
         }
         self.descriptor_edit = {
-            "vnfd0": yaml.load(
+            "vnfd0": yaml.safe_load(
                 """
                 scaling-group-descriptor:
                     -   name: "scale_dataVM"
@@ -3399,7 +3397,6 @@ class TestDeployHackfest3Charmed3(TestDeployHackfest3Charmed):
                                 "$[0]":
                                     default-value: "<touch_filename2>"
                 """,
-                Loader=yaml.Loader,
             )
         }
         self.ns_params = {
@@ -3812,7 +3809,7 @@ class TestDeployHnfd(TestDeployHackfest3Charmed):
         }
         if test_params and test_params.get("ns-config"):
             if isinstance(test_params["ns-config"], str):
-                ns_data.update(yaml.load(test_params["ns-config"]), Loader=yaml.Loader)
+                ns_data.update(yaml.safe_load(test_params["ns-config"]))
             else:
                 ns_data.update(test_params["ns-config"])
 
@@ -5045,7 +5042,6 @@ class TestNbiQuotas:
         test_user_id = engine.last_id if res else None
 
         if test_project_id and test_user_id:
-
             # Get user access
             engine.token = None
             engine.user = test_username
@@ -5113,7 +5109,6 @@ class TestNbiQuotas:
             test_vim_ids += [engine.last_id if res else None]
 
             if test_vim_ids[0]:
-
                 # Download descriptor files (if required)
                 test_dir = "/tmp/" + test_username + "/"
                 test_url = "https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/"
@@ -5140,7 +5135,6 @@ class TestNbiQuotas:
                                 file.write(res.content)
 
                 if all([os.path.exists(test_dir + p) for p in desc_filenames]):
-
                     # Test VNFD Quotas
                     res = engine.test(
                         "Create test VNFD #1",
@@ -5206,7 +5200,6 @@ class TestNbiQuotas:
                                 test_vnfd_ids[i] = None
 
                     if test_vnfd_ids[0] and test_vnfd_ids[1]:
-
                         # Test NSD Quotas
                         res = engine.test(
                             "Create test NSD #1",
@@ -5272,7 +5265,6 @@ class TestNbiQuotas:
                                     test_nsd_ids[i] = None
 
                         if test_nsd_ids[0] and test_nsd_ids[1]:
-
                             # Test NSR Quotas
                             res = engine.test(
                                 "Create test NSR #1",