From 2d7361d890b17d772f5e26564b17c0f5949b9efd Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 18 Sep 2017 11:35:45 -0700 Subject: [PATCH] Repair OF test - Specify bugs to be tested in OF suite. - Change compare stream to At Most (more safe). - Add oxygen stream in CompareStream library. Change-Id: I12d1d616991f9aebb1e87c5840682d8adad50f57 Signed-off-by: Luis Gomez --- csit/libraries/CompareStream.robot | 1 + .../Clustered_Reconciliation/010_Group_Flows.robot | 4 ++-- .../Stat_Manager_extended/010_SM_add_upd_del_flows.robot | 2 +- .../openflowplugin/Reconciliation/010_Group_Flows.robot | 4 ++-- csit/testplans/openflowplugin-flow-services.txt | 7 ++++++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/csit/libraries/CompareStream.robot b/csit/libraries/CompareStream.robot index d616642647..1126e33f51 100644 --- a/csit/libraries/CompareStream.robot +++ b/csit/libraries/CompareStream.robot @@ -9,6 +9,7 @@ Library String *** Variables *** &{Stream_dict} hydrogen=${1} stable-helium=${2} stable-lithium=${3} beryllium=${4} boron=${5} carbon=${6} nitrogen=${7} +... oxygen=${8} *** Keywords *** Set_Variable_If_At_Least diff --git a/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot b/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot index d61dacd7c5..7d8db9e66b 100644 --- a/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot +++ b/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot @@ -358,11 +358,11 @@ Initialization Phase ${all_groups}= BuiltIn.Evaluate ${switches} * ${iter} * 2 ${less_groups}= BuiltIn.Evaluate ${all_groups} - ${switches} * 2 # Stale flows/groups feature enabled in Boron onwards. - ${less_groups}= CompareStream.Set Variable If At Least Boron ${less_groups} ${all_groups} + ${less_groups}= CompareStream.Set Variable If At Most Beryllium ${all_groups} ${less_groups} ${all_flows}= BuiltIn.Evaluate ${switches} * ${iter+1} ${less_flows}= BuiltIn.Evaluate ${all_flows} - ${switches} # Stale flows/groups feature enabled in Boron onwards. - ${less_flows}= CompareStream.Set Variable If At Least Boron ${less_flows} ${all_flows} + ${less_flows}= CompareStream.Set Variable If At Most Beryllium ${all_flows} ${less_flows} BuiltIn.Set Suite Variable ${switches} BuiltIn.Set Suite Variable ${iter} BuiltIn.Set Suite Variable ${all_groups} diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot index aa4e53ec0b..d39d18b9bc 100644 --- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot @@ -583,7 +583,7 @@ Test Is Flow 225 Deleted *** Keywords *** Initialization Phase [Documentation] Initiate tcp connection with controller - ${check_id} = CompareStream.Set_Variable_If_At_Least_Boron ${True} ${False} + ${check_id} = CompareStream.Set_Variable_If_At_Most_Beryllium ${False} ${True} Set Suite Variable ${check_id} Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Write dpctl dump-flows -O OpenFlow13 diff --git a/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot b/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot index 21fd17a173..2bd9205bbd 100644 --- a/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot +++ b/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot @@ -128,11 +128,11 @@ Initialization Phase ${all_groups}= BuiltIn.Evaluate ${switches} * ${iter} * 2 ${less_groups}= BuiltIn.Evaluate ${all_groups} - ${switches} * 2 # Stale flows/groups feature enabled in Boron onwards. - ${less_groups}= CompareStream.Set Variable If At Least Boron ${less_groups} ${all_groups} + ${less_groups}= CompareStream.Set Variable If At Most Beryllium ${all_groups} ${less_groups} ${all_flows}= BuiltIn.Evaluate ${switches} * ${iter+1} ${less_flows}= BuiltIn.Evaluate ${all_flows} - ${switches} # Stale flows/groups feature enabled in Boron onwards. - ${less_flows}= CompareStream.Set Variable If At Least Boron ${less_flows} ${all_flows} + ${less_flows}= CompareStream.Set Variable If At Most Beryllium ${all_flows} ${less_flows} BuiltIn.Set Suite Variable ${switches} BuiltIn.Set Suite Variable ${iter} BuiltIn.Set Suite Variable ${all_groups} diff --git a/csit/testplans/openflowplugin-flow-services.txt b/csit/testplans/openflowplugin-flow-services.txt index e999df10a5..213ea3caa4 100644 --- a/csit/testplans/openflowplugin-flow-services.txt +++ b/csit/testplans/openflowplugin-flow-services.txt @@ -4,4 +4,9 @@ integration/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13 integration/test/csit/suites/openflowplugin/Switch_Qualification integration/test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended integration/test/csit/suites/openflowplugin/Reconciliation -integration/test/csit/suites/openflowplugin/Bug_Validation +integration/test/csit/suites/openflowplugin/Bug_Validation/2429 +integration/test/csit/suites/openflowplugin/Bug_Validation/6917 +integration/test/csit/suites/openflowplugin/Bug_Validation/7258 +integration/test/csit/suites/openflowplugin/Bug_Validation/7335 +integration/test/csit/suites/openflowplugin/Bug_Validation/7349 +integration/test/csit/suites/openflowplugin/Bug_Validation/8723 -- 2.36.6