Created vdm_utilities and db_utilities folder

Author: mihirpat1

sonic-xcvrd/tests/test_xcvrd.py

@@ -7,7 +7,7 @@
 from xcvrd.xcvrd import *
 from xcvrd.sff_mgr import *
 from xcvrd.xcvrd_utilities.xcvr_table_helper import *
-from xcvrd.dom.dom_utilities.common_db_utils import DBUtils
+from xcvrd.dom.dom_utilities.db_utilities.common_db_utils import DBUtils
 import pytest
 import copy
 import os
@@ -2889,7 +2889,6 @@ def test_beautify_info_dict(self):
             'eSNR' : '1.1',
         }
 
-        from xcvrd.dom.dom_utilities.common_db_utils import DBUtils
         db_utils = DBUtils(helper_logger)
         db_utils.beautify_info_dict(dom_info_dict)
         assert dom_info_dict == expected_dom_info_dict

sonic-xcvrd/xcvrd/dom/dom_mgr.py

@@ -20,9 +20,9 @@
     from xcvrd.xcvrd_utilities import sfp_status_helper
     from xcvrd.xcvrd_utilities.xcvr_table_helper import *
     from xcvrd.xcvrd_utilities import port_event_helper
-    from xcvrd.dom.dom_utilities.common_db_utils import DBUtils
-    from xcvrd.dom.dom_utilities.vdm_utils import VDMUtils
-    from xcvrd.dom.dom_utilities.vdm_db_utils import VDMDBUtils
+    from xcvrd.dom.dom_utilities.db_utilities.common_db_utils import DBUtils
+    from xcvrd.dom.dom_utilities.vdm_utilities.vdm_utils import VDMUtils
+    from xcvrd.dom.dom_utilities.vdm_utilities.vdm_db_utils import VDMDBUtils
 except ImportError as e:
     raise ImportError(str(e) + " - required module not found in dom_mgr.py")
 

sonic-xcvrd/xcvrd/dom/dom_utilities/common_db_utils.py renamed to sonic-xcvrd/xcvrd/dom/dom_utilities/db_utilities/common_db_utils.py

@@ -1,25 +1,23 @@
 import datetime
-
 from xcvrd.xcvrd_utilities.xcvrd_utils import XCVRDUtils
 from xcvrd.xcvrd_utilities.xcvr_table_helper import VDM_THRESHOLD_TYPES
-from xcvrd.dom.dom_utilities.common_db_utils import DBUtils
-from xcvrd.dom.dom_utilities.vdm_utils import VDMUtils
-
+from xcvrd.dom.dom_utilities.db_utilities.common_db_utils import DBUtils
+from xcvrd.dom.dom_utilities.vdm_utilities.vdm_utils import VDMUtils
 from swsscommon import swsscommon
 
-class VDMDBUtils:
+class VDMDBUtils(DBUtils):
     """
     This class provides utility functions for managing
     DB operations related to VDM on transceivers.
     """
     def __init__(self, sfp_obj_dict, port_mapping, xcvr_table_helper, task_stopping_event, helper_logger):
+        super().__init__(helper_logger)
         self.sfp_obj_dict = sfp_obj_dict
         self.port_mapping = port_mapping
         self.task_stopping_event = task_stopping_event
         self.xcvr_table_helper = xcvr_table_helper
         self.xcvrd_utils = XCVRDUtils(sfp_obj_dict, helper_logger)
         self.vdm_utils = VDMUtils(sfp_obj_dict, helper_logger)
-        self.db_utils = DBUtils(helper_logger)
         self.helper_logger = helper_logger
 
     def post_port_diagnostic_values_to_db(self, logical_port_name, table, get_values_func, db_cache=None):
