From 01354f38ff12eb8cf907f16592d7b21e1383a87a Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Wed, 15 Apr 2015 16:08:59 -0700 Subject: [PATCH] Adding l2switch scalability Change-Id: I331722e3face8acd2034efcb99b1a5088dd1e5da Signed-off-by: Luis Gomez --- .../suites/l2switch/Inventory_Scalability_OF13/__init__.txt | 2 +- .../openflowplugin/Inventory_Scalability_OF13/__init__.txt | 2 +- test/csit/testplans/l2switch-scalability.txt | 2 ++ test/csit/testplans/l2switch-switch.txt | 2 -- test/csit/testplans/openflowplugin-scalability.txt | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 test/csit/testplans/l2switch-scalability.txt 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-scalability.txt b/test/csit/testplans/openflowplugin-scalability.txt index c9cfd8569a..9bd50a162a 100644 --- a/test/csit/testplans/openflowplugin-scalability.txt +++ b/test/csit/testplans/openflowplugin-scalability.txt @@ -1 +1,2 @@ +# Place the suites in run order: integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF13 -- 2.36.6