diff options
author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-16 20:32:13 +0200 |
---|---|---|
committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-16 20:32:13 +0200 |
commit | 57be36071e3adcb8c7d59f096cfb82d2f47ce8c5 (patch) | |
tree | dd38070d42f4b24f5bc86269a641acbed7dcdeb0 /haircontrol/data.py | |
parent | f5814e325dc083523337d34c7f459ca5b7f8ca07 (diff) | |
download | haircontrol-57be36071e3adcb8c7d59f096cfb82d2f47ce8c5.zip haircontrol-57be36071e3adcb8c7d59f096cfb82d2f47ce8c5.tar.gz haircontrol-57be36071e3adcb8c7d59f096cfb82d2f47ce8c5.tar.bz2 |
Inspector: more of them. Discovery: guess from mac address and some unification. Equipment : lowercase for iface
Diffstat (limited to 'haircontrol/data.py')
-rw-r--r-- | haircontrol/data.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/haircontrol/data.py b/haircontrol/data.py index 463e38a..2ab8268 100644 --- a/haircontrol/data.py +++ b/haircontrol/data.py @@ -5,7 +5,7 @@ class EtherDomain: self.mac2ip = {} def __repr__(self): - return '([\n%s\n],\n%s\n)'%(',\n'.join(' %s'%repr(e) for e in get_equipment_list_sorted()), repr(self.ip2mac)) + return '([\n%s\n],\n%s\n)'%(',\n'.join(' %s'%repr(e) for e in self.get_equipment_list_sorted()), repr(self.ip2mac)) def get_equipment_list_sorted(self): e_list = list(self.equipments.values()) @@ -40,18 +40,20 @@ class Equipment: def add_iface(self, ifname, mac): iface = self.ifaces.get(ifname) + mac_lower = mac.lower() if iface: - iface.mac = mac + iface.mac = mac_lower else: - self.ifaces[ifname] = Interface(ifname, mac) + self.ifaces[ifname] = Interface(ifname, mac_lower) def add_seen_mac(self, ifname, mac): iface = self.ifaces.get(ifname) + mac_lower = mac.lower() if not iface: - print("Warn : add_seen_mac(%s, %s) auto-create iface on %s"%(ifname, mac, self.name)) + print("Warn : add_seen_mac(%s, %s) auto-create iface on %s"%(ifname, mac_lower, self.name)) iface = Interface(ifname) self.ifaces[ifname] = iface - iface.mac_seen.append(mac) + iface.mac_seen.append(mac_lower) class Interface: def __init__(self, name=None, mac=None): @@ -60,6 +62,6 @@ class Interface: self.mac_seen = [] def __repr__(self): - #return repr( ( self.mac, self.name, self.mac_seen ) ) - return repr( ( self.mac, self.name, '[ %i mac_seen ]'%len(self.mac_seen) ) ) + return repr( ( self.mac, self.name, self.mac_seen ) ) + #return repr( ( self.mac, self.name, '[ %i mac_seen ]'%len(self.mac_seen) ) ) |