Static Lag support changes in sonic-utilities

config/main.py

@@ -2051,8 +2051,11 @@ def portchannel(db, ctx, namespace):
 @click.option('--fast-rate', default='false',
               type=click.Choice(['true', 'false'],
                                 case_sensitive=False))
+@click.option('--static', default='false',
+              type=click.Choice(['true', 'false'],
+                                case_sensitive=False))
 @click.pass_context
-def add_portchannel(ctx, portchannel_name, min_links, fallback, fast_rate):
+def add_portchannel(ctx, portchannel_name, min_links, fallback, fast_rate, static):
     """Add port channel"""
 
     fvs = {
@@ -2066,6 +2069,8 @@ def add_portchannel(ctx, portchannel_name, min_links, fallback, fast_rate):
         fvs['min_links'] = str(min_links)
     if fallback != 'false':
         fvs['fallback'] = 'true'
+    if static != 'false':
+        fvs['static'] = 'true'
 
     db = ValidatedConfigDBConnector(ctx.obj['db'])
     if ADHOC_VALIDATION:

show/interfaces/portchannel.py

@@ -107,8 +107,12 @@ def get_teamshow_result(self):
                 self.summary[team_id]['ports'] = ''
                 continue
             state = self.teamsraw[team_id]
-            info['protocol'] = "LACP"
-            info['protocol'] += "(A)" if state['runner.active'] == "true" else '(I)'
+            if state['setup.runner_name'] == "lacp":
+                info['protocol'] = "LACP"
+                info['protocol'] += "(A)" if state['runner.active'] == "true" else '(I)'
+            else:
+                info['protocol'] = "NONE"
+                info['protocol'] += "(A)"
 
             portchannel_status = self.get_portchannel_status(team)
             if portchannel_status is None:
@@ -129,7 +133,9 @@ def get_teamshow_result(self):
                 for port in ports:
                     status = self.get_portchannel_member_status(team, port)
                     pstate = self.db.get_all(self.db.STATE_DB, PORT_CHANNEL_MEMBER_STATE_TABLE_PREFIX+team+'|'+port)
-                    selected = True if pstate['runner.aggregator.selected'] == "true" else False
+                    selected = True if pstate['link.up'] == "true" else False
+                    if state['setup.runner_name'] == "lacp":
+                        selected = True if pstate['runner.aggregator.selected'] == "true" else False
                     if clicommon.get_interface_naming_mode() == "alias":
                         alias = clicommon.InterfaceAliasConverter().name_to_alias(port)
                         info["ports"] += alias + "("

tests/dump_input/portchannel/state_db.json

@@ -1,5 +1,6 @@
 {
     "LAG_TABLE|PortChannel001":{
+        "setup.runner_name": "lacp",
         "runner.active": "true",
         "runner.fallback": "false",
         "runner.fast_rate": "false",
@@ -10,6 +11,7 @@
         "team_device.ifinfo.ifindex": "137"
     },
     "LAG_TABLE|PortChannel002":{
+        "setup.runner_name": "lacp",
         "runner.active": "true",
         "runner.fallback": "false",
         "runner.fast_rate": "false",

tests/interfaces_test.py

@@ -128,6 +128,7 @@
  0002  PortChannel0002  LACP(A)(Up)  Ethernet116(S)
  0003  PortChannel0003  LACP(A)(Up)  Ethernet120(S)
  0004  PortChannel0004  LACP(A)(Up)  N/A
+ 0100  PortChannel0100  NONE(A)(Up)  N/A
  1001  PortChannel1001  N/A
 """
 
@@ -140,6 +141,7 @@
  0002  PortChannel0002  LACP(A)(Up)  etp30(S)
  0003  PortChannel0003  LACP(A)(Up)  etp31(S)
  0004  PortChannel0004  LACP(A)(Up)  N/A
+ 0100  PortChannel0100  NONE(A)(Up)  N/A
  1001  PortChannel1001  N/A
 """
 

tests/ipv6_link_local_test.py

@@ -84,6 +84,8 @@
 +------------------+----------+
 | PortChannel0004  | Disabled |
 +------------------+----------+
+| PortChannel0100  | Disabled |
++------------------+----------+
 | Vlan1000         | Disabled |
 +------------------+----------+
 | Vlan2000         | Disabled |

tests/mock_tables/appl_db.json

@@ -278,6 +278,12 @@
         "tpid": "0x88A8",
         "oper_status": "up"
     },
+    "LAG_TABLE:PortChannel0100": {
+        "admin_status": "up",
+        "mtu": "9100",
+        "tpid": "0x88A8",
+        "oper_status": "up"
+    },
     "SWITCH_TABLE:switch": {
         "vxlan_port": "13550"
     },

tests/mock_tables/asic0/state_db.json

@@ -132,6 +132,7 @@
         "ifinfo.ifindex": "100"
     },
     "LAG_TABLE|PortChannel0001": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "71",
@@ -142,6 +143,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0002": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "72",
@@ -152,6 +154,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0003": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "73",
@@ -162,6 +165,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0004": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "74",
@@ -171,6 +175,14 @@
         "setup.kernel_team_mode_name": "loadbalance",
         "runner.active": "true"
     },
