aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2020-04-23 14:26:43 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-23 14:26:43 +0000
commitd0cb4ba1ee79050aef906ec3a14f839caf865ede (patch)
tree52c3795b3b6a761e1396e8cdf5de2459d3c62c73 /tests
parent4a7766240098959b5bbf5581b45d47d0643707dc (diff)
parente207b42c4806d949ec9125116cbafc23698b77b3 (diff)
Merge "[PMSH] Updating csits for CBS module"
Diffstat (limited to 'tests')
-rw-r--r--tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json6
-rw-r--r--tests/dcaegen2-services-pmsh/testcases/pmsh.robot8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
index 6f6972f4..569e9383 100644
--- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
@@ -82,7 +82,7 @@
"dmaap_info": {
"client_id": "1475976809466",
"client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"location": "san-francisco"
},
"type": "message_router"
@@ -94,14 +94,14 @@
"dmaap_info": {
"client_id": "1575976809466",
"client_role": "org.onap.dcae.aaiSub",
- "topic_url": "https://mr-sim:1080/events/AAI_EVENT",
+ "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
"location": "san-francisco"
}
},
"policy_pm_subscriber": {
"dmaap_info": {
"location": "san-francisco",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"client_role": "org.onap.dcae.pmSubscriber",
"client_id": "1575876809456"
},
diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
index 95b78c25..ebdae844 100644
--- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
+++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
@@ -15,8 +15,8 @@ Test Teardown Delete All Sessions
*** Variables ***
${PMSH_BASE_URL} https://${PMSH_IP}:8443
-${MR_BASE_URL} http://${MR_SIM_IP_ADDRESS}:1080
-${CBS_BASE_URL} http://${CBS_SIM_IP_ADDRESS}:1080
+${MR_BASE_URL} https://${MR_SIM_IP_ADDRESS}:3095
+${CBS_BASE_URL} https://${CBS_SIM_IP_ADDRESS}:10443
${HEALTHCHECK_ENDPOINT} /healthcheck
${MR_EXPECTATION_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json
@@ -27,8 +27,8 @@ ${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-serv
${ADMIN_STATE_LOCKED_PATTERN} 'administrativeState': 'LOCKED'
${ADMIN_STATE_UNLOCKED_PATTERN} 'administrativeState': 'UNLOCKED'
-${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log"
-${CLI_EXEC_GET_CBS_CONFIG_LAST} docker exec pmsh /bin/sh -c "grep 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log | tail -1"
+${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/debug.log"
+${CLI_EXEC_GET_CBS_CONFIG_LAST} docker exec pmsh /bin/sh -c "grep 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/debug.log | tail -1"
${DB_CMD_NETWORK_FUNCTIONS_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from network_functions;'"
${DB_CMD_NF_TO_SUB_REL_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from nf_to_sub_rel;'"