Make all class names CamelCase

Fixes: #11718
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py
index 0d3b14949a7cc57d3c5890bab171fb8f2fa59cc7..d9df450ffb46b907bff306bdc7866e4724c0b861 100644 (file)
--- a/src/nitsi/machine.py
+++ b/src/nitsi/machine.py
@@ -128,7 +128,7 @@ class Machine():
         return elem.text
 
     def check_is_booted_up(self):
-        serial_con = serial_connection.Serial_connection(self.get_serial_device())
+        serial_con = serial_connection.SerialConnection(self.get_serial_device())
 
         serial_con.write("\n")
         # This will block till the domain is booted up
@@ -138,7 +138,7 @@ class Machine():
 
     def login(self, log_file, log_start_time=None, longest_machine_name=10):
         try:
-            self.serial_con = serial_connection.Serial_connection(self.get_serial_device(),
+            self.serial_con = serial_connection.SerialConnection(self.get_serial_device(),
                                 username=self.username,
                                 log_file=log_file,
                                 log_start_time=log_start_time,

diff --git a/src/nitsi/serial_connection.py b/src/nitsi/serial_connection.py
index ca6ba62617659fdeb5d8435db3f08ae5ba90d285..f97d94f45b1d57d9a30e5f48a46943f518317971 100644 (file)
--- a/src/nitsi/serial_connection.py
+++ b/src/nitsi/serial_connection.py
@@ -11,7 +11,7 @@ from . import logger
 
 log = logging.getLogger("nitsi.serial")
 
-class Serial_connection():
+class SerialConnection():
     def __init__(self, device, username=None, log_file=None, name=None, log_start_time=None, longest_machine_name=10):
         self.buffer = b""
         self.back_at_prompt_pattern =  None

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index b9ea034c2c284e6dcba84168c6220d115d31c9e8..5ea928fab4fe36308ad5f3cf6efada725a4b9bc9 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -138,7 +138,7 @@ class Test():
 
 
     def virtual_environ_setup(self):
-        self.virtual_environ = virtual_environ.Virtual_environ(self.settings["virtual_environ_path"])
+        self.virtual_environ = virtual_environ.VirtualEnviron(self.settings["virtual_environ_path"])
 
         self.virtual_networks = self.virtual_environ.get_networks()
 

diff --git a/src/nitsi/virtual_environ.py b/src/nitsi/virtual_environ.py
index 2537b7d6273050a2f01ee171c6bf2da6eaaf58cd..d4f24ae34674a2db8c15c3cf5b46f1444aac0631 100644 (file)
--- a/src/nitsi/virtual_environ.py
+++ b/src/nitsi/virtual_environ.py
@@ -12,7 +12,7 @@ logger = logging.getLogger("nitsi.virtual_environ")
 
 # Should return all vms and networks in a list
 # and should provide the path to the necessary xml files
-class Virtual_environ():
+class VirtualEnviron():
     def __init__(self, path):
         self.log = logger.getChild(os.path.basename(os.path.abspath(path)))
         try: