From 3c917c59fb3a13585ad8031bf0a10869d0e14df6 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Fri, 27 Mar 2015 16:20:31 +0100 Subject: [PATCH] Fix error when missing adapter Fix #112 --- gns3server/modules/dynamips/nodes/router.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index 9c219a97..ba49e8be 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -1181,6 +1181,11 @@ class Router(BaseVM): except IndexError: raise DynamipsError('Slot {slot_number} does not exist on router "{name}"'.format(name=self._name, slot_number=slot_number)) + + if adapter is None: + raise DynamipsError("Adapter is missing in {slot_number}".format( slot_number=slot_number)) + + if not adapter.port_exists(port_number): raise DynamipsError("Port {port_number} does not exist in adapter {adapter}".format(adapter=adapter, port_number=port_number)) @@ -1215,6 +1220,9 @@ class Router(BaseVM): except IndexError: raise DynamipsError('Slot {slot_number} does not exist on router "{name}"'.format(name=self._name, slot_number=slot_number)) + + + if not adapter.port_exists(port_number): raise DynamipsError("Port {port_number} does not exist in adapter {adapter}".format(adapter=adapter, port_number=port_number))