Merge branch 'master' into robust-techsupport

sonic-net · Apr 8, 2022 · 2748ff9 · 2748ff9
2 parents 44f90ca + 52ca324
commit 2748ff9
Show file tree

Hide file tree

Showing 46 changed files with 3,106 additions and 1,270 deletions.
diff --git a/clear/main.py b/clear/main.py
@@ -4,10 +4,10 @@
 import sys
 import click
 import utilities_common.cli as clicommon
-import json
 
 from utilities_common import util_base
 from show.plugins.pbh import read_pbh_counters
+from config.plugins.pbh import serialize_pbh_counters
 from . import plugins
 
 
@@ -473,14 +473,8 @@ def statistics(db):
     pbh_rules = db.cfgdb.get_table("PBH_RULE")
     pbh_counters = read_pbh_counters(pbh_rules)
 
-    try:
-        with open('/tmp/.pbh_counters.txt', 'w') as fp:
-            json.dump(remap_keys(pbh_counters), fp)
-    except IOError as err:
-        pass
+    serialize_pbh_counters(pbh_counters)
 
-def remap_keys(dict):
-    return [{'key': k, 'value': v} for k, v in dict.items()]
 
 # ("sonic-clear flowcnt-trap")
 @cli.command()

diff --git a/config/config_mgmt.py b/config/config_mgmt.py
@@ -872,6 +872,27 @@ def _recurCreateConfig(diff, inp, outp, config):
             # we do not allow updates right now
             if isinstance(diff, list) and isinstance(outp, dict):
                 return changed
+            '''
+            libYang converts ietf yang types to lower case internally, which
+            creates false config diff for us while DPB.
+
+            Example:
+            For DEVICE_METADATA['localhost']['mac'] type is yang:mac-address.
+            Libyang converts from 'XX:XX:XX:E4:B3:DD' -> 'xx:xx:xx:e4:b3:dd'
+            so args for this functions will be:
+
+            diff = DEVICE_METADATA['localhost']['mac']
+            where DEVICE_METADATA': {'localhost': {'mac': ['XX:XX:XX:E4:B3:DD', 'xx:xx:xx:e4:b3:dd']}}}
+            Note: above dict is representation of diff in config given by diffJson
+            library.
+            out = 'XX:XX:XX:e4:b3:dd'
+            inp = 'xx:xx:xx:E4:B3:DD'
+
+            With below check, we will avoid processing of such config diff for DPB.
+            '''
+            if isinstance(diff, list) and isinstance(outp, str) and \
+              inp.lower() == outp.lower():
+                return changed
 
             idx = -1
             for key in diff:

diff --git a/config/main.py b/config/main.py
@@ -635,21 +635,23 @@ def _clear_cbf():
 
 def _clear_qos():
     QOS_TABLE_NAMES = [
+            'PORT_QOS_MAP',
+            'QUEUE',
             'TC_TO_PRIORITY_GROUP_MAP',
             'MAP_PFC_PRIORITY_TO_QUEUE',
             'TC_TO_QUEUE_MAP',
             'DSCP_TO_TC_MAP',
             'MPLS_TC_TO_TC_MAP',
             'SCHEDULER',
             'PFC_PRIORITY_TO_PRIORITY_GROUP_MAP',
-            'PORT_QOS_MAP',
             'WRED_PROFILE',
-            'QUEUE',
             'CABLE_LENGTH',
-            'BUFFER_POOL',
-            'BUFFER_PROFILE',
             'BUFFER_PG',
             'BUFFER_QUEUE',
+            'BUFFER_PORT_INGRESS_PROFILE_LIST',
+            'BUFFER_PORT_EGRESS_PROFILE_LIST',
+            'BUFFER_PROFILE',
+            'BUFFER_POOL',
             'DEFAULT_LOSSLESS_BUFFER_PARAMETER',
             'LOSSLESS_TRAFFIC_PATTERN']