Add new json events to PRH CSIT

Change-Id: I0d09bc1d8abd686145d82694e9fc367bc486206d
Issue-ID: INT-871
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

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 2ffe356..cdcab67 100644 (file)
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
@@ -5,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.17.123.234",
-      "oamV6IpAddress":""
+      "oamV6IpAddress":"",
+      "serial-number":"NOkkaaa123",
+      "equip-vendor":"equipVendor",
+      "equip-model":"equipModel",
+      "equip-type":"equipType",
+      "nf-role":"nf-role",
+      "sw-version":"swVersion"
     }
   }
 }

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 c4a0e72..f5ec23d 100644 (file)
--- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
@@ -5,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2e:0370:7334"
+      "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"
     }
   }
 }

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 16963e1..bc9cb1d 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
@@ -5,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.16.123.234",
-      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"
+      "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"
     }
   }
 }

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_empty_addtional_fields.json
new file mode 100644 (file)
index 0000000..7ca4d0c
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_empty_addtional_fields.json
@@ -0,0 +1,17 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "sourceName":"NOK6061ZW1"
+    },
+    "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":""
+    }
+  }
+}

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 1e3afa9..4942a3d 100644 (file)
--- 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
@@ -5,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":""
+      "oamV6IpAddress":"",
+      "serial-number":"NOkkaaa123",
+      "equip-vendor":"equipVendor",
+      "equip-model":"equipModel",
+      "equip-type":"equipType",
+      "nf-role":"nf-role",
+      "sw-version":"swVersion"
     }
   }
 }

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_missing_additional_fields.json
new file mode 100644 (file)
index 0000000..16963e1
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_additional_fields.json
@@ -0,0 +1,11 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "sourceName":"NOK6061ZW1"
+    },
+    "pnfRegistrationFields": {
+      "oamV4IpAddress":"10.16.123.234",
+      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"
+    }
+  }
+}

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 126987f..5e2a612 100644 (file)
--- 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
@@ -5,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.18.123.234",
-      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2a:0370:7334"
+      "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"
     }
   }
 }

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 de1f576..a6a6f36 100644 (file)
--- 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,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":""
+      "oamV6IpAddress":"",
+      "serial-number":"NOkkaaa123",
+      "equip-vendor":"equipVendor",
+      "equip-model":"equipModel",
+      "equip-type":"equipType",
+      "nf-role":"nf-role",
+      "sw-version":"swVersion"
     }
   }
 }

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 4838f1b..6d9eadf 100644 (file)
--- 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,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"",
-      "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2f:0370:7334"
+      "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"
     }
   }
 }

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 04ab7ce..9fac5b1 100644 (file)
--- 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,7 +5,13 @@
     },
     "pnfRegistrationFields": {
       "oamV4IpAddress":"10.17.163.234",
-      "oamV6IpAddress":""
+      "oamV6IpAddress":"",
+      "serial-number":"NOkkaaa123",
+      "equip-vendor":"equipVendor",
+      "equip-model":"equipModel",
+      "equip-type":"equipType",
+      "nf-role":"nf-role",
+      "sw-version":"swVersion"
     }
   }
 }

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 0aa0372..a416bb7 100644 (file)
--- 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
@@ -4,7 +4,13 @@
       "sourceName":"NOK6061ZW9"
     },
     "pnfRegistrationFields": {
-      "oamV4IpAddress":"10.17.123.24"
+      "oamV4IpAddress":"10.17.123.24",
+      "serial-number":"NOkkaaa123",
+      "equip-vendor":"equipVendor",
+      "equip-model":"equipModel",
+      "equip-type":"equipType",
+      "nf-role":"nf-role",
+      "sw-version":"swVersion"
     }
   }
 }

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 c87e188..08d9a49 100644 (file)
--- 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,6 +6,12 @@
     "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",
     }
   }
 }

diff --git a/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py b/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
index dc58936..d413be5 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
+++ b/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
@@ -24,8 +24,14 @@ class PrhLibrary(object):
         json_to_python = json.loads(json_file)
         ipv4 = json_to_python.get("event").get("pnfRegistrationFields").get("oamV4IpAddress")
         ipv6 = json_to_python.get("event").get("pnfRegistrationFields").get("oamV6IpAddress") if "oamV6IpAddress" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        serial_number = json_to_python.get("event").get("pnfRegistrationFields").get("serial-number") if "serial-number" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        equip_vendor = json_to_python.get("event").get("pnfRegistrationFields").get("equip-vendor") if "equip-vendor" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        equip_model = json_to_python.get("event").get("pnfRegistrationFields").get("equip-model") if "equip-model" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        equip_type = json_to_python.get("event").get("pnfRegistrationFields").get("equip-type") if "equip-type" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        nf_role = json_to_python.get("event").get("pnfRegistrationFields").get("nf-role") if "nf-role" in json_to_python["event"]["pnfRegistrationFields"] else ""
+        sw_version = json_to_python.get("event").get("pnfRegistrationFields").get("sw-version") if "sw-version" in json_to_python["event"]["pnfRegistrationFields"] else ""
         correlation_id = json_to_python.get("event").get("commonEventHeader").get("sourceName")
-        str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '"}'
+        str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '","serial-number":"' + serial_number + '","equip-vendor":"' + equip_vendor + '","equip-model":"' + equip_model + '","equip-type":"' + equip_type + '","nf-role":"' + nf_role + '","sw-version":"' + sw_version + '"}'
         python_to_json = json.dumps(str_json)
         return python_to_json.replace("\\", "")[1:-1]