diff --git a/sa/profiles/EdgeCore/ES/get_switchport.py b/sa/profiles/EdgeCore/ES/get_switchport.py index b1361af62c44d260484c26ff4a854b047ce221ff..200a06074d819d5634a46211f521479a43637c6a 100644 --- a/sa/profiles/EdgeCore/ES/get_switchport.py +++ b/sa/profiles/EdgeCore/ES/get_switchport.py @@ -29,7 +29,11 @@ class Script(BaseScript): r"Information of (?P[^\n]+?)\n", re.MULTILINE | re.IGNORECASE | re.DOTALL ) rx_interface_swport_3526 = re.compile( - r"Information of (?P[^\n]+?)\n.*?VLAN Membership Mode(|\s+):\s+(?P[^\n]+?)\n.*?Native VLAN(|\s+):\s+(?P\d+).*?Allowed VLAN(|\s+):\s+(?P.*?)Forbidden VLAN(|\s+):", + r"Information of (?P[^\n]+?)\n" + r".*?VLAN Membership Mode(|\s+):\s+(?P[^\n]+?)\n" + r"(.*?Native VLAN(|\s+):\s+(?P\d+))?" + r".*?Allowed VLAN(|\s+):\s+(?P.*?)" + r"Forbidden VLAN(|\s+):", re.MULTILINE | re.IGNORECASE | re.DOTALL, ) rx_interface_qinq_3526 = re.compile( @@ -57,7 +61,6 @@ class Script(BaseScript): # Get interfaces status for s in self.scripts.get_interface_status(): interface_status[s["interface"]] = s["status"] - if self.is_platform_3510 or self.is_platform_4612 or self.is_platform_ecs4100: cmd = self.cli("show interface switchport") for block in cmd.rstrip("\n\n").split("\n\n"):