fix fdb test on sonic kvm image (#1227)

Do not check total mac as there could be more macs from neighbors
Result unstable tests

Signed-off-by: Guohan Lu <[email protected]>

Author: lguohan

tests/fdb/test_fdb.py

@@ -152,8 +152,6 @@ def test_fdb(ansible_adhoc, testbed, ptfadapter):
         if "dynamic" in l.lower():
             total_mac_count += 1
 
+    print res
     # Verify that the number of dummy MAC entries is expected
     assert dummy_mac_count == DUMMY_MAC_COUNT * vlan_member_count
-    # Verify that total number of MAC entries is expected
-    assert total_mac_count == DUMMY_MAC_COUNT * vlan_member_count + vlan_member_count
-

tests/ptf_fixtures.py

@@ -49,11 +49,11 @@ def ptfadapter(ptfhost, testbed):
     ifaces_map = {int(ifname.replace(ETH_PFX, '')): ifname for ifname in ifaces}
 
     # generate supervisor configuration for ptf_nn_agent
-    ptfhost.host.options['variable_manager'].extra_vars = {
+    ptfhost.host.options['variable_manager'].extra_vars.update({
         'device_num': DEFAULT_DEVICE_NUM,
         'ptf_nn_port': DEFAULT_PTF_NN_PORT,
         'ifaces_map': ifaces_map,
-    }
+    })
     ptfhost.template(src='ptfadapter/templates/ptf_nn_agent.conf.ptf.j2',
                      dest='/etc/supervisor/conf.d/ptf_nn_agent.conf')