Skip to content

Commit db13a08

Browse files
vdahiya12vdahiya12
committed
fix some logging
Signed-off-by: vaibhav-dahiya <[email protected]>
1 parent 52ad70d commit db13a08

File tree

1 file changed

+30
-22
lines changed

1 file changed

+30
-22
lines changed

‎sonic-xcvrd/xcvrd/xcvrd_utilities/y_cable_helper.py

+30-22
Original file line numberDiff line numberDiff line change
@@ -289,17 +289,19 @@ def update_appdb_port_mux_cable_response_table(logical_port_name, asic_index, ap
289289
if y_cable_wrapper_get_presence(physical_port):
290290

291291
port_instance = y_cable_port_instances.get(physical_port)
292-
if port_instance is None:
292+
if port_instance is None or port_instance == -1:
293+
status = 'unknown'
294+
update_table_mux_status_for_response_tbl(y_cable_response_tbl[asic_index], status, logical_port_name)
293295
helper_logger.log_error(
294-
"Error: Could not get port instance for read side for Y cable port {}".format(logical_port_name))
296+
"Error: Could not get port instance to perform update appdb for read side for Y cable port {}".format(logical_port_name))
295297
return
296298

297299
if read_side is None:
298300

299301
status = 'unknown'
300302
update_table_mux_status_for_response_tbl(y_cable_response_tbl[asic_index], status, logical_port_name)
301303
helper_logger.log_warning(
302-
"Error: Could not get read side for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
304+
"Error: Could not get read side to perform update appdb for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
303305
return
304306

305307
active_side = None
@@ -311,7 +313,7 @@ def update_appdb_port_mux_cable_response_table(logical_port_name, asic_index, ap
311313
status = 'unknown'
312314
update_table_mux_status_for_response_tbl(y_cable_response_tbl[asic_index], status, logical_port_name)
313315
helper_logger.log_warning(
314-
"Error: Could not get active side for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
316+
"Error: Could not get active side to perform update appdb for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
315317
return
316318

317319
if read_side == active_side and (active_side == 1 or active_side == 2):
@@ -321,7 +323,7 @@ def update_appdb_port_mux_cable_response_table(logical_port_name, asic_index, ap
321323
else:
322324
status = 'unknown'
323325
helper_logger.log_warning(
324-
"Error: Could not get state for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
326+
"Error: Could not get state to perform update appdb for mux cable port probe command logical port {} and physical port {}".format(logical_port_name, physical_port))
325327

326328
helper_logger.log_debug("Y_CABLE_DEBUG: notifying a probe for port status {} {}".format(logical_port_name, status))
327329

@@ -357,9 +359,9 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
357359
if y_cable_wrapper_get_presence(physical_port):
358360

359361
port_instance = y_cable_port_instances.get(physical_port)
360-
if port_instance is None:
362+
if port_instance is None or port_instance == -1:
361363
helper_logger.log_error(
362-
"Error: Could not get port instance for read side for Y cable port {}".format(logical_port_name))
364+
"Error: Could not get port instance to perform read_y_cable update state db for read side for Y cable port {}".format(logical_port_name))
363365
return
364366

365367
with y_cable_port_locks[physical_port]:
@@ -370,7 +372,7 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
370372
update_table_mux_status_for_statedb_port_tbl(
371373
mux_config_tbl, "unknown", read_side, active_side, logical_port_name)
372374
helper_logger.log_error(
373-
"Error: Could not establish the read side for Y cable port {}".format(logical_port_name))
375+
"Error: Could not establish the read side for Y cable port {} to perform read_y_cable update state db".format(logical_port_name))
374376
return
375377

376378
with y_cable_port_locks[physical_port]:
@@ -381,7 +383,7 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
381383
update_table_mux_status_for_statedb_port_tbl(
382384
mux_config_tbl, "unknown", read_side, active_side, logical_port_name)
383385
helper_logger.log_error(
384-
"Error: Could not establish the active side for Y cable port {}".format(logical_port_name))
386+
"Error: Could not establish the active side for Y cable port {} to perform read_y_cable update state db".format(logical_port_name))
385387
return
386388

387389
if read_side == active_side and (active_side == 1 or active_side == 2):
@@ -391,7 +393,7 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
391393
else:
392394
status = 'unknown'
393395
helper_logger.log_warning(
394-
"Error: Could not establish the active status for Y cable port {}".format(logical_port_name))
396+
"Error: Could not establish the active status for Y cable port {} to perform read_y_cable update state db".format(logical_port_name))
395397

