Remove Beryllium specific test code

specifically this commit is targeted at removing the compare
stream keyword calls that refer to Beryllium

also removed a few bits that referred to initializing variables
based on Lithium, which is also no longer relevant

Change-Id: I618e844c50ed6bf2e99ab454f1071f78669fa09e
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/PacketcableVersion.robot b/csit/libraries/PacketcableVersion.robot
index 7aff6dfd6c584e7f33f22269290c91f29d2809c1..2eec86646497af6b0d437e7c644a108cf4d3df20 100644 (file)
--- a/csit/libraries/PacketcableVersion.robot
+++ b/csit/libraries/PacketcableVersion.robot
@@ -4,7 +4,7 @@ Resource          ${CURDIR}/CompareStream.robot
 
 *** Keywords ***
 Init Variables
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
+    Init Variables Lithium
     BuiltIn.Set Suite Variable    ${PACKETCABLE_RESOURCE_DIR}    ${CURDIR}/../variables/packetcable/beryllium
     BuiltIn.Set Suite Variable    ${ODLREST_CCAPS}    /restconf/config/packetcable:ccaps
     BuiltIn.Set Suite Variable    ${CCAP_TOKEN}    ccap

diff --git a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
index 64bc2226875ec5175a1dfadcd12a2ad85e2a29b0..d2e5cdf0eb0c96dba61d5026f1bcfe2b39b8fe44 100644 (file)
--- a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
@@ -12,7 +12,6 @@ Resource          ../../../libraries/Utils.robot
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Add Tenant to one node
@@ -45,9 +44,3 @@ Init Variables Master
     Set Suite Variable    ${GBP_TENANT_ID}    tenant-red
     Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/tenant/${GBP_TENANT_ID}
     Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}/../../../variables/gbp/master/tenant1.json
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${GBP_TENANT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/tenant/${GBP_TENANT_ID}
-    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}/../../../variables/gbp/lithium/tenant1.json

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
index 7948734117e3df5179d78179d4cb14bb187250cb..ea93ea5a4a341d53ef7500ea337dff2cf56923d8 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
@@ -37,7 +37,6 @@ Set Test Variables
 
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Init Variables Master
@@ -50,14 +49,3 @@ Init Variables Master
     Set Global Variable    ${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/master/tenant2.json
     Set Global Variable    ${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/master/demo-gbp1
     Set Global Variable    ${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/master/demo-gbp2
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Global Variable    ${GBP_TENANT1_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-    Set Global Variable    ${GBP_TENANT2_ID}    25c7d344-d1c7-4208-8531-2c2693657e12
-    Set Global Variable    ${TENANT1_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT1_ID}
-    Set Global Variable    ${TENANT2_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT2_ID}
-    Set Global Variable    ${TENANT1_FILE}    ${CURDIR}/../../../../variables/gbp/3node/lithium/tenant1.json
-    Set Global Variable    ${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/lithium/tenant2.json
-    Set Global Variable    ${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/lithium/demo-gbp1
-    Set Global Variable    ${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/lithium/demo-gbp2

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
index f8d930b4d9b109c24f509885f483cf9915a48d84..817adf70ecd26647a547c2873b1ac760e0473519 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot
@@ -51,7 +51,6 @@ Set Test Variables
 
 Set ODL Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Set ODL Variables Lithium
     Set ODL Variables Master
 
 Set ODL Variables Master
@@ -63,13 +62,3 @@ Set ODL Variables Master
     Set Global Variable    ${SFF_FILE}    ${CURDIR}/../../../../variables/gbp/6node/master/service_function_forwarders.json
     Set Global Variable    ${ENDPOINTS_ASYMM_DIR}    ${CURDIR}/../../../../variables/gbp/6node/demo-asymmetric-chain/master/
     Set Global Variable    ${ENDPOINTS_SYMM_DIR}    ${CURDIR}/../../../../variables/gbp/6node/demo-symmetric-chain/master/
-
-Set ODL Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Global Variable    ${GBP_TENANT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-    Set Global Variable    ${TENANT_PATH}    ${GBP_TENANTS_API}/tenant/${GBP_TENANT_ID}
-    Set Global Variable    ${TENANT_ASYMM_FILE}    ${CURDIR}/../../../../variables/gbp/6node/demo-asymmetric-chain/lithium/tenants.json
-    Set Global Variable    ${TENANT_SYMM_FILE}    ${CURDIR}/../../../../variables/gbp/6node/demo-symmetric-chain/lithium/tenants.json
-    Set Global Variable    ${SFF_FILE}    ${CURDIR}/../../../../variables/gbp/6node/lithium/service_function_forwarders.json
-    Set Global Variable    ${ENDPOINTS_ASYMM_DIR}    ${CURDIR}/../../../../variables/gbp/6node/demo-asymmetric-chain/lithium/
-    Set Global Variable    ${ENDPOINTS_SYMM_DIR}    ${CURDIR}/../../../../variables/gbp/6node/demo-symmetric-chain/lithium/

diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
index 24477e7a8dc2f67d7d5b89348c7094072782fbf1..8cf76167fa4bf1191fd70157e9c761dead1a4a63 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
+++ b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
@@ -13,7 +13,6 @@ Resource          ../../../libraries/Utils.robot
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Add Tenants
@@ -73,10 +72,3 @@ Init Variables Master
     Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENANT_ID}
     Set Suite Variable    ${GBP_TENANTS_FILE}    ${CURDIR}../../../variables/gbp/master/tenants.json
     Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}../../../variables/gbp/master/tenant1.json
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${GBP_TENANT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENANT_ID}
-    Set Suite Variable    ${GBP_TENANTS_FILE}    ${CURDIR}../../../variables/gbp/lithium/tenants.json
-    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}../../../variables/gbp/lithium/tenant1.json

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot b/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
index 119b642ac1ebcbe1236a5b11db86bbf33a597815..fdc0ae47ed121fb0e127cc882298dc7bed76452d 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
@@ -352,8 +352,6 @@ Verify Tunnel Monitoring
 
 Create Tunnel
     [Documentation]    Create tunnels betwee the 2 compute nodes and Openstack controller.
-    Log    If ODL version is Boron or higher then ITM tunnel should be auto configured. If not then the suite should fail. For ODL version Beryllium or lower, ITM tunnel should be created.
-    CompareStream.Run_Keyword_If_At_Least_Boron    BuiltIn.Fail    Tunnel should be auto configured for ${ODL_STREAM}
     ${node_1_dpid}=    Get DPID    ${OS_COMPUTE_1_IP}
     ${node_2_dpid}=    Get DPID    ${OS_COMPUTE_2_IP}
     ${node_3_dpid}=    Get DPID    ${OS_CONTROL_NODE_IP}

diff --git a/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot b/csit/suites/openflowplugin/Clustered_Reconciliation/010_Group_Flows.robot
index 7d8db9e66bf92b209ec4a60dcfd22bec660858ab..1a7a771c129d2be4a00fc58858ad114d88b6f616 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,9 @@ 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 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 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 97bd544dfe2080de7cc4b661f1a1096492daf240..4c518888e6160d50f872ea98c8c94a9f9aab1561 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
@@ -576,7 +576,7 @@ Test Is Flow 225 Deleted
 *** Keywords ***
 Initialization Phase
     [Documentation]    Initiate tcp connection with controller
-    ${check_id} =    CompareStream.Set_Variable_If_At_Most_Beryllium    ${False}    ${True}
+    ${check_id} =    Set Variable    ${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 2bd9205bbd69520d6f39891b11a4ff4be73d2162..33cb93ede2a4580503ad409da2b51ab69bf210b3 100644 (file)
--- a/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot
+++ b/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot
@@ -128,11 +128,9 @@ 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 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 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/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
index 39f6e2ae918a051cc56080518e4a4618d84bc7df..87e7c1fc2b9a6d365675a26f9f1827d4cd1bd76a 100755 (executable)
--- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
@@ -21,7 +21,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR HBase Feature Installation
@@ -74,17 +73,6 @@ Init Variables Master
     set Suite Variable    ${node_connector}    Node:openflow:1,NodeConnector:1
     set suite Variable    ${portstats}    PORTSTATS
 
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    @{CATEGORY}    FlowStats    FlowTableStats    PortStats    QueueStats
-    Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PortStats
-    Set Suite Variable    ${CONFIG_INTERVAL}    /restconf/config/TSDRDC:TSDRDCConfig
-    Set Suite Variable    ${OPER_INTERVAL}    /restconf/operations/TSDRDC:setPollingInterval
-    Set Suite Variable    ${default_poll}    180
-    set Suite Variable    ${non_default_poll}    200
-    set Suite Variable    ${node_connector}    openflow:1_1
-    set suite Variable    ${portstats}    InterfaceMetrics
-
 Initialize the Tsdr Suite
     COMMENT    Initialize the HBase for TSDR
     Start Tsdr Suite

diff --git a/csit/suites/tsdr/HBase/020_FlowMetrics.robot b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
index 30b03b61b84007cca8cced3d07948da5721e843e..710f8cd859673574a850333e5071943b2e43b0f6 100644 (file)
--- a/csit/suites/tsdr/HBase/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR FlowMetrics
@@ -49,9 +48,3 @@ Init Variables Master
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWSTATS
     set Suite Variable    ${node_connector}    Node:openflow:1,Table:0
     set suite Variable    ${flowstats}    FLOWSTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowStats
-    set Suite Variable    ${node_connector}    openflow:1_0
-    set suite Variable    ${flowstats}    FlowMetrics

diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
index 446687fa502c514d802d1c9918a41bcf77f29c20..5a2922fd307055a9a0015c64ca21be8696715e26 100644 (file)
--- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
@@ -17,7 +17,6 @@ ${TSDR_FLOWTABLE_STATS}    tsdr:list FLOWTABLESTATS
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR FlowTableMetrics
@@ -50,9 +49,3 @@ Init Variables Master
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWTABLESTATS
     set Suite Variable    ${node_connector}    Node:openflow:1,Table:0
     set suite Variable    ${flowtablestats}    FLOWTABLESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowTableStats
-    set Suite Variable    ${node_connector}    openflow:1_0
-    set suite Variable    ${flowtablestats}    FlowTableMetrics

diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index 99ac01901f57aa8f4a13c9408f86d9c4e34f65db..ece16b45ea6caf62e7416ec006913f82bdc74bd0 100644 (file)
--- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verify the Queue Metrics attributes exist thru Karaf console
@@ -55,9 +54,3 @@ Init Variables Master
     Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QUEUESTATS
     set Suite Variable    ${node_connector}    Node:openflow:2
     set suite Variable    ${queuestats}    QUEUESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QueueStats
-    set Suite Variable    ${node_connector}    openflow:2
-    set suite Variable    ${queuestats}    QueueMetrics

diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
index dfbc9da4b823e53296ca5c68c540d6e0fc1f4d46..db052e5f2f882c796d5da6711bdd4abe3fe24ad7 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
@@ -18,7 +18,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR HSQLDB Feature Installation
@@ -51,9 +50,3 @@ Init Variables Master
     ...    QUEUESTATS
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PORTSTATS
     Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-hsqldb
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    @{CATEGORY}    FlowStats    FlowTableStats    PortStats    QueueStats
-    Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PortStats
-    Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-HSQLDB

diff --git a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
index b46d8838abebb155b38253eb3a64e2786bb417aa..0a5753ef3d153479894daade00d8788c03a7c036 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR FlowMetrics
@@ -31,7 +30,3 @@ Verification of TSDR FlowMetrics
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWSTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowStats

diff --git a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
index d4b255aca8d07d63569f380eecbb18fcf624923f..dd558e30b415b5c943b501c78afcfd810f0cfc67 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verification of TSDR FLOWTABLESTATS
@@ -31,7 +30,3 @@ Verification of TSDR FLOWTABLESTATS
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_FLOWTABLE_STATS}    tsdr:list FLOWTABLESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_FLOWTABLE_STATS}    tsdr:list FlowTableStats

diff --git a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
index 8e0194b2080570586e04f9d722e0a9627a76e3d8..953d376240e44fe8d371c7928646a30e0deed570 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
@@ -17,7 +17,6 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verify the QueueStats attributes exist thru Karaf console
@@ -35,7 +34,3 @@ Configuration of Queue on Switch
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_QUEUE_STATS}    tsdr:list QUEUESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_QUEUE_STATS}    tsdr:list QueueStats