Skip to content

Commit 08fc23e

Browse files
Fixed pre-commit warnings
Signed-off-by: Ashutosh Agrawal <[email protected]>
1 parent c8dd2f4 commit 08fc23e

File tree

3 files changed

+7
-113
lines changed

3 files changed

+7
-113
lines changed

config/plugins/sonic-dhcpv4-relay_yang.py

+6-87
Original file line numberDiff line numberDiff line change
@@ -205,41 +205,6 @@ def clear_list_entry_validated(db, table, key, attr):
205205
update_entry_validated(db, table, key, {attr: None})
206206

207207

208-
209-
210-
211-
212-
213-
214-
215-
216-
217-
218-
219-
220-
221-
222-
223-
224-
225-
226-
227-
228-
229-
230-
231-
232-
233-
234-
235-
236-
237-
238-
239-
240-
241-
242-
243208
@click.group(name="dhcpv4-relay",
244209
cls=clicommon.AliasedGroup)
245210
def DHCPV4_RELAY():
@@ -248,24 +213,12 @@ def DHCPV4_RELAY():
248213
pass
249214

250215

251-
252-
253-
254-
255-
256-
257-
258-
259-
260-
261216
@DHCPV4_RELAY.command(name="add")
262-
263217
@click.argument(
264218
"name",
265219
nargs=1,
266220
required=True,
267221
)
268-
269222
@click.option(
270223
"--server-vrf",
271224
help="Server VRF",
@@ -299,7 +252,8 @@ def DHCPV4_RELAY():
299252
help="Server IPv4 address list",
300253
)
301254
@clicommon.pass_db
302-
def DHCPV4_RELAY_add(db, name, server_vrf, source_interface, link_selection, vrf_selection, server_id_override, agent_relay_mode, max_hop_count, dhcpv4_servers):
255+
def DHCPV4_RELAY_add(db, name, server_vrf, source_interface, link_selection, vrf_selection,
256+
server_id_override, agent_relay_mode, max_hop_count, dhcpv4_servers):
303257
""" Add object in DHCPV4_RELAY. """
304258

305259
table = "DHCPV4_RELAY"
@@ -329,13 +283,11 @@ def DHCPV4_RELAY_add(db, name, server_vrf, source_interface, link_selection, vrf
329283

330284

331285
@DHCPV4_RELAY.command(name="update")
332-
333286
@click.argument(
334287
"name",
335288
nargs=1,
336289
required=True,
337290
)
338-
339291
@click.option(
340292
"--server-vrf",
341293
help="Server VRF",
@@ -369,7 +321,8 @@ def DHCPV4_RELAY_add(db, name, server_vrf, source_interface, link_selection, vrf
369321
help="Server IPv4 address list",
370322
)
371323
@clicommon.pass_db
372-
def DHCPV4_RELAY_update(db, name, server_vrf, source_interface, link_selection, vrf_selection, server_id_override, agent_relay_mode, max_hop_count, dhcpv4_servers):
324+
def DHCPV4_RELAY_update(db, name, server_vrf, source_interface, link_selection, vrf_selection,
325+
server_id_override, agent_relay_mode, max_hop_count, dhcpv4_servers):
373326
""" Add object in DHCPV4_RELAY. """
374327

375328
table = "DHCPV4_RELAY"
@@ -399,7 +352,6 @@ def DHCPV4_RELAY_update(db, name, server_vrf, source_interface, link_selection,
399352

400353

401354
@DHCPV4_RELAY.command(name="delete")
402-
403355
@click.argument(
404356
"name",
405357
nargs=1,
@@ -416,36 +368,16 @@ def DHCPV4_RELAY_delete(db, name):
416368
except Exception as err:
417369
exit_with_error(f"Error: {err}", fg="red")
418370

419-
420-
421-
422-
423-
424-
425-
426-
427-
428-
429-
430-
431-
432-
433-
434-
435-
436-
437-
438371

439372
@DHCPV4_RELAY.group(name="dhcpv4-servers",
440-
cls=clicommon.AliasedGroup)
373+
cls=clicommon.AliasedGroup)
441374
def DHCPV4_RELAY_dhcpv4_servers():
442375
""" Add/Delete dhcpv4_servers in DHCPV4_RELAY """
443376

444377
pass
445378

446379

447380
@DHCPV4_RELAY_dhcpv4_servers.command(name="add")
448-
449381
@click.argument(
450382
"name",
451383
nargs=1,
@@ -474,9 +406,7 @@ def DHCPV4_RELAY_dhcpv4_servers_add(
474406
exit_with_error(f"Error: {err}", fg="red")
475407

476408

477-
478409
@DHCPV4_RELAY_dhcpv4_servers.command(name="delete")
479-
480410
@click.argument(
481411
"name",
482412
nargs=1,
@@ -505,9 +435,7 @@ def DHCPV4_RELAY_dhcpv4_servers_delete(
505435
exit_with_error(f"Error: {err}", fg="red")
506436

507437

508-
509438
@DHCPV4_RELAY_dhcpv4_servers.command(name="clear")
510-
511439
@click.argument(
512440
"name",
513441
nargs=1,
@@ -530,15 +458,6 @@ def DHCPV4_RELAY_dhcpv4_servers_clear(
530458
exit_with_error(f"Error: {err}", fg="red")
531459

532460

533-
534-
535-
536-
537-
538-
539-
540-
541-
542461
def register(cli):
543462
""" Register new CLI nodes in root CLI.
544463
@@ -551,4 +470,4 @@ def register(cli):
551470
cli_node = DHCPV4_RELAY
552471
if cli_node.name in cli.commands:
553472
raise Exception(f"{cli_node.name} already exists in CLI")
554-
cli.add_command(DHCPV4_RELAY)
473+
cli.add_command(DHCPV4_RELAY)

log

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flake8...................................................................Passed

show/plugins/sonic-dhcpv4-relay_yang.py

-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"""
22
Auto-generated show CLI plugin.
3-
4-
53
"""
64

75
import click
@@ -10,9 +8,6 @@
108
import utilities_common.cli as clicommon
119

1210

13-
14-
15-
1611
def format_attr_value(entry, attr):
1712
""" Helper that formats attribute to be presented in the table output.
1813
@@ -47,24 +42,6 @@ def format_group_value(entry, attrs):
4742
return tabulate.tabulate(data, tablefmt="plain")
4843

4944

50-
51-
52-
53-
54-
55-
56-
57-
58-
59-
60-
61-
62-
63-
64-
65-
66-
67-
6845
@click.group(name="dhcpv4-relay",
6946
cls=clicommon.AliasedGroup,
7047
invoke_without_command=True)
@@ -74,7 +51,6 @@ def DHCPV4_RELAY(db):
7451

7552
header = [
7653
"NAME",
77-
7854
"SERVER VRF",
7955
"SOURCE INTERFACE",
8056
"LINK SELECTION",
@@ -134,8 +110,6 @@ def DHCPV4_RELAY(db):
134110
click.echo(tabulate.tabulate(body, header))
135111

136112

137-
138-
139113
def register(cli):
140114
""" Register new CLI nodes in root CLI.
141115

0 commit comments

Comments
 (0)