Commit e54816c0 authored by Andrey Vertiprahov's avatar Andrey Vertiprahov
Browse files

Merge branch 'cherry-pick-ceedc3bb' into 'release-20.4'

release-20.4:Backport!5422

See merge request noc/noc!5424
parents f219fa2b 0f6d4410
......@@ -36,7 +36,7 @@ class Script(BaseScript):
rx_lldp_nei = re.compile(
r"^(?P<interface>\d+(\:\d+)?)\s+(\(\d\.\d\))?(?P<chassis_id>\S+)\s+"
r"(?P<port_id>\S+)\s+\d+\s+\d+",
r"(?P<port_id>\S+\s\S+|\S+)\s+\d+\s+\d+",
re.DOTALL | re.MULTILINE,
)
rx_edp_nei = re.compile(
......@@ -105,7 +105,7 @@ class Script(BaseScript):
n = {
"remote_chassis_id": remote_chassis_id,
"remote_port": remote_port,
"remote_port": remote_port.strip("."),
"remote_capabilities": cap,
"remote_port_subtype": remote_port_subtype,
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment