From d1589ad74e515757fb12cf8a5f976282924afe13 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 18 Feb 2019 14:53:28 +0100
Subject: Adapt autogen for SFd tests

+ Make the skipping logic in autogen more flexible.
+ Do not emit 4c cases when there is too much VMs/containers.
+ Peter says the second -eth- should be renamed away from suites.
+ Regenerate suites so test case names match (new) suite names.

Change-Id: I95ecc47ca07b8bae6693d5d4330811ff55672fc4
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 resources/libraries/python/autogen/Regenerator.py  |  35 +++--
 ...0-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...th-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...0-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...th-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...10-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...h-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...h-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...h-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...h-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...h-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...h-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...h-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...10-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...10-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot | 124 +++++++++++++++++
 ...eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot | 130 ++++++++++++++++++
 ...710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot | 140 ++++++++++++++++++++
 ...-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot | 146 +++++++++++++++++++++
 ...h-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot | 140 --------------------
 ...2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...h-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot | 124 -----------------
 ...2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot | 130 ------------------
 ...th-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot | 140 --------------------
 ...d-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot | 140 --------------------
 ...bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot | 140 --------------------
 ...bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot | 140 --------------------
 ...bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot | 140 --------------------
 ...bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot | 125 ------------------
 ...bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot | 130 ------------------
 ...-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot | 125 ------------------
 ...bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot | 131 ------------------
 ...-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot | 125 ------------------
 ...bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot | 131 ------------------
 ...th-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot | 125 ------------------
 ...l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot | 130 ------------------
 ...eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot | 140 --------------------
 ...l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...th-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot | 125 ------------------
 ...l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot | 131 ------------------
 ...eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot | 140 --------------------
 ...-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot | 146 ---------------------
 ...l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot |  24 ++--
 ...-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot |   1 -
 155 files changed, 10711 insertions(+), 10709 deletions(-)
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
 create mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot
 delete mode 100644 tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 8bfe054e5e..64bcea917d 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -60,6 +60,7 @@ class Regenerator(object):
             "ip6": 78,
             "vxlan+ip4": 114  # What is the real minimum for latency stream?
         }
+        min_framesize_values = protocol_to_min_framesize.values()
 
         def get_iface_and_suite_id(filename):
             """Get interface and suite ID.
@@ -94,20 +95,30 @@ class Regenerator(object):
             :rtype: int
             """
             # TODO: Is there a better way to disable some combinations?
-            if kwargs["framesize"] == 9000 and "vic1227" in iface:
-                # Not supported in HW.
-                pass
-            elif kwargs["framesize"] == 9000 and "avf" in suite_id:
-                # Not supported by AVF driver.
-                # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
-                pass
-            elif ("soak" in suite_id and
-                  (kwargs["phy_cores"] != 1
-                   or kwargs["framesize"] in (1518, 9000, "IMIX_v4_1"))):
+            emit = True
+            if kwargs["framesize"] == 9000:
+                if "vic1227" in iface:
+                    # Not supported in HW.
+                    emit = False
+                if "avf" in suite_id:
+                    # Not supported by AVF driver.
+                    # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
+                    emit = False
+            if "-16vm-" in suite_id or "-16dcr-" in suite_id:
+                if kwargs["phy_cores"] > 3:
+                    # CSIT lab only has 28 (physical) core processors,
+                    # so these test would fail when attempting to assign cores.
+                    emit = False
+            if "soak" in suite_id:
                 # Soak test take too long, do not risk other than tc01.
-                pass
-            else:
+                if kwargs["phy_cores"] != 1:
+                    emit = False
+                if kwargs["framesize"] not in min_framesize_values:
+                    emit = False
+            if emit:
                 file_out.write(testcase.generate(num=num, **kwargs))
