Skip to content

Commit 291321d

Browse files
jlevequelguohan
authored andcommitted
Incorporate swss-common Table Name Separator Changes (#1584)
* Table name separator now determined by database ID, no longer passed manually upon table creation * Update submodules to include table name separator changes
1 parent 7b31f7d commit 291321d

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

dockers/docker-lldp-sv2/lldpmgrd

+2-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ class LldpManager(object):
109109
corresponding port alias in the Config database, then form the
110110
appropriate lldpcli configuration command and run it.
111111
"""
112-
TABLE_SEPARATOR = "|"
113-
114112
# Retrieve all entires for this port from the Port table
115-
port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME, TABLE_SEPARATOR)
113+
port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
116114
(status, fvp) = port_table.get(port_name)
117115
if status:
118116
# Convert list of tuples to a dictionary
@@ -130,7 +128,7 @@ class LldpManager(object):
130128
lldpcli_cmd = "lldpcli configure ports {0} lldp portidsubtype local {1}".format(port_name, port_alias)
131129

132130
# Retrieve all entires for this port from the Device Neighbor table
133-
device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME, TABLE_SEPARATOR)
131+
device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME)
134132
(status, fvp) = device_neighbor_table.get(port_name)
135133
if status:
136134
# Convert list of tuples to a dictionary

src/sonic-sairedis

src/sonic-swss

src/sonic-swss-common

0 commit comments

Comments
 (0)