From 1e7b8b1e3c7bc48b370b85f1922333b6e2122422 Mon Sep 17 00:00:00 2001
From: Andrey Vertiprahov <aversanta@gmail.com>
Date: Mon, 19 Aug 2019 18:15:21 +0000
Subject: [PATCH] Merge branch 'fix-avs-eltex-confdb-normalizer' into 'master'

Fix  method name on Eltex.MES confdb normalizer.

See merge request noc/noc!2511

(cherry picked from commit 1fea741507a043369d89092980d55e0f3b4109d3)

5d16cff1 Fix  method name on Eltex.MES confdb normalizer.
---
 sa/profiles/Eltex/MES/confdb/normalizer.py | 106 +++++++++++++++++----
 1 file changed, 87 insertions(+), 19 deletions(-)

diff --git a/sa/profiles/Eltex/MES/confdb/normalizer.py b/sa/profiles/Eltex/MES/confdb/normalizer.py
index f2b4724425..81b93574c8 100644
--- a/sa/profiles/Eltex/MES/confdb/normalizer.py
+++ b/sa/profiles/Eltex/MES/confdb/normalizer.py
@@ -151,25 +151,93 @@ class MESNormalizer(BaseNormalizer):
     def normalize_default_gateway(self, tokens):
         yield self.make_inet_static_route_next_hop(route="0.0.0.0/0", next_hop=tokens[2])
 
-    @match("interface", ANY, "selective-qinq", "list", "ingress", REST)
-    def normalize_ingress_mappings(self, tokens):
+    # selective-qinq list ingress add_vlan 1000
+    @match("interface", ANY, "selective-qinq", "list", "ingress", "add_vlan", ANY)
+    def normalize_add_vlan(self, tokens):
         if_name = self.interface_name(tokens[1])
-        if tokens[5] == "permit":
-            # vlan mappings
-            yield self.make_es_rewrite(
-                interface=if_name,
-                unit=if_name,
-                # stack="1",
-                # inner_vlans=tokens[7],
-                op="swap",
+        yield self.make_input_vlan_map_rewrite_vlan(
+            interface=if_name,
+            unit=if_name,
+            num="1",
+            # stack="1",
+            # inner_vlans=tokens[8],
+            op="push",
+            vlan=tokens[6],
+        )
+
+    # selective-qinq list ingress permit ingress_vlan 100,101,102,103
+    @match("interface", ANY, "selective-qinq", "list", "egress", "permit", "ingress_vlan", ANY)
+    @match("interface", ANY, "selective-qinq", "list", "ingress", "permit", "ingress_vlan", ANY)
+    def normalize_ingress_vlan(self, tokens):
+        if_name = self.interface_name(tokens[1])
+        if tokens[4] == "ingress":
+            yield self.make_input_vlan_map_inner_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[7]
+            )
+        else:
+            yield self.make_output_vlan_map_outer_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[7]
+            )
+
+    @match(
+        "interface",
+        ANY,
+        "selective-qinq",
+        "list",
+        "egress",
+        "override_vlan",
+        ANY,
+        "ingress_vlan",
+        ANY,
+    )
+    @match(
+        "interface",
+        ANY,
+        "selective-qinq",
+        "list",
+        "ingress",
+        "override_vlan",
+        ANY,
+        "ingress_vlan",
+        ANY,
+    )
+    def normalize_ingress_override_vlan(self, tokens):
+        if_name = self.interface_name(tokens[1])
+        if tokens[4] == "ingress":
+            yield self.make_input_vlan_map_inner_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[8]
+            )
+            yield self.make_input_vlan_map_rewrite_vlan(
+                interface=if_name, unit=if_name, num="1", op="swap", vlan=tokens[6]
+            )
+        else:
+            yield self.make_output_vlan_map_outer_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[8]
+            )
+            yield self.make_output_vlan_map_rewrite_vlan(
+                interface=if_name, unit=if_name, num="1", op="swap", vlan=tokens[6]
+            )
+
+    # selective-qinq list ingress add_vlan 1000 ingress_vlan 100,200
+    @match(
+        "interface", ANY, "selective-qinq", "list", "egress", "add_vlan", ANY, "ingress_vlan", ANY
+    )
+    @match(
+        "interface", ANY, "selective-qinq", "list", "ingress", "add_vlan", ANY, "ingress_vlan", ANY
+    )
+    def normalize_ingress_add_vlan(self, tokens):
+        if_name = self.interface_name(tokens[1])
+        if tokens[4] == "ingress":
+            yield self.make_input_vlan_map_inner_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[8]
+            )
+            yield self.make_input_vlan_map_rewrite_vlan(
+                interface=if_name, unit=if_name, num="1", op="push", vlan=tokens[6]
+            )
+        else:
+            yield self.make_output_vlan_map_outer_vlans(
+                interface=if_name, unit=if_name, num="1", vlan_filter=tokens[8]
             )
-        elif tokens[5] == "add_vlan":
-            # vlan mappings
-            yield self.make_es_rewrite_vlan(
-                interface=if_name,
-                unit=if_name,
-                # stack="1",
-                # inner_vlans=tokens[8],
-                op="push",
-                vlan=tokens[6],
+            yield self.make_output_vlan_map_rewrite_vlan(
+                interface=if_name, unit=if_name, num="1", op="push", vlan=tokens[6]
             )
-- 
GitLab