22 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index f123729647..4db84345e0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -33,7 +33,7 @@ VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
-TEST_GROUPS=("l2bd_base,dhcp,gre,honeycomb,l2xc_base,lisp,softwire" "cop_base,telemetry,ipsec,ipv6_base,rpf,tap,vrf" "fds,iacl_base,ipv4_base,policer,vlan,vxlan")
+TEST_GROUPS=("l2bd,dhcp,gre,honeycomb,l2xc,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan")
 SUITE_PATH="tests.func"
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/tests/func/cop_base/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot
index 37e55c0666..37e55c0666 100644
--- a/tests/func/cop_base/eth2p-ethip4-ip4base-copblklistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot
diff --git a/tests/func/cop_base/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot
index eb8be688d9..eb8be688d9 100644
--- a/tests/func/cop_base/eth2p-ethip4-ip4base-copwhlistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot
diff --git a/tests/func/cop_base/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot
index 7511dfe31b..7511dfe31b 100644
--- a/tests/func/cop_base/eth2p-ethip6-ip6base-copblklistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot
diff --git a/tests/func/cop_base/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot
index f75f4d0dea..f75f4d0dea 100644
--- a/tests/func/cop_base/eth2p-ethip6-ip6base-copwhlistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot
diff --git a/tests/func/iacl_base/eth2p-eth-l2xcbase-iaclbase-func.robot b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot
index 1914130bac..1914130bac 100644
--- a/tests/func/iacl_base/eth2p-eth-l2xcbase-iaclbase-func.robot
+++ b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot
diff --git a/tests/func/iacl_base/eth2p-ethip4-ip4base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot
index ff55d94374..ff55d94374 100644
--- a/tests/func/iacl_base/eth2p-ethip4-ip4base-iaclbase-func.robot
+++ b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot
diff --git a/tests/func/iacl_base/eth2p-ethip6-ip6base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot
index 47daac02a5..47daac02a5 100644
--- a/tests/func/iacl_base/eth2p-ethip6-ip6base-iaclbase-func.robot
+++ b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot
diff --git a/tests/func/ipv4_base/eth2p-ethip4-ip4base-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot
index 020d1f143b..020d1f143b 100644
--- a/tests/func/ipv4_base/eth2p-ethip4-ip4base-func.robot
+++ b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot
diff --git a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4arp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot
index 0950610559..0950610559 100644
--- a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4arp-func.robot
+++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot
diff --git a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4ecmp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot
index f55ee64df9..f55ee64df9 100644
--- a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4ecmp-func.robot
+++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot
diff --git a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
index 765a54b6d5..765a54b6d5 100644
--- a/tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
+++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot
diff --git a/tests/func/ipv6_base/eth2p-ethip6-ip6base-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot
index 6048daad67..6048daad67 100644
--- a/tests/func/ipv6_base/eth2p-ethip6-ip6base-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot
diff --git a/tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
index fddf3a98a8..fddf3a98a8 100644
--- a/tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ecmp-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
diff --git a/tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ra-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot
index e45ce730c9..e45ce730c9 100644
--- a/tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ra-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot
diff --git a/tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
index b2279b90fc..b2279b90fc 100644
--- a/tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
diff --git a/tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot
index a0336e5cc8..a0336e5cc8 100644
--- a/tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-func.robot
+++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot
diff --git a/tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot
index ad5258bb9a..ad5258bb9a 100644
--- a/tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot
+++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot
diff --git a/tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot
index 271852e7e6..271852e7e6 100644
--- a/tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-func.robot
+++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot
diff --git a/tests/func/l2bd_base/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot
index 295a03eadc..295a03eadc 100644
--- a/tests/func/l2bd_base/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot
+++ b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot
diff --git a/tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
index 583a5ba052..583a5ba052 100644
--- a/tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
+++ b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
diff --git a/tests/func/l2xc_base/eth2p-eth-l2xcbase-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot
index aa25225f44..aa25225f44 100644
--- a/tests/func/l2xc_base/eth2p-eth-l2xcbase-func.robot
+++ b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot