Merge "Initial keyword to check if controller is Dead"

diff --git a/test/csit/suites/iotdm/basic/010_Restconf_OK.txt b/test/csit/suites/iotdm/basic/010_Restconf_OK.txt
new file mode 100644 (file)
index 0000000..743c76b
--- /dev/null
+++ b/test/csit/suites/iotdm/basic/010_Restconf_OK.txt
@@ -0,0 +1,20 @@
+*** Settings ***
+Documentation     Test suite to verify Restconf is OK
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown    Delete All Sessions
+Library           ../../../libraries/RequestsLibrary.py
+Library           ../../../libraries/Common.py
+Variables         ../../../variables/Variables.py
+Resource          ../../../libraries/Utils.txt
+
+*** Variables ***
+${REST_CONTEXT}    /restconf/modules
+
+*** Test Cases ***
+Get Controller Modules
+    [Documentation]    Get the controller modules via Restconf
+    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
+    Log    ${resp.content}
+    Should Be Equal As Strings    ${resp.status_code}    200
+    Should Contain    ${resp.content}    ietf-restconf
+

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/iotdm-basic.txt b/test/csit/testplans/iotdm-basic.txt
new file mode 100644 (file)
index 0000000..b7470fb
--- /dev/null
+++ b/test/csit/testplans/iotdm-basic.txt
@@ -0,0 +1,2 @@
+# Place the suites in run order:
+integration/test/csit/suites/iotdm/basic

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-scalability.txt b/test/csit/testplans/openflowplugin-scalability.txt
index c9cfd8569a512a4ff8ae79e79607820ab7437fc7..9bd50a162a1bc9c7dd2d1e8386365e9c40e26e25 100644 (file)
--- 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