X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fnetvirt%2Fupgrade%2Fupgrade.robot;h=9da84d58f0ce46e66ec24bc1785ff90104e12d64;hb=0a7b377645f729d94c7e19cf93b3eb13836f6bdd;hp=aba7c9e172f441fe368b40e328283fbb03777a64;hpb=4275e8c97933a84e01164530f0e8eedb1bd458a5;p=integration%2Ftest.git

diff --git a/csit/suites/netvirt/upgrade/upgrade.robot b/csit/suites/netvirt/upgrade/upgrade.robot
index aba7c9e172..9da84d58f0 100644
--- a/csit/suites/netvirt/upgrade/upgrade.robot
+++ b/csit/suites/netvirt/upgrade/upgrade.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     Test suite for ODL Upgrade. It is assumed that OLD + OpenStack
 ...               integrated environment is deployed and ready.
-Suite Setup       OpenStackOperations.OpenStack Suite Setup
+Suite Setup       Suite Setup
 Suite Teardown    Upgrade Suite Teardown
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     Get Test Teardown Debugs
@@ -27,6 +27,7 @@ ${ROUTER}         upgrade_router_1
 ${TYPE}           tun
 ${PASSIVE_MANAGER}    ptcp:6641:127.0.0.1
 @{DEBUG_LOG_COMPONENTS}    org.opendaylight.ovsdb    org.opendaylight.ovsdb.lib    org.opendaylight.netvirt    org.opendaylight.genius
+${UPDATE_FLAG_PATH}    /restconf/config/genius-mdsalutil:config
 
 *** Test Cases ***
 Create Setup And Verify Instance Connectivity
@@ -63,12 +64,20 @@ Wait For Full Sync
     [Documentation]    Wait for networking_odl to sync neutron configuration
     Wait Until Keyword Succeeds    90s    5s    Canary Network Should Exist
 
+Set Upgrade Flag
+    ${resp} =    RequestsLibrary.Put Request    session    ${UPDATE_FLAG_PATH}    {"config":{"upgradeInProgress":true}}
+    BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
+
 Set OVS Manager And Controller
     [Documentation]    Set controller and manager on each OpenStack node and check that egress flows are present
     : FOR    ${node}    IN    @{OS_ALL_IPS}
     \    Run Command On Remote System    ${node}    sudo ovs-vsctl set-manager tcp:${ODL_SYSTEM_IP}:${OVSDBPORT} ${PASSIVE_MANAGER}
     Wait Until Keyword Succeeds    180s    15s    Check OVS Nodes Have Egress Flows
 
+UnSet Upgrade Flag
+    ${resp} =    RequestsLibrary.Put Request    session    ${UPDATE_FLAG_PATH}    {"config":{"upgradeInProgress":false}}
+    BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
+
 Check Connectivity With Previously Created Resources And br-int Info
     [Documentation]    Check that pre-existing instance connectivity still works after the new controller is brought
     ...    up and config is sync'd
@@ -76,6 +85,12 @@ Check Connectivity With Previously Created Resources And br-int Info
     Wait Until Keyword Succeeds    90s    10s    Check Resource Connectivity
 
 *** Keywords ***
+Suite Setup
+    OpenStackOperations.OpenStack Suite Setup
+    Create Resources
+    OpenStackOperations.Show Debugs    @{NET_1_VMS}    @{NET_2_VMS}
+    OpenStackOperations.Get Suite Debugs
+
 Create Resources
     [Documentation]    Create 2 VXLAN networks, subnets with 2 VMs each and a router. Ping all 4 VMs.
     : FOR    ${net}    IN    @{NETWORKS}