diff --git a/sa/profiles/Eltex/MES/confdb/normalizer.py b/sa/profiles/Eltex/MES/confdb/normalizer.py index 940e6d5fa0b8b5d163f819f1fde9a68fe4de5f58..622523675b64944e443142df5f17e46a346d263c 100644 --- a/sa/profiles/Eltex/MES/confdb/normalizer.py +++ b/sa/profiles/Eltex/MES/confdb/normalizer.py @@ -118,7 +118,11 @@ class MESNormalizer(BaseNormalizer): @match("interface", ANY, "switchport", ANY, "allowed", "vlan", "add", ANY, "untagged") def normalize_switchport_untagged(self, tokens): if_name = self.interface_name(tokens[1]) - yield self.make_switchport_untagged(interface=if_name, unit=if_name, vlan_filter=tokens[7]) + untagged = tokens[7] + if "," in tokens[7]: + # QinQ + untagged = tokens[7].split(",")[0] + yield self.make_switchport_untagged(interface=if_name, unit=if_name, vlan_filter=untagged) @match("interface", ANY, "switchport", ANY, "native", "vlan", ANY) def normalize_switchport_native(self, tokens): diff --git a/sa/profiles/Eltex/MES/profile.py b/sa/profiles/Eltex/MES/profile.py index 2fc1e32aa73c735fdcf8460d92d7b01b5aa7e3c6..603540e871e3f28463051c8ebfd4471154fa53ee 100644 --- a/sa/profiles/Eltex/MES/profile.py +++ b/sa/profiles/Eltex/MES/profile.py @@ -80,6 +80,7 @@ class Profile(BaseProfile): "74": "MES-5324", "75": "MES-2124F", "76": "MES-2324", + "77": "MES-2324F", "78": "MES-2324FB", "80": "MES-3324", "81": "MES-3324F", @@ -90,7 +91,9 @@ class Profile(BaseProfile): "92": "MES-2324P", "98": "MES-3508P", "112": "MES-2308R", + "116": "MES-3308F", "120": "MES-3348F", + "136": "MES-5316A", } def get_platform(self, s):