Merge branch 'master' into route-flow-counter

Author: Junchao-Mellanox

.azure-pipelines/build-docker-sonic-vs-template.yml

@@ -125,19 +125,3 @@ stages:
     - publish: '$(System.DefaultWorkingDirectory)/dist/'
       artifact: wheels
       displayName: "Publish Python wheels"
-
-- stage: BuildDocker
-  dependsOn: Build
-  condition: succeeded('Build')
-  jobs:
-  - template: .azure-pipelines/build-docker-sonic-vs-template.yml
-    parameters:
-      artifact_name: docker-sonic-vs
-
-- stage: Test
-  dependsOn: BuildDocker
-  condition: succeeded('BuildDocker')
-  jobs:
-  - template: .azure-pipelines/test-docker-sonic-vs-template.yml
-    parameters:
-      log_artifact_name: log

.azure-pipelines/test-docker-sonic-vs-template.yml

@@ -10,6 +10,7 @@
 from flow_counter_util.route import exit_if_route_flow_counter_not_support
 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
 
 
@@ -475,14 +476,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()

azure-pipelines.yml

@@ -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:

clear/main.py

@@ -636,21 +636,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']
 
@@ -1025,6 +1027,19 @@ def validate_ipv4_address(ctx, param, ip_addr):
     except ValueError as e:
         raise click.UsageError(str(e))
 
+def validate_gre_type(ctx, _, value):
+    """A validator for validating input gre_type
+    """
+    try:
+        base = 10
+        if value.lower().startswith('0x'):
+            base = 16
+        gre_type_value = int(value, base)
+        if gre_type_value < GRE_TYPE_RANGE.min or gre_type_value > GRE_TYPE_RANGE.max:
+            raise click.UsageError("{} is not a valid GRE type".format(value))
+        return gre_type_value
+    except ValueError:
+        raise click.UsageError("{} is not a valid GRE type".format(value))
 
 # This is our main entrypoint - the main 'config' command
 @click.group(cls=clicommon.AbbreviationGroup, context_settings=CONTEXT_SETTINGS)
@@ -1792,11 +1807,11 @@ def add_portchannel_member(ctx, portchannel_name, port_name):
         ctx.fail("{} is not present.".format(portchannel_name))
 
     # Dont allow a port to be member of port channel if it is configured with an IP address
-    for key in db.get_table('INTERFACE').keys():
-        if type(key) != tuple:
+    for key,value in db.get_table('INTERFACE').items():
+        if type(key) == tuple:
             continue
-        if key[0] == port_name:
-            ctx.fail(" {} has ip address {} configured".format(port_name, key[1]))
+        if key == port_name:
+            ctx.fail(" {} has ip address configured".format(port_name))
             return
 
     # Dont allow a port to be member of port channel if it is configured as a VLAN member
@@ -1895,7 +1910,7 @@ def mirror_session():
 @click.argument('dst_ip', metavar='<dst_ip>', callback=validate_ipv4_address, required=True)
 @click.argument('dscp', metavar='<dscp>', type=DSCP_RANGE, required=True)
 @click.argument('ttl', metavar='<ttl>', type=TTL_RANGE, required=True)
-@click.argument('gre_type', metavar='[gre_type]', type=GRE_TYPE_RANGE, required=False)
+@click.argument('gre_type', metavar='[gre_type]', callback=validate_gre_type, required=False)
 @click.argument('queue', metavar='[queue]', type=QUEUE_RANGE, required=False)
 @click.option('--policer')
 def add(session_name, src_ip, dst_ip, dscp, ttl, gre_type, queue, policer):
@@ -1919,7 +1934,7 @@ def erspan(ctx):
 @click.argument('dst_ip', metavar='<dst_ip>', callback=validate_ipv4_address,required=True)
 @click.argument('dscp', metavar='<dscp>', type=DSCP_RANGE, required=True)
 @click.argument('ttl', metavar='<ttl>', type=TTL_RANGE, required=True)
-@click.argument('gre_type', metavar='[gre_type]', type=GRE_TYPE_RANGE, required=False)
+@click.argument('gre_type', metavar='[gre_type]', callback=validate_gre_type, required=False)
 @click.argument('queue', metavar='[queue]', type=QUEUE_RANGE, required=False)
 @click.argument('src_port', metavar='[src_port]', required=False)
 @click.argument('direction', metavar='[direction]', required=False)

config/config_mgmt.py

@@ -85,7 +85,7 @@ def is_ipv4_addr_valid(addr):
 
 
 def check_if_interface_is_valid(db, interface_name):
-    from main import interface_name_is_valid
+    from .main import interface_name_is_valid
     if interface_name_is_valid(db,interface_name) is False:
         ctx.fail("Interface name is invalid. Please enter a valid interface name!!")