From 5764620e7a5c9f637da93b8c21a3b8f53abbdef1 Mon Sep 17 00:00:00 2001
From: pmikus <pmikus@cisco.com>
Date: Wed, 16 Sep 2020 15:22:10 +0000
Subject: Tests: Remove GBP

- Specs
- Tests
- Library
- TODO: PAL

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I8890940d56c7a9924d4a5f9365b6bb881610db14
---
 docs/job_specs/report_coverage/2n-clx/l2-00.md     |  22 +-
 docs/job_specs/report_coverage/2n-dnv/l2-00.md     |  12 +-
 docs/job_specs/report_coverage/2n-skx/l2-00.md     |  22 +-
 docs/job_specs/report_coverage/2n-zn2/l2-00.md     |  22 +-
 .../report_iterative/2n-clx/vpp-mlr-00.md          |   8 -
 .../report_iterative/2n-clx/vpp-mrr-00.md          |   9 -
 .../report_iterative/2n-skx/vpp-mlr-00.md          |   6 +-
 .../report_iterative/2n-skx/vpp-mrr-00.md          |   6 +-
 .../report_iterative/2n-zn2/vpp-mlr-00.md          |  10 +-
 .../report_iterative/2n-zn2/vpp-mrr-00.md          |  10 +-
 resources/api/vpp/supported_crcs.yaml              |  14 -
 resources/libraries/python/GBP.py                  | 346 ---------------------
 resources/libraries/robot/features/gbp.robot       | 100 ------
 resources/libraries/robot/shared/default.robot     |   1 -
 .../tools/presentation/doc/report_test_groups.txt  |   1 -
 .../tools/presentation/doc/trending_test_groups.md |   2 -
 .../eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot   |  95 ------
 ...ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot | 147 ---------
 18 files changed, 8 insertions(+), 825 deletions(-)
 delete mode 100644 resources/libraries/python/GBP.py
 delete mode 100644 resources/libraries/robot/features/gbp.robot
 delete mode 100644 tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
 delete mode 100644 tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot

diff --git a/docs/job_specs/report_coverage/2n-clx/l2-00.md b/docs/job_specs/report_coverage/2n-clx/l2-00.md
index 5e8d9d8d46..de4173d181 100644
--- a/docs/job_specs/report_coverage/2n-clx/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-clx/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-clx
-### tests 189
+### tests 171
 ### job hrs est. 9.77
 ### job hrs real 9.77
 ### test mins est. 3.1
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ### mellanox-cx556a
 #### rdma-core
 ##### eth-l2patch
diff --git a/docs/job_specs/report_coverage/2n-dnv/l2-00.md b/docs/job_specs/report_coverage/2n-dnv/l2-00.md
index d953e833a4..f98f53d77e 100644
--- a/docs/job_specs/report_coverage/2n-dnv/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-dnv/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-dnv
-### tests 54
+### tests 45
 ### job hrs est. 3.38
 ### job hrs real 3.38
 ### test mins est. 3.75
@@ -63,16 +63,6 @@
 1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ## ./lb
 ## ./nfv_density/dcr_memif/chain
 ## ./nfv_density/dcr_memif/chain_ipsec
diff --git a/docs/job_specs/report_coverage/2n-skx/l2-00.md b/docs/job_specs/report_coverage/2n-skx/l2-00.md
index d99db1e2ce..94a76ecf66 100644
--- a/docs/job_specs/report_coverage/2n-skx/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-skx/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 162
+### tests 144
 ### job hrs est. 10
 ### job hrs real 10
 ### test mins est. 3.7
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ## ./lb
 ## ./nfv_density/dcr_memif/chain
 ## ./nfv_density/dcr_memif/chain_ipsec
diff --git a/docs/job_specs/report_coverage/2n-zn2/l2-00.md b/docs/job_specs/report_coverage/2n-zn2/l2-00.md
index 48adf92a40..565fadd36d 100644
--- a/docs/job_specs/report_coverage/2n-zn2/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-zn2/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 189
+### tests 171
 ### job hrs est. 9.77
 ### job hrs real 9.77
 ### test mins est. 3.1
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ### mellanox-cx556a
 #### rdma-core
 ##### eth-l2patch
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
index e08f119697..621e88c10c 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
@@ -457,10 +457,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -520,10 +516,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
index f99a65046f..6400677605 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
@@ -457,10 +457,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -520,11 +516,6 @@
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-##### eth-l2xcbase
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
index af625b6c51..eaccf91c5f 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 255
+### tests 249
 ### job hrs est. 24.5
 ### job hrs real 24.5
 ### test mins est. 5.76
