From: Luis Gomez Date: Fri, 17 Apr 2015 00:03:35 +0000 (+0000) Subject: Merge "Add basic RESTconf test to repo" X-Git-Tag: release/lithium~148 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4da2f0ab7c6427c3c60f9c53dc8dc78d2c55c5a4;hp=f6e113f21cae058c2981eaf67bdc2c27edb1c7e8;p=integration%2Ftest.git Merge "Add basic RESTconf test to repo" --- diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt index f4b56b846d..f9a97f30b9 100644 --- a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt @@ -15,7 +15,7 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${MININET} prompt=> timeout=${numnodes*2} + Open Connection ${MININET} prompt=> timeout=${numnodes*3} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt index f4b56b846d..f9a97f30b9 100644 --- a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt +++ b/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.txt @@ -15,7 +15,7 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${MININET} prompt=> timeout=${numnodes*2} + Open Connection ${MININET} prompt=> timeout=${numnodes*3} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > diff --git a/test/csit/testplans/l2switch-scalability.txt b/test/csit/testplans/l2switch-scalability.txt new file mode 100644 index 0000000000..87ee079ed2 --- /dev/null +++ b/test/csit/testplans/l2switch-scalability.txt @@ -0,0 +1,2 @@ +# Place the suites in run order: +integration/test/csit/suites/l2switch/Inventory_Scalability_OF13 diff --git a/test/csit/testplans/l2switch-switch.txt b/test/csit/testplans/l2switch-switch.txt index 472991d334..516594098a 100644 --- a/test/csit/testplans/l2switch-switch.txt +++ b/test/csit/testplans/l2switch-switch.txt @@ -3,5 +3,3 @@ integration/test/csit/suites/l2switch/Address_Tracking_OF13 integration/test/csit/suites/l2switch/Flow_Programming_OF13 integration/test/csit/suites/l2switch/Loop_Removal_OF13 integration/test/csit/suites/l2switch/Host_Tracking_OF13 -integration/test/csit/suites/l2switch/Inventory_Scalability_OF13 - diff --git a/test/csit/testplans/openflowplugin-cbench-daily.txt b/test/csit/testplans/openflowplugin-cbench-daily.txt new file mode 100644 index 0000000000..34c03421d5 --- /dev/null +++ b/test/csit/testplans/openflowplugin-cbench-daily.txt @@ -0,0 +1,2 @@ +# Place the suites in run order: +integration/test/csit/suites/openflowplugin/Performance/010_Cbench.txt diff --git a/test/csit/testplans/openflowplugin-flow-services.txt b/test/csit/testplans/openflowplugin-flow-services.txt index cb6ed36448..24a5638cbb 100644 --- a/test/csit/testplans/openflowplugin-flow-services.txt +++ b/test/csit/testplans/openflowplugin-flow-services.txt @@ -1,11 +1,9 @@ # Place the suites in run order: integration/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10 integration/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10 -integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF10 integration/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13 integration/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13 integration/test/csit/suites/openflowplugin/Flows_OF13 integration/test/csit/suites/openflowplugin/Switch_Qualification integration/test/csit/suites/openflowplugin/Flows_Stats_OF13 # integration/test/csit/suites/openflowplugin/Groups_Meters_OF13 -integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF13 diff --git a/test/csit/testplans/openflowplugin-scalability.txt b/test/csit/testplans/openflowplugin-scalability.txt new file mode 100644 index 0000000000..9bd50a162a --- /dev/null +++ b/test/csit/testplans/openflowplugin-scalability.txt @@ -0,0 +1,2 @@ +# Place the suites in run order: +integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF13 diff --git a/test/tools/tools_vm/scripts/connect.sh b/test/tools/tools_vm/scripts/connect.sh new file mode 100755 index 0000000000..99c938485c --- /dev/null +++ b/test/tools/tools_vm/scripts/connect.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env sh +# Connect to ODL Karaf shell. Mostly used for testing. + +# Output verbose debug info (true) or not (anything else) +VERBOSE=true +# Port that the Karaf shell listens on +KARAF_SHELL_PORT=8101 + +# This could be done with public key crypto, but sshpass is easier +if ! command -v sshpass &> /dev/null; then + echo "Installing sshpass. It's used connecting non-interactively" + if "$VERBOSE" = true; then + sudo yum install -y sshpass + else + sudo yum install -y sshpass &> /dev/null + fi +fi + +echo "Will repeatedly attempt connecting to Karaf shell until it's ready" +# Loop until exit status 0 (success) given by Karaf shell +# Exit status 255 means Karaf shell isn't open for SSH connections yet +# Exit status 1 means `dropAllPacketsRpc on` isn't runnable yet +until sshpass -p karaf ssh -p $KARAF_SHELL_PORT -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PreferredAuthentications=password karaf@localhost +do + echo "Karaf shell isn't ready yet, sleeping 5 seconds..." + sleep 5 +done