Skip to content

Commit 7383cd5

Browse files
stepanblyschaklguohan
stepanblyschak
authored and
lguohan
committed
Remove alias_map.json (sonic-net#87)
This file was added long time ago and now it is not needed anymore. We can simply get port aliases from DB. This also means that aliases will be now updated from DB once a reinit timeout, instead of beeing static in alias_map.json Signed-off-by: Stepan Blyschak <[email protected]>
1 parent b32f3ee commit 7383cd5

File tree

5 files changed

+59
-166
lines changed

5 files changed

+59
-166
lines changed

‎src/sonic_ax_impl/__init__.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
import json
22
import logging.handlers
33

4-
# path where a user may define an alias map
5-
USER_DEFINED_ALIAS_MAP_FILEPATH = '/etc/snmp/alias_map.json'
64

75
# configure logging
86
logger = logging.getLogger(__name__)
97
logger.setLevel(logging.INFO)
108
logger.addHandler(logging.NullHandler())
119

12-
_if_alias_map = None
13-
14-
# open user-defined alias map first
15-
try:
16-
with open(USER_DEFINED_ALIAS_MAP_FILEPATH) as f:
17-
_if_alias_map = json.load(f)
18-
_if_alias_map = {k.encode('ascii'): v.encode('ascii') for k, v in _if_alias_map.items()}
19-
except ValueError as e:
20-
logger.error(
21-
"User map contains error(s). Ensure file is well-formed JSON. Falling back to default map. {}".format(str(e))
22-
)
23-
except OSError:
24-
# No alias map found, error is emitted and handled in mibs/__init__.py
25-
logger.info("No user-defined alias map found, using default map.")

‎src/sonic_ax_impl/mibs/__init__.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from swsssdk import SonicV2Connector
55
from swsssdk import port_util
66
from swsssdk.port_util import get_index, get_index_from_str
7-
from sonic_ax_impl import logger, _if_alias_map
7+
from sonic_ax_impl import logger
88

99
COUNTERS_PORT_NAME_MAP = b'COUNTERS_PORT_NAME_MAP'
1010
COUNTERS_QUEUE_NAME_MAP = b'COUNTERS_QUEUE_NAME_MAP'
@@ -156,12 +156,15 @@ def init_sync_d_interface_tables(db_conn):
156156
.format(port_util.SONIC_ETHERNET_RE_PATTERN))
157157
logger.warning("Port name map:\n" + pprint.pformat(if_name_map, indent=2))
158158

159-
# { SONiC name -> optional rename }
160-
if_alias_map = _if_alias_map
159+
db_conn.connect(APPL_DB)
160+
161+
if_alias_map = dict()
162+
163+
for if_name in if_name_map:
164+
if_entry = db_conn.get_all(APPL_DB, if_entry_table(if_name), blocking=True)
165+
if_alias_map[if_name] = if_entry.get(b'alias', if_name)
166+
161167
logger.debug("Chassis name map:\n" + pprint.pformat(if_alias_map, indent=2))
162-
if if_alias_map is None or len(if_alias_map) == 0:
163-
logger.warning("No alias map found--port names will use SONiC names.")
164-
if_alias_map = dict(zip(if_name_map.keys(), if_name_map.keys()))
165168

166169
return if_name_map, if_alias_map, if_id_map, oid_sai_map, oid_name_map
167170

‎tests/mock_tables/appl_db.json

