From: Luis Gomez Date: Sun, 24 Jan 2016 17:59:49 +0000 (-0800) Subject: Add extra check in case we modify a flow X-Git-Tag: release/beryllium-sr1~142 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=3fd843c2f53f88efc6a4905327557f4ebcaa2f19 Add extra check in case we modify a flow We actually verify old flow has been properly deleted. Modify existing comment to be python-style. Change-Id: I19cebf108c2856aaaa565660281c8b52b76a8a3b Signed-off-by: Luis Gomez --- diff --git a/csit/libraries/ClusterOpenFlow.robot b/csit/libraries/ClusterOpenFlow.robot index a3d2560fa0..e2cb762491 100644 --- a/csit/libraries/ClusterOpenFlow.robot +++ b/csit/libraries/ClusterOpenFlow.robot @@ -88,6 +88,8 @@ Add Sample Flow And Verify [Arguments] ${controller_index_list} ${controller_index} [Documentation] Add sample flow in ${controller_index} and verify it gets applied in all instances in ${controller_index_list}. ${body}= OperatingSystem.Get File ${CURDIR}/../variables/openflowplugin/sample_flow_1.json + # There are slight differences on the way He and Li plugin display table information. He plugin has an additional Hashmap field + # replicating some of the matches in the flows section. Same comment applies for further keywords. Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.1.0/24=2 Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.1.0/24=1 Put And Check At URI In Cluster ${controller_index_list} ${controller_index} ${config_table_0}/flow/1 ${body} @@ -97,10 +99,8 @@ Modify Sample Flow And Verify [Arguments] ${controller_index_list} ${controller_index} [Documentation] Modify sample flow in ${controller_index} and verify it gets applied in all instances in ${controller_index_list}. ${body}= OperatingSystem.Get File ${CURDIR}/../variables/openflowplugin/sample_flow_2.json - ##There are slight differences on the way He and Li plugin display table information. He plugin has an additional Hashmap field - ##replicating some of the matches in the flows section. - Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.2.0/24=2 - Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.2.0/24=1 + Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.2.0/24=2 10.0.1.0/24=0 + Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.2.0/24=1 10.0.1.0/24=0 Put And Check At URI In Cluster ${controller_index_list} ${controller_index} ${config_table_0}/flow/1 ${body} Wait Until Keyword Succeeds 15s 1s Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary} ${operational_table_0}