Add new json events to PRH CSIT

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

14 files changed, 71 insertions, 71 deletions

diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
index cdcab678..ac7c3090 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
@@ -6,12 +6,10 @@
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.17.123.234",
       "oamV6IpAddress":"",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"NOkkaaa123",
+      "vendorName":"equipVendor",
+      "modelNumber":"equipModel",
+      "unitType":"equipType"
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
index f5ec23d0..5a67dfe1 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
@@ -6,12 +6,10 @@
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
       "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2e:0370:7334",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"NOkkaaa123",
+      "vendorName":"equipVendor",
+      "modelNumber":"equipModel",
+      "unitType":"equipType"
     }
   }
 }
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 bc9cb1d3..f55b2f9c 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
@@ -1,17 +1,16 @@
 {
   "event": {
     "commonEventHeader": {
-      "sourceName":"NOK6061ZW1"
+      "sourceName":"NOK6061ZW1",
+      "nfNamingCode": "nfNamingCode"
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.16.123.234",
       "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"serialNumber",
+      "vendorName":"vendorName",
+      "modelNumber":"modelNumber",
+      "unitType":"unitType"
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json
index 4942a3d5..6a14bfd4 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json
@@ -6,12 +6,10 @@
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
       "oamV6IpAddress":"",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"",
+      "vendorName":"",
+      "modelNumber":"",
+      "unitType":""
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json
index 5e2a6121..74425ec2 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json
@@ -6,12 +6,10 @@
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.18.123.234",
       "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2a:0370:7334",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"",
+      "vendorName":"",
+      "modelNumber":"",
+      "unitType":""
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
index a6a6f364..de1f576c 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
@@ -5,13 +5,7 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":"",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "oamV6IpAddress":""
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
index 6d9eadfe..4838f1b0 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
@@ -5,13 +5,7 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2f:0370:7334",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2f:0370:7334"
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
index 9fac5b19..253869ac 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
@@ -5,13 +5,8 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.17.163.234",
-      "oamV6IpAddress":"",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "oamV6IpAddress":""
+
     }
   }
 }
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
new file mode 100644
index 00000000..492d6071
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json
@@ -0,0 +1,17 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "sourceName":"NOK6061ZW4",
+      "nfNamingCode": "nfNamingCode",
+      "nfcNamingCode": "nfcNamingCode"
+    },
+    "pnfRegistrationFields": {
+      "oamV4IpAddress":"ipv4",
+      "oamV6IpAddress":"",
+      "serialNumber":"sn1234",
+      "vendorName":"vendorName",
+      "modelNumber":"modelNumber",
+      "unitType":"unitType"
+    }
+  }
+}
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_empty_addtional_fields.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json
index 7ca4d0c6..48363a47 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_empty_addtional_fields.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json
@@ -1,17 +1,16 @@
 {
   "event": {
     "commonEventHeader": {
-      "sourceName":"NOK6061ZW1"
+      "sourceName":"NOK6061ZW1",
+      "nfNamingCode": ""
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.16.123.234",
       "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-      "serial-number":"",
-      "equip-vendor":"",
-      "equip-model":"",
-      "equip-type":"",
-      "nf-role":"",
-      "sw-version":""
+      "serialNumber":"",
+      "vendorName":"",
+      "modelNumber":"",
+      "unitType":""
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_additional_fields.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_all.json
index 16963e1b..16963e1b 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_additional_fields.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_all.json
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json
new file mode 100644
index 00000000..ede956f5
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json
@@ -0,0 +1,14 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "sourceName":"NOK6061ZW4"
+    },
+    "pnfRegistrationFields": {
+      "oamV4IpAddress":"",
+      "oamV6IpAddress":"",
+      "serialNumber":"123",
+      "modelNumber":"sn123243",
+      "unitType": "unitType"
+    }
+  }
+}
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_without_IPV6_field.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_without_IPV6_field.json
index a416bb7e..02f01370 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_without_IPV6_field.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_without_IPV6_field.json
@@ -5,12 +5,10 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.17.123.24",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion"
+      "serialNumber":"NOkkaaa123",
+      "vendorName":"equipVendor",
+      "modelNumber":"equipModel",
+      "unitType":"equipType"
     }
   }
 }
diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json b/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
index 08d9a49c..f6afb1d3 100644
--- a/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
@@ -6,12 +6,10 @@
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.16.123.234",
       "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-      "serial-number":"NOkkaaa123",
-      "equip-vendor":"equipVendor",
-      "equip-model":"equipModel",
-      "equip-type":"equipType",
-      "nf-role":"nf-role",
-      "sw-version":"swVersion",
+      "serialNumber":"NOkkaaa123",
+      "vendorName":"equipVendor",
+      "modelNumber":"equipModel",
+      "unitType":"equipType",
     }
   }
 }