[sub intf] Validate parent port role #1784

wendani · 2021-06-13T23:24:46Z

Why I did it
Fix #1616

What I did
Check the role of parent port, and drop further processing if the parent port setting does not qualify a valid sub port interface use case. Specifically, we will not instantiate a Port object for sub port, which is the stepping stone for sub port router interface creation, if parent port role check hits the following cases:

parent physical port is a member of vlan, issue reported in [Sub-ports] SONiC allows adding of sub-ports, if parent port of sub-port is added to VLAN #1616

RIF type sub port -- physical port -- Vlan

parent lag is a member of vlan

RIF type sub port -- LAG -- Vlan

parent physical port is a member of lag

RIF type sub port -- physical port -- LAG

How I verified it
New vs test test_sub_port_intf_parent_misconfig, crafted around the steps in #1616

In the case setting above, load sub port interface profile into DB (CONFIG_DB or APPL_DB), and verify that sub port router interface object is not created in ASIC DB.

Before the change, vs test fails.

Details if related
May need a separate PR to prevent the same incorrect config case from getting into Linux kernel.

vs test failure message

parent physical port being a member of vlan

=========================================================================== FAILURES ============================================================================
______________________________________________________ TestSubPortIntf.test_sub_port_intf_parent_misconfig ______________________________________________________

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f9a60159a58>, dvs = <conftest.DockerVirtualSwitch object at 0x7f9a603766a0>

    def test_sub_port_intf_parent_misconfig(self, dvs):
        self.connect_dbs(dvs)
    
        #self._test_sub_port_intf_parent_misconfig(dvs, self.SUB_PORT_INTERFACE_UNDER_TEST, self.LAG_UNDER_TEST)
>       self._test_sub_port_intf_parent_misconfig(dvs, self.SUB_PORT_INTERFACE_UNDER_TEST, self.VLAN_UNDER_TEST)

test_sub_port_intf.py:548: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f9a60159a58>, dvs = <conftest.DockerVirtualSwitch object at 0x7f9a603766a0>
sub_port_intf_name = 'Ethernet64.10', grand_port = 'Vlan1000', vrf_name = None

    def _test_sub_port_intf_parent_misconfig(self, dvs, sub_port_intf_name, grand_port, vrf_name=None):
        substrs = sub_port_intf_name.split(VLAN_SUB_INTERFACE_SEPARATOR)
        parent_port = substrs[0]
    
        vrf_oid = self.default_vrf_oid
        rif_cnt = len(self.get_oids(ASIC_RIF_TABLE))
    
        self.set_parent_port_admin_status(dvs, parent_port, UP)
        if vrf_name:
            self.create_vrf(vrf_name)
            vrf_oid = self.get_newly_created_oid(ASIC_VIRTUAL_ROUTER_TABLE, [vrf_oid])
    
        if grand_port.startswith(LAG_PREFIX):
            assert parent_port.startswith(ETHERNET_PREFIX)
            phy_ports = [parent_port]
            # Create lag
            self.set_parent_port_admin_status(dvs, grand_port, UP)
            # Add parent physical port to lag
            self.add_lag_members(grand_port, phy_ports)
            self.asic_db.wait_for_n_keys(ASIC_LAG_MEMBER_TABLE, 1)
        else:
            assert grand_port.startswith(VLAN_PREFIX)
            # Create vlan
            vlan_cnt = len(self.asic_db.get_keys(ASIC_VLAN_TABLE))
            vlan_id = int(grand_port[len(VLAN_PREFIX):])
            dvs.create_vlan("{}".format(vlan_id))
            vlan_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_TABLE, vlan_cnt)
            # Add parent port to vlan
            vlan_member_cnt = len(self.asic_db.get_keys(ASIC_VLAN_MEMBER_TABLE))
            dvs.create_vlan_member("{}".format(vlan_id), parent_port)
            vlan_member_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_MEMBER_TABLE, vlan_member_cnt)
    
        # Test injecting sub port interface profile directly to APPL_DB
        self.create_sub_port_intf_profile_appl_db(sub_port_intf_name, UP, vrf_name)
        time.sleep(2)
        # Verify no sub port router interface created in ASIC_DB
>       assert rif_cnt == len(self.get_oids(ASIC_RIF_TABLE))
E       assert 1 == 2
E         +1
E         -2

test_sub_port_intf.py:502: AssertionError
==================================================================== short test summary info ====================================================================
FAILED test_sub_port_intf.py::TestSubPortIntf::test_sub_port_intf_parent_misconfig - assert 1 == 2
================================================================= 1 failed in 67.07s (0:01:07) ==================================================================

parent lag being a member of vlan

