diff --git a/frameworks/VboxMachine/VboxMachine.py b/frameworks/VboxMachine/VboxMachine.py index fe7598a..cd1b7b6 100644 --- a/frameworks/VboxMachine/VboxMachine.py +++ b/frameworks/VboxMachine/VboxMachine.py @@ -3,7 +3,7 @@ from frameworks.decorators import vm_is_turn_on from .vm_data import VmData -from tests.desktop_tests.tools.configs import VmConfig +from frameworks.VboxMachine.configs import VmConfig class VboxMachine: diff --git a/frameworks/VboxMachine/__init__.py b/frameworks/VboxMachine/__init__.py index 9961926..0caa01d 100644 --- a/frameworks/VboxMachine/__init__.py +++ b/frameworks/VboxMachine/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- from .VboxMachine import VboxMachine +from .configs import VmConfig -__all__ = [VboxMachine] +__all__ = [VboxMachine, VmConfig] diff --git a/tests/desktop_tests/tools/configs/__init__.py b/frameworks/VboxMachine/configs/__init__.py similarity index 100% rename from tests/desktop_tests/tools/configs/__init__.py rename to frameworks/VboxMachine/configs/__init__.py diff --git a/tests/desktop_tests/tools/configs/vm_config.py b/frameworks/VboxMachine/configs/vm_config.py similarity index 96% rename from tests/desktop_tests/tools/configs/vm_config.py rename to frameworks/VboxMachine/configs/vm_config.py index 4358472..45d53e4 100644 --- a/tests/desktop_tests/tools/configs/vm_config.py +++ b/frameworks/VboxMachine/configs/vm_config.py @@ -32,7 +32,7 @@ class VmConfig: cpus (int): The number of CPUs allocated for the system. memory (int): The amount of memory in MB. """ - def __init__(self, config_path: str = join(getcwd(), 'vm_config.json')): + def __init__(self, config_path: str): self.config_path = config_path self._config = self._load_config(self.config_path) self.cpus = self._config.cpus diff --git a/frameworks/__init__.py b/frameworks/__init__.py index 47ba7c1..84ea453 100644 --- a/frameworks/__init__.py +++ b/frameworks/__init__.py @@ -1,7 +1,15 @@ # -*- coding: utf-8 -*- -from .VboxMachine import VboxMachine +from .VboxMachine import VboxMachine, VmConfig from console import MyConsole from .decorators import vm_data_created, vm_is_turn_on, retry from .report import Report -__all__ = [VboxMachine, MyConsole, Report, 'vm_data_created', 'vm_is_turn_on', 'retry'] +__all__ = [ + VboxMachine, + MyConsole, + Report, + VmConfig, + 'vm_data_created', + 'vm_is_turn_on', + 'retry' +]