Fixing flake and black issues in code, enabling the same in tox

[osm/LCM.git] / osm_lcm / tests / test_ns.py

diff --git a/osm_lcm/tests/test_ns.py b/osm_lcm/tests/test_ns.py
index d7192c9..2004701 100644 (file)
--- a/osm_lcm/tests/test_ns.py
+++ b/osm_lcm/tests/test_ns.py
@@ -122,19 +122,15 @@ class TestMyNS(asynctest.TestCase):
         print("kwargs > {}".format(kwargs))
         if args:
             if "update" in args:
-                ro_ns_desc = yaml.load(
-                    descriptors.ro_update_action_text, Loader=yaml.Loader
-                )
+                ro_ns_desc = yaml.safe_load(descriptors.ro_update_action_text)
                 while True:
                     yield ro_ns_desc
         if kwargs.get("delete"):
-            ro_ns_desc = yaml.load(
-                descriptors.ro_delete_action_text, Loader=yaml.Loader
-            )
+            ro_ns_desc = yaml.safe_load(descriptors.ro_delete_action_text)
             while True:
                 yield ro_ns_desc
 
-        ro_ns_desc = yaml.load(descriptors.ro_ns_text, Loader=yaml.Loader)
+        ro_ns_desc = yaml.safe_load(descriptors.ro_ns_text)
 
         # if ip address provided, replace descriptor
         ip_addresses = getenv("OSMLCMTEST_NS_IPADDRESS", "")
@@ -176,36 +172,26 @@ class TestMyNS(asynctest.TestCase):
             Database.instance = None
 
             self.db = Database({"database": {"driver": "memory"}}).instance.db
-            self.db.create_list(
-                "vnfds", yaml.load(descriptors.db_vnfds_text, Loader=yaml.Loader)
-            )
+            self.db.create_list("vnfds", yaml.safe_load(descriptors.db_vnfds_text))
             self.db.create_list(
                 "vnfds_revisions",
-                yaml.load(descriptors.db_vnfds_revisions_text, Loader=yaml.Loader),
-            )
-            self.db.create_list(
-                "nsds", yaml.load(descriptors.db_nsds_text, Loader=yaml.Loader)
-            )
-            self.db.create_list(
-                "nsrs", yaml.load(descriptors.db_nsrs_text, Loader=yaml.Loader)
+                yaml.safe_load(descriptors.db_vnfds_revisions_text),
             )
+            self.db.create_list("nsds", yaml.safe_load(descriptors.db_nsds_text))
+            self.db.create_list("nsrs", yaml.safe_load(descriptors.db_nsrs_text))
             self.db.create_list(
                 "vim_accounts",
-                yaml.load(descriptors.db_vim_accounts_text, Loader=yaml.Loader),
+                yaml.safe_load(descriptors.db_vim_accounts_text),
             )
             self.db.create_list(
                 "k8sclusters",
-                yaml.load(descriptors.db_k8sclusters_text, Loader=yaml.Loader),
-            )
-            self.db.create_list(
-                "nslcmops", yaml.load(descriptors.db_nslcmops_text, Loader=yaml.Loader)
+                yaml.safe_load(descriptors.db_k8sclusters_text),
             )
             self.db.create_list(
-                "vnfrs", yaml.load(descriptors.db_vnfrs_text, Loader=yaml.Loader)
-            )
-            self.db_vim_accounts = yaml.load(
-                descriptors.db_vim_accounts_text, Loader=yaml.Loader
+                "nslcmops", yaml.safe_load(descriptors.db_nslcmops_text)
             )
+            self.db.create_list("vnfrs", yaml.safe_load(descriptors.db_vnfrs_text))
+            self.db_vim_accounts = yaml.safe_load(descriptors.db_vim_accounts_text)
 
         # Mock kafka
         self.msg = asynctest.Mock(MsgKafka())
@@ -839,7 +825,10 @@ class TestMyNS(asynctest.TestCase):
             self.assertEqual(return_value, expected_value)
             with self.assertRaises(Exception) as context:
                 self.db.get_one("vnfrs", {"_id": vnf_instance_id})
-            self.assertTrue("database exception Not found entry with filter" in str(context.exception))
+            self.assertTrue(
+                "database exception Not found entry with filter"
+                in str(context.exception)
+            )
 
     # test vertical scale executes sucessfully
     # @patch("osm_lcm.ng_ro.status.response")
@@ -1557,7 +1546,7 @@ class TestMyNS(asynctest.TestCase):
             result = find_software_version(db_vnfd)
             self.assertEqual(result, expected_result, "VNFD software version is wrong")
 
-        with self.subTest(i=3, t="Check charm hash, Hash has did not change"):
+        with self.subTest(i=3, t="Check charm hash, Hash did not change"):
             # Testing method check_charm_hash_changed
 
             current_path, target_path = "/tmp/charm1", "/tmp/charm1"