Changeset 195

Timestamp:

07/31/12 02:54:42 (12 years ago)

Author:

atzm

Message:

• refactoring

File:

• etherws/trunk/etherws.py (modified) (5 diffs)

etherws/trunk/etherws.py

@@ -9 +9 @@
 #   - websocket-client-0.7.0
 #   - tornado-2.3
+#   - PyYAML-3.10
 #
 # ===========================================================================
@@ -102 +103 @@
 
 class FDB(DebugMixIn):
+    class FDBEntry(object):
+        def __init__(self, port, ageout):
+            self.port = port
+            self._time = time.time()
+            self._ageout = ageout
+
+        @property
+        def age(self):
+            return time.time() - self._time
+
+        @property
+        def agedout(self):
+            return self.age > self._ageout
+
     def __init__(self, ageout, debug=False):
         self._ageout = ageout
         self._debug = debug
-        self._dict = {}
+        self._table = {}
+
+    def _set_entry(self, vid, mac, port):
+        if vid not in self._table:
+            self._table[vid] = {}
+        self._table[vid][mac] = self.FDBEntry(port, self._ageout)
+
+    def _del_entry(self, vid, mac):
+        if vid in self._table:
+            if mac in self._table[vid]:
+                del self._table[vid][mac]
+            if not self._table[vid]:
+                del self._table[vid]
+
+    def get_entry(self, vid, mac):
+        try:
+            entry = self._table[vid][mac]
+        except KeyError:
+            return None
+
+        if not entry.agedout:
+            return entry
+
+        self._del_entry(vid, mac)
+        self.dprintf('aged out: port:%d; vid:%d; mac:%s\n',
+                     lambda: (entry.port.number, vid, mac.encode('hex')))
+
+    def get_vid_list(self):
+        return self._table.keys()
+
+    def get_mac_list(self, vid):
+        return self._table[vid].keys()
 
     def lookup(self, frame):
         mac = frame.dst_mac
         vid = frame.vid
-
-        group = self._dict.get(vid)
-        if not group:
-            return None
-
-        entry = group.get(mac)
-        if not entry:
-            return None
-
-        if time.time() - entry['time'] > self._ageout:
-            port = self._dict[vid][mac]['port']
-            del self._dict[vid][mac]
-            if not self._dict[vid]:
-                del self._dict[vid]
-            self.dprintf('aged out: port:%d; vid:%d; mac:%s\n',
-                         lambda: (port.number, vid, mac.encode('hex')))
-            return None
-
-        return entry['port']
+        entry = self.get_entry(vid, mac)
+        return getattr(entry, 'port', None)
 
     def learn(self, port, frame):
         mac = frame.src_mac
         vid = frame.vid
-
-        if vid not in self._dict:
-            self._dict[vid] = {}
-
-        self._dict[vid][mac] = {'time': time.time(), 'port': port}
+        self._set_entry(vid, mac, port)
         self.dprintf('learned: port:%d; vid:%d; mac:%s\n',
                      lambda: (port.number, vid, mac.encode('hex')))
 
     def delete(self, port):
-        for vid in self._dict.keys():
-            for mac in self._dict[vid].keys():
-                if self._dict[vid][mac]['port'].number == port.number:
-                    del self._dict[vid][mac]
+        for vid in self.get_vid_list():
+            for mac in self.get_mac_list(vid):
+                entry = self.get_entry(vid, mac)
+                if entry and entry.port.number == port.number:
+                    self._del_entry(vid, mac)
                     self.dprintf('deleted: port:%d; vid:%d; mac:%s\n',
                                  lambda: (port.number, vid, mac.encode('hex')))
-            if not self._dict[vid]:
-                del self._dict[vid]
-
-
-class SwitchPort(object):
-    def __init__(self, number, interface):
-        self.number = number
-        self.interface = interface
-        self.tx = 0
-        self.rx = 0
-        self.shut = False
-
-    @staticmethod
-    def cmp_by_number(x, y):
-        return cmp(x.number, y.number)
 
 
 class SwitchingHub(DebugMixIn):
+    class Port(object):
+        def __init__(self, number, interface):
+            self.number = number
+            self.interface = interface
+            self.tx = 0
+            self.rx = 0
+            self.shut = False
+
+        @staticmethod
+        def cmp_by_number(x, y):
+            return cmp(x.number, y.number)
+
     def __init__(self, fdb, debug=False):
         self._fdb = fdb
@@ -174 +197 @@
     @property
     def portlist(self):
-        return sorted(self._table.itervalues(), cmp=SwitchPort.cmp_by_number)
+        return sorted(self._table.itervalues(), cmp=self.Port.cmp_by_number)
+
+    @property
+    def fdb(self):
+        return self._fdb
 
     def get_port(self, portnum):
@@ -182 +209 @@
         try:
             self._set_privattr('portnum', interface, self._next)  # XXX
-            self._table[self._next] = SwitchPort(self._next, interface)
+            self._table[self._next] = self.Port(self._next, interface)
             return self._next
         finally:
@@ -197 +224 @@
         ports = (self._table[n] for n in portnums)
         ports = (p for p in ports if not p.shut)
-        ports = sorted(ports, cmp=SwitchPort.cmp_by_number)
+        ports = sorted(ports, cmp=self.Port.cmp_by_number)
 
         for p in ports: