Skip to content

Re-introduce the original everflow PR to support T2 #6958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
judyjoseph wants to merge 3 commits into from
Closed

Re-introduce the original everflow PR to support T2 #6958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c780531
Revert "Revert T2 everflow (#6632)"
judyjoseph Dec 5, 2022
22d87d6
Additional fixes needed to get the PR #6225 pass for T0/T1 and T2 topo
judyjoseph Dec 5, 2022
3f8ac5a
Add/Delete IP address to/from recycle interfaces if they have no address
judyjoseph Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions tests/everflow/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import pytest
import logging


@pytest.fixture(autouse=True, scope="module")
def setup_recycle_port(duthosts, tbinfo):
"""Setup recycle port ip address on t2 topo"""
rec_intf = {}
if "t2" in tbinfo['topo']['name']:
for duthost in duthosts.frontend_nodes:
rec_intf[duthost.hostname] = {}
for asic in duthost.asics:
output = duthost.command("show ip interfaces -n {} -d all".format(asic.namespace))['stdout_lines']
if 'Ethernet-Rec' not in output:
rec_intf[duthost.hostname][asic.namespace] = 1
cmd = "sudo config interface -n {ns} ip add Ethernet-Rec{rec} 1.1.1.{an}/32".format(
ns=asic.namespace,
rec=asic.asic_index,
an=asic.asic_index + 1)
logging.info(cmd)
duthost.command(cmd)
duthost.command("sudo config save -y")
Copy link
Collaborator

@bingwang-ms bingwang-ms Dec 8, 2022

Choose a reason for hiding this comment

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

Is it necessary to do config save?

Copy link
Contributor

@tcusto tcusto Dec 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Now that fixture is module scope it should be safe to remove.

yield
if "t2" in tbinfo['topo']['name']:
for duthost in duthosts.frontend_nodes:
for asic in duthost.asics:
if rec_intf[duthost.hostname][asic.namespace]:
cmd = "sudo config interface -n {ns} ip remove Ethernet-Rec{rec} 1.1.1.{an}/32".format(
ns=asic.namespace,
rec=asic.asic_index,
an=asic.asic_index + 1)
logging.info(cmd)
duthost.command(cmd)
duthost.command("sudo config save -y")
Loading