+            # We bump tc number in any case, so that future enables/disables
+            # do not affect the numbering of other test cases.
             return num + 1
 
         def add_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..f8eacdd3e2
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 6 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..f4b222244d
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 6 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..bdd6022036
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 6 chains 6 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..443275381b
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 6 chains
+| ... | 6 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..f205c49808
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 12memif 6 pipelines 12
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..e5821e6e08
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 12memif 6
+| ... | pipelines 12 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..c0f32e4e87
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 12memif 6 pipelines 6
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..fc19fcc58d
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 12memif 6
+| ... | pipelines 1 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..422193b689
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..bf4e55c5b9
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 8 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..e7eadfbb64
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 2 chains 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..6aee137681
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
+| ... | 8 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..7bbfaf3056
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 4 chains 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..a3b9e141f3
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
+| ... | 8 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..5e36a2be46
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 8 chains 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..e491eeb0ba
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 8 chains
+| ... | 8 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..3a42d20ea0
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 16memif 8 pipelines 16
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..10606a71a1
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 16memif 8
+| ... | pipelines 16 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..31564df1dd
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 16memif 8 pipelines 8
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..ccb3b2c589
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 16memif 8
+| ... | pipelines 8 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..65d2f3244f
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 10 chains 10 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..ad914acf15
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 10 chains
+| ... | 10 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..ca66dc2002
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 20memif 10 pipelines 10
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..6f08ad23f4
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 20memif 10
+| ... | pipelines 1 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..d1be40a482
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 10 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..4929918914
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 10 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..a5eb17557c
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 2 chains 12 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..39e07a4faf
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
+| ... | 12 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..54dee8f594
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 6 chains 12 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..7b08dcd118
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 6 chains
+| ... | 12 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..b7276598d6
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 1 docker
+| ... | container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..44b7640060
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 1 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..9af708933f
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 10 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..90483d8bf0
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 10 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..2071c05848
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 1 docker
+| ... | container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..318ca5ad2d
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 1 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..d6c9e137b7
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 2 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..883fbe2e34
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 2 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..1b7f8917f1
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 4 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..c6a243cc25
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 4 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..e161a2d6c0
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 6 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..7e7c380808
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 6 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..f8cd5e7dfb
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..7636df73bd
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
+| ... | pipeline 8 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..14929f6bc2
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 2 chains 16 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..cfffdad46c
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
+| ... | 16 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..6e422f4fd8
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 4 chains 16 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..f64c84eaf6
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
+| ... | 16 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..298f758e97
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 8 chains 16 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..e992fe9203
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 8 chains
+| ... | 16 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..84b25cac41
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 2 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..31d294aaef
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 2 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..305ab86910
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 2 chains 2 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..338c2a42b8
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
+| ... | 2 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..53ef42c5a9
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 12
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..7b56186223
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
+| ... | pipelines 12 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..6c9954368b
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 16
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..dc8bfdb001
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
+| ... | pipelines 16 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..92e8f92332
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 2 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..8f192ea2e0
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
+| ... | pipelines 2 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..0067505031
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 4 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..8ddc84d1d3
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 2
+| ... | pipelines 4 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..58bf50fde5
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 8 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..8413a0bb89
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
+| ... | pipelines 8 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..7d8837438a
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 1 chain 4 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..a77f13a7b4
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
+| ... | 4 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..558807a54a
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 2 chains 4 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..c000a3ada9
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
+| ... | 4 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..a9f305e623
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with memif 4 chains 4 docker
+| ... | containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..84cd660ade
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
+| ... | NF_DENSITY | CHAIN | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
+| ... | 1 docker container*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | chain_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..0f6b369cc6
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 16
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..af364ace29
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,130 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
+| ... | pipelines 16 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..c1daf3092e
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 4
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..37cf9066ea
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
+| ... | pipelines 4 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
new file mode 100644
index 0000000000..0ccc5dd2fc
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
@@ -0,0 +1,140 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance mrr test
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 8
+| ... | docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
new file mode 100644
index 0000000000..ba07eaf8f3
--- /dev/null
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
@@ -0,0 +1,146 @@
+# Copyright (c) 2019 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/performance/performance_setup.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
+| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 2-node performance topology with DUT's NIC model | L3
+| ... | Intel-X710
+| ... | AND | Set up performance test suite with MEMIF
+| ...
+| Suite Teardown | Tear down 2-node performance topology
+| ...
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
+| ... | pipelines 8 docker containers*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
+| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | Container is connected to VPP via Memif interface. Container is running
+| ... | same VPP version as running on DUT. Container is limited via cgroup to
+| ... | use cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints.
+| ... | *[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 librairy.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
+# Container
+| ${container_engine}= | Docker
+| ${container_chain_topology}= | pipeline_ip4
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize}
+| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
+| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot
deleted file mode 100644
index f8eacdd3e2..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 6 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index f4b222244d..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 6 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot
deleted file mode 100644
index bdd6022036..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 6 chains 6 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 443275381b..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 6 chains
-| ... | 6 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot
deleted file mode 100644
index f205c49808..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 12memif 6 pipelines 12
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index e5821e6e08..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 12memif 6
-| ... | pipelines 12 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot
deleted file mode 100644
index c0f32e4e87..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 12memif 6 pipelines 6
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index fc19fcc58d..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 12memif 6
-| ... | pipelines 1 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 422193b689..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index bf4e55c5b9..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 8 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot
deleted file mode 100644
index e7eadfbb64..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 2 chains 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 6aee137681..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
-| ... | 8 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 7bbfaf3056..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 4 chains 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index f30f6c856d..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
-| ... | 8 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 5e36a2be46..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 8 chains 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index e491eeb0ba..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 8 chains
-| ... | 8 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot
deleted file mode 100644
index 3a42d20ea0..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 16memif 8 pipelines 16
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 10606a71a1..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 16memif 8
-| ... | pipelines 16 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 31564df1dd..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 16memif 8 pipelines 8
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index ccb3b2c589..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 16memif 8
-| ... | pipelines 8 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot
deleted file mode 100644
index 65d2f3244f..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 10 chains 10 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index ad914acf15..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 10 chains
-| ... | 10 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot
deleted file mode 100644
index ca66dc2002..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 20memif 10 pipelines 10
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 6f08ad23f4..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 10R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 20memif 10
-| ... | pipelines 1 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${10} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot
deleted file mode 100644
index d1be40a482..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 10 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 4929918914..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 10 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot
deleted file mode 100644
index a5eb17557c..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 2 chains 12 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 39e07a4faf..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
-| ... | 12 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot
deleted file mode 100644
index 54dee8f594..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 6 chains 12 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 7b08dcd118..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 6R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 6 chains
-| ... | 12 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${6} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot
deleted file mode 100644
index b7276598d6..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 1 docker
-| ... | container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 44b7640060..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 1 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot
deleted file mode 100644
index 9af708933f..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 10 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 90483d8bf0..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R10C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 10 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${10} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot
deleted file mode 100644
index 2071c05848..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 1 docker
-| ... | container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 318ca5ad2d..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 1 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot
deleted file mode 100644
index d6c9e137b7..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 2 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 883fbe2e34..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 2 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot
deleted file mode 100644
index 1b7f8917f1..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 4 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index c6a243cc25..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 4 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot
deleted file mode 100644
index e161a2d6c0..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 6 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 7e7c380808..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R6C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 6 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${6} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot
deleted file mode 100644
index f8cd5e7dfb..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 2memif 1 pipeline 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 7636df73bd..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R8C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 1
-| ... | pipeline 8 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${8} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot
deleted file mode 100644
index 9466d989f2..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 2 chains 16 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index cfffdad46c..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
-| ... | 16 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot
deleted file mode 100644
index e000112c41..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 4 chains 16 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 74bdac6b10..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
-| ... | 16 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot
deleted file mode 100644
index e8b0dce650..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 8 chains 16 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 99564d601c..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 8R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 8 chains
-| ... | 16 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${8} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot
deleted file mode 100644
index 84b25cac41..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 2 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 31d294aaef..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 2 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot
deleted file mode 100644
index 305ab86910..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 2 chains 2 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 338c2a42b8..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
-| ... | 2 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot
deleted file mode 100644
index 53ef42c5a9..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 12
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 7b56186223..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R6C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
-| ... | pipelines 12 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${6} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot
deleted file mode 100644
index dbaf74c64d..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 16
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index dc8bfdb001..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R8C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
-| ... | pipelines 16 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${8} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot
deleted file mode 100644
index 92e8f92332..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 2 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 8f192ea2e0..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
-| ... | pipelines 2 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot
deleted file mode 100644
index 0067505031..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 4 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 8ddc84d1d3..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 2memif 2
-| ... | pipelines 4 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 58bf50fde5..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 4memif 2 pipelines 8 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 8413a0bb89..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 4memif 2
-| ... | pipelines 8 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot
deleted file mode 100644
index 7d8837438a..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 1 chain 4 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index a77f13a7b4..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 1R4C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain
-| ... | 4 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${1} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot
deleted file mode 100644
index 558807a54a..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 2 chains 4 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index c000a3ada9..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 2R2C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 2 chains
-| ... | 4 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${2} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot
deleted file mode 100644
index a9f305e623..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with memif 4 chains 4 docker
-| ... | containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 84cd660ade..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
-| ... | NF_DENSITY | CHAIN | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 4 chains
-| ... | 1 docker container*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple chains with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot
deleted file mode 100644
index 46a94a336b..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 16
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 510bd755f5..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R4C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
-| ... | pipelines 16 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${4} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot
deleted file mode 100644
index c1daf3092e..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 4
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index 37cf9066ea..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R1C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
-| ... | pipelines 4 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${1} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot
deleted file mode 100644
index 0ccc5dd2fc..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance mrr test
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with 8memif 4 pipelines 8
-| ... | docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
deleted file mode 100644
index ba07eaf8f3..0000000000
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | MEMIF | DOCKER | 4R2C
-| ... | NF_DENSITY | PIPELINE | NF_VPPIP4
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
-| ... | AND | Set up performance test suite with MEMIF
-| ...
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with 8memif 4
-| ... | pipelines 8 docker containers*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
-| ... | Container is connected to VPP via Memif interface. Container is running
-| ... | same VPP version as running on DUT. Container is limited via cgroup to
-| ... | use cores allocated from pool of isolated CPUs. There are no memory
-| ... | contraints.
-| ... | *[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 librairy.
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
-| ... | addresses of the TG node interfaces.
-
-*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | pipeline_ip4
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
-| | ... | nf_chains=${4} | nf_nodes=${2} | auto_scale=${False}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
index 397d3f8f70..938c7b74ff 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
index 4cfeaa360f..829ffdd5a0 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
@@ -124,4 +124,3 @@
 | tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
-- 
cgit 1.2.3-korg