Autogen: Generate also NIC drivers.

+ Disallowed -avf- (or -rdma-) as "template" suites.
 + GBP suite switched to DPDK driver in repo.
+ Each NIC has its own list of supported drivers, in Constants.
+ Updated tag expressions for daily jobs:
 + Feature, ipsec, memif, scale, srv6, tunnels, vhost and vts
   are tested only with vfio-pci.
 + Other (base, dot1q, dot1ad) tested with all drivers.
+ Setup actions currently depend on driver, generated.
 - The performance_rdma action is trivial for now.
 - Several tests fail, to be fixed later, e.g. by performance_rdma.
+ Reconf tests are also supported.
+ Added DRV_VFIO_PCI tags missing, mainly in density tests.
 - Vhost suites (density, reconf) are failing, but suites look good.
- TCP suites do not support NIC drivers yet.
- DPDK obviously not supported.
+ Use Python 3 in regenerate scripts.
+ Fix typos binded => bound.
+ File open modes set either u"rt" or u"wt" everywhere.
+ Remove a trailing space in an environment variable name.

Change-Id: I290470675dc5c9e88b2eaa5ab6285ecd9ed7827a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

8 files changed, 89 insertions, 112 deletions

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index fbdf56a7e1..1819c457bb 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -606,8 +606,8 @@ function start_topology_containers () {
     # Override access to PCI bus by attaching a filesystem mount to the
     # container.
     dcr_stc_params+="--mount type=tmpfs,destination=/sys/bus/pci/devices "
-    # Mount vfio to be able to bind to see binded interfaces. We cannot use
-    # --device=/dev/vfio as this does not see newly binded interfaces.
+    # Mount vfio to be able to bind to see bound interfaces. We cannot use
+    # --device=/dev/vfio as this does not see newly bound interfaces.
     dcr_stc_params+="--volume /dev/vfio:/dev/vfio "
     # Mount docker.sock to be able to use docker deamon of the host.
     dcr_stc_params+="--volume /var/run/docker.sock:/var/run/docker.sock "
diff --git a/resources/libraries/bash/function/mrr-daily-clx.txt b/resources/libraries/bash/function/mrr-daily-clx.txt
index 95697a7ed6..e94df5c6e5 100644
--- a/resources/libraries/bash/function/mrr-daily-clx.txt
+++ b/resources/libraries/bash/function/mrr-daily-clx.txt
@@ -1,55 +1,49 @@
 !nf_density
 
 # container_memif
-mrrAND${default_nic}ANDmemifANDbaseAND64b
+mrrAND${default_nic}ANDmemifANDbaseAND64bANDdrv_vfio_pci
 
 # crypto
-# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
+mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000ANDdrv_vfio_pci
 
 # ip4
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1qNOTsrc_user_1
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdrv_avf
-mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec
-mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
+mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsecANDdrv_vfio_pci
+mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDip4baseAND64bNOTdot1q
-mrrANDip4baseAND64bANDdot1qNOTdrv_avf
-mrrANDip4fwdANDscaleANDfib_2mAND64b
+mrrANDip4fwdANDscaleANDfib_2mAND64bANDdrv_vfio_pci
 
 # ip4_tunnels
-mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost
+mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhostANDdrv_vfio_pci
 
 # ip6
-mrrAND${default_nic}ANDip6fwdANDbaseAND78b
-mrrAND${default_nic}ANDip6fwdANDscaleAND78b
+mrrAND${default_nic}ANDip6fwdANDbaseAND78bANDdrv_vfio_pci
+mrrAND${default_nic}ANDip6fwdANDscaleAND78bANDdrv_vfio_pci
 mrrANDip6baseAND78b
-mrrANDip6fwdANDscaleANDfib_2mAND78b
+mrrANDip6fwdANDscaleANDfib_2mAND78bANDdrv_vfio_pci
 
 # ip6_tunnels
 
 # l2
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTmemifNOTvhostNOTvxlanNOTdrv_avf
+mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b
-mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp
-mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
-mrrANDl2patchANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
-mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan
+mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
+mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
+mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbpANDdrv_vfio_pci
+mrrANDl2xcfwdANDbaseAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
+mrrANDl2patchANDbaseAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
+mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
 
 # srv6
-mrrAND${default_nic}ANDfeatureANDsrv6AND78b
+mrrAND${default_nic}ANDfeatureANDsrv6AND78bANDdrv_vfio_pci
 
 # vm_vhost
-mrrAND${default_nic}ANDvhostAND64b
-mrrANDvhostAND64bANDlbond
+mrrAND${default_nic}ANDvhostAND64bANDdrv_vfio_pci
+mrrANDvhostAND64bANDlbondANDdrv_vfio_pci
 
 # vts
-mrrAND${default_nic}ANDvtsAND114b
+mrrAND${default_nic}ANDvtsAND114bANDdrv_vfio_pci
 
 !ipsectun
 !hmac_sha_256
diff --git a/resources/libraries/bash/function/mrr-daily-dnv.txt b/resources/libraries/bash/function/mrr-daily-dnv.txt
index 2dd4757464..d5294be6cd 100644
--- a/resources/libraries/bash/function/mrr-daily-dnv.txt
+++ b/resources/libraries/bash/function/mrr-daily-dnv.txt
@@ -1,45 +1,41 @@
 !nf_density
 
 # container_memif
-mrrAND${default_nic}ANDmemifANDbaseAND64b
+mrrAND${default_nic}ANDmemifANDbaseAND64bANDdrv_vfio_pci
 
 # crypto
-# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
+mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000ANDdrv_vfio_pci
 
 # ip4
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1q
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1ANDdot1qNOTdrv_avf
-mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec
-mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
+mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsecANDdrv_vfio_pci
+mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDip4baseAND64bNOTdot1q
-mrrANDip4baseAND64bANDdot1qNOTdrv_avf
-mrrANDip4fwdANDscaleANDfib_2mAND64b
+mrrANDip4fwdANDscaleANDfib_2mAND64bANDdrv_vfio_pci
 
 # ip4_tunnels
-mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost
+mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhostANDdrv_vfio_pci
 
 # ip6
 mrrAND${default_nic}ANDip6fwdANDbaseAND78b
-mrrAND${default_nic}ANDip6fwdANDscaleAND78b
+mrrAND${default_nic}ANDip6fwdANDscaleAND78bANDdrv_vfio_pci
 mrrANDip6baseAND78b
-mrrANDip6fwdANDscaleANDfib_2mAND78b
+mrrANDip6fwdANDscaleANDfib_2mAND78bANDdrv_vfio_pci
 
 # ip6_tunnels
 
 # l2
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanANDdot1qNOTdrv_avf
+mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
+mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp
-mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
-mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan
+mrrANDl2xcfwdANDbaseAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
+mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
 
 # srv6
-mrrAND${default_nic}ANDfeatureANDsrv6AND78b
+mrrAND${default_nic}ANDfeatureANDsrv6AND78bANDdrv_vfio_pci
 
 # vm_vhost
-mrrAND${default_nic}ANDvhostANDbaseAND64b
+mrrAND${default_nic}ANDvhostANDbaseAND64bANDdrv_vfio_pci
diff --git a/resources/libraries/bash/function/mrr-daily-hsw.txt b/resources/libraries/bash/function/mrr-daily-hsw.txt
index 0393e3c192..52bd19b98a 100644
--- a/resources/libraries/bash/function/mrr-daily-hsw.txt
+++ b/resources/libraries/bash/function/mrr-daily-hsw.txt
@@ -1,23 +1,20 @@
 # container_memif
 
 # crypto
-# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-# mrrAND${default_nic}ANDscaleANDipsechwANDtnl_1000AND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcm
-# mrrAND${default_nic}ANDbaseANDipsechwAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcm
-mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-mrrAND${default_nic}ANDscaleANDipsechwANDtnl_1000ANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcm
-mrrAND${default_nic}ANDbaseANDipsechwANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcm
+mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000ANDdrv_vfio_pci
+mrrAND${default_nic}ANDscaleANDipsechwANDtnl_1000ANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmANDdrv_vfio_pci
+mrrAND${default_nic}ANDbaseANDipsechwANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmANDdrv_vfio_pci
 
 # ip4
 mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTmemifNOTipsecNOTnat44NOTvhostNOTvxlan
-mrrAND${default_nic}ANDip4fwdANDscaleANDfib_2mAND64bNOTnat44
+mrrAND${default_nic}ANDip4fwdANDscaleANDfib_2mAND64bNOTnat44ANDdrv_vfio_pci
 
 # ip4_tunnels
-mrrAND${default_nic}ANDvxlanAND64bNOTscaleNOTvhost
+mrrAND${default_nic}ANDvxlanAND64bNOTscaleNOTvhostANDdrv_vfio_pci
 
 # ip6
 mrrAND${default_nic}ANDip6fwdANDbaseAND78bNOTmemif
-mrrAND${default_nic}ANDip6fwdANDscaleANDfib_2mAND78b
+mrrAND${default_nic}ANDip6fwdANDscaleANDfib_2mAND78bANDdrv_vfio_pci
 
 # ip6_tunnels
 
@@ -25,17 +22,17 @@ mrrAND${default_nic}ANDip6fwdANDscaleANDfib_2mAND78b
 mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDscaleANDfib_1mAND64b
+mrrAND${default_nic}ANDl2bdmaclrnANDscaleANDfib_1mAND64bANDdrv_vfio_pci
 
 # srv6
-mrrAND${default_nic}ANDfeatureANDsrv6AND78b
+mrrAND${default_nic}ANDfeatureANDsrv6AND78bANDdrv_vfio_pci
 
 # vm_vhost
-mrrAND${default_nic}ANDvhostANDbaseAND64bNOTvxlanNOTlbondNOTdot1q
-mrrAND${default_nic}ANDvhostANDl2bdmaclrnAND64bANDdot1qNOTlbondNOTvxlan
+mrrAND${default_nic}ANDvhostANDbaseAND64bNOTvxlanNOTlbondNOTdot1qANDdrv_vfio_pci
+mrrAND${default_nic}ANDvhostANDl2bdmaclrnAND64bANDdot1qNOTlbondNOTvxlanANDdrv_vfio_pci
 
 # vts
-mrrAND${default_nic}ANDvtsAND114b
+mrrAND${default_nic}ANDvtsAND114bANDdrv_vfio_pci
 
 !ipsectun
 !hmac_sha_256
diff --git a/resources/libraries/bash/function/mrr-daily-skx.txt b/resources/libraries/bash/function/mrr-daily-skx.txt
index 95697a7ed6..2b1f598a7a 100644
--- a/resources/libraries/bash/function/mrr-daily-skx.txt
+++ b/resources/libraries/bash/function/mrr-daily-skx.txt
@@ -1,55 +1,49 @@
 !nf_density
 
 # container_memif
-mrrAND${default_nic}ANDmemifANDbaseAND64b
+mrrAND${default_nic}ANDmemifANDbaseAND64bANDdrv_vfio_pci
 
 # crypto
-# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
+mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000ANDdrv_vfio_pci
 
 # ip4
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1qNOTsrc_user_1
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdrv_avf
-mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec
-mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
+mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsecANDdrv_vfio_pci
+mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDip4baseAND64bNOTdot1q
-mrrANDip4baseAND64bANDdot1qNOTdrv_avf
-mrrANDip4fwdANDscaleANDfib_2mAND64b
+mrrANDip4fwdANDscaleANDfib_2mAND64bANDdrv_vfio_pci
 
 # ip4_tunnels
-mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost
+mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhostANDdrv_vfio_pci
 
 # ip6
 mrrAND${default_nic}ANDip6fwdANDbaseAND78b
-mrrAND${default_nic}ANDip6fwdANDscaleAND78b
+mrrAND${default_nic}ANDip6fwdANDscaleAND78bANDdrv_vfio_pci
 mrrANDip6baseAND78b
-mrrANDip6fwdANDscaleANDfib_2mAND78b
+mrrANDip6fwdANDscaleANDfib_2mAND78bANDdrv_vfio_pci
 
 # ip6_tunnels
 
 # l2
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTmemifNOTvhostNOTvxlanNOTdrv_avf
+mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
+mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp
-mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
-mrrANDl2patchANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
-mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan
+mrrANDl2xcfwdANDbaseAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
+mrrANDl2patchANDbaseAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost
+mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
 
 # srv6
-mrrAND${default_nic}ANDfeatureANDsrv6AND78b
+mrrAND${default_nic}ANDfeatureANDsrv6AND78bANDdrv_vfio_pci
 
 # vm_vhost
-mrrAND${default_nic}ANDvhostAND64b
-mrrANDvhostAND64bANDlbond
+mrrAND${default_nic}ANDvhostAND64bANDdrv_vfio_pci
+mrrANDvhostAND64bANDlbondANDdrv_vfio_pci
 
 # vts
-mrrAND${default_nic}ANDvtsAND114b
+mrrAND${default_nic}ANDvtsAND114bANDdrv_vfio_pci
 
 !ipsectun
 !hmac_sha_256
diff --git a/resources/libraries/bash/function/mrr-daily-tsh.txt b/resources/libraries/bash/function/mrr-daily-tsh.txt
index 37b4f3be33..32f2fed913 100644
--- a/resources/libraries/bash/function/mrr-daily-tsh.txt
+++ b/resources/libraries/bash/function/mrr-daily-tsh.txt
@@ -1,50 +1,46 @@
 # !nf_density
 
 # container_memif
-mrrAND${default_nic}ANDmemifANDbaseAND64b
+mrrAND${default_nic}ANDmemifANDbaseAND64bANDdrv_vfio_pci
 
 # crypto
-# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
-mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000
+mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000ANDdrv_vfio_pci
 
 # ip4
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1q
-mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1ANDdot1qNOTdrv_avf
-mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec
-mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b
-mrrANDip4baseAND64bNOTdot1q
-mrrANDip4baseAND64bANDdot1qNOTdrv_avf
-mrrANDip4fwdANDscaleANDfib_2mAND64b
+mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1
+mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsecANDdrv_vfio_pci
+mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
+mrrANDip4baseAND64b
+mrrANDip4fwdANDscaleANDfib_2mAND64bANDdrv_vfio_pci
 
 # ip4_tunnels
-mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost
+mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhostANDdrv_vfio_pci
 
 # ip6
 mrrAND${default_nic}ANDip6fwdANDbaseAND78b
-mrrAND${default_nic}ANDip6fwdANDscaleAND78b
+mrrAND${default_nic}ANDip6fwdANDscaleAND78bANDdrv_vfio_pci
 mrrANDip6baseAND78b
-mrrANDip6fwdANDscaleANDfib_2mAND78b
+mrrANDip6fwdANDscaleANDfib_2mAND78bANDdrv_vfio_pci
 
 # ip6_tunnels
 
 # l2
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q
-mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qNOTmemifNOTvhostNOTvxlanNOTdrv_avf
+mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan
 mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan
-mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b
+mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
+mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64bANDdrv_vfio_pci
 mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp
-mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan
+mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlanANDdrv_vfio_pci
 
 # srv6
-mrrAND${default_nic}ANDfeatureANDsrv6AND78b
+mrrAND${default_nic}ANDfeatureANDsrv6AND78bANDdrv_vfio_pci
 
 # vm_vhost
-mrrAND${default_nic}ANDvhostANDbaseAND64b
+mrrAND${default_nic}ANDvhostANDbaseAND64bANDdrv_vfio_pci
 
 # vts
-mrrAND${default_nic}ANDvtsAND114b
+mrrAND${default_nic}ANDvtsAND114bANDdrv_vfio_pci
 
 !ipsectun
 !hmac_sha_256
diff --git a/resources/libraries/bash/function/mrr-daily.txt b/resources/libraries/bash/function/mrr-daily.txt
index 20af48aad4..02a6d7eab0 100644
--- a/resources/libraries/bash/function/mrr-daily.txt
+++ b/resources/libraries/bash/function/mrr-daily.txt
@@ -4,5 +4,5 @@ mrrAND64bANDip4baseNOTdot1q
 mrrAND78bANDip6baseNOTdot1q
 mrrAND64bANDl2bdbaseNOTdot1q
 mrrAND64bANDl2xcbaseNOTdot1q
-mrrAND${default_nic}ANDscaleAND64bNOT4cNOTnf_density
-mrrAND${default_nic}ANDscaleAND78bNOT4cNOTnf_density
+mrrAND${default_nic}ANDscaleAND64bNOT4cNOTnf_densityANDdrv_vfio_pci
+mrrAND${default_nic}ANDscaleAND78bNOT4cNOTnf_densityANDdrv_vfio_pci
diff --git a/resources/libraries/bash/function/mrr-weekly.txt b/resources/libraries/bash/function/mrr-weekly.txt
index b89987dc23..b09c8228a2 100644
--- a/resources/libraries/bash/function/mrr-weekly.txt
+++ b/resources/libraries/bash/function/mrr-weekly.txt
@@ -24,4 +24,4 @@
 1numaAND4cAND64bANDbaseANDdpdkANDethANDhw_envANDl2xcfwdANDmrrANDnic_intel-xxv710NOT100_flowsNOT100k_flowsNOT10k_flowsNOT10r1cNOT114bNOT1518bNOT1cNOT1r10cNOT1r1cNOT1r2cNOT1r4cNOT1r6cNOT1r8cNOT1vmNOT1vnfNOT1vswitchNOT2cNOT2r1cNOT2r2cNOT2r4cNOT2r6cNOT2r8cNOT2vmNOT2vnfNOT4r1cNOT4r2cNOT4r4cNOT4vnfNOT6r1cNOT6r2cNOT78bNOT8r1cNOT8r2cNOT9000bNOTaclNOTacl1NOTacl10NOTacl50NOTacl_permitNOTacl_permit_reflectNOTacl_statefulNOTacl_statelessNOTaes_gcmNOTcbc_sha1NOTcfs_optNOTchainNOTcopwhlistNOTdockerNOTdot1adNOTdot1qNOTdrv_avfNOTencapNOTfeatureNOTfib_100kNOTfib_10kNOTfib_1mNOTfib_200kNOTfib_20kNOTfib_2mNOThorizontalNOTiaclNOTiacldstNOTimixNOTip4baseNOTip4fwdNOTip4ovrlayNOTip4unrlayNOTip6baseNOTip6fwdNOTip6ovrlayNOTip6unrlayNOTipsecNOTipsechwNOTipsecintNOTipsecswNOTipsectranNOTipsectunNOTk8sNOTl2bd_1NOTl2bd_10NOTl2bd_100NOTl2bd_1kNOTl2bdbaseNOTl2bdmaclrnNOTl2bdscaleNOTl2ovrlayNOTl2patchNOTl2xcbaseNOTlbondNOTlbond_1lNOTlbond_2lNOTlbond_dpdkNOTlbond_lb_l34NOTlbond_mode_lacpNOTlbond_mode_xorNOTlbond_vppNOTlispNOTlispgpeNOTlxcNOTmacipNOTmemifNOTnat44NOTndrpdrNOTnf_densityNOTnf_l3fwdip4NOTnf_vppip4NOTnic_cisco-vic-1227NOTnic_cisco-vic-1385NOTnic_intel-x520-da2NOTnic_intel-x553NOTnic_intel-x710NOTnic_intel-xl710NOToaclNOTparallelNOTpipelineNOTpolice_markNOTscaleNOTsfc_controllerNOTsingle_memifNOTsrc_user_1NOTsrc_user_10NOTsrc_user_100NOTsrc_user_1000NOTsrc_user_2000NOTsrc_user_4000NOTsrv6NOTsrv6_1sidNOTsrv6_2sid_decapNOTsrv6_2sid_nodecapNOTsrv6_proxyNOTsrv6_proxy_dynNOTsrv6_proxy_masqNOTsrv6_proxy_statNOTtnl_1000NOTvhostNOTvhost_1024NOTvlan_1NOTvlan_10NOTvlan_100NOTvlan_1kNOTvpp_agentNOTvtsNOTvxlanNOTvxlan_1NOTvxlan_10NOTvxlan_100NOTvxlan_1k
 
 # nfv_density
-mrrAND${default_nic}ANDnf_densityANDimix
+mrrAND${default_nic}ANDnf_densityANDimixANDdrv_vfio_pci