X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fnetvirt%2Fupgrade%2Fupgrade.robot;h=ede190962973e87e864b21518c5fdfc3b985e1b1;hb=1ffe154b7f804b55e932bee3c82dc1a05fcc621e;hp=c926b3f7450c8189a68f1d50df4272a27f3b7c07;hpb=9487b831976b94f85d70054f1785e2cd2a235db9;p=integration%2Ftest.git diff --git a/csit/suites/netvirt/upgrade/upgrade.robot b/csit/suites/netvirt/upgrade/upgrade.robot index c926b3f745..ede1909629 100644 --- a/csit/suites/netvirt/upgrade/upgrade.robot +++ b/csit/suites/netvirt/upgrade/upgrade.robot @@ -27,13 +27,12 @@ ${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 +${UPDATE_FLAG_PATH} /restconf/config/odl-serviceutils-upgrade:upgrade-config *** Test Cases *** Create Setup And Verify Instance Connectivity [Documentation] Create 2 VXLAN networks, subnets with 2 VMs each and a router. Ping all 4 VMs. Check Resource Connectivity - DevstackUtils.Set Node Data For Control Only Node Setup Dump Debug With Annotations POST_SETUP Stop ODL @@ -64,17 +63,17 @@ Wait For Full Sync Wait Until Keyword Succeeds 90s 5s Canary Network Should Exist Set Upgrade Flag - ${resp} = RequestsLibrary.Put Request session ${UPDATE_FLAG_PATH} {"config":{"upgradeInProgress":true}} + ${resp} = RequestsLibrary.Put Request session ${UPDATE_FLAG_PATH} {"upgrade-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} + \ Utils.Run Command On Remote System And Log ${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}} + ${resp} = RequestsLibrary.Put Request session ${UPDATE_FLAG_PATH} {"upgrade-config":{"upgradeInProgress":false}} BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 Check Connectivity With Previously Created Resources And br-int Info @@ -131,7 +130,7 @@ Check OVS Nodes Have Egress Flows Does OVS Have Multiple Egress Flows [Arguments] ${ip} [Documentation] Verifies that at least 1 flow exists on the node for the ${EGRESS_L2_FWD_TABLE} - ${flows} = Utils.Run Command On Remote System ${ip} sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE} + ${flows} = Utils.Run Command On Remote System And Log ${ip} sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE} ${egress_flows} = String.Get Lines Containing String ${flows} table=${EGRESS_LPORT_DISPATCHER_TABLE} ${num_egress_flows} = String.Get Line Count ${egress_flows} BuiltIn.Should Be True ${num_egress_flows} > 1