Merge branch 'master' into front_panel_port_name_regex

Author: itamar-talmon

.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

@@ -1024,6 +1024,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)
@@ -1790,11 +1803,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
@@ -1893,7 +1906,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):
@@ -1917,7 +1930,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)

azure-pipelines.yml

@@ -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!!")