Lines changed: 33 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -456,254 +456,160 @@
456456
},
457457
"PORT_TABLE:Ethernet0": {
458458
"description": "snowflake",
459+
"alias": "etp1",
459460
"speed": 100000
460461
},
461462
"PORT_TABLE:Ethernet4": {
462463
"description": "snowflake",
464+
"alias": "etp2",
463465
"speed": 100000
464466
},
465467
"PORT_TABLE:Ethernet8": {
466468
"description": "snowflake",
469+
"alias": "etp3",
467470
"speed": 100000
468471
},
469472
"PORT_TABLE:Ethernet12": {
470473
"description": "snowflake",
474+
"alias": "etp4",
471475
"speed": 100000
472476
},
473477
"PORT_TABLE:Ethernet16": {
474478
"description": "snowflake",
479+
"alias": "etp5",
475480
"speed": 100000
476481
},
477482
"PORT_TABLE:Ethernet20": {
478483
"description": "snowflake",
484+
"alias": "etp6",
479485
"speed": 100000
480486
},
481487
"PORT_TABLE:Ethernet24": {
482488
"description": "snowflake",
489+
"alias": "etp7",
483490
"speed": 100000
484491
},
485492
"PORT_TABLE:Ethernet28": {
486493
"description": "snowflake",
494+
"alias": "etp8",
487495
"speed": 100000
488496
},
489497
"PORT_TABLE:Ethernet32": {
490498
"description": "snowflake",
499+
"alias": "etp9",
491500
"speed": 100000
492501
},
493502
"PORT_TABLE:Ethernet36": {
494503
"description": "snowflake",
504+
"alias": "etp10",
495505
"speed": 100000
496506
},
497507
"PORT_TABLE:Ethernet40": {
498508
"description": "snowflake",
509+
"alias": "etp11",
499510
"speed": 100000
500511
},
501512
"PORT_TABLE:Ethernet44": {
502513
"description": "snowflake",
514+
"alias": "etp12",
503515
"speed": 100000
504516
},
505517
"PORT_TABLE:Ethernet48": {
506518
"description": "snowflake",
519+
"alias": "etp13",
507520
"speed": 100000
508521
},
509522
"PORT_TABLE:Ethernet52": {
510523
"description": "snowflake",
524+
"alias": "etp14",
511525
"speed": 100000
512526
},
513527
"PORT_TABLE:Ethernet56": {
514528
"description": "snowflake",
529+
"alias": "etp15",
515530
"speed": 100000
516531
},
517532
"PORT_TABLE:Ethernet60": {
518533
"description": "snowflake",
534+
"alias": "etp16",
519535
"speed": 100000
520536
},
521537
"PORT_TABLE:Ethernet64": {
522538
"description": "snowflake",
539+
"alias": "etp17",
523540
"speed": 100000
524541
},
525542
"PORT_TABLE:Ethernet68": {
526543
"description": "snowflake",
544+
"alias": "etp18",
527545
"speed": 100000
528546
},
529547
"PORT_TABLE:Ethernet72": {
530548
"description": "snowflake",
549+
"alias": "etp19",
531550
"speed": 100000
532551
},
533552
"PORT_TABLE:Ethernet76": {
534553
"description": "snowflake",
554+
"alias": "etp20",
535555
"speed": 100000
536556
},
537557
"PORT_TABLE:Ethernet80": {
538558
"description": "snowflake",
559+
"alias": "etp21",
539560
"speed": 100000
540561
},
541562
"PORT_TABLE:Ethernet84": {
542563
"description": "snowflake",
564+
"alias": "etp22",
543565
"speed": 100000
544566
},
545567
"PORT_TABLE:Ethernet88": {
546568
"description": "snowflake",
569+
"alias": "etp23",
547570
"speed": 100000
548571
},
549572
"PORT_TABLE:Ethernet92": {
550573
"description": "snowflake",
574+
"alias": "etp24",
551575
"speed": 100000
552576
},
553577
"PORT_TABLE:Ethernet96": {
554578
"description": "snowflake",
579+
"alias": "etp25",
555580
"speed": 100000
556581
},
557582
"PORT_TABLE:Ethernet100": {
558583
"description": "snowflake",
584+
"alias": "etp26",
559585
"speed": 100000
560586
},
561587
"PORT_TABLE:Ethernet104": {
562588
"description": "snowflake",
589+
"alias": "etp27",
563590
"speed": 100000
564591
},
565592
"PORT_TABLE:Ethernet108": {
566593
"description": "snowflake",
594+
"alias": "etp28",
567595
"speed": 100000
568596
},
569597
"PORT_TABLE:Ethernet112": {
570598
"description": "snowflake",
599+
"alias": "etp29",
571600
"speed": 100000
572601
},
573602
"PORT_TABLE:Ethernet116": {
574-
"speed": 1000
603+
"speed": 1000,
604+
"alias": "etp30"
575605
},
576606
"PORT_TABLE:Ethernet120": {
577-
"description": "snowflake"
578-
},
579-
"PORT_TABLE:Ethernet124": {
580-
"description": "snowflake",
581-
"speed": 100000
582-
},
583-
"PORT_TABLE:Ethernet0": {
584-
"description": "snowflake",
585-
"speed": 100000
586-
},
587-
"PORT_TABLE:Ethernet4": {
588-
"description": "snowflake",
589-
"speed": 100000
590-
},
591-
"PORT_TABLE:Ethernet8": {
592-
"description": "snowflake",
593-
"speed": 100000
594-
},
595-
"PORT_TABLE:Ethernet12": {
596-
"description": "snowflake",
597-
"speed": 100000
598-
},
599-
"PORT_TABLE:Ethernet16": {
600-
"description": "snowflake",
601-
"speed": 100000
602-
},
603-
"PORT_TABLE:Ethernet20": {
604-
"description": "snowflake",
605-
"speed": 100000
606-
},
607-
"PORT_TABLE:Ethernet24": {
608-
"description": "snowflake",
609-
"speed": 100000
610-
},
611-
"PORT_TABLE:Ethernet28": {
612-
"description": "snowflake",
613-
"speed": 100000
614-
},
615-
"PORT_TABLE:Ethernet32": {
616-
"description": "snowflake",
617-
"speed": 100000
618-
},
619-
"PORT_TABLE:Ethernet36": {
620-
"description": "snowflake",
621-
"speed": 100000
622-
},
623-
"PORT_TABLE:Ethernet40": {
624-
"description": "snowflake",
625-
"speed": 100000
626-
},
627-
"PORT_TABLE:Ethernet44": {
628-
"description": "snowflake",
629-
"speed": 100000
630-
},
631-
"PORT_TABLE:Ethernet48": {
632-
"description": "snowflake",
633-
"speed": 100000
634-
},
635-
"PORT_TABLE:Ethernet52": {
636-
"description": "snowflake",
637-
"speed": 100000
638-
},
639-
"PORT_TABLE:Ethernet56": {
640607
"description": "snowflake",
641-
"speed": 100000
642-
},
643-
"PORT_TABLE:Ethernet60": {
644-
"description": "snowflake",
645-
"speed": 100000
646-
},
647-
"PORT_TABLE:Ethernet64": {
648-
"description": "snowflake",
649-
"speed": 100000
650-
},
651-
"PORT_TABLE:Ethernet68": {
652-
"description": "snowflake",
653-
"speed": 100000
654-
},
655-
"PORT_TABLE:Ethernet72": {
656-
"description": "snowflake",
657-
"speed": 100000
658-
},
659-
"PORT_TABLE:Ethernet76": {
660-
"description": "snowflake",
661-
"speed": 100000
662-
},
663-
"PORT_TABLE:Ethernet80": {
664-
"description": "snowflake",
665-
"speed": 100000
666-
},
667-
"PORT_TABLE:Ethernet84": {
668-
"description": "snowflake",
669-
"speed": 100000
670-
},
671-
"PORT_TABLE:Ethernet88": {
672-
"description": "snowflake",
673-
"speed": 100000
674-
},
675-
"PORT_TABLE:Ethernet92": {
676-
"description": "snowflake",
677-
"speed": 100000
678-
},
679-
"PORT_TABLE:Ethernet96": {
680-
"description": "snowflake",
681-
"speed": 100000
682-
},
683-
"PORT_TABLE:Ethernet100": {
684-
"description": "snowflake",
685-
"speed": 100000
686-
},
687-
"PORT_TABLE:Ethernet104": {
688-
"description": "snowflake",
689-
"speed": 100000
690-
},
691-
"PORT_TABLE:Ethernet108": {
692-
"description": "snowflake",
693-
"speed": 100000
694-
},
695-
"PORT_TABLE:Ethernet112": {
696-
"description": "snowflake",
697-
"speed": 100000
698-
},
699-
"PORT_TABLE:Ethernet116": {
700-
"speed": 1000
701-
},
702-
"PORT_TABLE:Ethernet120": {
703-
"description": "snowflake"
608+
"alias": "et31"
704609
},
705610
"PORT_TABLE:Ethernet124": {
706611
"description": "snowflake",
612+
"alias": "etp32",
707613
"speed": 100000
708614
},
709615
"ROUTE_TABLE:0.0.0.0/0": {

‎tests/test_lldp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_ipv6_rem_man_addr(self):
133133
def test_local_port_identification(self):
134134
mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 3, 7, 1, 3)]
135135
ret = mib_entry(sub_id=(1,))
136-
self.assertEquals(ret, b'Ethernet0')
136+
self.assertEquals(ret, b'etp1')
137137
print(ret)
138138

139139
def test_local_port_num(self):
@@ -154,7 +154,7 @@ def test_getnextpdu_local_port_identification(self):
154154
response = get_pdu.make_response(self.lut)
155155
value0 = response.values[0]
156156
self.assertEqual(value0.type_, ValueType.OCTET_STRING)
157-
self.assertEqual(str(value0.data), "Ethernet0")
157+
self.assertEqual(str(value0.data), "etp1")
158158

159159
def test_lab_breaks(self):
160160
break1 = b'\x01\x06\x10\x00\x00\x00\x00q\x00\x01\xd1\x02\x00\x01\xd1\x03\x00\x00\x00P\t\x00\x01\x00\x00' \

0 commit comments

Comments
 (0)