Feature - Separation of API communication logic into a separate class. Code adjustments and improvements.

1 files changed, 32 insertions, 22 deletions

diff --git a/tests/test_vy_device.py b/tests/test_vy_device.py
index 84ff0ed..9ef3276 100644
--- a/tests/test_vy_device.py
+++ b/tests/test_vy_device.py
@@ -5,16 +5,16 @@ from pyvyos.device import VyDevice
 from pyvyos.device import ApiResponse
 from dotenv import load_dotenv
 import os
-import pprint 
+import pprint
 import random, string
 
-load_dotenv()  
+load_dotenv()
 
-hostname = os.getenv('VYDEVICE_HOSTNAME')
-apikey = os.getenv('VYDEVICE_APIKEY')
-port = os.getenv('VYDEVICE_PORT')
-protocol = os.getenv('VYDEVICE_PROTOCOL')
-verify = os.getenv('VYDEVICE_VERIFY_SSL')
+hostname = os.getenv("VYDEVICE_HOSTNAME")
+apikey = os.getenv("VYDEVICE_APIKEY")
+port = os.getenv("VYDEVICE_PORT")
+protocol = os.getenv("VYDEVICE_PROTOCOL")
+verify = os.getenv("VYDEVICE_VERIFY_SSL")
 if verify == "False":
     verify = False
 else:
@@ -23,7 +23,13 @@ else:
 
 class TestVyDevice(unittest.TestCase):
     def setUp(self):
-        self.device = VyDevice(hostname=hostname, apikey=apikey, port=port, protocol=protocol, verify=verify)
+        self.device = VyDevice(
+            hostname=hostname,
+            apikey=apikey,
+            port=port,
+            protocol=protocol,
+            verify=verify,
+        )
 
     def test_001_retrieve_show_config(self):
         response = self.device.retrieve_show_config([])
@@ -34,31 +40,37 @@ class TestVyDevice(unittest.TestCase):
         self.assertFalse(response.error)
 
     def test_010_configure_set_interface(self):
-        response = self.device.configure_set(path=["interfaces", "dummy", "dum1", "address", "192.168.140.1/24"])
-        #pprint.pprint(response)
+        response = self.device.configure_set(
+            path=["interfaces", "dummy", "dum1", "address", "192.168.140.1/24"]
+        )
+        # pprint.pprint(response)
 
         self.assertEqual(response.status, 200)
         self.assertIsNone(response.result)
         self.assertFalse(response.error)
-        
+
     def test_011_retrieve_return_values(self):
-        response = self.device.retrieve_return_values(path=["interfaces", "dummy", "dum1", "address"])
+        response = self.device.retrieve_return_values(
+            path=["interfaces", "dummy", "dum1", "address"]
+        )
         self.assertEqual(response.status, 200)
         self.assertIsNotNone(response.result)
         self.assertFalse(response.error)
-        self.assertEqual(response.result, ['192.168.140.1/24'])
+        self.assertEqual(response.result, ["192.168.140.1/24"])
 
     def test_020_configure_delete_interface(self):
         response = self.device.configure_delete(path=["interfaces", "dummy", "dum1"])
         pprint.pprint(response)
-        
+
         self.assertEqual(response.status, 200)
         self.assertIsNone(response.result)
-        self.assertFalse(response.error)        
+        self.assertFalse(response.error)
 
     def test_050_generate(self):
-        randstring = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(20))
-        keyrand =  f'/tmp/key_{randstring}'
+        randstring = "".join(
+            random.choice(string.ascii_letters + string.digits) for _ in range(20)
+        )
+        keyrand = f"/tmp/key_{randstring}"
         response = self.device.generate(path=["ssh", "client-key", keyrand])
         pprint.pprint(response)
 
@@ -72,7 +84,7 @@ class TestVyDevice(unittest.TestCase):
 
         self.assertEqual(response.status, 200)
         self.assertIsNotNone(response.result)
-        self.assertFalse(response.error)        
+        self.assertFalse(response.error)
 
     def test_200_reset(self):
         response = self.device.reset(path=["conntrack-sync", "internal-cache"])
@@ -98,7 +110,6 @@ class TestVyDevice(unittest.TestCase):
         self.assertIsNotNone(response.result)
         self.assertFalse(response.error)
 
-
     def test_302_config_file_load(self):
         response = self.device.config_file_load(file="/config/test300.config")
         pprint.pprint(response)
@@ -107,10 +118,9 @@ class TestVyDevice(unittest.TestCase):
         self.assertIsNone(response.result)
         self.assertFalse(response.error)
 
-
     def tearDown(self):
         pass
 
-if __name__ == '__main__':
-    unittest.main()
 
+if __name__ == "__main__":
+    unittest.main()