[pfcwd] use Ethernet0 mac as router mac. by stepanblyschak · Pull Request #2529 · sonic-net/sonic-mgmt

stepanblyschak · 2020-11-13T16:28:07Z

Some platforms do not use management port mac
as router mac, instead they use mac from different
source. This change uses Ethernet0 mac address as
router mac which should work for all platforms.

Signed-off-by: Stepan Blyschak [email protected]

Description of PR

Summary:
Fixes # (issue)

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Some platforms do not use management port mac as router mac, instead they use mac from different source. This change uses Ethernet0 mac address as router mac which should work for all platforms. Signed-off-by: Stepan Blyschak <[email protected]>

stepanblyschak · 2020-11-16T11:22:20Z

retest this please

yxieca · 2020-11-17T23:37:48Z

tests/pfcwd/test_pfcwd_function.py

             logger.info("--- Testing various Pfcwd actions on {} ---".format(port))
             self.setup_test_params(port, setup_info['vlan'], init=not idx)
-             self.traffic_inst = SendVerifyTraffic(self.ptf, dut_facts['ansible_eth0']['macaddress'], self.pfc_wd)
+             self.traffic_inst = SendVerifyTraffic(self.ptf, dut_facts['ansible_Ethernet0']['macaddress'], self.pfc_wd)


Not all platform HWSKU has Ethernet0 enabled. This is another loophole. We might want to read the config_db to get the mac address instead.

Agree, config_db is better. I fixed this PR but apparently it is the same problem in a lot of tests

Please, take a look at #2552 which does similar change for all the pytest tests that are using ansible_Ethernet0

Signed-off-by: Stepan Blyshchak <[email protected]>

tests/pfcwd/test_pfcwd_function.py

Signed-off-by: Stepan Blyschak <[email protected]>

wangxin · 2020-11-26T00:41:54Z

retest vsimage please

sonic-net#13202 advance sonic-utilities submodule for 202211 branch 34428157 - (HEAD, origin/202211) Revert "Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change sonic-net#2504)" (6 days ago) [stormliang] c3bd01f6 - Revert "[generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P sonic-net#2512)" (6 days ago) [stormliang] 5a326d8b - [Mellanox] Change severity to NOTICE in Mellanox buffer migrator when unable to fetch DEVICE_METADATA due to empty CONFIG_DB during initialization ([warm boot] cherry-pick PR sonic-net#2538 and advance related sub-modules in 201811 branch sonic-net#2569) (2 weeks ago) [Stephen Sun] 50b36ef3 - Fix issue: unconfigured PGs are displayed in watermarkstat ([docker-lldp]: fix several issues in lldpd docker sonic-net#2556) (2 weeks ago) [Stephen Sun] a9fd2a79 - [Command Ref] Add doc for syslog rate limit ([sub module] move sairedis and swss to 201811 branch sonic-net#2508) (2 weeks ago) [Junchao-Mellanox] 80546ff3 - [generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P sonic-net#2512) (2 weeks ago) [Vadym Hlushko] 6649ca8a - [timer.unit.j2] use wanted-by in timer unit ([201803] [services] Restart SwSS service upon unexpected critical process exit sonic-net#2546) (2 weeks ago) [Stepan Blyshchak] dd23d0ef - Fixes [Sub-If|VRF] Unbind sub-interface from VRF is failed sonic-net#12170: Delete subinterface and recreate the subinterface in ([VLAN] "show mac" doesn't work when interface added to vlan as tagged member sonic-net#2513) (2 weeks ago) [Preetham] 236749d3 - [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (DellEMC S6000 xcvrd support sonic-net#2560) (2 weeks ago) [Vaibhav Hemant Dixit] 5762d814 - Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change sonic-net#2504) (2 weeks ago) [Vadym Hlushko] d3c3e368 - [muxcable][show] update show mux tunnel-route to separate ASIC and kernel into two columns (build errors on branch 201811 for centec platform sonic-net#2553) (2 weeks ago) [Jing Zhang] c98648a1 - [show]Fix show route return code on error (Dell SMF driver hwmon number reorder fix for Dell S6100/Z9100 sonic-net#2542) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam] 01374673 - [route_check]: Ignore ASIC only SOC IPs (Added new SN3700/SN3700C Mellanox platforms sonic-net#2548) (2 weeks ago) [Lawrence Lee] d2967805 - YANG Validation for ConfigDB Updates: WARM_RESTART, SFLOW_SESSION, SFLOW, VXLAN_TUNNEL, VXLAN_EVPN_NVO, VXLAN_TUNNEL_MAP, MGMT_VRF_CONFIG, CABLE_LENGTH, VRF tables ([submodule 201811] advance sairedis and swss submodule for 201811 branch sonic-net#2526) (2 weeks ago) [isabelmsft] 88b01ffd - [db_migrator] Remove import of swsssdk as it is not supported in master ([build]: apply proxy setting to curl. sonic-net#2544) (2 weeks ago) [Vaibhav Hemant Dixit] 4ae970c6 - Support syslog rate limit configuration for containers and host (Move FRR from 4.0 to 6.0.2 and make new frr version and pkg compile sonic-net#2454) (2 weeks ago) [Junchao-Mellanox] 608ed147 - [generate_dump] [Mellanox] Fix the duplicate dfw dump collection problem by adding symlinks ('show vlan config' is not displaying the VLAN members, after the clear config and reload with default l2 configuration. sonic-net#2536) (2 weeks ago) [Vivek] bdc2599f - [config] Add check in config interface ip command to block if the interface is portchannel member ([sub module] advance sonic-swss sub module sonic-net#2539) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam] cff4fed5 - [system-health] Improve code structure of system health CLIs ([sub-module] advance sonic-swss sub-module sonic-net#2453) (2 weeks ago) [Junchao-Mellanox] 488e5714 - Transceiver eeprom dom CLI modification to show output from TRANSCEIVER_DOM_THRESHOLD table (Fix for KeyError: 'DEVICE_NEIGHBOR' when executing 'show interfaces neighbor expected' command sonic-net#2535) (2 weeks ago) [mihirpat1] 07ca5def - sonic-utilities: Update config reload() to verify formatting of an input file ([ntp]: Do not disable reader for error ENOBUFS sonic-net#2529) (2 weeks ago) [Caitlin Choate] f0f083a2 - [GCU] Add RemoveCreateOnlyDependency Validator/Generator (Enabling Fast-reboot command in s6100 loaded with T0 topo getting Failed unmounting /host error sonic-net#2500) (2 weeks ago) [jingwenxie] eca0253c - [QoS] Introduce delay to the qos reload flow (Config reload/load_minigraph not clearing State DB sonic-net#2503) (2 weeks ago) [DavidZagury] 35158ee0 - Use github code scanning instead of LGTM ([sub module] sub module sonic-swss-common tracking 201811 branch sonic-net#2530) (2 weeks ago) [Liu Shilong] 682b5cee - Change show kube command default value of insecure key to True ([submodule] update sonic-snmpagent sonic-net#2517) (2 weeks ago) [lixiaoyuner] ce19e631 - Add db_migrator_constants.py script to setup.py (Add device data for Arista 7060PX/DX4-32 sonic-net#2534) (2 weeks ago) [Vaibhav Hemant Dixit] 0d0c2693 - [drop counters] Fix CLI script for unconfigured PGs ([config] Do not fail for minigraphs which do not have neighbors listed in <Devices> section sonic-net#2518) (2 weeks ago) [Lior Avramov] 2c69d0fd - Update vrf add, del commands for duplicate/non-existing VRFs (solve package build dependency issue sonic-net#2467) (2 weeks ago) [Muhammad Danish] efc09280 - Port 202012 DB migration changes to newer branches ([vs]: Force10-S6000 buffer settings for virtual switch sonic-net#2515) (2 weeks ago) [Vaibhav Hemant Dixit] 70a15aaa - [VXLAN]Fixing traceback in show remotemac when mac moves during command execution ([build] When generating image version, handle case where current commit has no reachable tags sonic-net#2506) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]

