"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"
}
}
}
"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"
}
}
}
{
"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"
}
}
}
"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":""
}
}
}
"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":""
}
}
}
},
"pnfRegistrationFields": {
"oamV4IpAddress":"",
- "oamV6IpAddress":"",
- "serial-number":"NOkkaaa123",
- "equip-vendor":"equipVendor",
- "equip-model":"equipModel",
- "equip-type":"equipType",
- "nf-role":"nf-role",
- "sw-version":"swVersion"
+ "oamV6IpAddress":""
}
}
}
},
"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"
}
}
}
},
"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":""
+
}
}
}
--- /dev/null
+{
+ "event": {
+ "commonEventHeader": {
+ "sourceName":"NOK6061ZW4",
+ "nfNamingCode": "nfNamingCode",
+ "nfcNamingCode": "nfcNamingCode"
+ },
+ "pnfRegistrationFields": {
+ "oamV4IpAddress":"ipv4",
+ "oamV6IpAddress":"",
+ "serialNumber":"sn1234",
+ "vendorName":"vendorName",
+ "modelNumber":"modelNumber",
+ "unitType":"unitType"
+ }
+ }
+}
{
"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":""
}
}
}
--- /dev/null
+{
+ "event": {
+ "commonEventHeader": {
+ "sourceName":"NOK6061ZW4"
+ },
+ "pnfRegistrationFields": {
+ "oamV4IpAddress":"",
+ "oamV6IpAddress":"",
+ "serialNumber":"123",
+ "modelNumber":"sn123243",
+ "unitType": "unitType"
+ }
+ }
+}
},
"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"
}
}
}
"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",
}
}
}
${EVENT_WITH_MISSING_SOURCENAME_AND_IPV4} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
${EVENT_WITH_MISSING_SOURCENAME_AND_IPV6} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
${EVENT_WITH_MISSING_SOURCENAME_IPV4_AND_IPV6} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
+${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_ALL_FILLED} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json
+${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_EMPTY} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json
+${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_ALL} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_all.json
+${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_PARTIAL} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json
${EVENT_WITHOUT_IPV6_FILED} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_without_IPV6_field.json
${Not_json_format} %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
def check_for_log(search_for):
client = docker.from_env()
container = client.containers.get('prh')
+ #print ("Check for log searches for pattern: ", search_for )
for line in container.logs(stream=True):
+ #print ("Check for log analysis line: ", line )
if search_for in line.strip():
return True
else:
return False
@staticmethod
- def create_pnf_ready_notification(json_file):
+ def create_pnf_ready_notification_from_ves(json_file):
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 + '","serial-number":"' + serial_number + '","equip-vendor":"' + equip_vendor + '","equip-model":"' + equip_model + '","equip-type":"' + equip_type + '","nf-role":"' + nf_role + '","sw-version":"' + sw_version + '"}'
+ ipv4 = PrhLibrary.extract_ip_v4(json_to_python)
+ ipv6 = PrhLibrary.extract_ip_v6(json_to_python)
+ correlation_id = PrhLibrary.extract_correlation_id(json_to_python)
+ serial_number = PrhLibrary.extract_serial_number(json_to_python)
+ vendor_name = PrhLibrary.extract_vendor_name(json_to_python)
+ model_number = PrhLibrary.extract_model_number(json_to_python)
+ unit_type = PrhLibrary.extract_unit_type(json_to_python)
+
+ str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '","serialNumber":"' + serial_number + '","vendorName":"' + vendor_name + '","modelNumber":"' + model_number + '","unitType":"' + unit_type + '"}'
python_to_json = json.dumps(str_json)
return python_to_json.replace("\\", "")[1:-1]
+ @staticmethod
+ def create_pnf_ready_notification_as_pnf_ready(json_file):
+ json_to_python = json.loads(json_file)
+ ipv4 = PrhLibrary.extract_ip_v4(json_to_python)
+ ipv6 = PrhLibrary.extract_ip_v6(json_to_python)
+ correlation_id = PrhLibrary.extract_correlation_id(json_to_python)
+ serial_number = PrhLibrary.extract_serial_number(json_to_python)
+ vendor_name = PrhLibrary.extract_vendor_name(json_to_python)
+ model_number = PrhLibrary.extract_model_number(json_to_python)
+ unit_type = PrhLibrary.extract_unit_type(json_to_python)
+
+ nf_role = json_to_python.get("event").get("commonEventHeader").get("nfNamingCode") if "nfNamingCode" in json_to_python["event"]["commonEventHeader"] else ""
+
+ str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '","serial-number":"' + serial_number + '","equip-vendor":"' + vendor_name + '","equip-model":"' + model_number + '","equip-type":"' + unit_type + '","nf-role":"' + nf_role + '","sw-version":""}'
+ python_to_json = json.dumps(str_json)
+ return python_to_json.replace("\\", "")[1:-1]
+
+ @staticmethod
+ def extract_ip_v4(content):
+ return content.get("event").get("pnfRegistrationFields").get("oamV4IpAddress") if "oamV4IpAddress" in content["event"]["pnfRegistrationFields"] else ""
+
+ @staticmethod
+ def extract_ip_v6(content):
+ return content.get("event").get("pnfRegistrationFields").get("oamV6IpAddress") if "oamV6IpAddress" in content["event"]["pnfRegistrationFields"] else ""
+
+ @staticmethod
+ def extract_correlation_id(content):
+ return content.get("event").get("commonEventHeader").get("sourceName") if "sourceName" in content["event"]["commonEventHeader"] else ""
+
+ @staticmethod
+ def extract_serial_number(content):
+ return content.get("event").get("pnfRegistrationFields").get("serialNumber") if "serialNumber" in content["event"]["pnfRegistrationFields"] else ""
+
+ @staticmethod
+ def extract_vendor_name(content):
+ return content.get("event").get("pnfRegistrationFields").get("vendorName") if "vendorName" in content["event"]["pnfRegistrationFields"] else ""
+
+ @staticmethod
+ def extract_model_number(content):
+ return content.get("event").get("pnfRegistrationFields").get("modelNumber") if "modelNumber" in content["event"]["pnfRegistrationFields"] else ""
+
+ @staticmethod
+ def extract_unit_type(content):
+ return content.get("event").get("pnfRegistrationFields").get("unitType") if "unitType" in content["event"]["pnfRegistrationFields"] else ""
+
@staticmethod
def create_pnf_name(json_file):
json_to_python = json.loads(json_file)
def create_invalid_notification(self, json_file):
- return self.create_pnf_ready_notification(json_file).replace("\":", "\": ")\
- .replace("ipaddress-v4-oam", "oamV4IpAddress").replace("ipaddress-v6-oam", "oamV6IpAddress")\
- .replace("}", "\\n}")
+ invalidate_input = self.create_pnf_ready_notification_from_ves(json_file).replace("\":", "\": ") \
+ .replace("ipaddress-v4-oam", "oamV4IpAddress").replace("ipaddress-v6-oam","oamV6IpAddress").replace("}",'')
+ invalidate_input__and_add_additional_fields = invalidate_input + ',"nfNamingCode": ""' + "," + '"softwareVersion": ""' +"\\n"
+ return invalidate_input__and_add_additional_fields
[Arguments] ${input_valid_event_in_dmaap}
[Timeout] 30s
${data}= Get Data From File ${input_valid_event_in_dmaap}
- ${posted_event_to_dmaap}= Create PNF_Ready notification ${data}
+ ${posted_event_to_dmaap}= create pnf ready notification from ves ${data}
${pnf_name}= Create PNF name ${data}
Set PNF name in AAI ${pnf_name}
Set event in DMaaP ${data}
- Wait Until Keyword Succeeds 100x 300ms Check PNF_READY notification ${posted_event_to_dmaap}
+ ${expected_event_pnf_ready_in_dpaap}= create pnf ready_notification as pnf ready ${data}
+ Wait Until Keyword Succeeds 100x 300ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap}
Check PRH log
[Arguments] ${searched_log}
Code Review / integration / csit.git / commitdiff