X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FFlows_Additional_TCs%2FStat_Manager_extended%2F020_SM_sal_add_upd_del_flows.robot;fp=csit%2Fsuites%2Fopenflowplugin%2FFlows_Additional_TCs%2FStat_Manager_extended%2F020_SM_sal_add_upd_del_flows.robot;h=fc18e172221b2e1e9bb96e6ca81005caf7972348;hb=94651ca9711d8eb316721775561e815830bc6c7e;hp=a99cb3fa615904137cf31c9bc22ef443e8e8c951;hpb=89b88a0a23561f0bda62338b394ec41655679b2d;p=integration%2Ftest.git diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot index a99cb3fa61..fc18e17222 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot @@ -32,11 +32,12 @@ ${switch_name} s${switch_idx} Test Add Flows Group 0 [Documentation] Add all flows and waits for SM to collect data [Template] NONE - : FOR ${flowfile} IN @{flowlist0} - \ Log ${flowfile} - \ Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} - \ Run Keyword And Continue On Failure Add Flow Via RPC ${switch_idx} ${xmlroot} - # Lets wait for ofp to collect stats + FOR ${flowfile} IN @{flowlist0} + Log ${flowfile} + Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} + Run Keyword And Continue On Failure Add Flow Via RPC ${switch_idx} ${xmlroot} + # Lets wait for ofp to collect stats + END ${flows}= Get Length ${flowlist0} Wait Until Keyword Succeeds 30s 2s FlowLib.Check Flow Stats Are Available openflow:1 ${flows} # Show switch content (for debug purposes if needed) @@ -193,11 +194,12 @@ Test Is Flow 220 Added Test Update Flows Group 0 [Documentation] Update all flows and waits for SM to collect data [Template] NONE - : FOR ${flowfile} IN @{flowlist0} - \ Log ${flowfile} - \ Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} - \ Run Keyword And Continue On Failure Update Flow Via RPC ${switch_idx} ${data} ${upddata} - # Lets wait for ofp to collect stats + FOR ${flowfile} IN @{flowlist0} + Log ${flowfile} + Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} + Run Keyword And Continue On Failure Update Flow Via RPC ${switch_idx} ${data} ${upddata} + # Lets wait for ofp to collect stats + END Sleep ${flow_update_time} # Show switch content (for debug purposes if needed) Write dpctl dump-flows -O OpenFlow13 @@ -356,11 +358,12 @@ Test Is Flow 220 Updated Test Delete Flows Group 0 [Documentation] Delete all flows and waits for SM to collect data [Template] NONE - : FOR ${flowfile} IN @{flowlist0} - \ Log ${flowfile} - \ Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} - \ Run Keyword And Continue On Failure Delete Flow Via RPC ${switch_idx} ${xmlroot} - # Lets wait for ofp to collect stats + FOR ${flowfile} IN @{flowlist0} + Log ${flowfile} + Create Flow Variables For Suite From XML File ${XmlsDir}/${flowfile} + Run Keyword And Continue On Failure Delete Flow Via RPC ${switch_idx} ${xmlroot} + # Lets wait for ofp to collect stats + END Sleep ${flow_update_time} # Show switch content (for debug purposes if needed) Write dpctl dump-flows -O OpenFlow13