Merge "BUG 2676 : Add some tuning parameters to improve the performance of CDS"

diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt
index 68256440d6ad2f0136b3c64dbddd129e1384e6b1..913ba22c08bddba1cbbd770df8ffc98431ad8b6f 100644 (file)
--- a/test/csit/libraries/Utils.txt
+++ b/test/csit/libraries/Utils.txt
@@ -4,21 +4,20 @@ Library           ./UtilLibrary.py
 
 *** Variables ***
 ${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13
+${linux_prompt}   >
 
 *** Keywords ***
 Start Suite
     [Documentation]    Basic setup/cleanup work that can be done safely before any system
     ...    is run.
     Log    Start the test on the base edition
-    ${mininet_conn_id}=     Open Connection    ${MININET}    prompt=>    timeout=30s
+    ${mininet_conn_id}=     Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=30s
     Set Suite Variable  ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Write    sudo ovs-vsctl set-manager ptcp:6644
-    Read Until    >
+    Read Until    ${linux_prompt}
     Write    sudo mn -c
-    Read Until    >
-    Read Until    >
-    Read Until    >
+    Read Until    ${linux_prompt}
     Write    ${start}
     Read Until    mininet>
     Sleep    6
@@ -30,7 +29,7 @@ Stop Suite
     Switch Connection   ${mininet_conn_id}
     Read
     Write    exit
-    Read Until    >
+    Read Until    ${linux_prompt}
     Close Connection
 
 Ensure All Nodes Are In Response

diff --git a/test/csit/testplans/l2switch-switch.txt b/test/csit/testplans/l2switch-switch.txt
new file mode 100644 (file)
index 0000000..734104e
--- /dev/null
+++ b/test/csit/testplans/l2switch-switch.txt
@@ -0,0 +1,6 @@
+# Place the suites in run order:
+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/tools/cluster-deployer/templates/multi-node-test/akka.conf.template b/test/tools/cluster-deployer/templates/multi-node-test/akka.conf.template
index c1ae19f62086a6ce2b2c66ec364ac9e8d4d98c50..b33a080817812051436a5d402056e14e935989fe 100644 (file)
--- a/test/tools/cluster-deployer/templates/multi-node-test/akka.conf.template
+++ b/test/tools/cluster-deployer/templates/multi-node-test/akka.conf.template
@@ -51,7 +51,7 @@ odl-cluster-data {
     cluster {
       seed-nodes = {{{DS_SEED_NODES}}}
 
-      auto-down-unreachable-after = 10s
+      auto-down-unreachable-after = 300s
 
       roles = [
         "{{MEMBER_NAME}}"
@@ -83,13 +83,16 @@ odl-cluster-rpc {
       netty.tcp {
         hostname = "{{HOST}}"
         port = 2551
+        maximum-frame-size = 419430400
+        send-buffer-size = 52428800
+        receive-buffer-size = 52428800
       }
     }
 
     cluster {
       seed-nodes = {{{RPC_SEED_NODES}}}
 
-      auto-down-unreachable-after = 10s
+      auto-down-unreachable-after = 300s
     }
   }
 }

diff --git a/test/tools/cluster-deployer/templates/openflow/akka.conf.template b/test/tools/cluster-deployer/templates/openflow/akka.conf.template
index 8391ed9e4c731042f6ec5caded1cf17a84de3d57..50982013a79d296d37e6adfc8d894e62fe23ae60 100644 (file)
--- a/test/tools/cluster-deployer/templates/openflow/akka.conf.template
+++ b/test/tools/cluster-deployer/templates/openflow/akka.conf.template
@@ -52,7 +52,7 @@ odl-cluster-data {
     cluster {
       seed-nodes = {{{DS_SEED_NODES}}}
 
-      auto-down-unreachable-after = 10s
+      auto-down-unreachable-after = 300s
 
       roles = [
         "{{MEMBER_NAME}}"
@@ -84,13 +84,16 @@ odl-cluster-rpc {
       netty.tcp {
         hostname = "{{HOST}}"
         port = 2551
+        maximum-frame-size = 419430400
+        send-buffer-size = 52428800
+        receive-buffer-size = 52428800
       }
     }
 
     cluster {
       seed-nodes = {{{RPC_SEED_NODES}}}
 
-      auto-down-unreachable-after = 10s
+      auto-down-unreachable-after = 300s
     }
   }
 }