396398
update_table_mux_status_for_statedb_port_tbl(
397399
mux_config_tbl, status, read_side, active_side, logical_port_name)
@@ -402,7 +404,7 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
402404
update_table_mux_status_for_statedb_port_tbl(
403405
mux_config_tbl, "unknown", read_side, active_side, logical_port_name)
404406
helper_logger.log_warning(
405-
"Error: Could not establish presence for Y cable port {}".format(logical_port_name))
407+
"Error: Could not establish presence for Y cable port {} to perform read_y_cable update state db".format(logical_port_name))
406408
else:
407409
# Y cable ports should always have
408410
# one to one mapping of physical-to-logical
@@ -411,7 +413,7 @@ def read_y_cable_and_update_statedb_port_tbl(logical_port_name, mux_config_tbl):
411413
update_table_mux_status_for_statedb_port_tbl(
412414
mux_config_tbl, "unknown", read_side, active_side, logical_port_name)
413415
helper_logger.log_warning(
414-
"Error: Retreived multiple ports for a Y cable port {}".format(logical_port_name))
416+
"Error: Retreived multiple ports for a Y cable port {} to perform read_y_cable update state db".format(logical_port_name))
415417

416418

417419
def check_identifier_presence_and_update_mux_table_entry(state_db, port_tbl, y_cable_tbl, static_tbl, mux_tbl, asic_index, logical_port_name, y_cable_presence):
@@ -421,7 +423,7 @@ def check_identifier_presence_and_update_mux_table_entry(state_db, port_tbl, y_c
421423
(status, fvs) = port_tbl[asic_index].get(logical_port_name)
422424
if status is False:
423425
helper_logger.log_warning(
424-
"Could not retreive fieldvalue pairs for {}, inside config_db".format(logical_port_name))
426+
"Could not retreive fieldvalue pairs for {}, inside config_db table {}".format(logical_port_name), port_tbl[asic_index].getTableName())
425427
return
426428

