Use RFC8040 URL for JSON-RPC tests

[integration/test.git] / csit / libraries / PacketcableVersion.robot

diff --git a/csit/libraries/PacketcableVersion.robot b/csit/libraries/PacketcableVersion.robot
index 358a2ebe31b63c14a5a01b448d246f3ddad87add..5db7c87f935854b099d1ea3db4c7fc1b6fe19899 100644 (file)
--- a/csit/libraries/PacketcableVersion.robot
+++ b/csit/libraries/PacketcableVersion.robot
@@ -1,23 +1,15 @@
 *** Settings ***
-Documentation     This setup variable for Packetcable based on ODL version
-
-*** Variables ***
-${ODL_VERSION}    master    # defaults to latest version in the master branch
-${ODLREST_CCAPS}    /restconf/config/packetcable:ccaps
-${CCAP_TOKEN}     ccap
-${PACKETCABLE_RESOURCE_DIR}    ${CURDIR}/../variables/packetcable/${ODL_VERSION}
+Documentation     This setup variable for Packetcable based on ODL version using resource CompareStream.
+Resource          ${CURDIR}/CompareStream.robot
 
 *** Keywords ***
 Init Variables
-    Run Keyword If    "${ODL_VERSION}" == "lithium"    Init Variables Lithium
-    log    ${ODL_VERSION}
+    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
     log    ${ODLREST_CCAPS}
     log    ${CCAP_TOKEN}
 
-Init Variables Lithium
-    Set Suite Variable    ${ODLREST_CCAPS}    /restconf/config/packetcable:ccap
-    Set Suite Variable    ${CCAP_TOKEN}    ccaps
-
 Create Session And Init Variables
     Init Variables
     Create Session    ODLSession    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}