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: [PATCH] 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 ++++++++++++++--------
 ...-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot} | 24 +++++++--------
 ...-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot} |  0
 ...-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot} |  0
 ...h-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot} |  0
 ...th-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot} |  0
 ...l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot} |  0
 ...-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot} |  0
 ...-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot} |  0
 ...-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot} |  0
 ...-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot} |  1 -
 ...-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot} |  0
 ...eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot} |  1 -
 ...-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot} |  1 -
 ...eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot} |  1 -
 ...-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot} |  1 -
 ...0-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot} |  1 -
 ...th-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot} |  0
 ...th-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot} |  0
 ...0-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot} |  1 -
 ...th-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot} |  1 -
 ...10-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot} |  0
 ...10-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot} |  0
 ...eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot} |  0
 ...l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot | 24 +++++++--------
 ...-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot |  1 -
 79 files changed, 47 insertions(+), 45 deletions(-)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot} (87%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot} (99%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot} (100%)
 rename tests/vpp/perf/container_memif/{2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot => 2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot} (100%)

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-eth-12memif-1chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
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-12memif-1chain-6dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
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-12memif-6chain-6dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
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-12memif-6chain-6dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
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-12memif-6pipe-12dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
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-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
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-12memif-6pipe-6dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
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-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
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-16memif-1chain-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
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-16memif-1chain-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
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-16memif-2chain-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
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-16memif-2chain-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
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-16memif-4chain-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
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-16memif-4chain-8dcr-vppip4-ndrpdr.robot
similarity index 87%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
index f30f6c856d..a3b9e141f3 100644
--- 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-16memif-4chain-8dcr-vppip4-ndrpdr.robot
@@ -97,50 +97,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-8dcrr-vppip4-ndrpdr
+| 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-eth-16memif-8chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
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-16memif-8chain-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
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-16memif-8pipe-16dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
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-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
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-16memif-8pipe-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
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-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
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-20memif-10chain-10dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
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-20memif-10chain-10dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
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-20memif-10pipe-10dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
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-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
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-20memif-1chain-10dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
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-20memif-1chain-10dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
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-24memif-2chain-12dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
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-24memif-2chain-12dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
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-24memif-6chain-12dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
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-24memif-6chain-12dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
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-2memif-1chain-1dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
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-2memif-1chain-1dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-10dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
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-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-1dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
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-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-2dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
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-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
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-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-6dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
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-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
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-2memif-1pipe-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
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-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
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-32memif-2chain-16dcr-vppip4-mrr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
index 9466d989f2..14929f6bc2 100644
--- 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-32memif-2chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | 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-32memif-2chain-16dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
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-32memif-4chain-16dcr-vppip4-mrr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
index e000112c41..6e422f4fd8 100644
--- 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-32memif-4chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | 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-32memif-4chain-16dcr-vppip4-ndrpdr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
index 74bdac6b10..f64c84eaf6 100644
--- 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-32memif-4chain-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | 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-32memif-8chain-16dcr-vppip4-mrr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
index e8b0dce650..298f758e97 100644
--- 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-32memif-8chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | 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-32memif-8chain-16dcr-vppip4-ndrpdr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
index 99564d601c..e992fe9203 100644
--- 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-32memif-8chain-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | 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-4memif-1chain-2dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
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-4memif-1chain-2dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
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-4memif-2chain-2dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
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-4memif-2chain-2dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
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-4memif-2pipe-12dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
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-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
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-4memif-2pipe-16dcr-vppip4-mrr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
index dbaf74c64d..6c9954368b 100644
--- 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-4memif-2pipe-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | 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-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
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-4memif-2pipe-2dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
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-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
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-4memif-2pipe-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
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-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
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-4memif-2pipe-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
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-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
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-8memif-1chain-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
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-8memif-1chain-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
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-8memif-2chain-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
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-8memif-2chain-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
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-8memif-4chain-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
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-8memif-4chain-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
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-8memif-4pipe-16dcr-vppip4-mrr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
index 46a94a336b..0f6b369cc6 100644
--- 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-8memif-4pipe-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | 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-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
similarity index 99%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
index 510bd755f5..af364ace29 100644
--- 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-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | 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-8memif-4pipe-4dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
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-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
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-8memif-4pipe-8dcr-vppip4-mrr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
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-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
similarity index 100%
rename from tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
rename to tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
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}
-
-- 
2.16.6