Skip to content

Limit IP addr flushes to global scope IPs #12556

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

Merged
StormLiangMS merged 1 commit into from
May 24, 2024
Merged

Limit IP addr flushes to global scope IPs #12556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ansible/roles/test/files/helpers/remove_ip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ INTF_LIST=$(ls /sys/class/net | grep -E "^eth[0-9]+(\.[0-9]+)?$")

for INTF in ${INTF_LIST}; do
echo "Flush ${INTF} IP address"
ip addr flush dev ${INTF}
ip addr flush dev ${INTF} scope global
done
2 changes: 1 addition & 1 deletion tests/bgp/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def _setup_interfaces_t0_or_mx(mg_facts, peer_count):

finally:
for conn in connections:
ptfhost.shell("ip address flush %s" % conn["neighbor_intf"])
ptfhost.shell("ip address flush %s scope global" % conn["neighbor_intf"])

@contextlib.contextmanager
def _setup_interfaces_t1_or_t2(mg_facts, peer_count):
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/remove_ip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ INTF_LIST=$(ls /sys/class/net | grep -E "^eth[0-9]+(\.[0-9]+)?$")

for INTF in ${INTF_LIST}; do
echo "Flush ${INTF} IP address"
ip addr flush dev ${INTF}
ip addr flush dev ${INTF} scope global
done
4 changes: 2 additions & 2 deletions tests/vrf/test_vrf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,8 +1404,8 @@ def setup_vrf_capacity(self, duthosts, rand_one_dut_hostname, ptfhost, localhost
# -------- Teardown ----------

# remove cfg on ptf
ptfhost.shell("ip address flush dev eth{}".format(ptf_port1))
ptfhost.shell("ip address flush dev eth{}".format(ptf_port2))
ptfhost.shell("ip address flush dev eth{} scope global".format(ptf_port1))
ptfhost.shell("ip address flush dev eth{} scope global".format(ptf_port2))
ptfhost.template(src='vrf/vrf_capacity_del_ptf_cfg.j2',
dest='/tmp/vrf_capacity_del_ptf_cfg.sh', mode="0755")
ptfhost.shell('/tmp/vrf_capacity_del_ptf_cfg.sh')
Expand Down