hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-09 03:10:46 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions 2

fix(netx): prefer UUID net_id from ME{} in objectName

Browse source 
Only treat UUID-like values as net_id. Prefer extracting ME{uuid} from objectName and ignore ME{numeric} wrappers found in alarmkey so alarms join inventory correctly.

Also constrain legacy alarmkey split formats (#, csv, space) to UUID-like prefixes.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-13 17:11:58 +08:00
parent 15d9cb5db3
commit 16607db3cd
2 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/test_ume_sync.py
View file

@ -488,6 +488,10 @@ class UmeSyncServiceTests(unittest.TestCase):
alarm_csv = {"alarmkey": "00ceb960-1b62-478e-8303-0935ffea1d28, 4237, 79"}
alarm_space = {"alarmkey": "00ceb960-1b62-478e-8303-0935ffea1d28 4205 3588"}
alarm_object_name_me = {"alarmkey": "no-net-id-here", "objectName": "OLT/ME{00ceb960-1b62-478e-8303-0935ffea1d28}/PON-1"}
alarm_key_me_wrapped = {
"alarmkey": "BN:ME{353319917}:35 1778634688",
"objectName": "ME{33a3e8f4-a76e-40fd-a0ba-045371a5f234},PWR={/module=3}",
}
self.assertEqual(
_derive_ne_id_from_alarm(alarm_hash),
@ -505,6 +509,10 @@ class UmeSyncServiceTests(unittest.TestCase):
_derive_ne_id_from_alarm(alarm_object_name_me),
"00ceb960-1b62-478e-8303-0935ffea1d28",
)
self.assertEqual(
_derive_ne_id_from_alarm(alarm_key_me_wrapped),
"33a3e8f4-a76e-40fd-a0ba-045371a5f234",
)
def test_serialize_ume_alarm_raw_row_select_fields(self):
alarm = UmeAlarmCurrent(