aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-07-29 17:15:06 +0000
committerGerrit Code Review <gerrit@fd.io>2019-07-29 17:15:06 +0000
commit2fd3a04360f11698bcb54b9952ad0d1334e7a50a (patch)
tree094d010c88196bc953904e844d91cd587215ab3b /src
parent0c39abd1dbedc948dbaff8e57ef4d2e6c21835bd (diff)
parent4c605ed3c8a2bfb70e6ff1432a6f1ca9ad863234 (diff)
Merge "l2-bindings not required, they are created by the gbp_bridge_domain"v0.0.1
Diffstat (limited to 'src')
-rw-r--r--src/VppEndPointGroupManager.cpp8
-rw-r--r--src/test/VppManager_test.cpp6
2 files changed, 0 insertions, 14 deletions
diff --git a/src/VppEndPointGroupManager.cpp b/src/VppEndPointGroupManager.cpp
index 9310e38..f66aeef 100644
--- a/src/VppEndPointGroupManager.cpp
+++ b/src/VppEndPointGroupManager.cpp
@@ -229,12 +229,6 @@ EndPointGroupManager::mk_bvi(Runtime &r,
OM::write(key, *bvi);
/*
- * Add the BVI to the BD
- */
- l2_binding l2_bvi(*bvi, bd);
- OM::write(key, l2_bvi);
-
- /*
* the bridge is not in learning mode. So add an L2FIB entry for the BVI
*/
bridge_domain_entry be(bd, bvi->l2_address().to_mac(), *bvi);
@@ -406,8 +400,6 @@ EndPointGroupManager::mk_group(Runtime &runtime,
vt_mc = mk_mcast_tunnel(
runtime, key, bd_vnid.get(), bd_mcast.get());
- l2_binding l2_vxbd(*vt_mc, bd);
- OM::write(key, l2_vxbd);
std::shared_ptr<VOM::gbp_route_domain> grd =
mk_gbp_rd(runtime, key, rd, rd_vnid.get());
diff --git a/src/test/VppManager_test.cpp b/src/test/VppManager_test.cpp
index e3b5590..335eb5f 100644
--- a/src/test/VppManager_test.cpp
+++ b/src/test/VppManager_test.cpp
@@ -749,11 +749,6 @@ BOOST_FIXTURE_TEST_CASE(endpoint_group_add_del, VppStitchedManagerFixture)
WAIT_FOR_MATCH(*v_bvi_epg0);
/*
- * the BVI is put in the bridge-domain
- */
- WAIT_FOR_MATCH(l2_binding(*v_bvi_epg0, v_bd_epg0));
-
- /*
* The EPG uplink interface, also bound to BD=1
*/
interface v_phy("opflex-itf",
@@ -1228,7 +1223,6 @@ BOOST_FIXTURE_TEST_CASE(trans_endpoint_group_add_del,
vxlan_tunnel vt_bd_mcast(
host, bd_mcast, 0xAA, v_sub, vxlan_tunnel::mode_t::GBP_L2);
WAIT_FOR_MATCH(vt_bd_mcast);
- WAIT_FOR_MATCH(l2_binding(vt_bd_mcast, v_bd));
igmp_binding igmp_b(v_sub);
WAIT_FOR_MATCH(igmp_b);