Fix robot cases due to attachment-point

Change-Id: I23540bd7332b9dbe64cde6c469c69964d106d882
Issue-ID: INT-1096
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>

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 c48c841..95c5570 100644 (file)
--- 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 9da0201..c183da2 100644 (file)
--- 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 c67d863..64531b6 100644 (file)
--- 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 eb4dfaf..149c9e4 100644 (file)
--- 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 39fadb8..d16c0fb 100644 (file)
--- 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 9d730bf..732dd97 100644 (file)
--- 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 aa44e06..0400e87 100644 (file)
--- 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"