From 4fa0c62900a3a8c0b008bc7b8b4ea3512980de68 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Thu, 6 Jun 2019 12:32:11 +0200 Subject: Fix robot cases due to attachment-point Change-Id: I23540bd7332b9dbe64cde6c469c69964d106d882 Issue-ID: INT-1096 Signed-off-by: Marcin Migdal --- .../prh-testcases/assets/bbs_registration/expected-logical-link.json | 2 +- .../assets/bbs_registration/expected-pnf-ready-event.json | 2 +- tests/dcaegen2/prh-testcases/assets/bbs_registration/ves-event.json | 2 +- .../prh-testcases/assets/json_events/event_with_all_fields.json | 2 +- .../event_with_optional_registration_fields_all_filled.json | 2 +- .../json_events/ves-event-pnf-registration-with-attachment-point.json | 2 +- tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-logical-link.json b/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-logical-link.json index c48c841c..95c5570a 100644 --- a/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-logical-link.json +++ b/tests/dcaegen2/prh-testcases/assets/bbs_registration/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/bbs_registration/expected-pnf-ready-event.json b/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-pnf-ready-event.json index 9da0201c..c183da2a 100644 --- a/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-pnf-ready-event.json +++ b/tests/dcaegen2/prh-testcases/assets/bbs_registration/expected-pnf-ready-event.json @@ -1,6 +1,6 @@ { "additionalFields": { - "attachmentPoint": "bbs-link" + "attachment-point": "bbs-link" }, "correlationId": "NOK6061ZW9" } diff --git a/tests/dcaegen2/prh-testcases/assets/bbs_registration/ves-event.json b/tests/dcaegen2/prh-testcases/assets/bbs_registration/ves-event.json index c67d863e..64531b6c 100644 --- a/tests/dcaegen2/prh-testcases/assets/bbs_registration/ves-event.json +++ b/tests/dcaegen2/prh-testcases/assets/bbs_registration/ves-event.json @@ -33,7 +33,7 @@ "oamV6IpAddress": "val4", "softwareVersion": "val7", "additionalFields": { - "attachmentPoint": "bbs-link" + "attachment-point": "bbs-link" } } } 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 eb4dfaf9..149c9e4d 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 @@ -12,7 +12,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 39fadb8a..d16c0fb9 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 @@ -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/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 9d730bf6..732dd977 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 @@ -10,7 +10,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/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index aa44e060..0400e875 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -1,7 +1,7 @@ version: "2.2" services: prh: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.3-SNAPSHOT + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.4-SNAPSHOT ports: - "8100:8100" - "8433:8433" @@ -18,7 +18,7 @@ services: condition: service_started ssl_prh: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.3-SNAPSHOT + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.4-SNAPSHOT ports: - "8200:8100" - "8533:8433" -- cgit 1.2.3-korg