From 78ad94f8152969e0149c98ae0cb89e18939dd581 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 6 Feb 2014 01:02:38 -0700 Subject: [PATCH] Get the default base MAC address when creating a new router --- gns3server/modules/dynamips/nodes/router.py | 3 +++ tests/dynamips/test_router.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index 698e6994..bcb2886c 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -89,6 +89,9 @@ class Router(object): id=self._id)) self.console = self._hypervisor.baseconsole + self._id self.aux = self._hypervisor.baseaux + self._id + + self._mac_addr = self._hypervisor.send("{platform} get_mac_addr {name}".format(platform=self._platform, + name=self._name))[0] else: log.info("creating a new ghost IOS file") Router._instance_count -= 1 diff --git a/tests/dynamips/test_router.py b/tests/dynamips/test_router.py index aba6a377..50cc7b79 100644 --- a/tests/dynamips/test_router.py +++ b/tests/dynamips/test_router.py @@ -205,7 +205,7 @@ def test_get_slot_nio_bindings(router): def test_mac_addr(router): - assert router.mac_addr == None # default value + assert router.mac_addr != None router.mac_addr = "aa:aa:aa:aa:aa:aa" assert router.mac_addr == "aa:aa:aa:aa:aa:aa"