Rename all instances of "father" to "parent"

fkie-cad · Oct 15, 2024 · 5b1cd97 · 5b1cd97
1 parent c29d9e4
commit 5b1cd97
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/src/vmcontrol/sessionhandler/sessionhandler.py b/src/vmcontrol/sessionhandler/sessionhandler.py
@@ -60,9 +60,9 @@ class Clone(DictNamespace):
 
 class CloneCreator:
     def __init__(
-        self, father_vm, base_snapshot, number_of_clones, vmm_controller: VMMController, vrde_port_start=5000
+        self, parent_vm, base_snapshot, number_of_clones, vmm_controller: VMMController, vrde_port_start=5000
     ):
-        self.father_vm = father_vm
+        self.parent_vm = parent_vm
         self.base_snapshot = base_snapshot
         self.number_of_clones = number_of_clones
         self.vmmc = vmm_controller
@@ -85,7 +85,7 @@ def set_data(self, clone):
         self.set_vrde_port(clone)
 
     def set_vm_name(self, clone):
-        clone.vm = self.father_vm + "Clone" + str(clone.id)
+        clone.vm = self.parent_vm + "Clone" + str(clone.id)
         while clone.vm in self._current_vms:
             clone.vm += "a"
 
@@ -104,7 +104,7 @@ def set_vrde_port(self, clone):
         clone.vrde_port = self.vrde_port_start + clone.id - 1
 
     def create_vm(self, clone):
-        self.vmmc.clone(self.father_vm, self.base_snapshot, clone.vm)
+        self.vmmc.clone(self.parent_vm, self.base_snapshot, clone.vm)
         self.vmmc.set_mac(clone.vm, clone.management_mac, if_id=2)
         self.vmmc.set_mac(clone.vm, clone.internal_mac, if_id=1)
         self.vmmc.set_vrde_port(clone.vm, clone.vrde_port)
@@ -202,9 +202,9 @@ def create_backup_snapshots(self, vms):
 
     def create_clones(self):
         logger.info("Creating clones")
-        father_vm = self.config.client_vm
-        base_snapshot = self.backup_snapshots[father_vm]
-        clone_creator = self.clone_creator_class(father_vm, base_snapshot, self.config.number_of_clones, self.vmmc)
+        parent_vm = self.config.client_vm
+        base_snapshot = self.backup_snapshots[parent_vm]
+        clone_creator = self.clone_creator_class(parent_vm, base_snapshot, self.config.number_of_clones, self.vmmc)
         self.clones = clone_creator.create()
 
     def start_all_vms(self):

diff --git a/src/vmcontrol/sessionhandler/tests/test_sessionhandler.py b/src/vmcontrol/sessionhandler/tests/test_sessionhandler.py
@@ -21,8 +21,7 @@
 
 import pytest
 
-from vmcontrol.sessionhandler import SessionHandler, SessionConfig, SessionHandlerException, \
-    CloneCreator
+from vmcontrol.sessionhandler import SessionHandler, SessionConfig, SessionHandlerException, CloneCreator
 from vmcontrol.sessionhandler.sessionhandler import Clone, DictNamespace
 from vmcontrol.vmmcontroller import VMMControllerException
 from vmcontrol.vmmcontroller.tests.mocks import MockVMMController
@@ -109,8 +108,13 @@ class TestSessionHandler:
     def test_default_config(self):
         config = SessionHandler.default_config()
         assert config.server_vms == [
-            "Internet Router", "Attacker", "Company Router", "Log Server", "Internal Server",
-            "DMZ Server"]
+            "Internet Router",
+            "Attacker",
+            "Company Router",
+            "Log Server",
+            "Internal Server",
+            "DMZ Server",
+        ]
         assert config.client_vm == "Client"
         assert config.number_of_clones == 3
         assert config.vm_start_timeout == 0
@@ -209,8 +213,7 @@ def test_login_clones(self, sh: SessionHandler):
         sh.create_clones()
         sh.login_clones()
         for clone in sh.clones:
-            sh.vmmc.set_credentials.assert_any_call(
-                clone.vm, clone.user, clone.password, clone.domain)
+            sh.vmmc.set_credentials.assert_any_call(clone.vm, clone.user, clone.password, clone.domain)
 
     def test_start_session(self, sh: SessionHandler):
         server_vms = sh.config.server_vms
@@ -309,16 +312,16 @@ def test_init_default_fields(self):
 
 @pytest.fixture()
 def cc():
-    father_vm = "Client"
+    parent_vm = "Client"
     base_snapshot = "CloneShot"
     number_of_clones = 5
     mvmmc = MockVMMController()
     some_vm = mvmmc.get_vms()[0]
     some_shot = "Snap"
     mvmmc.create_snapshot(some_vm, some_shot)
-    mvmmc.clone(some_vm, some_shot, father_vm)
-    mvmmc.create_snapshot(father_vm, base_snapshot)
-    cc = CloneCreator(father_vm, base_snapshot, number_of_clones, mvmmc)
+    mvmmc.clone(some_vm, some_shot, parent_vm)
+    mvmmc.create_snapshot(parent_vm, base_snapshot)
+    cc = CloneCreator(parent_vm, base_snapshot, number_of_clones, mvmmc)
     return cc
 
 
@@ -334,7 +337,7 @@ def test_generate_ids(self, cc: CloneCreator):
     def test_set_vm_name(self, cc: CloneCreator):
         clone = Clone(id=42)
         cc.set_vm_name(clone)
-        assert clone.vm.startswith(cc.father_vm)
+        assert clone.vm.startswith(cc.parent_vm)
 
     def test_set_vm_name_avoiding_current_vms(self, cc: CloneCreator):
         clone = Clone(id=42)

