cleaning up system variables

[integration/test.git] / csit / suites / groupbasedpolicy / GBP_Basic / 020_gbp_tenant.robot

diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
index 3ddf3678177f4b9091b5bf78f5dc813d93f891ce..49f78700b14f35f9618dbd9a09b37fd4e7289e90 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
+++ b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for GBP Tenants, Operates functions from Restconf APIs.
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
@@ -9,21 +9,19 @@ Library           RequestsLibrary
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${GBP_TENANTS_FILE}  ../../../variables/gbp/tenants.json
-
-${GBP_TENENT_ID}     f5c7d344-d1c7-4208-8531-2c2693657e12
-${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENENT_ID}
-${GBP_TENANT1_FILE}  ../../../variables/gbp/tenant1.json
-
-
 *** 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
+
 Add Tenants
     [Documentation]    Add Tenants from JSON file
     Add Elements To URI From File    ${GBP_TENANTS_API}    ${GBP_TENANTS_FILE}
     ${body}    OperatingSystem.Get File    ${GBP_TENANTS_FILE}
     ${jsonbody}    To Json    ${body}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANTS_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANTS_API}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}
     Lists Should be Equal    ${jsonbody}    ${result}
@@ -33,10 +31,10 @@ Delete All Tenants
     Add Elements To URI From File    ${GBP_TENANTS_API}    ${GBP_TENANTS_FILE}
     ${body}    OperatingSystem.Get File    ${GBP_TENANTS_FILE}
     ${jsonbody}    To Json    ${body}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANTS_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANTS_API}
     Should Be Equal As Strings    ${resp.status_code}    200
     Remove All Elements At URI    ${GBP_TENANTS_API}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANTS_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANTS_API}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Add one Tenant
@@ -44,7 +42,7 @@ Add one Tenant
     Add Elements To URI From File    ${GBP_TENANT1_API}    ${GBP_TENANT1_FILE}
     ${body}    OperatingSystem.Get File    ${GBP_TENANT1_FILE}
     ${jsonbody}    To Json    ${body}
-    ${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}
@@ -52,7 +50,7 @@ Add one Tenant
 Get A Non-existing Tenant
     [Documentation]    Get A Non-existing Tenant
     Remove All Elements At URI    ${GBP_TENANTS_API}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANT1_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANT1_API}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete one Tenant
@@ -60,10 +58,25 @@ Delete one Tenant
     Remove All Elements At URI    ${GBP_TENANTS_API}
     Add Elements To URI From File    ${GBP_TENANT1_API}    ${GBP_TENANT1_FILE}
     Remove All Elements At URI    ${GBP_TENANT1_API}
-    ${resp}    RequestsLibrary.Get    session    ${GBP_TENANTS_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${GBP_TENANTS_API}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain    ${resp.content}    ${GBP_TENENT_ID}
+    Should Not Contain    ${resp.content}    ${GBP_TENANT_ID}
 
 Clean Datastore After Tests
     [Documentation]    Clean All Tenants In Datastore After Tests
     Remove All Elements At URI    ${GBP_TENANTS_API}
+
+*** Keywords ***
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    Set Suite Variable    ${GBP_TENANT_ID}    tenant-red
+    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