=========================================================================== FAILURES ============================================================================
______________________________________________________ TestSubPortIntf.test_sub_port_intf_parent_misconfig ______________________________________________________

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f04dd480828>, dvs = <conftest.DockerVirtualSwitch object at 0x7f04dd65a080>

    def test_sub_port_intf_parent_misconfig(self, dvs):
        self.connect_dbs(dvs)
    
        #self._test_sub_port_intf_parent_misconfig(dvs, self.SUB_PORT_INTERFACE_UNDER_TEST, self.LAG_UNDER_TEST)
        #self._test_sub_port_intf_parent_misconfig(dvs, self.SUB_PORT_INTERFACE_UNDER_TEST, self.VLAN_UNDER_TEST)
>       self._test_sub_port_intf_parent_misconfig(dvs, self.LAG_SUB_PORT_INTERFACE_UNDER_TEST, self.VLAN_UNDER_TEST)

test_sub_port_intf.py:549: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f04dd480828>, dvs = <conftest.DockerVirtualSwitch object at 0x7f04dd65a080>
sub_port_intf_name = 'PortChannel1.20', grand_port = 'Vlan1000', vrf_name = None

    def _test_sub_port_intf_parent_misconfig(self, dvs, sub_port_intf_name, grand_port, vrf_name=None):
        substrs = sub_port_intf_name.split(VLAN_SUB_INTERFACE_SEPARATOR)
        parent_port = substrs[0]
    
        vrf_oid = self.default_vrf_oid
        rif_cnt = len(self.get_oids(ASIC_RIF_TABLE))
    
        self.set_parent_port_admin_status(dvs, parent_port, UP)
        if vrf_name:
            self.create_vrf(vrf_name)
            vrf_oid = self.get_newly_created_oid(ASIC_VIRTUAL_ROUTER_TABLE, [vrf_oid])
    
        if grand_port.startswith(LAG_PREFIX):
            assert parent_port.startswith(ETHERNET_PREFIX)
            phy_ports = [parent_port]
            # Create lag
            self.set_parent_port_admin_status(dvs, grand_port, UP)
            # Add parent physical port to lag
            self.add_lag_members(grand_port, phy_ports)
            self.asic_db.wait_for_n_keys(ASIC_LAG_MEMBER_TABLE, 1)
        else:
            assert grand_port.startswith(VLAN_PREFIX)
            # Create vlan
            vlan_cnt = len(self.asic_db.get_keys(ASIC_VLAN_TABLE))
            vlan_id = int(grand_port[len(VLAN_PREFIX):])
            dvs.create_vlan("{}".format(vlan_id))
            vlan_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_TABLE, vlan_cnt)
            # Add parent port to vlan
            vlan_member_cnt = len(self.asic_db.get_keys(ASIC_VLAN_MEMBER_TABLE))
            dvs.create_vlan_member("{}".format(vlan_id), parent_port)
            vlan_member_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_MEMBER_TABLE, vlan_member_cnt)
    
        # Test injecting sub port interface profile directly to APPL_DB
        self.create_sub_port_intf_profile_appl_db(sub_port_intf_name, UP, vrf_name)
        time.sleep(2)
        # Verify no sub port router interface created in ASIC_DB
>       assert rif_cnt == len(self.get_oids(ASIC_RIF_TABLE))
E       assert 1 == 2
E         +1
E         -2

test_sub_port_intf.py:502: AssertionError
==================================================================== short test summary info ====================================================================
FAILED test_sub_port_intf.py::TestSubPortIntf::test_sub_port_intf_parent_misconfig - assert 1 == 2
================================================================= 1 failed in 65.57s (0:01:05) ==================================================================

parent physical port being a member of lag

=========================================================================== FAILURES ============================================================================
______________________________________________________ TestSubPortIntf.test_sub_port_intf_parent_misconfig ______________________________________________________

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f6ae7335cc0>, dvs = <conftest.DockerVirtualSwitch object at 0x7f6ae731ed30>

    def test_sub_port_intf_parent_misconfig(self, dvs):
        self.connect_dbs(dvs)
    
>       self._test_sub_port_intf_parent_misconfig(dvs, self.SUB_PORT_INTERFACE_UNDER_TEST, self.LAG_UNDER_TEST)

