Changeset 198

Timestamp:

08/01/12 00:43:21 (12 years ago)

Author:

atzm

Message:

• add ctl command "listfdb"

File:

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

etherws/trunk/etherws.py

@@ -101 +101 @@
         return 0
 
+    @staticmethod
+    def format_mac(mac, sep=':'):
+        return sep.join(b.encode('hex') for b in mac)
+
 
 class FDB(DebugMixIn):
@@ -148 +152 @@
 
     def get_vid_list(self):
-        return self._table.keys()
+        return sorted(self._table.iterkeys())
 
     def get_mac_list(self, vid):
-        return self._table[vid].keys()
+        return sorted(self._table[vid].iterkeys())
 
     def lookup(self, frame):
@@ -548 +552 @@
             self.finish({'result': None, 'error': {'message': msg}, 'id': id_})
 
+    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:
+                    mac = EthernetFrame.format_mac(mac)
+                    list_.append([vid, mac, entry.port.number, int(entry.age)])
+        return {'result': list_}
+
     def handle_listPort(self, params):
         list_ = [self._portstat(p) for p in self._switch.portlist]
-        return {'portlist': list_}
+        return {'result': list_}
 
     def handle_addPort(self, params):
@@ -562 +576 @@
             portnum = interface.open()
             list_.append(self._portstat(self._switch.get_port(portnum)))
-        return {'portlist': list_}
+        return {'result': list_}
 
     def handle_delPort(self, params):
@@ -570 +584 @@
             list_.append(self._portstat(port))
             port.interface.close()
-        return {'portlist': list_}
+        return {'result': list_}
 
     def handle_shutPort(self, params):
@@ -578 +592 @@
             port.shut = bool(p['shut'])
             list_.append(self._portstat(port))
-        return {'portlist': list_}
+        return {'result': list_}
 
     def _optparse_tap(self, opt):
@@ -778 +792 @@
         return request(args, 'listPort', [])
 
+    def handle_ctl_listfdb(args):
+        return request(args, 'listFdb', [])
+
     res = locals()['handle_ctl_' + args.control_method](args)
 
@@ -783 +800 @@
         print(res['error']['message'])
     else:
-        print(yaml.safe_dump(res['result']['portlist']).strip())
+        print(yaml.safe_dump(res['result']).strip())
 
 
@@ -837 +854 @@
     parser_c_lp = control_method.add_parser('listport')
 
+    parser_c_lf = control_method.add_parser('listfdb')
+
     # -- go
     args = parser.parse_args()