From ca1b585347b8fbfd5c90ec05a7d239aafe4e23a1 Mon Sep 17 00:00:00 2001 From: ajay_dp001 Date: Tue, 20 Apr 2021 18:20:50 +0530 Subject: [PATCH] [CSIT] Update config-over-netconf csit Issue-ID: INT-1909 Signed-off-by: ajay_dp001 Change-Id: I33635b01f2451288e4b3c587a79b85978f5f7bff --- .../config-over-netconf/config_over_netconf.robot | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot b/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot index e7d923f8..a2c06fe1 100644 --- a/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot +++ b/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot @@ -6,9 +6,9 @@ Library json Library String *** Variables *** -${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore -${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator -${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist +${SDNC_KEYSTORE_CONFIG_PATH} /restconf/config/netconf-keystore:keystore +${SDNC_MOUNT_PATH} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator +${PNFSIM_MOUNT_PATH} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist ${BP_UPLOAD_URL} /api/v1/blueprint-model/publish ${BP_PROCESS_URL} /api/v1/execution-service/process ${BP_ARCHIVE_PATH} ${CURDIR}/data/blueprint_archive.zip @@ -17,9 +17,9 @@ ${BP_ARCHIVE_PATH} ${CURDIR}/data/blueprint_archive.zip *** Test Cases *** Test SDNC Keystore [Documentation] Checking keystore after SDNC installation - Create Session sdnc http://localhost:8282/restconf + Create Session sdnc http://localhost:8282 &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json - ${resp}= Get Request sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} + ${resp}= GET On Session sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 ${keystoreContent}= Convert To String ${resp.content} Log to console ************************* @@ -32,7 +32,7 @@ Test BP-PROC upload blueprint archive ${bp_archive}= Get Binary File ${BP_ARCHIVE_PATH} &{bp_file}= create Dictionary file ${bp_archive} &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== - ${resp}= Post Request blueprint ${BP_UPLOAD_URL} files=${bp_file} headers=${headers} + ${resp}= POST On Session blueprint ${BP_UPLOAD_URL} files=${bp_file} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Test BP-PROC CONFIG-ASSIGN @@ -41,7 +41,7 @@ Test BP-PROC CONFIG-ASSIGN ${config-assign}= Get File ${CURDIR}${/}data${/}config-assign.json Log to console ${config-assign} &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json - ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-assign} headers=${headers} + ${resp}= POST On Session blueprint ${BP_PROCESS_URL} data=${config-assign} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Test BP-PROC CONFIG-DEPLOY @@ -50,20 +50,20 @@ Test BP-PROC CONFIG-DEPLOY ${config-deploy}= Get File ${CURDIR}${/}data${/}config-deploy.json Log to console ${config-deploy} &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json - ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-deploy} headers=${headers} + ${resp}= POST On Session blueprint ${BP_PROCESS_URL} data=${config-deploy} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Test PNF Configuration update [Documentation] Checking PNF configuration params - Create Session sdnc http://localhost:8282/restconf + Create Session sdnc http://localhost:8282 ${mount}= Get File ${CURDIR}${/}data${/}mount.xml Log to console ${mount} &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/xml Accept=application/xml - ${resp}= Put Request sdnc ${SDNC_MOUNT_PATH} data=${mount} headers=${headers} + ${resp}= PUT On Session sdnc ${SDNC_MOUNT_PATH} data=${mount} headers=${headers} Should Be Equal As Strings ${resp.status_code} 201 Sleep 10 &{headers1}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json - ${resp1}= Get Request sdnc ${PNFSIM_MOUNT_PATH} headers=${headers1} + ${resp1}= GET On Session sdnc ${PNFSIM_MOUNT_PATH} headers=${headers1} Should Be Equal As Strings ${resp1.status_code} 200 Log to console ${resp1.content} Should Contain ${resp1.text} {"netconf-id":30,"netconf-param":3000} -- 2.16.6