aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dcaegen2
diff options
context:
space:
mode:
Diffstat (limited to 'tests/dcaegen2')
-rw-r--r--tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-with-attachment-point.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-logical-link.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-pnf-ready-event.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/ves-event.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/expected-pnf-ready-event.json2
-rw-r--r--tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/ves-event.json2
-rw-r--r--tests/dcaegen2/prh-testcases/resources/docker-compose.yml35
9 files changed, 13 insertions, 38 deletions
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
index 13c564c1..cd3e73f1 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
@@ -13,7 +13,7 @@
"modelNumber": "modelNumber",
"unitType": "unitType",
"additionalFields": {
- "attachmentPoint": "bla-bla-30-3",
+ "attachment-point": "bla-bla-30-3",
"svlan": "1005",
"cvlan": "678"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json
index 9be02f10..0f2af3cd 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json
@@ -14,7 +14,7 @@
"modelNumber": "modelNumber",
"unitType": "unitType",
"additionalFields": {
- "attachmentPoint": "bla-bla-30-3",
+ "attachment-point": "bla-bla-30-3",
"svlan": "1005",
"cvlan": "678"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-with-attachment-point.json b/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-with-attachment-point.json
index 054774c5..97d2dffa 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-with-attachment-point.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-with-attachment-point.json
@@ -11,7 +11,7 @@
"modelNumber": "modelNumber",
"unitType": "unitType",
"additionalFields": {
- "attachmentPoint": "bla-bla-30-3",
+ "attachment-point": "bla-bla-30-3",
"svlan": "1005",
"cvlan": "678"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-logical-link.json b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-logical-link.json
index c48c841c..95c5570a 100644
--- a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-logical-link.json
+++ b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-logical-link.json
@@ -1,6 +1,6 @@
{
"link-name": "bbs-link",
- "link-type": "attachmentPoint",
+ "link-type": "attachment-point",
"relationship-list": [
{
"relationship": {
diff --git a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-pnf-ready-event.json b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-pnf-ready-event.json
index 0ccc1dfb..5c77e125 100644
--- a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-pnf-ready-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/expected-pnf-ready-event.json
@@ -1,7 +1,7 @@
[
{
"additionalFields": {
- "attachmentPoint": "bbs-link"
+ "attachment-point": "bbs-link"
},
"correlationId": "NOK6061ZW9"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/ves-event.json b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/ves-event.json
index 9f024983..84e52233 100644
--- a/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/ves-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/ves-event-with-attachment-point/ves-event.json
@@ -34,7 +34,7 @@
"oamV6IpAddress": "val4",
"softwareVersion": "val7",
"additionalFields": {
- "attachmentPoint": "bbs-link"
+ "attachment-point": "bbs-link"
}
}
}
diff --git a/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/expected-pnf-ready-event.json b/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/expected-pnf-ready-event.json
index d2cf9547..363ff3ff 100644
--- a/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/expected-pnf-ready-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/expected-pnf-ready-event.json
@@ -1,7 +1,7 @@
[
{
"additionalFields": {
- "attachmentPoint": ""
+ "attachment-point": ""
},
"correlationId": "NOK6061ZW8"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/ves-event.json b/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/ves-event.json
index c1b6dc2c..fda6ef10 100644
--- a/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/ves-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/ves-event-with-empty-attachment-point/ves-event.json
@@ -34,7 +34,7 @@
"oamV6IpAddress": "val4",
"softwareVersion": "val7",
"additionalFields": {
- "attachmentPoint": ""
+ "attachment-point": ""
}
}
}
diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index 6459ad27..aba658b0 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -55,55 +55,30 @@ services:
image: consul:1.0.6
restart: on-failure
command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-prh", '{
- "dmaap.dmaapConsumerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT",
- "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr",
- "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223,
- "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT",
- "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"https",
"dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
"dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
"dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json",
"dmaap.dmaapConsumerConfiguration.consumerId": "c12",
"dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDCAE-c12",
"dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
- "dmaap.dmaapConsumerConfiguration.messageLimit": -1,
-
- "dmaap.dmaapProducerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY",
- "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr",
- "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223,
- "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY",
- "dmaap.dmaapProducerConfiguration.dmaapProtocol":"https",
"dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
"dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
"dmaap.dmaapProducerConfiguration.dmaapContentType": "application/json",
-
- "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223,
- "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "https",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
-
"aai.aaiClientConfiguration.pnfUrl":"https://aai:3334/aai/v12/network/pnfs/pnf",
- "aai.aaiClientConfiguration.aaiHost":"aai",
- "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
- "aai.aaiClientConfiguration.aaiProtocol":"https",
"aai.aaiClientConfiguration.aaiUserName": "DCAE",
"aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
- "aai.aaiClientConfiguration.aaiBasePath": "/aai/v12",
- "aai.aaiClientConfiguration.aaiPnfPath": "/network/pnfs/pnf",
"aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
"aai.aaiClientConfiguration.aaiHeaders":{
- "X-FromAppId": "prh",
- "X-TransactionId": "9999",
- "Accept": "application/json",
- "Real-Time": "true",
- "Authorization": "Basic QUFJOkFBSQ=="
+ "X-FromAppId": "prh",
+ "X-TransactionId": "9999",
+ "Accept": "application/json",
+ "Real-Time": "true",
+ "Authorization": "Basic QUFJOkFBSQ=="
},
-
"security.trustStorePath":"/tmp/certs/truststore.jks",
"security.trustStorePasswordPath":"/tmp/certs/truststore.password",
"security.keyStorePath":"/tmp/certs/keystore.p12",