Fix OpenFlow flow services suite

[integration/test.git] / csit / suites / openflowplugin / Flows_Additional_TCs / Stat_Manager_extended / 020_SM_sal_add_upd_del_flows.robot

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 4a80b660221e94ecb4e6b1609df45e99fdd78195..a42fc9e53224d608f96e906cf86779b92465bebc 100644 (file)
--- 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
@@ -3,15 +3,16 @@ Documentation     Test suite for Stats Manager flows collection
 Suite Setup       Initialization Phase
 Suite Teardown    Delete All Sessions
 Test Template     Check Datastore Presence
-Library           OperatingSystem
 Library           Collections
-Library           XML
-Library           SSHLibrary
-Resource          ../../../../libraries/FlowLib.robot
-Library           ../../../../libraries/XmlComparator.py
-Variables         ../../../../variables/Variables.py
+Library           OperatingSystem
 Library           RequestsLibrary
-Library           ../../../../libraries/Common.py
+Library           SSHLibrary
+Library           XML
+Library           ${CURDIR}/../../../../libraries/Common.py
+Library           ${CURDIR}/../../../../libraries/XmlComparator.py
+Resource          ${CURDIR}/../../../../libraries/CompareStream.robot
+Resource          ${CURDIR}/../../../../libraries/FlowLib.robot
+Resource          ${CURDIR}/../../../../variables/Variables.robot
 
 *** Variables ***
 ${flow_update_time}    3s
@@ -31,6 +32,7 @@ ${switch_name}    s${switch_idx}
 Test Add Flows Group 0
     [Documentation]    Add all flows and waits for SM to collect data
     [Template]    NONE
+    CompareStream.Run_Keyword_If_At_Most_Boron    Remove Values From List    ${flowlist0}    f19.xml    f102.xml
     : FOR    ${flowfile}    IN    @{flowlist0}
     \    Log    ${flowfile}
     \    Create Flow Variables For Suite From XML File    ${XmlsDir}/${flowfile}
@@ -88,6 +90,7 @@ Test Is Flow 18 Added
     f18.xml    ${False}    ${True}    ${False}
 
 Test Is Flow 19 Added
+    [Tags]    skip_if_boron
     f19.xml    ${False}    ${True}    ${False}
 
 Test Is Flow 20 Added
@@ -127,6 +130,7 @@ Test Is Flow 101 Added
     f101.xml    ${False}    ${True}    ${False}
 
 Test Is Flow 102 Added
+    [Tags]    skip_if_boron
     f102.xml    ${False}    ${True}    ${False}
 
 Test Is Flow 103 Added
@@ -251,6 +255,7 @@ Test Is Flow 18 Updated
     f18.xml    ${False}    ${True}    ${True}
 
 Test Is Flow 19 Updated
+    [Tags]    skip_if_boron
     f19.xml    ${False}    ${True}    ${True}
 
 Test Is Flow 20 Updated
@@ -290,6 +295,7 @@ Test Is Flow 101 Updated
     f101.xml    ${False}    ${True}    ${True}
 
 Test Is Flow 102 Updated
+    [Tags]    skip_if_boron
     f102.xml    ${False}    ${True}    ${True}
 
 Test Is Flow 103 Updated
@@ -414,6 +420,7 @@ Test Is Flow 18 Deleted
     f18.xml    ${False}    ${False}    ${True}
 
 Test Is Flow 19 Deleted
+    [Tags]    skip_if_boron
     f19.xml    ${False}    ${False}    ${True}
 
 Test Is Flow 20 Deleted
@@ -453,6 +460,7 @@ Test Is Flow 101 Deleted
     f101.xml    ${False}    ${False}    ${True}
 
 Test Is Flow 102 Deleted
+    [Tags]    skip_if_boron
     f102.xml    ${False}    ${False}    ${True}
 
 Test Is Flow 103 Deleted