@@ -263,10 +263,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
index 4633026366..ef96d6b516 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 255
+### tests 249
 ### job hrs est. 22.6
 ### job hrs real 22.6
 ### test mins est. 2.86
@@ -263,10 +263,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
index 5a0c331ece..50ed95b3af 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 363
+### tests 357
 ### job hrs est. 35
 ### job hrs real 35
 ### test mins est. 5.78
@@ -361,10 +361,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -424,10 +420,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
index 93417cf5a4..2127e7d5e5 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 363
+### tests 357
 ### job hrs est. 10
 ### job hrs real 10
 ### test mins est. 1.65
@@ -361,10 +361,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -424,10 +420,6 @@
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml
index 63578c9ce6..7213f06389 100644
--- a/resources/api/vpp/supported_crcs.yaml
+++ b/resources/api/vpp/supported_crcs.yaml
@@ -89,20 +89,6 @@
     det44_plugin_enable_disable_reply: '0xe8d4e804'  # perf
     det44_session_dump: '0xe45a3af7'  # perf teardown
     # dhcp_proxy_dump / details # honeycomb
-    gbp_bridge_domain_add: '0x8454bfdf'  # dev
-    gbp_bridge_domain_add_reply: '0xe8d4e804'  # dev
-    gbp_contract_add_del: '0x553e275b'  # dev
-    gbp_contract_add_del_reply: '0x1992deab'  # dev
-    gbp_endpoint_add: '0x9ce16d5a'  # dev
-    gbp_endpoint_add_reply: '0x1dd3ff3e'  # dev
-    gbp_endpoint_group_add: '0x8e0f4054'  # dev
-    gbp_endpoint_group_add_reply: '0xe8d4e804'  # dev
-    gbp_ext_itf_add_del: '0x12ed5700'  # dev
-    gbp_ext_itf_add_del_reply: '0xe8d4e804'  # dev
-    gbp_route_domain_add: '0x2d0afe38'  # dev
-    gbp_route_domain_add_reply: '0xe8d4e804'  # dev
-    gbp_subnet_add_del: '0x888aca35'  # dev
-    gbp_subnet_add_del_reply: '0xe8d4e804'  # dev
     gpe_enable_disable: '0xc264d7bf'  # dev
     gpe_enable_disable_reply: '0xe8d4e804'  # dev
     # gre_tunnel_add_del / reply # unused L1 keyword: create_gre_tunnel_interface
