aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-02-11 17:15:10 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-11 17:15:10 +0000
commit301c2a2bf6d1c337a49784ce5439eb6c231f33bb (patch)
tree38de7efeaf6a0d15d4acedd9e6fc61e0a9d8aaad /tests
parent81aa88425cd8daaa24ea83bb05e1b5dd438e2ec9 (diff)
parenta4516196eeb9c244f5a044a42aca21f1a0d97da8 (diff)
Merge "Changes to CSIT so it executes in ONAP also"
Diffstat (limited to 'tests')
-rw-r--r--tests/usecases/5G-bulkpm/BulkpmE2E.robot5
-rw-r--r--tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json2
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/usecases/5G-bulkpm/BulkpmE2E.robot b/tests/usecases/5G-bulkpm/BulkpmE2E.robot
index fcc1cc76..28de4c24 100644
--- a/tests/usecases/5G-bulkpm/BulkpmE2E.robot
+++ b/tests/usecases/5G-bulkpm/BulkpmE2E.robot
@@ -8,7 +8,7 @@ Resource resources/bulkpm_keywords.robot
*** Variables ***
-${VESC_URL} http://%{VESC_IP}:8080
+${VESC_URL} http://%{VESC_IP}:%{VESC_PORT}
${GLOBAL_APPLICATION_ID} robot-ves
${VES_ANY_EVENT_PATH} /eventListener/v7
${HEADER_STRING} content-type=application/json
@@ -17,7 +17,6 @@ ${EVENT_DATA_FILE} %{WORKSPACE}/tests/usecases/5G-bulkpm/a
${TARGETURL_TOPICS} http://${DMAAP_MR_IP}:3904/topics
${TARGETURL_SUBSCR} http://${DMAAP_MR_IP}:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12?timeout=1000
${CLI_EXEC_CLI} curl -k https://${DR_PROV_IP}:8443/internal/prov
-${CLI_EXEC_CLI_DFC} docker exec dfc /bin/sh -c "ls /target | grep .gz"
${CLI_EXEC_CLI_FILECONSUMER} docker exec fileconsumer-node /bin/sh -c "ls /opt/app/subscriber/delivery | grep .gz"
*** Test Cases ***
@@ -55,7 +54,7 @@ Check VES Notification Topic is existing in Message Router
Verify Downloaded PM file from xNF exist on Data File Collector
[Tags] Bulk_PM_E2E_03
[Documentation] Check the PM XML file exists on the data file collector
- ${cli_cmd_output}= Run Process ${CLI_EXEC_CLI_DFC} shell=yes
+ ${cli_cmd_output}= Run Process %{CLI_EXEC_CLI_DFC} shell=yes
Log ${cli_cmd_output.stdout}
Should Be Equal As Strings ${cli_cmd_output.rc} 0
Should Contain ${cli_cmd_output.stdout} xNF.pm.xml.gz
diff --git a/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json b/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
index 4064ea31..d5d8fd05 100644
--- a/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
+++ b/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
@@ -21,7 +21,7 @@
"arrayOfNamedHashMap": [
{ "name": "xNF.pm.xml.gz",
"hashMap":{
- "location": "sftp://admin:admin@sftpserver:22/xNF.pm.xml.gz",
+ "location": "sftp://admin:admin@sftpserver:sftpport/xNF.pm.xml.gz",
"compression": "gzip",
"fileFormatType": "org.3GPP.32.435#measCollec",
"fileFormatVersion": "V10"