+    "LAG_TABLE|PortChannel0100": {
+        "setup.runner_name": "loadbalance",
+        "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
+        "team_device.ifinfo.ifindex": "74",
+        "setup.pid": "56",
+        "state": "ok",
+        "setup.kernel_team_mode_name": "loadbalance"
+    },
     "FAN_INFO|fan1": {
         "drawer_name": "drawer1",
         "presence": "True",

tests/mock_tables/asic1/state_db.json

@@ -132,6 +132,7 @@
         "ifinfo.ifindex": "100"
     },
     "LAG_TABLE|PortChannel0001": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "71",
@@ -142,6 +143,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0002": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "72",
@@ -152,6 +154,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0003": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "73",
@@ -162,6 +165,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0004": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "74",
@@ -171,6 +175,14 @@
         "setup.kernel_team_mode_name": "loadbalance",
         "runner.active": "true"
     },
+    "LAG_TABLE|PortChannel0100": {
+        "setup.runner_name": "loadbalance",
+        "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
+        "team_device.ifinfo.ifindex": "74",
+        "setup.pid": "56",
+        "state": "ok",
+        "setup.kernel_team_mode_name": "loadbalance"
+    },
     "FAN_INFO|fan1": {
         "drawer_name": "drawer1",
         "presence": "True",

tests/mock_tables/asic2/state_db.json

@@ -130,6 +130,7 @@
         "ifinfo.ifindex": "100"
     },
     "LAG_TABLE|PortChannel1015": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "71",
@@ -140,6 +141,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel1016": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "72",
@@ -150,6 +152,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel4011": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "73",
@@ -160,6 +163,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel4012": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "74",

tests/mock_tables/config_db.json

@@ -649,6 +649,13 @@
         "tpid": "0x8100",
         "mtu": "9100"
     },
+    "PORTCHANNEL|PortChannel0100": {
+        "admin_status": "up",
+        "min_links": "1",
+        "tpid": "0x8100",
+        "static": "true",
+        "mtu": "9100"
+    },
     "PORTCHANNEL_MEMBER|PortChannel1001|Ethernet32": {
         "NULL": "NULL"
     },

tests/mock_tables/state_db.json

@@ -487,6 +487,7 @@
         "ifinfo.ifindex": "100"
     },
     "LAG_TABLE|PortChannel0001": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "71",
@@ -497,6 +498,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0002": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "72",
@@ -507,6 +509,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0003": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "73",
@@ -517,6 +520,7 @@
         "runner.active": "true"
     },
     "LAG_TABLE|PortChannel0004": {
+        "setup.runner_name": "lacp",
         "runner.fallback": "false",
         "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
         "team_device.ifinfo.ifindex": "74",
@@ -526,6 +530,14 @@
         "setup.kernel_team_mode_name": "loadbalance",
         "runner.active": "true"
     },
+    "LAG_TABLE|PortChannel0100": {
+        "setup.runner_name": "loadbalance",
+        "team_device.ifinfo.dev_addr": "52:54:00:f2:e1:23",
+        "team_device.ifinfo.ifindex": "74",
+        "setup.pid": "56",
+        "state": "ok",
+        "setup.kernel_team_mode_name": "loadbalance"
+    },
     "FAN_INFO|fan1": {
         "drawer_name": "drawer1",
         "presence": "True",

tests/mock_tables/t1/state_db.json

@@ -1177,6 +1177,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1192,6 +1193,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1207,6 +1209,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1222,6 +1225,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1237,6 +1241,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1252,6 +1257,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1267,6 +1273,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 
@@ -1282,6 +1289,7 @@
     "ttl": -0.001, 
     "type": "hash", 
     "value": {
+      "setup.runner_name": "lacp",
       "runner.active": "true", 
       "runner.fallback": "false", 
       "runner.fast_rate": "false", 

tests/portchannel_test.py

@@ -125,6 +125,32 @@ def test_add_portchannel_with_invalid_fast_rate(self, fast_rate):
         assert result.exit_code != 0
         assert 'Invalid value for "--fast-rate"'  in result.output
 
+    @pytest.mark.parametrize("static", ["False", "True", "false", "true"])
+    def test_add_portchannel_with_static_adhoc_validation(self, static):
+        config.ADHOC_VALIDATION = True
+        runner = CliRunner()
+        db = Db()
+        obj = {'db':db.cfgdb}
+
+        # add a portchannel with fats rate
+        result = runner.invoke(config.config.commands["portchannel"].commands["add"], ["PortChannel0101", "--static", static], obj=obj)
+        print(result.exit_code)
+        print(result.output)
+        assert result.exit_code == 0
+
+    @pytest.mark.parametrize("static", ["Fls", "tru"])
+    def test_add_portchannel_with_invalid_static(self, static):
+        runner = CliRunner()
+        db = Db()
+        obj = {'db':db.cfgdb}
+
+        # add a portchannel with invalid fats rate
+        result = runner.invoke(config.config.commands["portchannel"].commands["add"], ["PortChannel0101", "--static", static], obj=obj)
+        print(result.exit_code)
+        print(result.output)
+        assert result.exit_code != 0
+        assert 'Invalid value for "--static"'  in result.output
+
     def test_add_portchannel_member_with_invalid_name(self):
         runner = CliRunner()
         db = Db()