Convert suites from ODL_VERSION to CompareStream

[integration/test.git] / csit / suites / groupbasedpolicy / Clustering_Datastore / 020_simple_clustering.robot

diff --git a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
index e15940e1f48fb21961d875a30085c4479e1d748f..64bc2226875ec5175a1dfadcd12a2ad85e2a29b0 100644 (file)
--- a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
@@ -6,29 +6,29 @@ Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
 Variables         ../../../variables/Variables.py
+Resource          ../../../libraries/CompareStream.robot
 Resource          ../../../libraries/Utils.robot
 
 *** Test Cases ***
 Init Variables
-    [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
-    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
-    ...    ELSE    Init Variables Master
+    [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
     [Documentation]    Add one Tenant from JSON file
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     ${jsonbody}    Read JSON From File    ${GBP_TENANT1_FILE}
-    Add Elements To URI From File    ${GBP_TENANT1_API}    ${GBP_TENANT1_FILE}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANT1_API}
+    Add Elements To URI From File    ${GBP_TENANT1_API}    ${GBP_TENANT1_FILE}    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANT1_API}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}
     Lists Should be Equal    ${result}    ${jsonbody}
 
 Read Tenant from other node
-    Create Session    session    http://${CONTROLLER1}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     ${jsonbody}    Read JSON From File    ${GBP_TENANT1_FILE}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANT1_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANT1_API}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}
     Lists Should be Equal    ${result}    ${jsonbody}