Ensure netvirt is loaded before executing the remaining tests cases.

Change-Id: I5af54a00b68f98a93a874cc5ba407f6c6c27b29b
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
(cherry picked from commit abedbc0f82e81cb4a14e4b3503aa0ea95bc3cf63)

diff --git a/test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot b/test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
index 7afcd8bc54a8af31bde9440e5c8fc00e71572e53..e1151ead70b6dbee11d5b737fcd1b3542d2ca5ba 100644 (file)
--- a/test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
+++ b/test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
@@ -40,7 +40,8 @@ ${FLOAT_IP1_PORT_ID}    01671703-695e-4497-8a11-b5da989d2dc3
 ${FLOAT_IP1_MAC}    FA:16:3E:3F:37:BB
 ${FLOAT_IP1_DEVICE_ID}    f013bef4-9468-494d-9417-c9d9e4abb97c
 ${FLOAT_IP1_ADDRESS}    192.168.111.22
-@{node_list}      ovsdb://uuid/
+@{node_list}    ovsdb://uuid/
+@{netvirt}    1
 
 *** Test Cases ***
 Add variables to controller custom.properties
@@ -59,6 +60,11 @@ Ensure controller is running
     [Tags]    Check controller reachability
     Wait Until Keyword Succeeds    300s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${node_list}
 
+Ensure netvirt is loaded
+    [Documentation]    Check if the netvirt piece has been loaded into the karaf instance
+    [Tags]    Ensure netvirt is loaded
+    Wait Until Keyword Succeeds    300s    4s    Check For Elements At URI    ${OPERATIONAL_NODES_NETVIRT}    ${netvirt}
+
 Check External Net for Tenant
     [Documentation]    Check External Net for Tenant
     [Tags]    OpenStack Call Flow
@@ -249,4 +255,4 @@ Associate the Floating IP with Tenant VM
     ${Data}    Replace String    ${Data}    {vmPortId}    ${TNT1_VM1_PORT_ID}
     Log    ${Data}
     ${resp}    RequestsLibrary.Put    session    ${ODLREST}/floatingips/${FLOAT_IP1_ID}    ${Data}
-    Should Be Equal As Strings    ${resp.status_code}    200
\ No newline at end of file
+    Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index d7f4861c3603c13bad5841c930cad19cc62e67f5..4025e504beabb93a03e3a75ae06d0c9c95898ab1 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -70,6 +70,7 @@ PORTS = 'ports/detail.json'
 # Common APIs
 CONFIG_NODES_API = '/restconf/config/opendaylight-inventory:nodes'
 OPERATIONAL_NODES_API = '/restconf/operational/opendaylight-inventory:nodes'
+OPERATIONAL_NODES_NETVIRT = '/restconf/operational/network-topology:network-topology/topology/netvirt:1'
 OPERATIONAL_TOPO_API = '/restconf/operational/network-topology:' \
                        'network-topology'
 CONFIG_TOPO_API = '/restconf/config/network-topology:network-topology'