[FastReboot]: Update FR to make it working with 1.0.3 (sonic-net#95)

* Update FR to make it working with 1.0.3

scripts/fast-reboot-dump.py

@@ -6,7 +6,7 @@
 from pprint import pprint
 
 
-def generate_arp_entries(filename):
+def generate_arp_entries(filename, all_available_macs):
     db = swsssdk.SonicV2Connector()
     db.connect(db.APPL_DB, False)   # Make one attempt only
 
@@ -15,9 +15,13 @@ def generate_arp_entries(filename):
     keys = db.keys(db.APPL_DB, 'NEIGH_TABLE:*')
     keys = [] if keys is None else keys
     for key in keys:
+        entry = db.get_all(db.APPL_DB, key)
+        if entry['neigh'].lower() not in all_available_macs:
+            # print me to log
+            continue
         obj = {
-          'OP': 'SET',
-          key: db.get_all(db.APPL_DB, key)
+          key: entry,
+          'OP': 'SET'
         }
         arp_output.append(obj)
 
@@ -49,24 +53,56 @@ def get_vlan_ifaces():
 
     return vlans
 
+def get_bridge_port_id_2_port_id(db):
+    bridge_port_id_2_port_id = {}
+    keys = db.keys(db.ASIC_DB, 'ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT:oid:*')
+    keys = [] if keys is None else keys
+    for key in keys:
+        value = db.get_all(db.ASIC_DB, key)
+        port_type = value['SAI_BRIDGE_PORT_ATTR_TYPE']
+        if port_type != 'SAI_BRIDGE_PORT_TYPE_PORT':
+            continue
+        port_id = value['SAI_BRIDGE_PORT_ATTR_PORT_ID']
+        # ignore admin status
+        bridge_id = key.replace('ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT:', '')
+        bridge_port_id_2_port_id[bridge_id] = port_id
+
+    return bridge_port_id_2_port_id
+
 def get_map_port_id_2_iface_name(db):
     port_id_2_iface = {}
     keys = db.keys(db.ASIC_DB, 'ASIC_STATE:SAI_OBJECT_TYPE_HOSTIF:oid:*')
     keys = [] if keys is None else keys
     for key in keys:
         value = db.get_all(db.ASIC_DB, key)
-        port_id = value['SAI_HOSTIF_ATTR_RIF_OR_PORT_ID']
+        port_id = value['SAI_HOSTIF_ATTR_OBJ_ID']
         iface_name = value['SAI_HOSTIF_ATTR_NAME']
         port_id_2_iface[port_id] = iface_name
 
     return port_id_2_iface
 
-def get_fdb(db, vlan_id, port_id_2_iface):
+def get_map_bridge_port_id_2_iface_name(db):
+    bridge_port_id_2_port_id = get_bridge_port_id_2_port_id(db)
+    port_id_2_iface = get_map_port_id_2_iface_name(db)
+
+    bridge_port_id_2_iface_name = {}
+
+    for bridge_port_id, port_id in bridge_port_id_2_port_id.items():
+        if port_id in port_id_2_iface:
+            bridge_port_id_2_iface_name[bridge_port_id] = port_id_2_iface[port_id]
+        else:
+            print "Not found"
+
+    return bridge_port_id_2_iface_name
+
+def get_fdb(db, vlan_id, bridge_id_2_iface):
     fdb_types = {
       'SAI_FDB_ENTRY_TYPE_DYNAMIC': 'dynamic',
       'SAI_FDB_ENTRY_TYPE_STATIC' : 'static'
     }
 
+    available_macs = set()
+
     entries = []
     keys = db.keys(db.ASIC_DB, 'ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY:{*\"vlan\":\"%d\"}' % vlan_id)
     keys = [] if keys is None else keys
@@ -76,12 +112,15 @@ def get_fdb(db, vlan_id, port_id_2_iface):
         mac = str(key_obj['mac'])
         if not is_mac_unicast(mac):
             continue
+        available_macs.add(mac.lower())
         mac = mac.replace(':', '-')
         # FIXME: mac is unicast
         # get attributes
         value = db.get_all(db.ASIC_DB, key)
         type = fdb_types[value['SAI_FDB_ENTRY_ATTR_TYPE']]
-        port = port_id_2_iface[value['SAI_FDB_ENTRY_ATTR_PORT_ID']]
+        if value['SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID'] not in bridge_id_2_iface:
+            continue
+        port = bridge_id_2_iface[value['SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID']]
 
         obj = {
           'FDB_TABLE:Vlan%d:%s' % (vlan_id, mac) : {
@@ -93,7 +132,7 @@ def get_fdb(db, vlan_id, port_id_2_iface):
 
         entries.append(obj)
 
-    return entries
+    return entries, available_macs
 
 
 def generate_fdb_entries(filename):
@@ -102,24 +141,27 @@ def generate_fdb_entries(filename):
     db = swsssdk.SonicV2Connector()
     db.connect(db.ASIC_DB, False)   # Make one attempt only
 
-    port_id_2_iface = get_map_port_id_2_iface_name(db)
+    bridge_id_2_iface = get_map_bridge_port_id_2_iface_name(db)
 
     vlan_ifaces = get_vlan_ifaces()
 
+    all_available_macs = set()
     for vlan in vlan_ifaces:
         vlan_id = int(vlan.replace('Vlan', ''))
-        fdb_entries.extend(get_fdb(db, vlan_id, port_id_2_iface))
+        fdb_entry, available_macs = get_fdb(db, vlan_id, bridge_id_2_iface)
+        all_available_macs |= available_macs
+        fdb_entries.extend(fdb_entry)
 
     db.close(db.ASIC_DB)
 
     with open(filename, 'w') as fp:
         json.dump(fdb_entries, fp, indent=2, separators=(',', ': '))
 
-    return
+    return all_available_macs
 
 def main():
-    generate_arp_entries('/tmp/arp.json')
-    generate_fdb_entries('/tmp/fdb.json')
+    all_available_macs = generate_fdb_entries('/tmp/fdb.json')
+    generate_arp_entries('/tmp/arp.json', all_available_macs)
 
     return