427429
else:
@@ -528,6 +530,9 @@ def check_identifier_presence_and_update_mux_table_entry(state_db, port_tbl, y_c
528530
logical_port_name, mux_tbl[asic_index])
529531
post_port_mux_static_info_to_db(
530532
logical_port_name, static_tbl[asic_index])
533+
else:
534+
helper_logger.log_warning(
535+
"Error: Could not get transceiver info dict Y cable port {} while inserting entries".format(logical_port_name))
531536
else:
532537
helper_logger.log_warning(
533538
"Error: Could not establish transceiver presence for a Y cable port {} while inserting entries".format(logical_port_name))
@@ -537,6 +542,9 @@ def check_identifier_presence_and_update_mux_table_entry(state_db, port_tbl, y_c
537542
else:
538543
helper_logger.log_warning(
539544
"Could not retreive active or auto value for state kvp for {}, inside MUX_CABLE table".format(logical_port_name))
545+
else:
546+
helper_logger.log_warning(
547+
"Could not retreive state value inside mux_info_dict for {}, inside MUX_CABLE table".format(logical_port_name))
540548

541549

542550
def check_identifier_presence_and_delete_mux_table_entry(state_db, port_tbl, asic_index, logical_port_name, y_cable_presence, delete_change_event):
@@ -551,7 +559,7 @@ def check_identifier_presence_and_delete_mux_table_entry(state_db, port_tbl, asi
551559
(status, fvs) = port_tbl[asic_index].get(logical_port_name)
552560
if status is False:
553561
helper_logger.log_warning(
554-
"Could not retreive fieldvalue pairs for {}, inside config_db".format(logical_port_name))
562+
"Could not retreive fieldvalue pairs for {}, inside config_db table {}".format(logical_port_name, port_tbl[asic_index].getTableName()))
555563
return
556564

557565
else:
@@ -598,7 +606,7 @@ def init_ports_status_for_y_cable(platform_sfp, platform_chassis, y_cable_presen
598606
y_cable_platform_sfputil = platform_sfp
599607
y_cable_platform_chassis = platform_chassis
600608

601-
fvs_updated = swsscommon.FieldValuePairs([('log_verbosity', 'debug')])
609+
fvs_updated = swsscommon.FieldValuePairs([('log_verbosity', 'notice')])
602610
# Get the namespaces in the platform
603611
namespaces = multi_asic.get_front_end_namespaces()
604612
for namespace in namespaces:
@@ -631,7 +639,7 @@ def init_ports_status_for_y_cable(platform_sfp, platform_chassis, y_cable_presen
631639
# logical_ports after loading the port_mappings from port_config_file
632640
# This should not happen
633641
helper_logger.log_warning(
634-
"Could not retreive port inside config_db PORT table {}".format(logical_port_name))
642+
"Could not retreive port inside config_db PORT table {} for Y-Cable initiation".format(logical_port_name))
635643

636644

637645
def change_ports_status_for_y_cable_change_event(port_dict, y_cable_presence, stop_event=threading.Event()):
@@ -758,12 +766,12 @@ def check_identifier_presence_and_update_mux_info_entry(state_db, mux_tbl, asic_
758766
for namespace in namespaces:
759767
asic_id = multi_asic.get_asic_index_from_namespace(namespace)
760768
config_db[asic_id] = daemon_base.db_connect("CONFIG_DB", namespace)
761-
port_tbl[asic_id] = swsscommon.Table(config_db[asic_id], "PORT")
769+
port_tbl[asic_id] = swsscommon.Table(config_db[asic_id], "MUX_CABLE")
762770

763771
(status, fvs) = port_tbl[asic_index].get(logical_port_name)
764772

765773
if status is False:
766-
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside config_db".format(logical_port_name))
774+
helper_logger.log_debug("Could not retreive fieldvalue pairs for {}, inside config_db table {}".format(logical_port_name, port_tbl[asic_index].getTableName()))
767775
return
768776

769777
else:
@@ -831,7 +839,7 @@ def get_muxcable_info(physical_port, logical_port_name):
831839

832840
(status, fvs) = y_cable_tbl[asic_index].get(logical_port_name)
833841
if status is False:
834-
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside state_db table {}".format(logical_port_name, y_cable_tbl[asic_index]))
842+
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside state_db table {}".format(logical_port_name, y_cable_tbl[asic_index].getTableName()))
835843
return -1
836844

837845
mux_port_dict = dict(fvs)
@@ -1019,7 +1027,7 @@ def get_muxcable_static_info(physical_port, logical_port_name):
10191027
(status, fvs) = y_cable_tbl[asic_index].get(logical_port_name)
10201028
if status is False:
10211029
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside state_db table {}".format(
1022-
logical_port_name, y_cable_tbl[asic_index]))
1030+
logical_port_name, y_cable_tbl[asic_index].getTableName()))
10231031
return -1
10241032
mux_port_dict = dict(fvs)
10251033
read_side = int(mux_port_dict.get("read_side"))
@@ -1358,7 +1366,7 @@ def task_worker(self):
13581366
(status, fvs) = y_cable_tbl[asic_index].get(port)
13591367
if status is False:
13601368
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside state_db table {}".format(
1361-
port, y_cable_tbl[asic_index]))
1369+
port, y_cable_tbl[asic_index].getTableName()))
13621370
continue
13631371
mux_port_dict = dict(fvs)
13641372
old_status = mux_port_dict.get("state")
@@ -1408,7 +1416,7 @@ def task_worker(self):
14081416
(status, fv) = y_cable_tbl[asic_index].get(port_m)
14091417
if status is False:
14101418
helper_logger.log_warning("Could not retreive fieldvalue pairs for {}, inside state_db table {}".format(
1411-
port_m, y_cable_tbl[asic_index]))
1419+
port_m, y_cable_tbl[asic_index].getTableName()))
14121420
continue
14131421
mux_port_dict = dict(fv)
14141422
read_side = mux_port_dict.get("read_side")

0 commit comments

Comments
 (0)