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
This commit is contained in:
parent
7b31f7df32
commit
291321d851
@ -109,10 +109,8 @@ class LldpManager(object):
|
||||
corresponding port alias in the Config database, then form the
|
||||
appropriate lldpcli configuration command and run it.
|
||||
"""
|
||||
TABLE_SEPARATOR = "|"
|
||||
|
||||
# Retrieve all entires for this port from the Port table
|
||||
port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME, TABLE_SEPARATOR)
|
||||
port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
|
||||
(status, fvp) = port_table.get(port_name)
|
||||
if status:
|
||||
# Convert list of tuples to a dictionary
|
||||
@ -130,7 +128,7 @@ class LldpManager(object):
|
||||
lldpcli_cmd = "lldpcli configure ports {0} lldp portidsubtype local {1}".format(port_name, port_alias)
|
||||
|
||||
# Retrieve all entires for this port from the Device Neighbor table
|
||||
device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME, TABLE_SEPARATOR)
|
||||
device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME)
|
||||
(status, fvp) = device_neighbor_table.get(port_name)
|
||||
if status:
|
||||
# Convert list of tuples to a dictionary
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit c860472a3d8c16cad8a44fd7f76e848c39651f2e
|
||||
Subproject commit d1c52239635b68c672a9c8f59854a474f3e99d3b
|
@ -1 +1 @@
|
||||
Subproject commit d711d2cf57839589aa7d6653b252305c31f8c2b0
|
||||
Subproject commit 114faa4c591917540933348801d9f96cffcd8ca1
|
@ -1 +1 @@
|
||||
Subproject commit 14ca39fa0670b0e9b34d0ab63b12348bcba652ac
|
||||
Subproject commit 821377734ab86ca931ffa45609c17a08c7859e99
|
Loading…
Reference in New Issue
Block a user