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 <ecelgp@gmail.com>

diff --git a/csit/libraries/CompareStream.robot b/csit/libraries/CompareStream.robot
index d6166426478ad9ffef4039f6141c4c291049353f..1126e33f513c39c69022612143fc3ffd6d6cff1c 100644 (file)
--- 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 d61dacd7c59f3e7d646d52c8604bbe50761075c9..7d8db9e66bf92b209ec4a60dcfd22bec660858ab 100644 (file)
--- 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 aa4e53ec0bce97408b00f7b5c655c0a799d022aa..d39d18b9bc8001529b57ff3d1bc0245d25e0e492 100644 (file)
--- 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 21fd17a1736783d39a972df3f0150723eba89b66..2bd9205bbd69520d6f39891b11a4ff4be73d2162 100644 (file)
--- 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 e999df10a5a2c6b8a9a91163f6b6d608c27f244b..213ea3caa4602f47a02abc65a5fb5797a08ce773 100644 (file)
--- 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