Skip to content

Commit 70ca5a3

Browse files
authored
Merge pull request #331 from mkekez-SIE/maint_id_bug
Fix bug with maintenance_id generation due to CircuitImpact
2 parents 262f70f + 308608f commit 70ca5a3

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

changes/331.housekeeping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix bug with maintenance_id generation due to CircuitImpact

circuit_maintenance_parser/parser.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,12 @@ def _get_account(self, generated_json: dict):
500500

501501
return account
502502

503-
def _get_maintenance_id(self, generated_json: dict, start, end, circuits):
503+
def _get_maintenance_id(self, generated_json: dict, start, end):
504504
"""Method to get the Maintenance ID."""
505505
maintenance_key = self.get_key_with_string(generated_json, "maintenance")
506506
if maintenance_key and generated_json["maintenance_id"] != "N/A":
507507
return generated_json["maintenance_id"]
508-
maintenance_id = str(start) + str(end) + "".join(list(circuits))
508+
maintenance_id = str(start) + str(end) + "_" + "-".join(generated_json["circuit_ids"])
509509
return hashlib.sha256(maintenance_id.encode("utf-8")).hexdigest() # nosec
510510

511511
def parse_content(self, content):
@@ -539,7 +539,6 @@ def parse_content(self, content):
539539
generated_json,
540540
main_data["start"],
541541
main_data["end"],
542-
main_data["circuits"],
543542
)
544543
)
545544

@@ -566,7 +565,6 @@ def parse_content(self, content):
566565
generated_json,
567566
backup_start,
568567
backup_end,
569-
backup_data["circuits"],
570568
)
571569
)
572570

0 commit comments

Comments
 (0)