Skip to content

[sFlow] Fix sFlow CLI cannot use parameter "all" to disable sFlow on all interfaces. #1749

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
wants to merge 2 commits into from
Closed

[sFlow] Fix sFlow CLI cannot use parameter "all" to disable sFlow on all interfaces. #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c921b5e
Fix sFlow CLI command cannot use parameter "all" to disable sFlow on …
steven-guo-ec Aug 9, 2021
d08f3f7
Fix sflow test case.
steven-guo-ec Aug 9, 2021
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: 21 additions & 13 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4436,16 +4436,20 @@ def interface(ctx):
def enable(ctx, ifname):
config_db = ctx.obj['db']
if not interface_name_is_valid(config_db, ifname) and ifname != 'all':
click.echo("Invalid interface name")
return
ctx.fail("Invalid interface name")

intf_dict = config_db.get_table('SFLOW_SESSION')

if intf_dict and ifname in intf_dict:
intf_dict[ifname]['admin_state'] = 'up'
config_db.mod_entry('SFLOW_SESSION', ifname, intf_dict[ifname])
if ifname == 'all':
port_dict = config_db.get_table('PORT')
for port in port_dict.keys():
config_db.mod_entry('SFLOW_SESSION', port, {'admin_state': 'up'})
else:
config_db.mod_entry('SFLOW_SESSION', ifname, {'admin_state': 'up'})
if intf_dict and ifname in intf_dict:
intf_dict[ifname]['admin_state'] = 'up'
config_db.mod_entry('SFLOW_SESSION', ifname, intf_dict[ifname])
else:
config_db.mod_entry('SFLOW_SESSION', ifname, {'admin_state': 'up'})

#
# 'sflow' command ('config sflow interface disable ...')
Expand All @@ -4456,17 +4460,21 @@ def enable(ctx, ifname):
def disable(ctx, ifname):
config_db = ctx.obj['db']
if not interface_name_is_valid(config_db, ifname) and ifname != 'all':
click.echo("Invalid interface name")
return
ctx.fail("Invalid interface name")

intf_dict = config_db.get_table('SFLOW_SESSION')

if intf_dict and ifname in intf_dict:
intf_dict[ifname]['admin_state'] = 'down'
config_db.mod_entry('SFLOW_SESSION', ifname, intf_dict[ifname])
if ifname == 'all':
port_dict = config_db.get_table('PORT')
for port in port_dict.keys():
config_db.mod_entry('SFLOW_SESSION', port, {'admin_state': 'down'})
else:
config_db.mod_entry('SFLOW_SESSION', ifname,
{'admin_state': 'down'})
if intf_dict and ifname in intf_dict:
intf_dict[ifname]['admin_state'] = 'down'
config_db.mod_entry('SFLOW_SESSION', ifname, intf_dict[ifname])
else:
config_db.mod_entry('SFLOW_SESSION', ifname,
{'admin_state': 'down'})

#
# 'sflow' command ('config sflow interface sample-rate ...')
Expand Down
21 changes: 17 additions & 4 deletions tests/sflow_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,21 @@ def test_config_sflow_intf_sample_rate(self):

return

def verify_all_ports(self, config_db, status):
port_table = config_db.get_table('PORT')
sflow_table = config_db.get_table('SFLOW_SESSION')

for port in port_table.keys():
if port not in sflow_table.keys():
return False

admin_state = 'up' if status == 'enable' else 'down'

if sflow_table[port].get('admin_state') != admin_state:
return False

return True

def test_config_disable_all_intf(self):
db = Db()
runner = CliRunner()
Expand All @@ -273,8 +288,7 @@ def test_config_disable_all_intf(self):
assert result.exit_code == 0

# verify in configDb
sflowSession = db.cfgdb.get_table('SFLOW_SESSION')
assert sflowSession["all"]["admin_state"] == "down"
assert self.verify_all_ports(db.cfgdb, 'disable') == True

def test_config_enable_all_intf(self):
db = Db()
Expand All @@ -287,8 +301,7 @@ def test_config_enable_all_intf(self):
assert result.exit_code == 0

# verify in configDb
sflowSession = db.cfgdb.get_table('SFLOW_SESSION')
assert sflowSession["all"]["admin_state"] == "up"
assert self.verify_all_ports(db.cfgdb, 'enable') == True

@classmethod
def teardown_class(cls):
Expand Down