From 3f4da9050ce29dcabb9ce75461705b7613986743 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 11 Nov 2015 21:57:58 +0100 Subject: [PATCH] Support VPCS 0.6.1 --- gns3server/modules/vpcs/vpcs_vm.py | 6 +++--- tests/modules/vpcs/test_vpcs_vm.py | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/vpcs/vpcs_vm.py b/gns3server/modules/vpcs/vpcs_vm.py index 8413bc5e..3e57659d 100644 --- a/gns3server/modules/vpcs/vpcs_vm.py +++ b/gns3server/modules/vpcs/vpcs_vm.py @@ -197,7 +197,7 @@ class VPCSVM(BaseVM): @asyncio.coroutine def _check_vpcs_version(self): """ - Checks if the VPCS executable version is >= 0.8b. + Checks if the VPCS executable version is >= 0.8b or == 0.6.1. """ try: output = yield from subprocess_check_output(self.vpcs_path, "-v", cwd=self.working_dir) @@ -205,8 +205,8 @@ class VPCSVM(BaseVM): if match: version = match.group(1) self._vpcs_version = parse_version(version) - if self._vpcs_version < parse_version("0.8b"): - raise VPCSError("VPCS executable version must be >= 0.8b") + if self._vpcs_version < parse_version("0.8b") and self._vpcs_version != parse_version("0.6.1"): + raise VPCSError("VPCS executable version must be >= 0.8b or 0.6.1") else: raise VPCSError("Could not determine the VPCS version for {}".format(self.vpcs_path)) except (OSError, subprocess.SubprocessError) as e: diff --git a/tests/modules/vpcs/test_vpcs_vm.py b/tests/modules/vpcs/test_vpcs_vm.py index 86994c1b..f133a525 100644 --- a/tests/modules/vpcs/test_vpcs_vm.py +++ b/tests/modules/vpcs/test_vpcs_vm.py @@ -56,6 +56,12 @@ def test_vm_check_vpcs_version(loop, vm, manager): assert vm._vpcs_version == parse_version("0.9") +def test_vm_check_vpcs_version_0_6_1(loop, vm, manager): + with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.subprocess_check_output", return_value="Welcome to Virtual PC Simulator, version 0.6.1"): + loop.run_until_complete(asyncio.async(vm._check_vpcs_version())) + assert vm._vpcs_version == parse_version("0.6.1") + + def test_vm_invalid_vpcs_version(loop, manager, vm): with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.subprocess_check_output", return_value="Welcome to Virtual PC Simulator, version 0.1"): with pytest.raises(VPCSError):