aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/addSubscriber.json)0
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/createFeed.json)0
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/datafile_endpoints.json)0
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/xNF.pm.xml.gz)bin63 -> 63 bytes
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/composefile/docker-compose-e2e.yml)0
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/setup.sh (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh)16
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/teardown.sh (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh)0
-rw-r--r--test/csit/plans/usecases/5G-bulkpm/testplan.txt (renamed from test/csit/plans/dcae-bulkpm/bulkpm-suite/testplan.txt)2
-rw-r--r--test/csit/tests/usecases/5G-bulkpm/BulkpmE2E.robot (renamed from test/csit/tests/dcae-bulkpm/testcases/BulkpmE2E.robot)4
-rw-r--r--test/csit/tests/usecases/5G-bulkpm/__init__.robot (renamed from test/csit/tests/dcae-bulkpm/testcases/__init__.robot)0
-rw-r--r--test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json (renamed from test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json)0
-rw-r--r--test/csit/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot (renamed from test/csit/tests/dcae-bulkpm/testcases/resources/ves_keywords.robot)3
-rw-r--r--test/csit/tests/usecases/5G-bulkpm/resources/xNFLibrary.py (renamed from test/csit/tests/dcae-bulkpm/testcases/resources/VesLibrary.py)4
13 files changed, 14 insertions, 15 deletions
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/addSubscriber.json b/test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json
index 612c4626a..612c4626a 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/addSubscriber.json
+++ b/test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/createFeed.json b/test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json
index fdcc7eef6..fdcc7eef6 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/createFeed.json
+++ b/test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/datafile_endpoints.json b/test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
index 17c7078e9..17c7078e9 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/datafile_endpoints.json
+++ b/test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/xNF.pm.xml.gz b/test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz
index 2f527c275..2f527c275 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/xNF.pm.xml.gz
+++ b/test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz
Binary files differ
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/composefile/docker-compose-e2e.yml b/test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
index 16db4afad..16db4afad 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/composefile/docker-compose-e2e.yml
+++ b/test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh b/test/csit/plans/usecases/5G-bulkpm/setup.sh
index b0ea68195..f27bfba51 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh
+++ b/test/csit/plans/usecases/5G-bulkpm/setup.sh
@@ -57,7 +57,7 @@ git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
cd datarouter
cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
rm -rf docker-compose.yml
-cp $WORKSPACE/test/csit/plans/dcae-bulkpm/bulkpm-suite/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml
+cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml
docker login -u docker -p docker nexus3.onap.org:10001
docker-compose up -d
docker kill datarouter-prov
@@ -121,7 +121,7 @@ pip install jsonschema uuid
sleep 2
# Data File Collector configuration :
-cp $WORKSPACE/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/datafile_endpoints.json /tmp/
+cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json
sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json
docker cp /tmp/datafile_endpoints.json dfc:/config/
@@ -129,13 +129,13 @@ docker restart dfc
# SFTP Configuration:
# Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server.
-cp $WORKSPACE/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json $WORKSPACE/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
-sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
-docker cp $WORKSPACE/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/xNF.pm.xml.gz sftp:/home/admin/
+cp $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/test/csit/tests/usecases/5G-bulkpm-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
+sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
+docker cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/
# Data Router Configuration:
# Create default feed and create file consumer subscriber on data router
-curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
-cp $WORKSPACE/test/csit/plans/dcae-bulkpm/bulkpm-suite/assets/addSubscriber.json /tmp/addSubscriber.json
+curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
+cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json
sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json
-curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 \ No newline at end of file
+curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1ii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 \ No newline at end of file
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh b/test/csit/plans/usecases/5G-bulkpm/teardown.sh
index c55f43989..c55f43989 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh
+++ b/test/csit/plans/usecases/5G-bulkpm/teardown.sh
diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/testplan.txt b/test/csit/plans/usecases/5G-bulkpm/testplan.txt
index 25a5d6e8b..c4e1c4271 100644
--- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/testplan.txt
+++ b/test/csit/plans/usecases/5G-bulkpm/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration.git]/test/csit/tests/.
# Place the suites in run order.
-dcae-bulkpm/testcases
+usecases/5G-bulkpm
diff --git a/test/csit/tests/dcae-bulkpm/testcases/BulkpmE2E.robot b/test/csit/tests/usecases/5G-bulkpm/BulkpmE2E.robot
index aa391ad8c..9098b1abe 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/BulkpmE2E.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/BulkpmE2E.robot
@@ -4,7 +4,7 @@ Library RequestsLibrary
Library OperatingSystem
Library Collections
Library Process
-Resource resources/ves_keywords.robot
+Resource resources/bulkpm_keywords.robot
*** Variables ***
@@ -12,7 +12,7 @@ ${VESC_URL} http://%{VESC_IP}:8080
${GLOBAL_APPLICATION_ID} robot-ves
${VES_ANY_EVENT_PATH} /eventListener/v7
${HEADER_STRING} content-type=application/json
-${EVENT_DATA_FILE} %{WORKSPACE}/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
+${EVENT_DATA_FILE} %{WORKSPACE}/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
${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
diff --git a/test/csit/tests/dcae-bulkpm/testcases/__init__.robot b/test/csit/tests/usecases/5G-bulkpm/__init__.robot
index 7114fd447..7114fd447 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/__init__.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/__init__.robot
diff --git a/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json b/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
index 4064ea312..4064ea312 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json
+++ b/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
diff --git a/test/csit/tests/dcae-bulkpm/testcases/resources/ves_keywords.robot b/test/csit/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot
index 76bc33f47..6859ea0df 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/resources/ves_keywords.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot
@@ -1,7 +1,7 @@
*** Settings ***
Documentation The main interface for interacting with VES. It handles low level stuff like managing the http request library and VES required fields
Library RequestsLibrary
-Library ../resources/VesLibrary.py
+Library ../resources/xNFLibrary.py
Library OperatingSystem
Library Collections
Library requests
@@ -36,4 +36,3 @@ GetCall
[Arguments] ${url}
${resp}= Evaluate requests.get('${url}') requests
[Return] ${resp}
- \ No newline at end of file
diff --git a/test/csit/tests/dcae-bulkpm/testcases/resources/VesLibrary.py b/test/csit/tests/usecases/5G-bulkpm/resources/xNFLibrary.py
index d1ec9811d..01574f778 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/resources/VesLibrary.py
+++ b/test/csit/tests/usecases/5G-bulkpm/resources/xNFLibrary.py
@@ -7,7 +7,7 @@ from robot.api import logger
from Queue import Queue
import uuid, time, json, threading,os, platform, subprocess,paramiko
-class VesLibrary(object):
+class xNFLibrary(object):
def __init__(self):
pass
@@ -21,5 +21,5 @@ class VesLibrary(object):
return uuid.uuid4()
if __name__ == '__main__':
- lib = VesLibrary()
+ lib = xNFLibrary()
time.sleep(100000) \ No newline at end of file