diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-09-27 15:29:15 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-27 15:29:15 +0000 |
commit | f2f9278a5839949dee07c0174ab433a83e8e4dbf (patch) | |
tree | 946dedeeb5dd38d5d88e3979aff21ea912440f67 /test/csit/plans | |
parent | 4fab8f0830672c8accb36ad594e708daee36c2e8 (diff) | |
parent | 4b97e33295086748108ecb042461719fb09600ba (diff) |
Merge "Renaming 5G Bulk PM to usecase/5G-bulkpm"
Diffstat (limited to 'test/csit/plans')
-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) | bin | 63 -> 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 |
8 files changed, 9 insertions, 9 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 Binary files differindex 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 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 |