advance sonic-utilities 4bd35e62 - Revert "sonic-utilities: Update config reload() to verify formatting of an input file (sonic-net#2529)" (sonic-net#2595) (23 hours ago) [ganglv]

[pfcwd] use Ethernet0 mac as router mac.

e1b2478

Some platforms do not use management port mac as router mac, instead they use mac from different source. This change uses Ethernet0 mac address as router mac which should work for all platforms. Signed-off-by: Stepan Blyschak <[email protected]>

volodymyrsamotiy approved these changes Nov 13, 2020

View reviewed changes

neethajohn approved these changes Nov 16, 2020

View reviewed changes

yxieca reviewed Nov 17, 2020

View reviewed changes

use router mac from config db instead of ansible_Ethernet0 mac

4e7cd77

Signed-off-by: Stepan Blyshchak <[email protected]>

wangxin requested changes Nov 25, 2020

View reviewed changes

tests/pfcwd/test_pfcwd_function.py Outdated Show resolved Hide resolved

fix Ethernet0_mac -> router_mac

5d25f2a

Signed-off-by: Stepan Blyschak <[email protected]>

wangxin approved these changes Nov 26, 2020

View reviewed changes

wangxin merged commit 7534e77 into sonic-net:master Nov 26, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[pfcwd] use Ethernet0 mac as router mac.#2529

[pfcwd] use Ethernet0 mac as router mac.#2529
wangxin merged 3 commits intosonic-net:masterfrom
stepanblyschak:pfcwd_use_Ethernet0

stepanblyschak commented Nov 13, 2020 •

edited

Loading

Uh oh!

stepanblyschak commented Nov 16, 2020

Uh oh!

yxieca Nov 17, 2020

Uh oh!

stepanblyschak Nov 19, 2020

Uh oh!

stepanblyschak Nov 19, 2020

Uh oh!

Uh oh!

wangxin commented Nov 26, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

stepanblyschak commented Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Uh oh!

stepanblyschak commented Nov 16, 2020

Uh oh!

yxieca Nov 17, 2020

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Nov 19, 2020

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Nov 19, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

wangxin commented Nov 26, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

stepanblyschak commented Nov 13, 2020 •

edited

Loading