Layer 2 Forwarding Enhancements

clear/main.py

@@ -401,8 +401,6 @@ def clear_all_fdb():
     command = 'fdbclear'
     run_command(command)
 
-# 'sonic-clear fdb port' and 'sonic-clear fdb vlan' will be added later
-'''
 @fdb.command('port')
 @click.argument('portid', required=True)
 def clear_port_fdb(portid):
@@ -416,7 +414,6 @@ def clear_vlan_fdb(vlanid):
     """Clear FDB entries learned in one VLAN"""
     command = 'fdbclear' + ' -v ' + vlanid
     run_command(command)
-'''
 
 #
 # 'line' command

config/main.py

@@ -5,6 +5,7 @@
 import json
 import jsonpatch
 import netaddr
+import time
 import netifaces
 import os
 import re
@@ -16,6 +17,10 @@
 from collections import OrderedDict
 from generic_config_updater.generic_updater import GenericUpdater, ConfigFormat
 from minigraph import parse_device_desc_xml
+from itertools import count, groupby
+from utilities_common.intf_filter import parse_interface_in_filter
+from portconfig import get_child_ports
+from sonic_py_common import device_info
 from natsort import natsorted
 from portconfig import get_child_ports
 from socket import AF_INET, AF_INET6
@@ -319,6 +324,15 @@ def interface_name_is_valid(config_db, interface_name):
                     return True
     return False
 
+def vlan_id_is_valid(vid):
+    """Check if the vlan id is in acceptable range (between 1 and 4094)
+    """
+
+    if vid>0 and vid<4095:
+        return True
+
+    return False
+
 def interface_name_to_alias(config_db, interface_name):
     """Return alias interface name if default name is given as argument
     """
@@ -2534,6 +2548,111 @@ def delete_snmptrap_server(ctx, ver):
     cmd="systemctl restart snmp"
     os.system (cmd)
 
+# Validate VLAN range.
+#
+def vlan_range_validate(ctx, vid1, vid2):
+    vlan1 = 'Vlan{}'.format(vid1)
+    vlan2 = 'Vlan{}'.format(vid2)
+
+    if vlan_id_is_valid(vid1) is False:
+        ctx.fail("{} is not within allowed range of 1 through 4094".format(vlan1))
+    if vlan_id_is_valid(vid2) is False:
+        ctx.fail("{} is not within allowed range of 1 through 4094".format(vlan2))
+
+    if vid2 <= vid1:
+        ctx.fail(" vid2 should be greater than vid1")
+
+#
+# Return a string with ranges separated by hyphen.
+#
+def get_hyphenated_string(vlan_list):
+    vlan_list.sort()
+    G = (list(x) for _,x in groupby(vlan_list, lambda x,c=count(): next(c)-x))
+    hyphenated_string = ",".join("-".join(map(str,(g[0],g[-1])[:len(g)])) for g in G)
+    return hyphenated_string
+
+#
+# 'mac' group ('config mac ...')
+#
+@config.group()
+@click.pass_context
+@click.option('-s', '--redis-unix-socket-path', help='unix socket path for redis connection')
+def mac(ctx, redis_unix_socket_path):
+    """Mac-related configuration tasks"""
+    kwargs = {}
+    if redis_unix_socket_path:
+        kwargs['unix_socket_path'] = redis_unix_socket_path
+    config_db = ConfigDBConnector(**kwargs)
+    config_db.connect(wait_for_init=False)
+    ctx.obj = {'db': config_db}
+
+@mac.command('aging_time')
+@click.argument('interval', metavar='<aging interval in sec [0-1000000], 0 to disable aging>', required=True, type=int)
+@clicommon.pass_db
+def set_aging_time(db, interval):
+    if interval not in range(0,1000001):
+        ctx.fail("Aging timer must be in range [0-1000000]")
+    db.cfgdb.set_entry('SWITCH', 'switch', {'fdb_aging_time': interval})
+
+def mac_address_is_valid(mac):
+    """Check if the mac address is valid
+    """
+    return bool(re.match('^' + '[\:\-]'.join(['([0-9a-f]{2})']*6) + '$', mac.lower()))
+
+@mac.command('add')
+@click.argument('mac', metavar='<mac-address as xx:xx:xx:xx:xx:xx>', required=True)
+@click.argument('vlan', metavar='<vlan>', required=True, type=int)
+@click.argument('interface_name', metavar='<interface name>', required=True)
+@clicommon.pass_db
+def add_mac(db, mac, vlan, interface_name):
+    mac_valid = bool(mac_address_is_valid(mac))
+    if mac_valid == False:
+        click.echo("Incorrect mac-address format!!")
+
+    mac_valid = not bool(re.match('^' + '[\:\-]'.join(['([00]{2})']*6) + '$', mac.lower()))
+    if mac_valid == False:
+        click.echo("Invalid (Zero) mac-address!!")
+
+    mac_valid = not bool(re.match('^' + '[\:\-]'.join(['([ff]{2})']*6) + '$', mac.lower()))
+    if mac_valid == False:
+        click.echo("Invalid (Bcast) mac-address!!")
+
+    mac_is_multicast = int(mac[:2]) & 1;
+    if mac_is_multicast == True:
+        click.echo("Invalid (Multicast) mac-address!!")
+
+    vlan_valid = bool(vlan_id_is_valid(vlan))
+    if vlan_valid == False:
+        click.echo("Invalid VlanId!!")
+
+    vlan_name = 'Vlan{}'.format(vlan)
+
+    if clicommon.get_interface_naming_mode() == "alias":
+        interface_name = interface_alias_to_name(db.cfgdb, interface_name)
+        if interface_name is None:
+            click.echo("'interface_name' is None!")
+
+    if interface_name_is_valid(db.cfgdb, interface_name) is False:
+        click.echo("Interface name is invalid!!")
+
+    db.cfgdb.set_entry('FDB', (vlan_name, mac), {'port': interface_name })
+
+@mac.command('del')
+@click.argument('mac', metavar='<mac-address as xx:xx:xx:xx:xx:xx>', required=True)
+@click.argument('vlan', metavar='<vlan>', required=True, type=int)
+@clicommon.pass_db
+def del_mac(db, mac, vlan):
+    mac_valid = bool(mac_address_is_valid(mac))
+    if mac_valid == False:
+        click.echo("Incorrect mac-address format!!")
+
+    vlan_valid = bool(vlan_id_is_valid(vlan))
+    if vlan_valid == False:
+        click.echo("Invalid VlanId!!")
+
+    vlan_name = 'Vlan{}'.format(vlan)
+
+    db.cfgdb.set_entry('FDB', (vlan_name, mac), None)
 
 
 #