From: Jonatan Schlag Date: Mon, 25 Jun 2018 10:51:43 +0000 (+0200) Subject: Make all class names CamelCase X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9f6c37f1e3237e4f6067e2851327a330d13cb3f;hp=e8da2bf327969e105d19ef73a8c4654c74eac4ff;p=nitsi.git Make all class names CamelCase Fixes: #11718 Signed-off-by: Jonatan Schlag --- diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py index 0d3b149..d9df450 100644 --- 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 ca6ba62..f97d94f 100644 --- 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 b9ea034..5ea928f 100755 --- 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 2537b7d..d4f24ae 100644 --- 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: