From 3be9164f80ebb1929488bbe2ee4da1d35f42c1a2 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 14 Sep 2020 07:41:48 +0000 Subject: [PATCH] misc: deprecate gbp and its dependents MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Type: improvement Signed-off-by: Neale Ranns Signed-off-by: Benoît Ganne Change-Id: I2f30a4f04fd9a8635ce2d259b5fd5b0c85cee8c3 --- MAINTAINERS | 16 --- .../deprecated}/plugins/gbp/CMakeLists.txt | 0 {src => extras/deprecated}/plugins/gbp/gbp.api | 0 {src => extras/deprecated}/plugins/gbp/gbp.h | 0 {src => extras/deprecated}/plugins/gbp/gbp_api.c | 0 .../deprecated}/plugins/gbp/gbp_bridge_domain.c | 0 .../deprecated}/plugins/gbp/gbp_bridge_domain.h | 0 .../deprecated}/plugins/gbp/gbp_classify.c | 0 .../deprecated}/plugins/gbp/gbp_classify.h | 0 .../deprecated}/plugins/gbp/gbp_classify_node.c | 0 .../deprecated}/plugins/gbp/gbp_contract.c | 0 .../deprecated}/plugins/gbp/gbp_contract.h | 0 .../deprecated}/plugins/gbp/gbp_endpoint.c | 0 .../deprecated}/plugins/gbp/gbp_endpoint.h | 0 .../deprecated}/plugins/gbp/gbp_endpoint_group.c | 0 .../deprecated}/plugins/gbp/gbp_endpoint_group.h | 0 .../deprecated}/plugins/gbp/gbp_ext_itf.c | 0 .../deprecated}/plugins/gbp/gbp_ext_itf.h | 0 {src => extras/deprecated}/plugins/gbp/gbp_fwd.c | 0 .../deprecated}/plugins/gbp/gbp_fwd_dpo.c | 0 .../deprecated}/plugins/gbp/gbp_fwd_dpo.h | 0 .../deprecated}/plugins/gbp/gbp_fwd_node.c | 0 {src => extras/deprecated}/plugins/gbp/gbp_itf.c | 0 {src => extras/deprecated}/plugins/gbp/gbp_itf.h | 0 {src => extras/deprecated}/plugins/gbp/gbp_learn.c | 0 {src => extras/deprecated}/plugins/gbp/gbp_learn.h | 0 .../deprecated}/plugins/gbp/gbp_learn_node.c | 0 .../deprecated}/plugins/gbp/gbp_policy.c | 0 .../deprecated}/plugins/gbp/gbp_policy.h | 0 .../deprecated}/plugins/gbp/gbp_policy_dpo.c | 0 .../deprecated}/plugins/gbp/gbp_policy_dpo.h | 0 .../deprecated}/plugins/gbp/gbp_policy_node.c | 0 .../deprecated}/plugins/gbp/gbp_recirc.c | 0 .../deprecated}/plugins/gbp/gbp_recirc.h | 0 .../deprecated}/plugins/gbp/gbp_route_domain.c | 0 .../deprecated}/plugins/gbp/gbp_route_domain.h | 0 .../deprecated}/plugins/gbp/gbp_scanner.c | 0 .../deprecated}/plugins/gbp/gbp_scanner.h | 0 .../deprecated}/plugins/gbp/gbp_subnet.c | 0 .../deprecated}/plugins/gbp/gbp_subnet.h | 0 {src => extras/deprecated}/plugins/gbp/gbp_types.h | 0 {src => extras/deprecated}/plugins/gbp/gbp_vxlan.c | 0 {src => extras/deprecated}/plugins/gbp/gbp_vxlan.h | 0 .../deprecated}/plugins/gbp/gbp_vxlan_node.c | 0 .../deprecated/plugins/gbp}/test_gbp.py | 0 .../deprecated}/plugins/l2e/CMakeLists.txt | 0 {src => extras/deprecated}/plugins/l2e/l2e.api | 0 {src => extras/deprecated}/plugins/l2e/l2e.c | 0 {src => extras/deprecated}/plugins/l2e/l2e.h | 0 {src => extras/deprecated}/plugins/l2e/l2e_api.c | 0 {src => extras/deprecated}/plugins/l2e/l2e_node.c | 0 {src => extras/deprecated}/vnet/vxlan-gbp/decap.c | 0 {src => extras/deprecated}/vnet/vxlan-gbp/dir.dox | 0 {src => extras/deprecated}/vnet/vxlan-gbp/encap.c | 0 .../deprecated/vnet/vxlan-gbp}/test_vxlan_gbp.py | 0 .../vnet/vxlan-gbp}/vpp_vxlan_gbp_tunnel.py | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp.api | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp.c | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp.h | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp_api.c | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp_error.def | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp_packet.c | 0 .../deprecated}/vnet/vxlan-gbp/vxlan_gbp_packet.h | 0 src/vnet/CMakeLists.txt | 24 ---- src/vnet/l2/l2_fwd.c | 3 +- src/vnet/l2/l2_input.h | 7 - src/vnet/l2/l2_input_node.c | 5 +- src/vnet/l2/l2_output.h | 3 - test/patches/scapy-2.3.3/vxlan.patch | 1 - test/patches/scapy-2.4/vxlan.py.patch | 12 -- test/test_dvr.py | 153 --------------------- test/vpp_papi_provider.py | 28 ---- 72 files changed, 3 insertions(+), 249 deletions(-) rename {src => extras/deprecated}/plugins/gbp/CMakeLists.txt (100%) rename {src => extras/deprecated}/plugins/gbp/gbp.api (100%) rename {src => extras/deprecated}/plugins/gbp/gbp.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_api.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_bridge_domain.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_bridge_domain.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_classify.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_classify.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_classify_node.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_contract.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_contract.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_endpoint.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_endpoint.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_endpoint_group.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_endpoint_group.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_ext_itf.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_ext_itf.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_fwd.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_fwd_dpo.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_fwd_dpo.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_fwd_node.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_itf.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_itf.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_learn.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_learn.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_learn_node.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_policy.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_policy.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_policy_dpo.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_policy_dpo.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_policy_node.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_recirc.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_recirc.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_route_domain.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_route_domain.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_scanner.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_scanner.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_subnet.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_subnet.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_types.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_vxlan.c (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_vxlan.h (100%) rename {src => extras/deprecated}/plugins/gbp/gbp_vxlan_node.c (100%) rename {test => extras/deprecated/plugins/gbp}/test_gbp.py (100%) rename {src => extras/deprecated}/plugins/l2e/CMakeLists.txt (100%) rename {src => extras/deprecated}/plugins/l2e/l2e.api (100%) rename {src => extras/deprecated}/plugins/l2e/l2e.c (100%) rename {src => extras/deprecated}/plugins/l2e/l2e.h (100%) rename {src => extras/deprecated}/plugins/l2e/l2e_api.c (100%) rename {src => extras/deprecated}/plugins/l2e/l2e_node.c (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/decap.c (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/dir.dox (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/encap.c (100%) rename {test => extras/deprecated/vnet/vxlan-gbp}/test_vxlan_gbp.py (100%) rename {test => extras/deprecated/vnet/vxlan-gbp}/vpp_vxlan_gbp_tunnel.py (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp.api (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp.c (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp.h (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp_api.c (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp_error.def (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp_packet.c (100%) rename {src => extras/deprecated}/vnet/vxlan-gbp/vxlan_gbp_packet.h (100%) delete mode 100644 test/patches/scapy-2.4/vxlan.py.patch diff --git a/MAINTAINERS b/MAINTAINERS index ddcacae84ca..fc0439514f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -286,12 +286,6 @@ I: vxlan-gpe M: Hongjun Ni F: src/vnet/vxlan-gpe/ -VNET VXLAN-GBP -I: vxlan-gbp -M: Mohsin Kazmi -M: Neale Ranns -F: src/vnet/vxlan-gbp/ - VNET IPIP I: ipip Y: src/vnet/ipip/FEATURE.yaml @@ -433,11 +427,6 @@ I: builtinurl M: Dave Barach F: src/plugins/builtinurl/ -Plugin - Group Based Policy (GBP) -I: gbp -M: Neale Ranns -F: src/plugins/gbp/ - Plugin - GTPU I: gtpu M: Hongjun Ni @@ -693,11 +682,6 @@ I: svs M: Neale Ranns F: src/plugins/svs/ -Plugin - LAN Emulation -I: l2e -M: Neale Ranns -F: src/plugins/l2e/ - Plugin - IPv6 Connection Tracker I: ct6 M: Dave Barach diff --git a/src/plugins/gbp/CMakeLists.txt b/extras/deprecated/plugins/gbp/CMakeLists.txt similarity index 100% rename from src/plugins/gbp/CMakeLists.txt rename to extras/deprecated/plugins/gbp/CMakeLists.txt diff --git a/src/plugins/gbp/gbp.api b/extras/deprecated/plugins/gbp/gbp.api similarity index 100% rename from src/plugins/gbp/gbp.api rename to extras/deprecated/plugins/gbp/gbp.api diff --git a/src/plugins/gbp/gbp.h b/extras/deprecated/plugins/gbp/gbp.h similarity index 100% rename from src/plugins/gbp/gbp.h rename to extras/deprecated/plugins/gbp/gbp.h diff --git a/src/plugins/gbp/gbp_api.c b/extras/deprecated/plugins/gbp/gbp_api.c similarity index 100% rename from src/plugins/gbp/gbp_api.c rename to extras/deprecated/plugins/gbp/gbp_api.c diff --git a/src/plugins/gbp/gbp_bridge_domain.c b/extras/deprecated/plugins/gbp/gbp_bridge_domain.c similarity index 100% rename from src/plugins/gbp/gbp_bridge_domain.c rename to extras/deprecated/plugins/gbp/gbp_bridge_domain.c diff --git a/src/plugins/gbp/gbp_bridge_domain.h b/extras/deprecated/plugins/gbp/gbp_bridge_domain.h similarity index 100% rename from src/plugins/gbp/gbp_bridge_domain.h rename to extras/deprecated/plugins/gbp/gbp_bridge_domain.h diff --git a/src/plugins/gbp/gbp_classify.c b/extras/deprecated/plugins/gbp/gbp_classify.c similarity index 100% rename from src/plugins/gbp/gbp_classify.c rename to extras/deprecated/plugins/gbp/gbp_classify.c diff --git a/src/plugins/gbp/gbp_classify.h b/extras/deprecated/plugins/gbp/gbp_classify.h similarity index 100% rename from src/plugins/gbp/gbp_classify.h rename to extras/deprecated/plugins/gbp/gbp_classify.h diff --git a/src/plugins/gbp/gbp_classify_node.c b/extras/deprecated/plugins/gbp/gbp_classify_node.c similarity index 100% rename from src/plugins/gbp/gbp_classify_node.c rename to extras/deprecated/plugins/gbp/gbp_classify_node.c diff --git a/src/plugins/gbp/gbp_contract.c b/extras/deprecated/plugins/gbp/gbp_contract.c similarity index 100% rename from src/plugins/gbp/gbp_contract.c rename to extras/deprecated/plugins/gbp/gbp_contract.c diff --git a/src/plugins/gbp/gbp_contract.h b/extras/deprecated/plugins/gbp/gbp_contract.h similarity index 100% rename from src/plugins/gbp/gbp_contract.h rename to extras/deprecated/plugins/gbp/gbp_contract.h diff --git a/src/plugins/gbp/gbp_endpoint.c b/extras/deprecated/plugins/gbp/gbp_endpoint.c similarity index 100% rename from src/plugins/gbp/gbp_endpoint.c rename to extras/deprecated/plugins/gbp/gbp_endpoint.c diff --git a/src/plugins/gbp/gbp_endpoint.h b/extras/deprecated/plugins/gbp/gbp_endpoint.h similarity index 100% rename from src/plugins/gbp/gbp_endpoint.h rename to extras/deprecated/plugins/gbp/gbp_endpoint.h diff --git a/src/plugins/gbp/gbp_endpoint_group.c b/extras/deprecated/plugins/gbp/gbp_endpoint_group.c similarity index 100% rename from src/plugins/gbp/gbp_endpoint_group.c rename to extras/deprecated/plugins/gbp/gbp_endpoint_group.c diff --git a/src/plugins/gbp/gbp_endpoint_group.h b/extras/deprecated/plugins/gbp/gbp_endpoint_group.h similarity index 100% rename from src/plugins/gbp/gbp_endpoint_group.h rename to extras/deprecated/plugins/gbp/gbp_endpoint_group.h diff --git a/src/plugins/gbp/gbp_ext_itf.c b/extras/deprecated/plugins/gbp/gbp_ext_itf.c similarity index 100% rename from src/plugins/gbp/gbp_ext_itf.c rename to extras/deprecated/plugins/gbp/gbp_ext_itf.c diff --git a/src/plugins/gbp/gbp_ext_itf.h b/extras/deprecated/plugins/gbp/gbp_ext_itf.h similarity index 100% rename from src/plugins/gbp/gbp_ext_itf.h rename to extras/deprecated/plugins/gbp/gbp_ext_itf.h diff --git a/src/plugins/gbp/gbp_fwd.c b/extras/deprecated/plugins/gbp/gbp_fwd.c similarity index 100% rename from src/plugins/gbp/gbp_fwd.c rename to extras/deprecated/plugins/gbp/gbp_fwd.c diff --git a/src/plugins/gbp/gbp_fwd_dpo.c b/extras/deprecated/plugins/gbp/gbp_fwd_dpo.c similarity index 100% rename from src/plugins/gbp/gbp_fwd_dpo.c rename to extras/deprecated/plugins/gbp/gbp_fwd_dpo.c diff --git a/src/plugins/gbp/gbp_fwd_dpo.h b/extras/deprecated/plugins/gbp/gbp_fwd_dpo.h similarity index 100% rename from src/plugins/gbp/gbp_fwd_dpo.h rename to extras/deprecated/plugins/gbp/gbp_fwd_dpo.h diff --git a/src/plugins/gbp/gbp_fwd_node.c b/extras/deprecated/plugins/gbp/gbp_fwd_node.c similarity index 100% rename from src/plugins/gbp/gbp_fwd_node.c rename to extras/deprecated/plugins/gbp/gbp_fwd_node.c diff --git a/src/plugins/gbp/gbp_itf.c b/extras/deprecated/plugins/gbp/gbp_itf.c similarity index 100% rename from src/plugins/gbp/gbp_itf.c rename to extras/deprecated/plugins/gbp/gbp_itf.c diff --git a/src/plugins/gbp/gbp_itf.h b/extras/deprecated/plugins/gbp/gbp_itf.h similarity index 100% rename from src/plugins/gbp/gbp_itf.h rename to extras/deprecated/plugins/gbp/gbp_itf.h diff --git a/src/plugins/gbp/gbp_learn.c b/extras/deprecated/plugins/gbp/gbp_learn.c similarity index 100% rename from src/plugins/gbp/gbp_learn.c rename to extras/deprecated/plugins/gbp/gbp_learn.c diff --git a/src/plugins/gbp/gbp_learn.h b/extras/deprecated/plugins/gbp/gbp_learn.h similarity index 100% rename from src/plugins/gbp/gbp_learn.h rename to extras/deprecated/plugins/gbp/gbp_learn.h diff --git a/src/plugins/gbp/gbp_learn_node.c b/extras/deprecated/plugins/gbp/gbp_learn_node.c similarity index 100% rename from src/plugins/gbp/gbp_learn_node.c rename to extras/deprecated/plugins/gbp/gbp_learn_node.c diff --git a/src/plugins/gbp/gbp_policy.c b/extras/deprecated/plugins/gbp/gbp_policy.c similarity index 100% rename from src/plugins/gbp/gbp_policy.c rename to extras/deprecated/plugins/gbp/gbp_policy.c diff --git a/src/plugins/gbp/gbp_policy.h b/extras/deprecated/plugins/gbp/gbp_policy.h similarity index 100% rename from src/plugins/gbp/gbp_policy.h rename to extras/deprecated/plugins/gbp/gbp_policy.h diff --git a/src/plugins/gbp/gbp_policy_dpo.c b/extras/deprecated/plugins/gbp/gbp_policy_dpo.c similarity index 100% rename from src/plugins/gbp/gbp_policy_dpo.c rename to extras/deprecated/plugins/gbp/gbp_policy_dpo.c diff --git a/src/plugins/gbp/gbp_policy_dpo.h b/extras/deprecated/plugins/gbp/gbp_policy_dpo.h similarity index 100% rename from src/plugins/gbp/gbp_policy_dpo.h rename to extras/deprecated/plugins/gbp/gbp_policy_dpo.h diff --git a/src/plugins/gbp/gbp_policy_node.c b/extras/deprecated/plugins/gbp/gbp_policy_node.c similarity index 100% rename from src/plugins/gbp/gbp_policy_node.c rename to extras/deprecated/plugins/gbp/gbp_policy_node.c diff --git a/src/plugins/gbp/gbp_recirc.c b/extras/deprecated/plugins/gbp/gbp_recirc.c similarity index 100% rename from src/plugins/gbp/gbp_recirc.c rename to extras/deprecated/plugins/gbp/gbp_recirc.c diff --git a/src/plugins/gbp/gbp_recirc.h b/extras/deprecated/plugins/gbp/gbp_recirc.h similarity index 100% rename from src/plugins/gbp/gbp_recirc.h rename to extras/deprecated/plugins/gbp/gbp_recirc.h diff --git a/src/plugins/gbp/gbp_route_domain.c b/extras/deprecated/plugins/gbp/gbp_route_domain.c similarity index 100% rename from src/plugins/gbp/gbp_route_domain.c rename to extras/deprecated/plugins/gbp/gbp_route_domain.c diff --git a/src/plugins/gbp/gbp_route_domain.h b/extras/deprecated/plugins/gbp/gbp_route_domain.h similarity index 100% rename from src/plugins/gbp/gbp_route_domain.h rename to extras/deprecated/plugins/gbp/gbp_route_domain.h diff --git a/src/plugins/gbp/gbp_scanner.c b/extras/deprecated/plugins/gbp/gbp_scanner.c similarity index 100% rename from src/plugins/gbp/gbp_scanner.c rename to extras/deprecated/plugins/gbp/gbp_scanner.c diff --git a/src/plugins/gbp/gbp_scanner.h b/extras/deprecated/plugins/gbp/gbp_scanner.h similarity index 100% rename from src/plugins/gbp/gbp_scanner.h rename to extras/deprecated/plugins/gbp/gbp_scanner.h diff --git a/src/plugins/gbp/gbp_subnet.c b/extras/deprecated/plugins/gbp/gbp_subnet.c similarity index 100% rename from src/plugins/gbp/gbp_subnet.c rename to extras/deprecated/plugins/gbp/gbp_subnet.c diff --git a/src/plugins/gbp/gbp_subnet.h b/extras/deprecated/plugins/gbp/gbp_subnet.h similarity index 100% rename from src/plugins/gbp/gbp_subnet.h rename to extras/deprecated/plugins/gbp/gbp_subnet.h diff --git a/src/plugins/gbp/gbp_types.h b/extras/deprecated/plugins/gbp/gbp_types.h similarity index 100% rename from src/plugins/gbp/gbp_types.h rename to extras/deprecated/plugins/gbp/gbp_types.h diff --git a/src/plugins/gbp/gbp_vxlan.c b/extras/deprecated/plugins/gbp/gbp_vxlan.c similarity index 100% rename from src/plugins/gbp/gbp_vxlan.c rename to extras/deprecated/plugins/gbp/gbp_vxlan.c diff --git a/src/plugins/gbp/gbp_vxlan.h b/extras/deprecated/plugins/gbp/gbp_vxlan.h similarity index 100% rename from src/plugins/gbp/gbp_vxlan.h rename to extras/deprecated/plugins/gbp/gbp_vxlan.h diff --git a/src/plugins/gbp/gbp_vxlan_node.c b/extras/deprecated/plugins/gbp/gbp_vxlan_node.c similarity index 100% rename from src/plugins/gbp/gbp_vxlan_node.c rename to extras/deprecated/plugins/gbp/gbp_vxlan_node.c diff --git a/test/test_gbp.py b/extras/deprecated/plugins/gbp/test_gbp.py similarity index 100% rename from test/test_gbp.py rename to extras/deprecated/plugins/gbp/test_gbp.py diff --git a/src/plugins/l2e/CMakeLists.txt b/extras/deprecated/plugins/l2e/CMakeLists.txt similarity index 100% rename from src/plugins/l2e/CMakeLists.txt rename to extras/deprecated/plugins/l2e/CMakeLists.txt diff --git a/src/plugins/l2e/l2e.api b/extras/deprecated/plugins/l2e/l2e.api similarity index 100% rename from src/plugins/l2e/l2e.api rename to extras/deprecated/plugins/l2e/l2e.api diff --git a/src/plugins/l2e/l2e.c b/extras/deprecated/plugins/l2e/l2e.c similarity index 100% rename from src/plugins/l2e/l2e.c rename to extras/deprecated/plugins/l2e/l2e.c diff --git a/src/plugins/l2e/l2e.h b/extras/deprecated/plugins/l2e/l2e.h similarity index 100% rename from src/plugins/l2e/l2e.h rename to extras/deprecated/plugins/l2e/l2e.h diff --git a/src/plugins/l2e/l2e_api.c b/extras/deprecated/plugins/l2e/l2e_api.c similarity index 100% rename from src/plugins/l2e/l2e_api.c rename to extras/deprecated/plugins/l2e/l2e_api.c diff --git a/src/plugins/l2e/l2e_node.c b/extras/deprecated/plugins/l2e/l2e_node.c similarity index 100% rename from src/plugins/l2e/l2e_node.c rename to extras/deprecated/plugins/l2e/l2e_node.c diff --git a/src/vnet/vxlan-gbp/decap.c b/extras/deprecated/vnet/vxlan-gbp/decap.c similarity index 100% rename from src/vnet/vxlan-gbp/decap.c rename to extras/deprecated/vnet/vxlan-gbp/decap.c diff --git a/src/vnet/vxlan-gbp/dir.dox b/extras/deprecated/vnet/vxlan-gbp/dir.dox similarity index 100% rename from src/vnet/vxlan-gbp/dir.dox rename to extras/deprecated/vnet/vxlan-gbp/dir.dox diff --git a/src/vnet/vxlan-gbp/encap.c b/extras/deprecated/vnet/vxlan-gbp/encap.c similarity index 100% rename from src/vnet/vxlan-gbp/encap.c rename to extras/deprecated/vnet/vxlan-gbp/encap.c diff --git a/test/test_vxlan_gbp.py b/extras/deprecated/vnet/vxlan-gbp/test_vxlan_gbp.py similarity index 100% rename from test/test_vxlan_gbp.py rename to extras/deprecated/vnet/vxlan-gbp/test_vxlan_gbp.py diff --git a/test/vpp_vxlan_gbp_tunnel.py b/extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py similarity index 100% rename from test/vpp_vxlan_gbp_tunnel.py rename to extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.api b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.api similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp.api rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.api diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.c b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.c similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp.c rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.c diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.h b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.h similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp.h rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp.h diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_api.c b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_api.c similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp_api.c rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_api.c diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_error.def b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_error.def similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp_error.def rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_error.def diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_packet.c b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_packet.c similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp_packet.c rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_packet.c diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_packet.h b/extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_packet.h similarity index 100% rename from src/vnet/vxlan-gbp/vxlan_gbp_packet.h rename to extras/deprecated/vnet/vxlan-gbp/vxlan_gbp_packet.h diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 5de06da971f..5dd7cdb24ab 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -778,30 +778,6 @@ list(APPEND VNET_HEADERS list(APPEND VNET_API_FILES mpls/mpls.api) -############################################################################## -# Tunnel protocol: vxlan-gbp -############################################################################## -list(APPEND VNET_SOURCES - vxlan-gbp/decap.c - vxlan-gbp/encap.c - vxlan-gbp/vxlan_gbp_api.c - vxlan-gbp/vxlan_gbp.c - vxlan-gbp/vxlan_gbp_packet.c -) - -list (APPEND VNET_MULTIARCH_SOURCES - vxlan-gbp/decap.c - vxlan-gbp/encap.c -) - -list(APPEND VNET_HEADERS - vxlan-gbp/vxlan_gbp.h - vxlan-gbp/vxlan_gbp_packet.h - vxlan-gbp/vxlan_gbp_error.def -) - -list(APPEND VNET_API_FILES vxlan-gbp/vxlan_gbp.api) - ############################################################################## # Tunnel protocol: vxlan-gpe ############################################################################## diff --git a/src/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c index 3414f6c490e..1ee3a534cd7 100644 --- a/src/vnet/l2/l2_fwd.c +++ b/src/vnet/l2/l2_fwd.c @@ -215,8 +215,7 @@ l2fwd_process (vlib_main_t * vm, * unless some other feature is inserted before uu_flood */ if (vnet_buffer (b0)->l2.feature_bitmap & - (L2INPUT_FEAT_UU_FLOOD | - L2INPUT_FEAT_UU_FWD | L2INPUT_FEAT_GBP_FWD)) + (L2INPUT_FEAT_UU_FLOOD | L2INPUT_FEAT_UU_FWD)) { *next0 = vnet_l2_feature_next (b0, msm->feat_next_node_index, L2INPUT_FEAT_FWD); diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h index ba4c4b6ed31..7d1dc9c1d05 100644 --- a/src/vnet/l2/l2_input.h +++ b/src/vnet/l2/l2_input.h @@ -136,17 +136,10 @@ l2input_bd_config (u32 bd_index) _(ARP_UFWD, "l2-uu-fwd") \ _(ARP_TERM, "arp-term-l2bd") \ _(UU_FLOOD, "l2-flood") \ - _(GBP_FWD, "gbp-fwd") \ _(UU_FWD, "l2-uu-fwd") \ _(FWD, "l2-fwd") \ _(RW, "l2-rw") \ _(LEARN, "l2-learn") \ - _(L2_EMULATION, "l2-emulation") \ - _(GBP_LEARN, "gbp-learn-l2") \ - _(GBP_LPM_ANON_CLASSIFY, "l2-gbp-lpm-anon-classify") \ - _(GBP_NULL_CLASSIFY, "gbp-null-classify") \ - _(GBP_SRC_CLASSIFY, "gbp-src-classify") \ - _(GBP_LPM_CLASSIFY, "l2-gbp-lpm-classify") \ _(VTR, "l2-input-vtr") \ _(L2_IP_QOS_RECORD, "l2-ip-qos-record") \ _(VPATH, "vpath-input-l2") \ diff --git a/src/vnet/l2/l2_input_node.c b/src/vnet/l2/l2_input_node.c index 3638a8aa00d..74625b2ec99 100644 --- a/src/vnet/l2/l2_input_node.c +++ b/src/vnet/l2/l2_input_node.c @@ -141,9 +141,8 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u16 * next0) u8 protocol = ((ip6_header_t *) l3h0)->protocol; /* Disable bridge forwarding (flooding will execute instead if not xconnect) */ - feat_mask &= ~(L2INPUT_FEAT_FWD | - L2INPUT_FEAT_UU_FLOOD | - L2INPUT_FEAT_UU_FWD | L2INPUT_FEAT_GBP_FWD); + feat_mask &= + ~(L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD | L2INPUT_FEAT_UU_FWD); if (ethertype != ETHERNET_TYPE_ARP) feat_mask &= ~(L2INPUT_FEAT_ARP_UFWD); diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h index 1cc1e738841..201f5e195a4 100644 --- a/src/vnet/l2/l2_output.h +++ b/src/vnet/l2/l2_output.h @@ -81,9 +81,6 @@ extern vlib_node_registration_t l2output_node; #define foreach_l2output_feat \ _(OUTPUT, "interface-output") \ _(SPAN, "span-l2-output") \ - _(GBP_POLICY_LPM, "gbp-policy-lpm") \ - _(GBP_POLICY_PORT, "gbp-policy-port") \ - _(GBP_POLICY_MAC, "gbp-policy-mac") \ _(CFM, "feature-bitmap-drop") \ _(QOS, "feature-bitmap-drop") \ _(ACL, "l2-output-acl") \ diff --git a/test/patches/scapy-2.3.3/vxlan.patch b/test/patches/scapy-2.3.3/vxlan.patch index 71493dd742c..556df4dd70a 100644 --- a/test/patches/scapy-2.3.3/vxlan.patch +++ b/test/patches/scapy-2.3.3/vxlan.patch @@ -8,5 +8,4 @@ diff --git a/scapy/layers/vxlan.py b/scapy/layers/vxlan.py +bind_layers(UDP, VXLAN, dport=4790) # RFC standard vxlan-gpe port bind_layers(UDP, VXLAN, dport=6633) # New IANA assigned port for use with NSH bind_layers(UDP, VXLAN, dport=8472) # Linux implementation port -+bind_layers(UDP, VXLAN, dport=48879) # RFC standard vxlan-gbp port bind_layers(VXLAN, Ether, {'flags': 0x8}) diff --git a/test/patches/scapy-2.4/vxlan.py.patch b/test/patches/scapy-2.4/vxlan.py.patch deleted file mode 100644 index c5876a4adbd..00000000000 --- a/test/patches/scapy-2.4/vxlan.py.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scapy/layers/vxlan.py b/scapy/layers/vxlan.py -index 03c3a5a..ee30f28 100644 ---- a/scapy/layers/vxlan.py -+++ b/scapy/layers/vxlan.py -@@ -69,6 +69,7 @@ bind_layers(UDP, VXLAN, dport=4789) # RFC standard vxlan port - bind_layers(UDP, VXLAN, dport=4790) # RFC standard vxlan-gpe port - bind_layers(UDP, VXLAN, dport=6633) # New IANA assigned port for use with NSH - bind_layers(UDP, VXLAN, dport=8472) # Linux implementation port -+bind_layers(UDP, VXLAN, dport=48879) # iVXLAN port - bind_layers(UDP, VXLAN, sport=4789) - bind_layers(UDP, VXLAN, sport=4790) - bind_layers(UDP, VXLAN, sport=6633) diff --git a/test/test_dvr.py b/test/test_dvr.py index 8531b8553ca..c0424a3047f 100644 --- a/test/test_dvr.py +++ b/test/test_dvr.py @@ -252,159 +252,6 @@ class TestDVR(VppTestCase): sub_if_on_pg3.remove_vpp_config() sub_if_on_pg2.remove_vpp_config() - def test_l2_emulation(self): - """ L2 Emulation """ - - # - # non distinct L3 packets, in the tag/non-tag combos - # - pkt_no_tag = (Ether(src=self.pg0.remote_mac, - dst=self.pg1.remote_mac) / - IP(src="2.2.2.2", - dst="1.1.1.1") / - UDP(sport=1234, dport=1234) / - Raw(b'\xa5' * 100)) - pkt_to_tag = (Ether(src=self.pg0.remote_mac, - dst=self.pg2.remote_mac) / - IP(src="2.2.2.2", - dst="1.1.1.2") / - UDP(sport=1234, dport=1234) / - Raw(b'\xa5' * 100)) - pkt_from_tag = (Ether(src=self.pg3.remote_mac, - dst=self.pg2.remote_mac) / - Dot1Q(vlan=93) / - IP(src="2.2.2.2", - dst="1.1.1.1") / - UDP(sport=1234, dport=1234) / - Raw(b'\xa5' * 100)) - pkt_from_to_tag = (Ether(src=self.pg3.remote_mac, - dst=self.pg2.remote_mac) / - Dot1Q(vlan=93) / - IP(src="2.2.2.2", - dst="1.1.1.2") / - UDP(sport=1234, dport=1234) / - Raw(b'\xa5' * 100)) - pkt_bcast = (Ether(src=self.pg0.remote_mac, - dst="ff:ff:ff:ff:ff:ff") / - IP(src="2.2.2.2", - dst="255.255.255.255") / - UDP(sport=1234, dport=1234) / - Raw(b'\xa5' * 100)) - - # - # A couple of sub-interfaces for tags - # - sub_if_on_pg2 = VppDot1QSubint(self, self.pg2, 92) - sub_if_on_pg3 = VppDot1QSubint(self, self.pg3, 93) - sub_if_on_pg2.admin_up() - sub_if_on_pg3.admin_up() - - # - # Put all the interfaces into a new bridge domain - # - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=self.pg0.sw_if_index, bd_id=1) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=self.pg1.sw_if_index, bd_id=1) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1) - self.vapi.l2_interface_vlan_tag_rewrite( - sw_if_index=sub_if_on_pg2.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, - push_dot1q=92) - self.vapi.l2_interface_vlan_tag_rewrite( - sw_if_index=sub_if_on_pg3.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, - push_dot1q=93) - - # - # Disable UU flooding, learning and ARP termination. makes this test - # easier as unicast packets are dropped if not extracted. - # - self.vapi.bridge_flags(bd_id=1, is_set=0, - flags=(1 << 0) | (1 << 3) | (1 << 4)) - - # - # Add a DVR route to steer traffic at L3 - # - route_1 = VppIpRoute( - self, "1.1.1.1", 32, - [VppRoutePath("0.0.0.0", - self.pg1.sw_if_index, - type=FibPathType.FIB_PATH_TYPE_DVR)]) - route_2 = VppIpRoute( - self, "1.1.1.2", 32, - [VppRoutePath("0.0.0.0", - sub_if_on_pg2.sw_if_index, - type=FibPathType.FIB_PATH_TYPE_DVR)]) - route_1.add_vpp_config() - route_2.add_vpp_config() - - # - # packets are dropped because bridge does not flood unknown unicast - # - self.send_and_assert_no_replies(self.pg0, pkt_no_tag) - - # - # Enable L3 extraction on pgs - # - self.vapi.l2_emulation(self.pg0.sw_if_index) - self.vapi.l2_emulation(self.pg1.sw_if_index) - self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index) - self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index) - - # - # now we expect the packet forward according to the DVR route - # - rx = self.send_and_expect(self.pg0, pkt_no_tag * NUM_PKTS, self.pg1) - self.assert_same_mac_addr(pkt_no_tag, rx) - self.assert_has_no_tag(rx) - - rx = self.send_and_expect(self.pg0, pkt_to_tag * NUM_PKTS, self.pg2) - self.assert_same_mac_addr(pkt_to_tag, rx) - self.assert_has_vlan_tag(92, rx) - - rx = self.send_and_expect(self.pg3, pkt_from_tag * NUM_PKTS, self.pg1) - self.assert_same_mac_addr(pkt_from_tag, rx) - self.assert_has_no_tag(rx) - - rx = self.send_and_expect(self.pg3, - pkt_from_to_tag * NUM_PKTS, - self.pg2) - self.assert_same_mac_addr(pkt_from_tag, rx) - self.assert_has_vlan_tag(92, rx) - - # - # but broadcast packets are still flooded - # - self.send_and_expect(self.pg0, pkt_bcast * 33, self.pg2) - - # - # cleanup - # - self.vapi.l2_emulation(self.pg0.sw_if_index, - enable=0) - self.vapi.l2_emulation(self.pg1.sw_if_index, - enable=0) - self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index, - enable=0) - self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index, - enable=0) - - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=self.pg0.sw_if_index, bd_id=1, enable=0) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=self.pg1.sw_if_index, bd_id=1, enable=0) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1, enable=0) - self.vapi.sw_interface_set_l2_bridge( - rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1, enable=0) - - route_1.remove_vpp_config() - route_2.remove_vpp_config() - sub_if_on_pg3.remove_vpp_config() - sub_if_on_pg2.remove_vpp_config() - if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 0d521455abf..1c5b6c5084f 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -652,10 +652,6 @@ class VppPapiProvider(object): 'is_ip6': is_ip6 }}) - def vxlan_gbp_tunnel_dump(self, sw_if_index=0xffffffff): - return self.api(self.papi.vxlan_gbp_tunnel_dump, - {'sw_if_index': sw_if_index}) - def pppoe_add_del_session( self, client_ip, @@ -960,30 +956,6 @@ class VppPapiProvider(object): return self.api(self.papi.punt_socket_deregister, {'punt': reg}) - def gbp_endpoint_dump(self): - """ GBP endpoint Dump """ - return self.api(self.papi.gbp_endpoint_dump, {}) - - def gbp_recirc_dump(self): - """ GBP recirc Dump """ - return self.api(self.papi.gbp_recirc_dump, {}) - - def gbp_ext_itf_dump(self): - """ GBP recirc Dump """ - return self.api(self.papi.gbp_ext_itf_dump, {}) - - def gbp_subnet_dump(self): - """ GBP Subnet Dump """ - return self.api(self.papi.gbp_subnet_dump, {}) - - def gbp_contract_dump(self): - """ GBP contract Dump """ - return self.api(self.papi.gbp_contract_dump, {}) - - def gbp_vxlan_tunnel_dump(self): - """ GBP VXLAN tunnel add/del """ - return self.api(self.papi.gbp_vxlan_tunnel_dump, {}) - def igmp_enable_disable(self, sw_if_index, enable, host): """ Enable/disable IGMP on a given interface """ return self.api(self.papi.igmp_enable_disable, -- 2.16.6