@@ -29,13 +27,13 @@ def post_port_diagnostic_values_to_db(self, logical_port_name, table, get_values
         pport_list = self.port_mapping.get_logical_to_physical(logical_port_name)
         if not pport_list:
             self.helper_logger.log_error(f"Post port diagnostic values to db failed for {logical_port_name} "
-                           "as no physical port found")
+                                         "as no physical port found")
             return
         physical_port = pport_list[0]
 
         if physical_port not in self.sfp_obj_dict:
             self.helper_logger.log_error(f"Post port diagnostic values to db failed for {logical_port_name} "
-                           "as no sfp object found")
+                                         "as no sfp object found")
             return
 
         if not self.xcvrd_utils.get_transceiver_presence(physical_port):
@@ -53,7 +51,7 @@ def post_port_diagnostic_values_to_db(self, logical_port_name, table, get_values
             if diagnostic_values_dict is not None:
                 if not diagnostic_values_dict:
                     return
-                self.db_utils.beautify_info_dict(diagnostic_values_dict)
+                self.beautify_info_dict(diagnostic_values_dict)
                 fvs = swsscommon.FieldValuePairs([(k, v) for k, v in diagnostic_values_dict.items()])
                 table.set(logical_port_name, fvs)
             else:
@@ -120,13 +118,13 @@ def _post_port_vdm_thresholds_or_flags_to_db(self, logical_port_name, get_vdm_ta
                             # for the flags
                             if flag_data:
                                 asic_id = self.port_mapping.get_asic_id_for_logical_port(logical_port_name)
-                                self.db_utils.update_flag_metadata_tables(logical_port_name, new_key, value,
-                                                                    vdm_values_dict_update_time,
-                                                                    self.xcvr_table_helper.get_vdm_flag_tbl(asic_id, threshold_type),
-                                                                    self.xcvr_table_helper.get_vdm_flag_change_count_tbl(asic_id, threshold_type),
-                                                                    self.xcvr_table_helper.get_vdm_flag_set_time_tbl(asic_id, threshold_type),
-                                                                    self.xcvr_table_helper.get_vdm_flag_clear_time_tbl(asic_id, threshold_type),
-                                                                    f"VDM {threshold_type}")
+                                self.update_flag_metadata_tables(logical_port_name, new_key, value,
+                                                                 vdm_values_dict_update_time,
+                                                                 self.xcvr_table_helper.get_vdm_flag_tbl(asic_id, threshold_type),
+                                                                 self.xcvr_table_helper.get_vdm_flag_change_count_tbl(asic_id, threshold_type),
+                                                                 self.xcvr_table_helper.get_vdm_flag_set_time_tbl(asic_id, threshold_type),
+                                                                 self.xcvr_table_helper.get_vdm_flag_clear_time_tbl(asic_id, threshold_type),
+                                                                 f"VDM {threshold_type}")
 
                 if db_cache is not None:
                     # If cache is enabled, put vdm values to cache
@@ -136,7 +134,7 @@ def _post_port_vdm_thresholds_or_flags_to_db(self, logical_port_name, get_vdm_ta
 
             for threshold_type, threshold_value_dict in vdm_threshold_type_value_dict.items():
                 if threshold_value_dict:
-                    self.db_utils.beautify_info_dict(threshold_value_dict)
+                    self.beautify_info_dict(threshold_value_dict)
                     fvs = swsscommon.FieldValuePairs([(k, v) for k, v in threshold_value_dict.items()])
                     table = get_vdm_table_func(self.port_mapping.get_asic_id_for_logical_port(logical_port_name), threshold_type)
                     table.set(logical_port_name, fvs)

sonic-xcvrd/xcvrd/dom/dom_utilities/vdm_db_utils.py renamed to sonic-xcvrd/xcvrd/dom/dom_utilities/vdm_utilities/vdm_db_utils.py

@@ -34,7 +34,7 @@
     from .xcvrd_utilities.port_event_helper import PortChangeObserver
     from .xcvrd_utilities import media_settings_parser
     from .xcvrd_utilities import optics_si_parser
-    from xcvrd.dom.dom_utilities.vdm_db_utils import VDMDBUtils
+    from xcvrd.dom.dom_utilities.vdm_utilities.vdm_db_utils import VDMDBUtils
 
     from sonic_platform_base.sonic_xcvr.api.public.c_cmis import CmisApi