Skip to content

Commit 621aad0

Browse files
authored
[Python] Migrate applications/scripts to import sonic-py-common package (sonic-net#1008)
As part of consolidating all common Python-based functionality into the new sonic-py-common package, this pull request redirects all Python applications/scripts in sonic-utilities repo to point to sonic-py-common and removes multiple duplicate definitions of common functions in the process. This is the next step toward resolving sonic-net#4999. - Also reorganize imports for consistency - Also align some style
1 parent a80826d commit 621aad0

File tree

24 files changed

+323
-829
lines changed

24 files changed

+323
-829
lines changed

acl_loader/main.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import ipaddr
55
import json
66
import syslog
7-
import tabulate
8-
from natsort import natsorted
9-
import sonic_device_util
107

118
import openconfig_acl
9+
import tabulate
1210
import pyangbind.lib.pybindJSON as pybindJSON
13-
from swsssdk import ConfigDBConnector
14-
from swsssdk import SonicV2Connector
15-
from swsssdk import SonicDBConfig
11+
from natsort import natsorted
12+
from sonic_py_common import device_info
13+
from swsssdk import ConfigDBConnector, SonicV2Connector, SonicDBConfig
1614

1715

1816
def info(msg):
@@ -142,7 +140,7 @@ def __init__(self):
142140

143141
# Getting all front asic namespace and correspding config and state DB connector
144142

145-
namespaces = sonic_device_util.get_all_namespaces()
143+
namespaces = device_info.get_all_namespaces()
146144
for front_asic_namespaces in namespaces['front_ns']:
147145
self.per_npu_configdb[front_asic_namespaces] = ConfigDBConnector(use_unix_socket_path=True, namespace=front_asic_namespaces)
148146
self.per_npu_configdb[front_asic_namespaces].connect()

0 commit comments

Comments
 (0)