Changeset 207 for etherws

Timestamp:

08/03/12 12:41:05 (12 years ago)

Author:

atzm

Message:

• refactoring

File:

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

etherws/trunk/etherws.py

@@ -136 +136 @@
                 del self._table[vid]
 
-    def get_entry(self, vid, mac):
+    def _get_entry(self, vid, mac):
         try:
             entry = self._table[vid][mac]
@@ -149 +149 @@
                      lambda: (entry.port.number, vid, mac.encode('hex')))
 
-    def get_vid_list(self):
-        return sorted(self._table.iterkeys())
-
-    def get_mac_list(self, vid):
-        return sorted(self._table[vid].iterkeys())
+    def foreach(self):
+        for vid in sorted(self._table.iterkeys()):
+            for mac in sorted(self._table[vid].iterkeys()):
+                entry = self._get_entry(vid, mac)
+                if entry:
+                    yield (vid, mac, entry)
 
     def lookup(self, frame):
         mac = frame.dst_mac
         vid = frame.vid
-        entry = self.get_entry(vid, mac)
+        entry = self._get_entry(vid, mac)
         return getattr(entry, 'port', None)
 
@@ -169 +170 @@
 
     def delete(self, port):
-        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')))
+        for vid, mac, entry in self.foreach():
+            if 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')))
 
 
@@ -577 +576 @@
     def handle_listFdb(self, params):
         list_ = []
-        for vid in self._switch.fdb.get_vid_list():
-            for mac in self._switch.fdb.get_mac_list(vid):
-                entry = self._switch.fdb.get_entry(vid, mac)
-                if entry:
-                    list_.append({
-                        'vid':  vid,
-                        'mac':  EthernetFrame.format_mac(mac),
-                        'port': entry.port.number,
-                        'age':  int(entry.age),
-                    })
+        for vid, mac, entry in self._switch.fdb.foreach():
+            list_.append({
+                'vid':  vid,
+                'mac':  EthernetFrame.format_mac(mac),
+                'port': entry.port.number,
+                'age':  int(entry.age),
+            })
         return {'entries': list_}