From 12be5148cfa6283f6aa24e00daa3794451e2c085 Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 22 Aug 2019 13:43:43 +0000 Subject: [PATCH] Merge branch 'fix-edgecore-es-switchport' into 'master' Edcore.ES.get_switchport. Fix 'interface_swport' regex if output not 'Native VLAN' field See merge request noc/noc!2522 (cherry picked from commit 5895598e102a3bf933d0bc065f0b6f92680686b8) cd654dad Edcore.ES.get_switchport. Fix 'interface_swport' regex if output not 'Native VLAN' field --- sa/profiles/EdgeCore/ES/get_switchport.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sa/profiles/EdgeCore/ES/get_switchport.py b/sa/profiles/EdgeCore/ES/get_switchport.py index b1361af62c..200a06074d 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"): -- GitLab