From cced0335a8a98e4e680eba0a11417d4f59c8c520 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Sun, 14 Feb 2016 20:07:26 -0800 Subject: [PATCH] Change modified flow in cluster test Per OF spec, flow modification occurs when action changes. Change-Id: Ia6bce22c0e87f0654c6d7942fa053f518ca6e1a0 Signed-off-by: Luis Gomez --- csit/libraries/ClusterOpenFlow.robot | 8 ++++---- csit/variables/openflowplugin/sample_flow_2.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/csit/libraries/ClusterOpenFlow.robot b/csit/libraries/ClusterOpenFlow.robot index c33bbd7ac7..0a3fd80437 100644 --- a/csit/libraries/ClusterOpenFlow.robot +++ b/csit/libraries/ClusterOpenFlow.robot @@ -90,8 +90,8 @@ Add Sample Flow And Verify ${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 + Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.1.0/24=2 "output-node-connector":"1"=1 + Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.1.0/24=1 "output-node-connector":"1"=1 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} @@ -99,8 +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 - 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 + Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.1.0/24=2 "output-node-connector":"2"=1 + Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.1.0/24=1 "output-node-connector":"2"=1 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} diff --git a/csit/variables/openflowplugin/sample_flow_2.json b/csit/variables/openflowplugin/sample_flow_2.json index d4864555d2..82d5460f45 100644 --- a/csit/variables/openflowplugin/sample_flow_2.json +++ b/csit/variables/openflowplugin/sample_flow_2.json @@ -23,7 +23,7 @@ ] }, "match": { - "ipv4-destination": "10.0.2.0/24", + "ipv4-destination": "10.0.1.0/24", "ethernet-match": { "ethernet-type": { "type": 2048 -- 2.36.6