From: Peter Gubka <pgubka@cisco.com>
Date: Mon, 23 Jan 2017 14:37:49 +0000 (+0100)
Subject: Remove ODL_STREAM variable usage in if statement from 010_SM_add_upd_del_flows.robot
X-Git-Tag: release/boron-sr3~156
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=78bd2182928718b7ffb9c3e5e7c8fe70e2ed48d4;p=integration%2Ftest.git

Remove ODL_STREAM variable usage in if statement from 010_SM_add_upd_del_flows.robot

Change-Id: Iccc2480d1e6ea89584e04df2b4677a7004eba4aa
Signed-off-by: Peter Gubka <pgubka@cisco.com>
---

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 7b2ae6e1cc..2d45b85956 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
@@ -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
+Variables         ${CURDIR}/../../../../variables/Variables.py
+Resource          ${CURDIR}/../../../../libraries/CompareStream.robot
+Resource          ${CURDIR}/../../../../libraries/FlowLib.robot
 
 *** Variables ***
 ${flow_update_time}    3s
@@ -603,7 +604,7 @@ Test Is Flow 225 Deleted
 *** Keywords ***
 Initialization Phase
     [Documentation]    Initiate tcp connection with controller
-    ${check_id} =    Set Variable If    '${ODL_STREAM}' == 'stable/lithium' or '${ODL_STREAM}' == 'beryllium'    ${False}    ${True}
+    ${check_id} =    CompareStream.Set_Variable_If_At_Least_Boron    ${True}    ${False}
     Set Suite Variable    ${check_id}
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Write    dpctl dump-flows -O OpenFlow13