From 9dd32cc8a30e5e3f27d7abd2f7c48bd29ac07dbc Mon Sep 17 00:00:00 2001 From: toby chen <49122725+651477787@users.noreply.github.com> Date: Fri, 28 Apr 2023 09:12:22 +0800 Subject: [PATCH 1/4] Update main.py update ctx.fail in sflow --- config/main.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/config/main.py b/config/main.py index b2c9198b01..806da07469 100644 --- a/config/main.py +++ b/config/main.py @@ -6476,7 +6476,7 @@ def polling_int(ctx, interval): """Set polling-interval for counter-sampling (0 to disable)""" if ADHOC_VALIDATION: if interval not in range(5, 301) and interval != 0: - click.echo("Polling interval must be between 5-300 (0 to disable)") + ctx.fail("Polling interval must be between 5-300 (0 to disable)") config_db = ValidatedConfigDBConnector(ctx.obj['db']) sflow_tbl = config_db.get_table('SFLOW') @@ -6513,8 +6513,7 @@ def enable(ctx, ifname): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: 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') @@ -6540,8 +6539,7 @@ def disable(ctx, ifname): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: 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') @@ -6569,11 +6567,9 @@ def sample_rate(ctx, ifname, rate): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: if not interface_name_is_valid(config_db, ifname) and ifname != 'all': - click.echo('Invalid interface name') - return + ctx.fail('Invalid interface name') if not is_valid_sample_rate(rate) and rate != 'default': - click.echo('Error: Sample rate must be between 256 and 8388608 or default') - return + ctx.fail('Sample rate must be between 256 and 8388608 or default') sess_dict = config_db.get_table('SFLOW_SESSION') From 3669cea77596c32c1122db333400cde2db34eda2 Mon Sep 17 00:00:00 2001 From: toby chen <49122725+651477787@users.noreply.github.com> Date: Fri, 5 May 2023 14:15:37 +0800 Subject: [PATCH 2/4] Update main.py --- config/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/main.py b/config/main.py index 806da07469..92c25c3647 100644 --- a/config/main.py +++ b/config/main.py @@ -6513,7 +6513,8 @@ def enable(ctx, ifname): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: if not interface_name_is_valid(config_db, ifname) and ifname != 'all': - ctx.fail("Invalid interface name") + click.echo("Invalid interface name") + return intf_dict = config_db.get_table('SFLOW_SESSION') @@ -6539,7 +6540,8 @@ def disable(ctx, ifname): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: if not interface_name_is_valid(config_db, ifname) and ifname != 'all': - ctx.fail("Invalid interface name") + click.echo("Invalid interface name") + return intf_dict = config_db.get_table('SFLOW_SESSION') From 2eed6662a1a50f499f6dc47005a08c376dfcffea Mon Sep 17 00:00:00 2001 From: toby chen <49122725+651477787@users.noreply.github.com> Date: Fri, 5 May 2023 14:28:52 +0800 Subject: [PATCH 3/4] Update main.py --- config/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/main.py b/config/main.py index 92c25c3647..c514b938e1 100644 --- a/config/main.py +++ b/config/main.py @@ -6569,7 +6569,8 @@ def sample_rate(ctx, ifname, rate): config_db = ValidatedConfigDBConnector(ctx.obj['db']) if ADHOC_VALIDATION: if not interface_name_is_valid(config_db, ifname) and ifname != 'all': - ctx.fail('Invalid interface name') + click.echo('Invalid interface name') + return if not is_valid_sample_rate(rate) and rate != 'default': ctx.fail('Sample rate must be between 256 and 8388608 or default') From 1b8cb30b94f9bb78550935d762a36254959ad9ae Mon Sep 17 00:00:00 2001 From: toby chen <49122725+651477787@users.noreply.github.com> Date: Fri, 5 May 2023 15:10:51 +0800 Subject: [PATCH 4/4] Update main.py --- config/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/main.py b/config/main.py index c514b938e1..c3c38aea69 100644 --- a/config/main.py +++ b/config/main.py @@ -6572,7 +6572,8 @@ def sample_rate(ctx, ifname, rate): click.echo('Invalid interface name') return if not is_valid_sample_rate(rate) and rate != 'default': - ctx.fail('Sample rate must be between 256 and 8388608 or default') + click.echo('Error: Sample rate must be between 256 and 8388608 or default') + return sess_dict = config_db.get_table('SFLOW_SESSION')