diff --git a/src/vmcontrol/vmmcontroller/tests/test_vboxcontroller.py b/src/vmcontrol/vmmcontroller/tests/test_vboxcontroller.py
@@ -39,11 +39,13 @@ def test_vboxmanage_mock(self, vbc: VBoxController):
         assert isinstance(vbc._vboxmanage_execute, Mock)
 
     def test_get_vms(self, vbc: VBoxController):
-        return_value = "\n".join([
-            "\"Attacker\" {8451900b-320a-43b4-9eb9-9bd6656f33ad}",
-            "\"Client\" {4d0986c7-eabc-4cd3-a2f3-e28111a66ac1}",
-            "\"Company Router\" {d75d3108-266b-420e-aa74-bc73f689ee9c}"
-        ])
+        return_value = "\n".join(
+            [
+                '"Attacker" {8451900b-320a-43b4-9eb9-9bd6656f33ad}',
+                '"Client" {4d0986c7-eabc-4cd3-a2f3-e28111a66ac1}',
+                '"Company Router" {d75d3108-266b-420e-aa74-bc73f689ee9c}',
+            ]
+        )
         vbc._vboxmanage_execute = Mock(return_value=return_value)
         vms = vbc.get_vms()
         assert_call(vbc, ["list", "vms"])
@@ -67,11 +69,13 @@ def test_is_running(self, vbc: VBoxController):
         assert not vbc.is_running("VM2")
 
     def test_get_running_vms(self, vbc: VBoxController):
-        return_value = "\n".join([
-            "\"Attacker\" {8451900b-320a-43b4-9eb9-9bd6656f33ad}",
-            "\"Client\" {4d0986c7-eabc-4cd3-a2f3-e28111a66ac1}",
-            "\"Company Router\" {d75d3108-266b-420e-aa74-bc73f689ee9c}"
-        ])
+        return_value = "\n".join(
+            [
+                '"Attacker" {8451900b-320a-43b4-9eb9-9bd6656f33ad}',
+                '"Client" {4d0986c7-eabc-4cd3-a2f3-e28111a66ac1}',
+                '"Company Router" {d75d3108-266b-420e-aa74-bc73f689ee9c}',
+            ]
+        )
         vbc._vboxmanage_execute = Mock(return_value=return_value)
         vms = vbc._get_running_vms()
         assert_call(vbc, ["list", "runningvms"])
@@ -89,7 +93,7 @@ def test_get_macs(self, vbc: VBoxController):
         return_value = {
             "macaddress1": "0800278144CB",
             "macaddress2": "080027859405",
-            "othervalue": "ABAB"
+            "othervalue": "ABAB",
         }
         vbc._get_vm_info = Mock(return_value=return_value)
         macs = vbc.get_macs("VM")
@@ -100,7 +104,7 @@ def test_get_mac(self, vbc: VBoxController):
         return_value = {
             "macaddress1": "0800278144CB",
             "macaddress2": "080027859405",
-            "othervalue": "ABAB"
+            "othervalue": "ABAB",
         }
         vbc._get_vm_info = Mock(return_value=return_value)
         mac = vbc.get_mac("VM", if_id=1)
@@ -111,7 +115,7 @@ def test_get_mac_with_if_id(self, vbc: VBoxController):
         return_value = {
             "macaddress1": "0800278144CB",
             "macaddress2": "080027859405",
-            "othervalue": "ABAB"
+            "othervalue": "ABAB",
         }
         vbc._get_vm_info = Mock(return_value=return_value)
         mac = vbc.get_mac("VM", if_id=2)
@@ -122,7 +126,7 @@ def test_get_mac_exception(self, vbc: VBoxController):
         return_value = {
             "macaddress1": "0800278144CB",
             "macaddress2": "080027859405",
-            "othervalue": "ABAB"
+            "othervalue": "ABAB",
         }
         vbc._get_vm_info = Mock(return_value=return_value)
         with pytest.raises(VMMControllerException) as ei:
@@ -156,6 +160,7 @@ def vbox_causes_exception(vbox_vector):
                 raise VMMControllerException("Some text....")
             else:
                 pass
+
         vbc._vboxmanage_execute = Mock(side_effect=vbox_causes_exception)
         # get_vms may be used for hack
         vbc.get_vms = Mock(return_value=[vm_without_snapshot])
@@ -176,18 +181,13 @@ def test_restore_snapshot(self, vbc: VBoxController):
 
     def test_clone(self, vbc: VBoxController):
         vbc.clone("VM", "Snapshot", "VMClone")
-        assert_call(vbc, [
-            "clonevm", "VM", "--name", "VMClone",
-            "--options", "link", "--snapshot", "Snapshot",
-            "--register"
-        ])
+        assert_call(
+            vbc, ["clonevm", "VM", "--name", "VMClone", "--options", "link", "--snapshot", "Snapshot", "--register"]
+        )
 
     def test_set_credentials(self, vbc: VBoxController):
         vbc.set_credentials("VM", "TheUser", "ThePassword", "TheDomain")
-        assert_call(vbc, [
-            "controlvm", "VM",
-            "setcredentials", "TheUser", "ThePassword", "TheDomain"
-        ])
+        assert_call(vbc, ["controlvm", "VM", "setcredentials", "TheUser", "ThePassword", "TheDomain"])
 
     def _some_vbox_info_output(self):
         return """name="Company Router"
@@ -339,7 +339,7 @@ def _some_snapshot_output(self):
 
 
 """
-["VBoxManage", "clonevm", self.father, "--name", c.vm_name,
+["VBoxManage", "clonevm", self.parent, "--name", c.vm_name,
                      "--options", "link", "--snapshot", "CloneSnapshot",
                      "--register"])
-"""
+"""