X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fgroupbasedpolicy%2FGBP_Basic%2F020_gbp_tenant.robot;h=020ee461566b8ae6c2e289c9cefb8b3f142efd4b;hb=76927f69b56604c1b81d007d8dc63dffd4a87a99;hp=f7e79036d1b91377873ce47d75fb404bf4af184e;hpb=e3a507c87d7bc60463271103a0db9849598dba00;p=integration%2Ftest.git

diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
index f7e79036d1..020ee46156 100644
--- a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
+++ b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
@@ -9,13 +9,13 @@ 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}
@@ -60,8 +60,24 @@ Delete one Tenant
     Remove All Elements At URI    ${GBP_TENANT1_API}
     ${resp}    RequestsLibrary.Get    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