diff --git a/resources/libraries/python/GBP.py b/resources/libraries/python/GBP.py
deleted file mode 100644
index 9d56d4475b..0000000000
--- a/resources/libraries/python/GBP.py
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""GBP utilities library."""
-
-from enum import IntEnum
-
-from ipaddress import ip_address
-
-from resources.libraries.python.IPAddress import IPAddress
-from resources.libraries.python.L2Util import L2Util
-from resources.libraries.python.PapiExecutor import PapiSocketExecutor
-
-
-class GBPEndpointFlags(IntEnum):
-    """GBP Endpoint Flags."""
-    GBP_API_ENDPOINT_FLAG_NONE = 0
-    GBP_API_ENDPOINT_FLAG_BOUNCE = 1
-    GBP_API_ENDPOINT_FLAG_REMOTE = 2
-    GBP_API_ENDPOINT_FLAG_LEARNT = 4
-    GBP_API_ENDPOINT_FLAG_EXTERNAL = 8
-
-
-class GBPBridgeDomainFlags(IntEnum):
-    """GBP Bridge Domain Flags."""
-    GBP_BD_API_FLAG_NONE = 0
-    GBP_BD_API_FLAG_DO_NOT_LEARN = 1
-    GBP_BD_API_FLAG_UU_FWD_DROP = 2
-    GBP_BD_API_FLAG_MCAST_DROP = 4
-    GBP_BD_API_FLAG_UCAST_ARP = 8
-
-
-class GBPSubnetType(IntEnum):
-    """GBP Subnet Type."""
-    GBP_API_SUBNET_TRANSPORT = 1
-    # TODO: Names too long for pylint, fix in VPP.
-    GBP_API_SUBNET_STITCHED_INTERNAL = 2
-    GBP_API_SUBNET_STITCHED_EXTERNAL = 3
-    GBP_API_SUBNET_L3_OUT = 4
-    GBP_API_SUBNET_ANON_L3_OUT = 5
-
-
-class GBPExtItfFlags(IntEnum):
-    """GBP External Interface Flags."""
-    GBP_API_EXT_ITF_F_NONE = 0
-    GBP_API_EXT_ITF_F_ANON = 1
-
-
-class GBPRuleAction(IntEnum):
-    """GBP Rule Action."""
-    GBP_API_RULE_PERMIT = 1
-    GBP_API_RULE_DENY = 2
-    GBP_API_RULE_REDIRECT = 3
-
-
-class GBPHashMode(IntEnum):
-    """GBP Hash Mode."""
-    GBP_API_HASH_MODE_SRC_IP = 1
-    GBP_API_HASH_MODE_DST_IP = 2
-    GBP_API_HASH_MODE_SYMETRIC = 3
-
-
-class GBP:
-    """GBP utilities."""
-
-    @staticmethod
-    def gbp_route_domain_add(
-            node, rd_id=1, ip4_table_id=1, ip6_table_id=0,
-            ip4_uu_sw_if_index=0xffffffff, ip6_uu_sw_if_index=0xffffffff):
-        """Add GBP route domain.
-
-        :param node: Node to add GBP route domain on.
-        :param rd_id: GBP route domain ID.
-        :param ip4_table_id: IPv4 table.
-        :param ip6_table_id: IPv6 table.
-        :param ip4_uu_sw_if_index: IPv4 unicast interface index.
-        :param ip6_uu_sw_if_index: IPv6 unicast interface index.
-        :type node: dict
-        :type rd_id: int
-        :type ip4_table_id: int
-        :type ip6_table_id: int
-        :type ip4_uu_sw_if_index: int
-        :type ip6_uu_sw_if_index: int
-        """
-        cmd = u"gbp_route_domain_add"
-        err_msg = f"Failed to add GBP route domain on {node[u'host']}!"
-
-        args_in = dict(
-            rd=dict(
-                rd_id=rd_id,
-                ip4_table_id=ip4_table_id,
-                ip6_table_id=ip6_table_id,
-                ip4_uu_sw_if_index=ip4_uu_sw_if_index,
-                ip6_uu_sw_if_index=ip6_uu_sw_if_index
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_bridge_domain_add(
-            node, bvi_sw_if_index, bd_id=1, rd_id=1,
-            uu_fwd_sw_if_index=0xffffffff, bm_flood_sw_if_index=0xffffffff):
-        """Add GBP bridge domain.
-
-        :param node: Node to add GBP bridge domain on.
-        :param bvi_sw_if_index: SW index of BVI/loopback interface.
-        :param bd_id: GBP bridge domain ID.
-        :param rd_id: GBP route domain ID.
-        :param uu_fwd_sw_if_index: Unicast forward interface index.
-        :param bm_flood_sw_if_index: Bcast/Mcast flood interface index.
-        :type node: dict
-        :type bvi_sw_if_index: int
-        :type bd_id: int
-        :type rd_id: int
-        :type uu_fwd_sw_if_index: int
-        :type bm_flood_sw_if_index: int
-        """
-        cmd = u"gbp_bridge_domain_add"
-        err_msg = f"Failed to add GBP bridge domain on {node[u'host']}!"
-
-        args_in = dict(
-            bd=dict(
-                flags=getattr(
-                    GBPBridgeDomainFlags, u"GBP_BD_API_FLAG_NONE"
-                ).value,
-                bvi_sw_if_index=bvi_sw_if_index,
-                uu_fwd_sw_if_index=uu_fwd_sw_if_index,
-                bm_flood_sw_if_index=bm_flood_sw_if_index,
-                bd_id=bd_id,
-                rd_id=rd_id
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_endpoint_group_add(
-            node, sclass, bd_id=1, rd_id=1, vnid=1,
-            uplink_sw_if_index=0xffffffff, remote_ep_timeout=0xffffffff):
-        """Add GBP endpoint group.
-
-        :param node: Node to add GBP endpoint group on.
-        :param sclass: Source CLASS.
-        :param bd_id: GBP bridge domain ID.
-        :param rd_id: GBP route domain ID.
-        :param uplink_sw_if_index: Uplink interface index.
-        :param remote_ep_timeout: Remote endpoint interface index.
-        :param vnid: VNID.
-        :type node: dict
-        :type sclass: int
-        :type bd_id: int
-        :type rd_id: int
-        :type vnid: int
-        :type uplink_sw_if_index: int
-        :type remote_ep_timeout: int
-        """
-        cmd = u"gbp_endpoint_group_add"
-        err_msg = f"Failed to add GBP endpoint group on {node[u'host']}!"
-
-        args_in = dict(
-            epg=dict(
-                uplink_sw_if_index=uplink_sw_if_index,
-                bd_id=bd_id,
-                rd_id=rd_id,
-                vnid=vnid,
-                sclass=sclass,
-                retention=dict(
-                    remote_ep_timeout=remote_ep_timeout
-                )
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_endpoint_add(node, sw_if_index, ip_addr, mac_addr, sclass):
-        """Add GBP endpoint.
-
-        :param node: Node to add GBP endpoint on.
-        :param sw_if_index: SW index of interface.
-        :param ip_addr: GBP route domain ID.
-        :param mac_addr: MAC address.
-        :param sclass: Source CLASS.
-        :type node: dict
-        :type sw_if_index: int
-        :type ip_addr: str
-        :type mac_addr: str
-        :type sclass: int
-        """
-        cmd = u"gbp_endpoint_add"
-        err_msg = f"Failed to add GBP endpoint on {node[u'host']}!"
-
-        ips = list()
-        ips.append(IPAddress.create_ip_address_object(ip_address(ip_addr)))
-        tun_src = IPAddress.create_ip_address_object(ip_address(u"0.0.0.0"))
-        tun_dst = IPAddress.create_ip_address_object(ip_address(u"0.0.0.0"))
-
-        args_in = dict(
-            endpoint=dict(
-                sw_if_index=sw_if_index,
-                ips=ips,
-                n_ips=len(ips),
-                mac=L2Util.mac_to_bin(mac_addr),
-                sclass=sclass,
-                flags=getattr(
-                    GBPEndpointFlags, u"GBP_API_ENDPOINT_FLAG_EXTERNAL"
-                ).value,
-                tun=dict(
-                    src=tun_src,
-                    dst=tun_dst
-                )
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_ext_itf_add_del(node, sw_if_index, bd_id=1, rd_id=1):
-        """Add external interface to GBP.
-
-        :param node: Node to add external GBP interface on.
-        :param sw_if_index: SW index of interface.
-        :param bd_id: GBP bridge domain ID.
-        :param rd_id: GBP route domain ID.
-        :type node: dict
-        :type sw_if_index: int
-        :type bd_id: int
-        :type rd_id: int
-        """
-        cmd = u"gbp_ext_itf_add_del"
-        err_msg = u"Failed to add external GBP interface on {node[u'host']}!"
-
-        args_in = dict(
-            is_add=True,
-            ext_itf=dict(
-                sw_if_index=sw_if_index,
-                bd_id=bd_id,
-                rd_id=rd_id,
-                flags=getattr(GBPExtItfFlags, u"GBP_API_EXT_ITF_F_NONE").value
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_subnet_add_del(
-            node, address, subnet_length, sclass, rd_id=1,
-            sw_if_index=0xffffffff):
-        """Add external interface to GBP.
-
-        :param node: Node to add GBP subnet on.
-        :param address: IPv4 adddress.
-        :param subnet_length: IPv4 address subnet.
-        :param sclass: Source CLASS.
-        :param rd_id: GBP route domain ID.
-        :param sw_if_index: Interface index.
-        :type node: dict
-        :type address: int
-        :type subnet_length: int
-        :type sclass: int
-        :type rd_id: int
-        :type sw_if_index: int
-        """
-        cmd = u"gbp_subnet_add_del"
-        err_msg = f"Failed to add GBP subnet on {node[u'host']}!"
-
-        args_in = dict(
-            is_add=True,
-            subnet=dict(
-                type=getattr(GBPSubnetType, u"GBP_API_SUBNET_L3_OUT").value,
-                sw_if_index=sw_if_index,
-                sclass=sclass,
-                prefix=dict(
-                    address=IPAddress.create_ip_address_object(
-                        ip_address(address)
-                    ),
-                    len=int(subnet_length)
-                ),
-                rd_id=rd_id
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
-
-    @staticmethod
-    def gbp_contract_add_del(node, sclass, dclass, acl_index=0, hash_mode=None):
-        """Add GBP contract.
-
-        :param node: Node to add GBP contract on.
-        :param sclass: Source CLASS.
-        :param dclass: Destination CLASS.
-        :param acl_index: Index of ACL rule.
-        :param hash_mode: GBP contract hash mode.
-        :type node: dict
-        :type sclass: int
-        :type dclass: int
-        :type acl_index: int
-        :type hash_mode: str
-        """
-        cmd = u"gbp_contract_add_del"
-        err_msg = f"Failed to add GBP contract on {node[u'host']}!"
-
-        hash_mode = u"GBP_API_HASH_MODE_SRC_IP" if hash_mode is None \
-            else hash_mode
-        rule_permit = dict(
-            action=getattr(GBPRuleAction, u"GBP_API_RULE_PERMIT").value,
-            nh_set=dict(
-                hash_mode=getattr(GBPHashMode, hash_mode).value,
-                n_nhs=8,
-                nhs=[dict()]*8,
-            )
-        )
-        rules = [rule_permit, rule_permit]
-
-        args_in = dict(
-            is_add=True,
-            contract=dict(
-                acl_index=acl_index,
-                sclass=sclass,
-                dclass=dclass,
-                n_rules=len(rules),
-                rules=rules,
-                n_ether_types=16,
-                allowed_ethertypes=[0x800, 0x86dd] + [0]*14
-            )
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args_in).get_reply(err_msg)
diff --git a/resources/libraries/robot/features/gbp.robot b/resources/libraries/robot/features/gbp.robot
deleted file mode 100644
index fc1c9faba4..0000000000
--- a/resources/libraries/robot/features/gbp.robot
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.GBP
-|
-| Documentation | GBP keywords.
-
-*** Keywords ***
-| Initialize GBP routing domains on node
-| | [Documentation]
-| | ... | Initialize GBP routing domains on node.
-| |
-| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - count - Number of baseline interface variables. Type: integer
-| |
-| | ... | *Example:*
-| |
-| | ... | \| Initialize GBP routing domains on node \| DUT1 \| 1 \|
-| |
-| | [Arguments] | ${dut} | ${count}=${1}
-| |
-| | FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | ${hexa_id}= | Convert To Hex | ${id} | length=2 | lowercase=yes
-| | | ${dut_lo}= | VPP Create Loopback | ${nodes['${dut}']}
-| | | ... | mac=ba:dc:00:ff:ee:${hexa_id}
-| | | Set Interface State
-| | | ... | ${nodes['${dut}']} | ${dut_lo} | up
-| | | Add Fib Table
-| | | ... | ${nodes['${dut}']} | ${id}
-| | | GBP Route Domain Add
-| | | ... | ${nodes['${dut}']} | rd_id=${id}
-| | | Assign Interface To Fib Table
-| | | ... | ${nodes['${dut}']} | ${dut_lo} | ${id}
-| | | Create L2 BD
-| | | ... | ${nodes['${dut}']} | ${id} | arp_term=${1}
-| | | GBP Bridge Domain Add
-| | | ... | ${nodes['${dut}']} | ${dut_lo} | bd_id=${id}
-| | | GBP Endpoint Group Add
-| | | ... | ${nodes['${dut}']} | ${100} | bd_id=${id} | rd_id=${id}
-| | | VPP Interface Set IP Address
-| | | ... | ${nodes['${dut}']} | ${dut_lo} | 1.1.1.1 | 24
-| | | GBP Subnet Add Del
-| | | ... | ${nodes['${dut}']} | 1.1.1.0 | 24 | ${100} | rd_id=${id}
-| | | GBP Ext Itf Add Del
-| | | ... | ${nodes['${dut}']} | ${dut_lo} | bd_id=${id} | rd_id=${id}
-| | | GBP Endpoint Add
-| | | ... | ${nodes['${dut}']} | ${${dut}_${int}1_${id}}[0]
-| | | ... | 1.1.1.100 | ${TG_pf1_mac}[0] | ${100}
-| | | GBP Endpoint Add
-| | | ... | ${nodes['${dut}']} | ${${dut}_${int}2_${id}}[0]
-| | | ... | 1.1.1.200 | ${TG_pf2_mac}[0] | ${100}
-| | | VPP Route Add
-| | | ... | ${nodes['${dut}']} | 10.10.10.0 | 24 | gateway=1.1.1.100
-| | | ... | interface=${dut_lo} | vrf=${1}
-| | | VPP Route Add
-| | | ... | ${nodes['${dut}']} | 20.20.20.0 | 24 | gateway=1.1.1.200
-| | | ... | interface=${dut_lo} | vrf=${1}
-| | | GBP Subnet Add Del
-| | | ... | ${nodes['${dut}']} | 10.10.10.0 | 24 | ${200} | rd_id=${id}
-| | | GBP Subnet Add Del
-| | | ... | ${nodes['${dut}']} | 20.20.20.0 | 24 | ${300} | rd_id=${id}
-| | | Add Replace Acl Multi Entries
-| | | ... | ${nodes['${dut}']}
-| | | ... | rules="ipv4 permit src 0.0.0.0/0 dst 0.0.0.0/0 proto 61"
-| | | ... | tag="gbp-permit-200-300"
-| | | GBP Contract Add Del
-| | | ... | ${nodes['${dut}']} | ${200} | ${300} | acl_index=${0}
-| | | GBP Contract Add Del
-| | | ... | ${nodes['${dut}']} | ${300} | ${200} | acl_index=${0}
-| | END
-
-| Initialize GBP routing domains
-| | [Documentation]
-| | ... | Initialize GBP routing domains on all DUTs.
-| |
-| | ... | *Arguments:*
-| | ... | - count - Number of GBP routing domains. Type: integer
-| |
-| | ... | *Example:*
-| |
-| | ... | \| Initialize GBP routing domains \| 1 \|
-| |
-| | [Arguments] | ${count}=${1}
-| |
-| | FOR | ${dut} | IN | @{duts}
-| | | Initialize GBP routing domains on node | ${dut} | count=${count}
-| | END
-| | Set interfaces in path up
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 4f83d1c193..641cfa5cb1 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -44,7 +44,6 @@
 | Resource | resources/libraries/robot/lb/load_balancer.robot
 | Resource | resources/libraries/robot/crypto/ipsec.robot
 | Resource | resources/libraries/robot/features/acl.robot
-| Resource | resources/libraries/robot/features/gbp.robot
 | Resource | resources/libraries/robot/features/policer.robot
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Resource | resources/libraries/robot/ip/ip6.robot
diff --git a/resources/tools/presentation/doc/report_test_groups.txt b/resources/tools/presentation/doc/report_test_groups.txt
index b8d0927564..c48ec45254 100644
--- a/resources/tools/presentation/doc/report_test_groups.txt
+++ b/resources/tools/presentation/doc/report_test_groups.txt
@@ -28,7 +28,6 @@ Sub-chapters titles:
 2n1l-25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
 2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
 2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
-2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 
 ### 64b-?t?c-l2switching-base-i40e
 2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr
diff --git a/resources/tools/presentation/doc/trending_test_groups.md b/resources/tools/presentation/doc/trending_test_groups.md
index 07c252729e..e272a4c7b1 100644
--- a/resources/tools/presentation/doc/trending_test_groups.md
+++ b/resources/tools/presentation/doc/trending_test_groups.md
@@ -79,7 +79,6 @@ will be on the Trending web page.
     2n1l-25ge2p1xxv710-avf-eth-l2xcbase-mrr
     2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-mrr
     2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-mrr
 
 #### 64b-?t?c-l2switching-base-i40e
     2n1l-25ge2p1xxv710-eth-l2patch-mrr
@@ -224,7 +223,6 @@ will be on the Trending web page.
     2n1l-25ge2p1xxv710-avf-eth-l2xcbase-mrr
     2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-mrr
     2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-mrr
 
 #### 64b-?t?c-l2switching-base-i40e
     2n1l-25ge2p1xxv710-eth-l2patch-mrr
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
deleted file mode 100644
index 5c10713ba0..0000000000
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | avf-dot1q-l2bdbasemaclrn-gbp
-|
-| Suite Setup | Setup suite topology interfaces | scapy
-| Suite Teardown | Tear down suite
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-|
-| Test Template | Local template
-|
-| Documentation | *L2BD with IEEE 802.1Q and GBP test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \
-| ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 .
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with:\
-| ... | 2 VLAN subinterfaces (VID 200 and 300),\
-| ... | 1 L2 BD with the 2 VLAN subinterfaces and a BVI,\
-| ... | 1 GBP L3 RD,\
-| ... | 1 GBP L2 BD with the L2 BD,\
-| ... | 1 GBP EPG EPG-1 with sclass 100, the GBP L2 BD and L3 RD,\
-| ... | 2 GBP external EP in EPG-1,\
-| ... | 2 external subnets with sclass 200 and 300,\
-| ... | Contracts allowing full communications between the 2 external subnets.\
-| ... | DUT1 tested with ${nic_name} with VF enabled.
-| ... | *[Ver] TG verification:* Test IPv4 packets are sent in one direction \
-| ... | by TG on link to DUT1; on receive TG verifies packets for correctness \
-| ... | and drops as applicable.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
-
-*** Variables ***
-| @{plugins_to_enable}= | avf_plugin.so | gbp_plugin.so | acl_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
-| ${nic_driver}= | avf
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 1
-| ${overhead}= | ${4}
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Ver] Make TG send IPv4 packet in one direction between two\
-| | ... | of its interfaces to be switched by DUT to and from docker.\
-| | ... | Make TG verify IPv4 packet is correct.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize layer dot1q
-| | And Initialize GBP routing domains
-| | Then Send packet and verify headers
-| | ... | ${tg} | 10.10.10.2 | 20.20.20.2
-| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ba:dc:00:ff:ee:01
-| | ... | ${TG_pf2}[0] | ba:dc:00:ff:ee:01 | ${TG_pf2_mac}[0]
-| | ... | traffic_script=send_ip_check_headers
-
-*** Test Cases ***
-| 64B-avf-dot1q-l2bdbasemaclrn-gbp-dev
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
deleted file mode 100644
index b70d8c1629..0000000000
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0 | GBP
-| ... | dot1q-l2bdbasemaclrn-gbp
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
-|
-| Test Template | Local template
-|
-| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q and GBP test
-| ... | cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \
-| ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 .
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with:\
-| ... | 2 VLAN subinterfaces (VID 100 and 200),\
-| ... | 1 L2 BD with the 2 VLAN subinterfaces and a BVI,\
-| ... | 1 GBP L3 RD,\
-| ... | 1 GBP L2 BD with the L2 BD,\
-| ... | 1 GBP EPG EPG-1 with sclass 100, the GBP L2 BD and L3 RD,\
-| ... | 2 GBP external EP in EPG-1,\
-| ... | 2 external subnets with sclass 200 and 300,\
-| ... | Contracts allowing full communications between the 2 external subnets.\
-| ... | DUT1 tested with ${nic_name} with VF enabled.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on\
-| ... | links to DUT. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
-| ... | containing Ethernet header including IEEE 802.1Q tagging, IPv4 header\
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | gbp_plugin.so | acl_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L2
-| ${overhead}= | ${4}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-dot1qip4-vlan1ip4src254ip4dst254-bvi
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD with VLAN and GBP config with ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize layer dot1q
-| | And Initialize GBP routing domains
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
-- 
cgit 1.2.3-korg