From: Jan Gelety Date: Wed, 25 Jan 2017 12:32:01 +0000 (+0100) Subject: Remove _base from test suite dir names X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=5814118adfec1cf88603d5b8c0015a0a1d032942 Remove _base from test suite dir names Change-Id: I2e495f99a88dedc47f64efcc14722bb629a25f02 Signed-off-by: Jan Gelety --- diff --git a/bootstrap.sh b/bootstrap.sh index 9e390383ca..7eeb68113c 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 similarity index 100% rename from tests/func/cop_base/eth2p-ethip4-ip4base-copblklistbase-func.robot rename to 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 similarity index 100% rename from tests/func/cop_base/eth2p-ethip4-ip4base-copwhlistbase-func.robot rename to 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 similarity index 100% rename from tests/func/cop_base/eth2p-ethip6-ip6base-copblklistbase-func.robot rename to 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 similarity index 100% rename from tests/func/cop_base/eth2p-ethip6-ip6base-copwhlistbase-func.robot rename to 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 similarity index 100% rename from tests/func/iacl_base/eth2p-eth-l2xcbase-iaclbase-func.robot rename to 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 similarity index 100% rename from tests/func/iacl_base/eth2p-ethip4-ip4base-iaclbase-func.robot rename to 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 similarity index 100% rename from tests/func/iacl_base/eth2p-ethip6-ip6base-iaclbase-func.robot rename to 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 similarity index 100% rename from tests/func/ipv4_base/eth2p-ethip4-ip4base-func.robot rename to 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 similarity index 100% rename from tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4arp-func.robot rename to 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 similarity index 100% rename from tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4ecmp-func.robot rename to 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 similarity index 100% rename from tests/func/ipv4_base/eth2p-ethip4-ip4base-ip4proxyarp-func.robot rename to 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 similarity index 100% rename from tests/func/ipv6_base/eth2p-ethip6-ip6base-func.robot rename to 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 similarity index 100% rename from tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ecmp-func.robot rename to 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 similarity index 100% rename from tests/func/ipv6_base/eth2p-ethip6-ip6base-ip6ra-func.robot rename to 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 similarity index 100% rename from tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot rename to 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 similarity index 100% rename from tests/func/l2bd_base/eth2p-eth-l2bdbasemaclrn-func.robot rename to 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 similarity index 100% rename from tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot rename to 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 similarity index 100% rename from tests/func/l2bd_base/eth2p-eth-l2bdbasemacstc-func.robot rename to 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 similarity index 100% rename from tests/func/l2bd_base/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot rename to 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 similarity index 100% rename from tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot rename to 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 similarity index 100% rename from tests/func/l2xc_base/eth2p-eth-l2xcbase-func.robot rename to tests/func/l2xc/eth2p-eth-l2xcbase-func.robot