Fix MAC address regex
Previously the regex for finding MAC addressing was not catching the
last byte of the address.
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index de5a6e7..d5f4399 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -202,10 +202,11 @@
if self.handle :
response = self.execute(cmd=host+" ifconfig",prompt="mininet>",timeout=10)
- pattern = "HWaddr\s(((\d|\w)+:)+(\d|\w))"
- mac_address_search = re.search(pattern, response)
- main.log.info("Mac-Address of Host "+host +" is "+mac_address_search.group(1))
- return mac_address_search.group(1)
+ pattern = r'HWaddr\s([0-9A-F]{2}[:-]){5}([0-9A-F]{2})'
+ mac_address_search = re.search(pattern, response, re.I)
+ mac_address = mac_address_search.group().split(" ")[1]
+ main.log.info("Mac-Address of Host "+ host + " is " + mac_address)
+ return mac_address
else :
main.log.error("Connection failed to the host")
def getIPAddress(self,host):