aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dcaegen2-pmmapper/pmmapper
diff options
context:
space:
mode:
Diffstat (limited to 'tests/dcaegen2-pmmapper/pmmapper')
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml6
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json14
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json12
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot2
4 files changed, 17 insertions, 17 deletions
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml
index 4d20d4b4..fadc8a65 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml
@@ -47,9 +47,9 @@ xsi:schemaLocation="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measC
<measType p="4">succImmediateAssignProcs4</measType>
<measValue measObjLdn="ManagedElement=RNC-Gbg-1,ENodeBFunction=1">
<r p="1">4</r>
- <r p="12">86,87,2,6,77,96,75,33,24</r>
- <r p="13">40</r>
- <r p="14">90</r>
+ <r p="2">86,87,2,6,77,96,75,33,24</r>
+ <r p="3">40</r>
+ <r p="4">90</r>
<suspect>false</suspect>
</measValue>
</measInfo>
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
index 544b6980..1e3604f6 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
@@ -2,9 +2,9 @@
"pm-mapper-filter": {
"filters":[{
"pmDefVsn": "1.0",
- "nfType": "5G",
+ "nfType": "gnb",
"vendor": "Ericsson",
- "measTypes": ["attTCHSeizures","succImmediateAssignProcs"]
+ "measTypes": ["attTCHSeizures","succTCHSeizures2","succImmediateAssignProcs8"]
}]
},
"streams_subscribes": {
@@ -14,7 +14,7 @@
"aaf_password": null,
"dmaap_info": {
"location": "csit-pmmapper",
- "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery",
+ "delivery_url": "http://dcae-pm-mapper:8081/delivery",
"username": "username",
"password": "password",
"subscriber_id": "1"
@@ -38,8 +38,8 @@
"dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
"services_calls": {},
"enable_http": true,
- "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64",
- "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass",
- "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64",
- "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass"
+ "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
+ "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
+ "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
+ "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
} \ No newline at end of file
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
index 64fefa48..cbb313d0 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
@@ -1,5 +1,5 @@
{
- "pm-mapper-filter": {
+ "pm-mapper-filter": {
"filters":[{
"pmDefVsn": "1.0",
"nfType": "gnb",
@@ -14,7 +14,7 @@
"aaf_password": null,
"dmaap_info": {
"location": "csit-pmmapper",
- "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery",
+ "delivery_url": "http://dcae-pm-mapper:8081/delivery",
"username": "username",
"password": "password",
"subscriber_id": "1"
@@ -38,8 +38,8 @@
"dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
"services_calls": {},
"enable_http": true,
- "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64",
- "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass",
- "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64",
- "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass"
+ "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
+ "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
+ "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
+ "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
} \ No newline at end of file
diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
index 5d217513..ec798293 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
+++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
@@ -21,7 +21,7 @@ ${NO_MANAGED_ELEMENT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pm
${NO_MEASDATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_measdata.xml
${VALID_METADATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json
${DIFF_VENDOR_METADATA} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json
-${CLI_EXEC_CLI_PM_LOG} docker exec pmmapper /bin/sh -c "tail -10 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
+${CLI_EXEC_CLI_PM_LOG} docker exec pmmapper /bin/sh -c "tail -15 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1
${TYPE-A_PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml
${TYPE-C_PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml