Skip to content

PVSTP feature implementation#305

Merged
lguohan merged 7 commits intosonic-net:masterfrom
ph408077:stp_pr
Nov 22, 2019
Merged

PVSTP feature implementation#305
lguohan merged 7 commits intosonic-net:masterfrom
ph408077:stp_pr

Conversation

@ph408077
Copy link
Contributor

@ph408077 ph408077 commented Sep 17, 2019

PVSTP feature implementation

lguohan
lguohan reviewed Oct 25, 2019
View reviewed changes
lguohan
lguohan reviewed Oct 25, 2019
View reviewed changes
common/schema.h Outdated
#define CFG_STP_GLOBAL_TABLE_NAME "STP"
#define CFG_STP_VLAN_TABLE_NAME "STP_VLAN"
#define CFG_STP_VLAN_INTF_TABLE_NAME "STP_VLAN_INTF"
#define CFG_STP_INTF_TABLE_NAME "STP_INTF"
Copy link
Contributor

@lguohan lguohan Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

Copy link
Contributor Author

@ph408077 ph408077 Nov 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we prefer not to change these table names

lguohan
lguohan reviewed Oct 25, 2019
View reviewed changes
lguohan
lguohan reviewed Oct 25, 2019
View reviewed changes
lguohan
lguohan requested changes Oct 25, 2019
View reviewed changes
Copy link
Contributor

@lguohan lguohan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as comments

prsunny
prsunny reviewed Nov 14, 2019
View reviewed changes
@lguohan
Copy link
Contributor

lguohan commented Nov 22, 2019

retest this please

@ph408077
Copy link
Contributor Author

ph408077 commented Nov 22, 2019

Verified STP on VS. Logs below:

VS1:
root@sonic:/home/admin# show spanning_tree
Spanning-tree Mode: PVST

VLAN 100 - STP instance 0

STP Bridge Parameters:
Bridge           Bridge Bridge Bridge Hold  LastTopology Topology
Identifier       MaxAge Hello  FwdDly Time  Change       Change
hex              sec    sec    sec    sec   sec          cnt
8064525400123457 20     2      15     1     18           2

RootBridge       RootPath  DesignatedBridge  RootPort           Max Hel Fwd
Identifier       Cost      Identifier                           Age lo  Dly
hex                        hex                                  sec sec sec
8064525400123456 500       8064525400123456  Ethernet0          20  2   15

STP Port Parameters:
Port             Prio Path      Port Uplink State         Designated  Designated       Designated
Name             rity Cost      Fast Fast                 Cost        Root             Bridge
Ethernet0        128  500       N    N      FORWARDING    0           8064525400123456 8064525400123456
Ethernet4        128  500       N    N      BLOCKING      0           8064525400123456 8064525400123456
root@sonic:/home/admin#

VS2:
root@sonic:/home/admin# show spanning_tree
Spanning-tree Mode: PVST

VLAN 100 - STP instance 0

STP Bridge Parameters:
Bridge           Bridge Bridge Bridge Hold  LastTopology Topology
Identifier       MaxAge Hello  FwdDly Time  Change       Change
hex              sec    sec    sec    sec   sec          cnt
8064525400123456 20     2      15     1     1            6

RootBridge       RootPath  DesignatedBridge  RootPort           Max Hel Fwd
Identifier       Cost      Identifier                           Age lo  Dly
hex                        hex                                  sec sec sec
8064525400123456 0         8064525400123456  Root               20  2   15

STP Port Parameters:
Port             Prio Path      Port Uplink State         Designated  Designated       Designated
Name             rity Cost      Fast Fast                 Cost        Root             Bridge
Ethernet0        128  500       N    N      FORWARDING    0           8064525400123456 8064525400123456
Ethernet4        128  500       N    N      FORWARDING    0           8064525400123456 8064525400123456
root@sonic:/home/admin#

Also verified same on BRCM:

root@sonic:/home/admin# config vlan add 100
root@sonic:/home/admin# config vlan member add 100 Ethernet49
root@sonic:/home/admin# config vlan member add 100 Ethernet48
root@sonic:/home/admin#
root@sonic:/home/admin# config spanning_tree enable pvst
root@sonic:/home/admin#
root@sonic:/home/admin# show spanning_tree vlan 100
Spanning-tree Mode: PVST

VLAN 100 - STP instance 0

STP Bridge Parameters:
Bridge           Bridge Bridge Bridge Hold  LastTopology Topology
Identifier       MaxAge Hello  FwdDly Time  Change       Change
hex              sec    sec    sec    sec   sec          cnt
80643c2c992d8235 20     2      15     1     7            3

RootBridge       RootPath  DesignatedBridge  RootPort           Max Hel Fwd
Identifier       Cost      Identifier                           Age lo  Dly
hex                        hex                                  sec sec sec
80643c2c992d8235 0         80643c2c992d8235  Root               20  2   15

STP Port Parameters:
Port             Prio Path      Port Uplink State         Designated  Designated       Designated
Name             rity Cost      Fast Fast                 Cost        Root             Bridge
Ethernet48       128  800       N    N      FORWARDING    0           80643c2c992d8235 80643c2c992d8235
Ethernet49       128  800       N    N      FORWARDING    0           80643c2c992d8235 80643c2c992d8235
root@sonic:/home/admin#
root@sonic:/home/admin# show spanning_tree statistics
VLAN 100 - STP instance 0

PortNum          BPDU Tx        BPDU Rx        TCN Tx         TCN Rx
Ethernet49       24             1              0              0
Ethernet48       24             1              0              1
root@sonic:/home/admin#
root@sonic:/home/admin# show runningconfiguration spanning_tree
"STP":
{
    "GLOBAL": {
        "forward_delay": "15",
        "hello_time": "2",
        "max_age": "20",
        "mode": "pvst",
        "priority": "32768",
        "rootguard_timeout": "30"
    }
}
"STP_PORT":
{
    "Ethernet48": {
        "bpdu_guard": "true",
        "bpdu_guard_do_disable": "false",
        "enabled": "true",
        "portfast": "true",
        "root_guard": "false",
        "uplink_fast": "false"
    },
    "Ethernet49": {
        "bpdu_guard": "false",
        "bpdu_guard_do_disable": "false",
        "enabled": "true",
        "portfast": "true",
        "root_guard": "false",
        "uplink_fast": "false"
    }
}
"STP_VLAN":
{
    "Vlan100": {
        "enabled": "true",
        "forward_delay": "15",
        "hello_time": "2",
        "max_age": "20",
        "priority": "32768"
    }
}
root@sonic:/home/admin#

@lguohan lguohan merged commit 95057b1 into sonic-net:master Nov 22, 2019
@chenkelly chenkelly mentioned this pull request Nov 26, 2019
Merged
prgeor pushed a commit to prgeor/sonic-swss-common that referenced this pull request Feb 27, 2025
@keboliu
[CMIS] 'get_transceiver_info' should return 'None' when CMIS cable EE…
75c055e 
…PROM is not ready (sonic-net#305)

* get_transceiver_info should return None when cmis cable eeprom is not ready

Signed-off-by: Kebo Liu <[email protected]>

* Add more comments to describe the change

Signed-off-by: Kebo Liu <[email protected]>

Signed-off-by: Kebo Liu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lguohan lguohan lguohan approved these changes

@prsunny prsunny prsunny approved these changes

+1 more reviewer

@mhampasagar mhampasagar mhampasagar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ph408077 @lguohan @prsunny @mhampasagar