commit 4c7e76d72cddb90c6b592f957076b5056e220b84
author Andy Bavier <acb@cs.princeton.edu> Wed Sep 09 18:06:30 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Wed Sep 09 18:06:30 2015 -0400
tree 02e5a3a210fa55cdfc25127b48a3ad664867cfd8
parent e43810e21d0c207ef8b87169314ff6116bd7ebf1

Don't hardcode VM interfaces connected by pipework

xos/cord/models.py

diff --git a/xos/cord/models.py b/xos/cord/models.py
index 7cf58e7..37b29a5 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -633,15 +633,7 @@
 
     @property
     def wan_mac(self):
-        ip = self.wan_ip
-        if not ip:
-           return None
-        try:
-           (a,b,c,d) = ip.split('.')
-           wan_mac = "02:42:%02x:%02x:%02x:%02x" % (int(a), int(b), int(c), int(d))
-        except:
-           wan_mac = "Exception"
-        return wan_mac
+        return self.addresses.get("wan", (None, None) )[1]
 
     @property
     def private_ip(self):