Skip to content

Commit 6c98714

Browse files
committed
add comments
Signed-off-by: Guohan Lu <[email protected]>
1 parent acf5678 commit 6c98714

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

config/main.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
from swsssdk import ConfigDBConnector, SonicV2Connector, SonicDBConfig
1919
from utilities_common.db import Db
2020
from utilities_common.intf_filter import parse_interface_in_filter
21-
import utilities_common.cli as clicommon # lgtm [py/import-and-import-from]
22-
from utilities_common.cli import cfglog as log
21+
import utilities_common.cli as clicommon
22+
from .utils import log
23+
2324

2425
import aaa
2526
import mlnx

config/utils.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from sonic_py_common import logger
2+
3+
SYSLOG_IDENTIFIER = "config"
4+
5+
# Global logger instance
6+
log = logger.Logger(SYSLOG_IDENTIFIER)

config/vlan.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import click
22

33
import utilities_common.cli as clicommon
4+
from .utils import log
45

56
#
67
# 'vlan' group ('config vlan ...')
@@ -33,7 +34,7 @@ def add_vlan(db, vid):
3334
def del_vlan(db, vid):
3435
"""Delete VLAN"""
3536

36-
clicommon.cfglog.log_info("'vlan del {}' executing...".format(vid))
37+
log.log_info("'vlan del {}' executing...".format(vid))
3738

3839
ctx = click.get_current_context()
3940

@@ -66,7 +67,7 @@ def add_vlan_member(db, vid, port, untagged):
6667

6768
ctx = click.get_current_context()
6869

69-
clicommon.cfglog.log_info("'vlan member add {} {}' executing...".format(vid, port))
70+
log.log_info("'vlan member add {} {}' executing...".format(vid, port))
7071

7172
if not clicommon.is_vlanid_in_range(vid):
7273
ctx.fail("Invalid VLAN ID {} (1-4094)".format(vid))
@@ -110,7 +111,7 @@ def del_vlan_member(db, vid, port):
110111

111112
ctx = click.get_current_context()
112113

113-
clicommon.cfglog.log_info("'vlan member del {} {}' executing...".format(vid, port))
114+
log.log_info("'vlan member del {} {}' executing...".format(vid, port))
114115

115116
if not clicommon.is_vlanid_in_range(vid):
116117
ctx.fail("Invalid VLAN ID {} (1-4094)".format(vid))

utilities_common/cli.py

-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@
77

88
from utilities_common.db import Db
99

10-
from sonic_py_common import logger
1110
from swsssdk import ConfigDBConnector
1211

13-
SYSLOG_IDENTIFIER_FOR_CONFIG = "config"
1412
VLAN_SUB_INTERFACE_SEPARATOR = '.'
1513

1614
pass_db = click.make_pass_decorator(Db, ensure=True)
1715

18-
# Global logger instance
19-
cfglog = logger.Logger(SYSLOG_IDENTIFIER_FOR_CONFIG)
20-
2116
class AbbreviationGroup(click.Group):
2217
"""This subclass of click.Group supports abbreviated subgroup/subcommand names
2318
"""

0 commit comments

Comments
 (0)