From d539c094594001969bf83709f6defa23652e6350 Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Fri, 8 Apr 2022 13:49:52 -0700 Subject: [PATCH] Use RFC8040 URL for DAEXIM tests Replace Bierman02 URLs in the DAEXIM tests with RFC8040 URLs. Change-Id: I6a814dc94964c50599aeb49091b340f3a1a2e002 Signed-off-by: Sangwook Ha --- csit/libraries/DaeximKeywords.robot | 10 +++++----- csit/variables/daexim/DaeximVariables.robot | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/csit/libraries/DaeximKeywords.robot b/csit/libraries/DaeximKeywords.robot index f52f619bcd..67af13ed71 100644 --- a/csit/libraries/DaeximKeywords.robot +++ b/csit/libraries/DaeximKeywords.robot @@ -183,17 +183,17 @@ Mount Netconf Endpoint ${json} OperatingSystem.Get File ${CURDIR}/${NETCONF_PAYLOAD_JSON} ${json} Builtin.Replace Variables ${json} Builtin.Log ${json} - ${resp} ClusterManagement.Put As Json To Member ${NETCONF_MOUNT_URL}${endpoint} ${json} ${host_index} + ${resp} ClusterManagement.Put As Json To Member ${NETCONF_NODE_URL}=${endpoint} ${json} ${host_index} Builtin.Log ${resp} Fetch Status Information From Netconf Endpoint [Arguments] ${endpoint} ${host_index} [Documentation] This keyword fetches netconf endpoint information - ${resp} ClusterManagement.Get From Member ${NTCF_TPLG_OPR_URL}${endpoint} ${host_index} + ${resp} ClusterManagement.Get From Member ${NETCONF_NODE_URL}=${endpoint} ${host_index} ${output1} Builtin.Set Variable ${resp} ${output} RequestsLibrary.To Json ${output1} Builtin.Log ${output} - ${status} Collections.Get From Dictionary ${output['node'][0]} netconf-node-topology:connection-status + ${status} Collections.Get From Dictionary ${output['network-topology:node'][0]} netconf-node-topology:connection-status [Return] ${status} ${output} Verify Status Information @@ -210,8 +210,8 @@ Verify Netconf Mount [Arguments] ${endpoint} ${host_index} [Documentation] Verify if a netconf endpoint is mounted ${sts1} ${output} Verify Status Information ${endpoint} ${host_index} - ${ep} Collections.Get From Dictionary ${output['node'][0]} node-id - ${port} Collections.Get From Dictionary ${output['node'][0]} netconf-node-topology:port + ${ep} Collections.Get From Dictionary ${output['network-topology:node'][0]} node-id + ${port} Collections.Get From Dictionary ${output['network-topology:node'][0]} netconf-node-topology:port ${port} Builtin.Convert To String ${port} Builtin.Should Be Equal ${endpoint} ${ep} Builtin.Should Be Equal ${port} ${NETCONF_PORT} diff --git a/csit/variables/daexim/DaeximVariables.robot b/csit/variables/daexim/DaeximVariables.robot index a749b536fc..7084d6eb47 100644 --- a/csit/variables/daexim/DaeximVariables.robot +++ b/csit/variables/daexim/DaeximVariables.robot @@ -2,20 +2,20 @@ Documentation Resource consisting purely of variable definitions useful for multiple project suites. *** Variables *** -${CANCEL_EXPORT_URL} /restconf/operations/data-export-import:cancel-export +${CANCEL_EXPORT_URL} /rests/operations/data-export-import:cancel-export ${EXPORT_FILE} ${CURDIR}/schedule_export.json ${EXPORT_INCLUDE_FILE} ${CURDIR}/schedule_export_include.json ${EXP_DIR} /tmp/Export ${EXPORT_EXCLUDE_FILE} ${CURDIR}/schedule_export_exclude.json ${EXPORT_INCEXCLUDE_FILE} ${CURDIR}/schedule_export_include_exclude.json -${SCHEDULE_EXPORT_URL} /restconf/operations/data-export-import:schedule-export +${SCHEDULE_EXPORT_URL} /rests/operations/data-export-import:schedule-export ${EXP_DATA_FILE} odl_backup_config.json ${EXP_OPER_FILE} odl_backup_operational.json ${MODELS_FILE} odl_backup_models.json -${STATUS_EXPORT_URL} /restconf/operations/data-export-import:status-export +${STATUS_EXPORT_URL} /rests/operations/data-export-import:status-export ${NETCONF_PAYLOAD_JSON} ../variables/daexim/netconf_mount.json -${NETCONF_MOUNT_URL} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/ -${TOPOLOGY_URL} /restconf/config/network-topology:network-topology/ +${NETCONF_NODE_URL} /rests/data/network-topology:network-topology/topology=topology-netconf/node +${TOPOLOGY_URL} /rests/data/network-topology:network-topology ${NETCONF_EP_NAME} CONTROLLER1 ${EXPORT_INITIAL_STATUS} initial ${EXPORT_SCHEDULED_STATUS} scheduled @@ -24,11 +24,10 @@ ${EXPORT_SKIPPED_STATUS} skipped ${FIRST_CONTROLLER_INDEX} 1 ${SECOND_CONTROLLER_INDEX} 2 ${THIRD_CONTROLLER_INDEX} 3 -${NTCF_TPLG_OPR_URL} /restconf/operational/network-topology:network-topology/topology/topology-netconf/node/ ${NETCONF_PORT} 1830 ${NTCF_OPR_STATUS} connected ${DAEXIM_DATA_DIRECTORY} ../variables/daexim/daexim ${MDL_DEF_FLAG} false ${STR_DEF_FLAG} data ${IMPORT_PAYLOAD} ../variables/daexim/import.json -${IMPORT_URL} /restconf/operations/data-export-import:immediate-import +${IMPORT_URL} /rests/operations/data-export-import:immediate-import -- 2.36.6