test_sub_port_intf.py:547: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <test_sub_port_intf.TestSubPortIntf object at 0x7f6ae7335cc0>, dvs = <conftest.DockerVirtualSwitch object at 0x7f6ae731ed30>
sub_port_intf_name = 'Ethernet64.10', grand_port = 'PortChannel1', vrf_name = None

    def _test_sub_port_intf_parent_misconfig(self, dvs, sub_port_intf_name, grand_port, vrf_name=None):
        substrs = sub_port_intf_name.split(VLAN_SUB_INTERFACE_SEPARATOR)
        parent_port = substrs[0]
    
        vrf_oid = self.default_vrf_oid
        rif_cnt = len(self.get_oids(ASIC_RIF_TABLE))
    
        self.set_parent_port_admin_status(dvs, parent_port, UP)
        if vrf_name:
            self.create_vrf(vrf_name)
            vrf_oid = self.get_newly_created_oid(ASIC_VIRTUAL_ROUTER_TABLE, [vrf_oid])
    
        if grand_port.startswith(LAG_PREFIX):
            assert parent_port.startswith(ETHERNET_PREFIX)
            phy_ports = [parent_port]
            # Create lag
            self.set_parent_port_admin_status(dvs, grand_port, UP)
            # Add parent physical port to lag
            self.add_lag_members(grand_port, phy_ports)
            self.asic_db.wait_for_n_keys(ASIC_LAG_MEMBER_TABLE, 1)
        else:
            assert grand_port.startswith(VLAN_PREFIX)
            # Create vlan
            vlan_cnt = len(self.asic_db.get_keys(ASIC_VLAN_TABLE))
            vlan_id = int(grand_port[len(VLAN_PREFIX):])
            dvs.create_vlan("{}".format(vlan_id))
            vlan_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_TABLE, vlan_cnt)
            # Add parent port to vlan
            vlan_member_cnt = len(self.asic_db.get_keys(ASIC_VLAN_MEMBER_TABLE))
            dvs.create_vlan_member("{}".format(vlan_id), parent_port)
            vlan_member_cnt += 1
            self.asic_db.wait_for_n_keys(ASIC_VLAN_MEMBER_TABLE, vlan_member_cnt)
    
        # Test injecting sub port interface profile directly to APPL_DB
        self.create_sub_port_intf_profile_appl_db(sub_port_intf_name, UP, vrf_name)
        time.sleep(2)
        # Verify no sub port router interface created in ASIC_DB
>       assert rif_cnt == len(self.get_oids(ASIC_RIF_TABLE))
E       assert 1 == 2
E         +1
E         -2

test_sub_port_intf.py:502: AssertionError
==================================================================== short test summary info ====================================================================
FAILED test_sub_port_intf.py::TestSubPortIntf::test_sub_port_intf_parent_misconfig - assert 1 == 2
================================================================= 1 failed in 66.89s (0:01:06) ==================================================================

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

…ic-net#1784) Fixes sonic-net/sonic-buildimage#8323 and added unit tests for all ecn queue configs. This regression was caused because the current ecn unit tests didn't cover the queue configs. Signed-off-by: Neetha John <nejo@microsoft.com> How to verify it Ran tests/ecn_test.py and all cases passed

wendani added 9 commits June 10, 2021 02:35

Check the role of parent physical port or LAG

e76b94b

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Update check condition and comment

2115b79

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Update comment

75557e8

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Test parent port misconfig: member of lag

29817c6

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Test parent port misconfig: member of vlan

79be1b0

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Merge remote-tracking branch 'public/master' into sub_intf_create_check

50a6b27

Adjust log level

c15b33b

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Test parent lag port misconfig: member of vlan

4165966

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Clean up parent lag

7bd14d6

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

wendani changed the title ~~[sub intf] Check parent port role~~ [sub intf] Validate parent port role Jun 14, 2021

Merge remote-tracking branch 'public/master' into sub_intf_create_check

2363ee5

prsunny requested a review from neethajohn June 14, 2021 16:09

Merge remote-tracking branch 'public/master' into sub_intf_create_check

cd889e2

wendani requested a review from prsunny as a code owner July 3, 2021 18:26

wendani added 4 commits July 6, 2021 17:35

Merge remote-tracking branch 'public/master' into sub_intf_create_check

5d09489

Merge remote-tracking branch 'public/master' into sub_intf_create_check

440f276

Fix space in syslog message

d08b330

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>

Merge remote-tracking branch 'public/master' into sub_intf_create_check

9f2b206

wendani mentioned this pull request Aug 21, 2021

sub_port_interfaces/test_sub_port_interfaces.py fails on T1-64-lag profile sonic-net/sonic-mgmt#4104

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sub intf] Validate parent port role #1784

[sub intf] Validate parent port role #1784

wendani commented Jun 13, 2021 •

edited

Loading

[sub intf] Validate parent port role #1784

Are you sure you want to change the base?

[sub intf] Validate parent port role #1784

Conversation

wendani commented Jun 13, 2021 • edited Loading

vs test failure message

parent physical port being a member of vlan

parent lag being a member of vlan

parent physical port being a member of lag

wendani commented Jun 13, 2021 •

edited

Loading