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 f4b56b846d06a4e2570c6b70b6dba68ccb2e6d9f..f9a97f30b9e43d491d3cb3f92aa5b462a3464c60 100644 (file)
--- 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 f4b56b846d06a4e2570c6b70b6dba68ccb2e6d9f..f9a97f30b9e43d491d3cb3f92aa5b462a3464c60 100644 (file)
--- 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 (file)
index 0000000..87ee079
--- /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 472991d3348a31ac7c8613e3b04d0729f9101fe0..516594098a8fa237a09856efd910a9bab8676ceb 100644 (file)
--- 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 (file)
index 0000000..34c0342
--- /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 cb6ed3644812613c1d17c9016ab45a89a1cf6981..24a5638cbb1b6ca98b43bd27cf03705223f3f485 100644 (file)
--- 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 (file)
index 0000000..9bd50a1
--- /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 (executable)
index 0000000..99c9384
--- /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