def check_for_log(search_for):
client = docker.from_env()
container = client.containers.get('prh')
- #print ("Check for log searches for pattern: ", search_for )
+ print ("Check for log searches for pattern: ", search_for )
for line in container.logs(stream=True):
- #print ("Check for log analysis line: ", line )
+ print ("Check for log analysis line: ", line )
if search_for in line.strip():
return True
else:
return False
@staticmethod
- def create_pnf_ready_notification_from_ves(json_file):
+ def create_invalid_notification(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)
-
- 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]
+ correlation_id = PrhLibrary.extract_correlation_id_value(json_to_python, "correlationId")
+ ipv4 = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "oamV4IpAddress", "oamV4IpAddress")
+ ipv6 = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "oamV6IpAddress", "oamV6IpAddress")
+ serial_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "serialNumber", "serialNumber")
+ vendor_name = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "vendorName", "vendorName")
+ model_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "modelNumber", "modelNumber")
+ unit_type = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "unitType", "unitType")
+ additional_fields = PrhLibrary.extract_additional_fields(json_to_python, "additionalFields")
+
+ str_json = '{' + correlation_id + ipv4 + ipv6 + serial_number + vendor_name + model_number + unit_type + '"nfNamingCode":""' + "," + '"softwareVersion":"",' + additional_fields
+ return json.dumps(str_json).replace("\\", "")[1:-1].replace("\":", "\": ").rstrip(',') + '\\n}'
@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)
+ correlation_id = PrhLibrary.extract_correlation_id_value(json_to_python, "correlationId")
+ serial_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "serial-number", "serialNumber")
+ vendor_name = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-vendor", "vendorName")
+ model_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-model", "modelNumber")
+ unit_type = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-type", "unitType")
+ additional_fields = PrhLibrary.extract_additional_fields_value(json_to_python, "additionalFields")
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 ""
+ str_json = '{' + correlation_id + serial_number + vendor_name + model_number + unit_type + '"nf-role":"' + nf_role + '","sw-version":"",' + additional_fields
- @staticmethod
- def extract_correlation_id(content):
- return content.get("event").get("commonEventHeader").get("sourceName") if "sourceName" in content["event"]["commonEventHeader"] else ""
+ return json.dumps(str_json.rstrip(',') + '}').replace("\\", "")[1:-1]
@staticmethod
- def extract_serial_number(content):
- return content.get("event").get("pnfRegistrationFields").get("serialNumber") if "serialNumber" in content["event"]["pnfRegistrationFields"] else ""
+ def extract_additional_fields(content, name):
+ fields = content.get("event").get("pnfRegistrationFields").get(name) if name in content["event"]["pnfRegistrationFields"] else []
+ if fields == []:
+ return '"additionalFields":' + 'null'
+ res = '"' + name + '":{'
+ for f in fields:
+ res += '"' + f + '"' + ':' + '"' + fields.get(f) + '",'
+ return res.rstrip(',') + '},'
@staticmethod
- def extract_vendor_name(content):
- return content.get("event").get("pnfRegistrationFields").get("vendorName") if "vendorName" in content["event"]["pnfRegistrationFields"] else ""
+ def extract_additional_fields_value(content, name):
+ fields = content.get("event").get("pnfRegistrationFields").get(name) if name in content["event"]["pnfRegistrationFields"] else []
+ if fields == [] or len(fields) == 0:
+ return ""
+ res = '"' + name + '":{'
+ for f in fields:
+ res += '"' + f + '"' + ':' + '"' + fields.get(f) + '",'
+ return res.rstrip(',') + '},'
@staticmethod
- def extract_model_number(content):
- return content.get("event").get("pnfRegistrationFields").get("modelNumber") if "modelNumber" in content["event"]["pnfRegistrationFields"] else ""
+ def extract_value_from_pnfRegistrationFields(content, name, key):
+ return '"' + name + '":"' + (content.get("event").get("pnfRegistrationFields").get(key) + '",' if key 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 ""
+ def extract_correlation_id_value(content, name):
+ return '"' + name + '":"' + (content.get("event").get("commonEventHeader").get("sourceName") + '",' if "sourceName" in content["event"]["commonEventHeader"] else '",')
@staticmethod
def create_pnf_name(json_file):
@staticmethod
def is_in_status(client, name, status):
return len(client.containers.list(all=True, filters={"name": "^/"+name+"$", "status": status})) == 1
-
-
- def create_invalid_notification(self, json_file):
- 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
Code Review / integration / csit.git / commitdiff