LISP: Separate Lithium and Beryllium tests

[integration/test.git] / csit / suites / lispflowmapping / msmr / 020_RPC_CRUD.robot

diff --git a/csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot b/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
similarity index 85%
rename from csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot
rename to csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
index 8f0552de829790ec47eaf016c18efaab540f39be..a3bbeb1f120770b4d0b7e44c55b4a5ef4604f4c6 100644 (file)
--- a/csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot
+++ b/csit/suites/lispflowmapping/msmr/020_RPC_CRUD.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite to verify CRUD operations using RPCs
-Suite Setup       Create Session And Set External Variables
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           OperatingSystem
@@ -11,12 +11,12 @@ Resource          ../../../libraries/LISPFlowMapping.robot
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${IPV4_C_KEY}     ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_add-key_ipv4.json
-${IPV4_RD}        ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_get-remove_ipv4.json
-${MISS_RD}        ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_get-remove_missing.json
-${IPV4_U_KEY}     ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_update-key_ipv4.json
-${IPV4_C_MAP}     ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_add-mapping_ipv4_ipv4.json
-${IPV4_U_MAP}     ${CURDIR}/../../../variables/lispflowmapping/${ODL_VERSION}/rpc_update-mapping_ipv4_ipv4.json
+${IPV4_C_KEY}     ${JSON_DIR}/rpc_add-key_ipv4.json
+${IPV4_RD}        ${JSON_DIR}/rpc_get-remove_ipv4.json
+${MISS_RD}        ${JSON_DIR}/rpc_get-remove_missing.json
+${IPV4_U_KEY}     ${JSON_DIR}/rpc_update-key_ipv4.json
+${IPV4_C_MAP}     ${JSON_DIR}/rpc_add-mapping_ipv4_ipv4.json
+${IPV4_U_MAP}     ${JSON_DIR}/rpc_update-mapping_ipv4_ipv4.json
 
 *** Test Cases ***
 Create Key