From bc63f96c5be04dc3c6aae30d77f5a204f09f3663 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 21 Jun 2021 11:17:47 +0800
Subject: [PATCH] =?UTF-8?q?7400=20adapt:=E5=9C=A8NPB=E6=98=AFtera=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8Bvlan=5Fflipping=5Fmap.conf=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84vlan=20ID=E4=BF=A1=E6=81=AF=E8=AF=BB=E5=8F=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01    | 7 ++++++-
 .../templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01  | 5 +++--
 .../files/tsg-os-provision/provision.yml.sample            | 6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
index 66760965..728c2861 100644
--- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
+++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
@@ -11,7 +11,12 @@ in_mask={{inline_device_config.keepalive_mask}}
 vlan-id-allow=1000,1001,4000,4001
 {% endif %}
 {% if NPB_device == 'tera' %}
-vlan-id-allow= {{ access_vlan_id_list | join(",") }},4000,4001
+{% set mrzcpd_vlanid_allow_list = [] %}
+{% for vlan_info in vlan_flipping %}
+{{ mrzcpd_vlanid_allow_list.append(vlan_info.C_router_vlan_id) }}
+{{ mrzcpd_vlanid_allow_list.append(vlan_info.I_router_vlan_id) }}
+{% endfor %}
+vlan-id-allow= {{ mrzcpd_vlanid_allow_list | join(",") }},4000,4001
 {% endif %}
 {% endraw %}
 jumbo_frame=1
diff --git a/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01
index 09cda689..59fbeb91 100644
--- a/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01
+++ b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01
@@ -8,8 +8,9 @@
 #C_router_vlan_id  I_router_vlan_id mac_flipping_enable
 {% raw %}
 {% if NPB_device == 'tera' %}
-1301	1302	1
-1201	1202	1
+{% for vlan_info in vlan_flipping %}
+{{ vlan_info.C_router_vlan_id }}	{{ vlan_info.I_router_vlan_id }}	1
+{% endfor %}
 {% endif %}
 {% endraw %}
 4000	4001	0
diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample
index 06372c44..2a3f91d7 100644
--- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample
+++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample
@@ -43,6 +43,12 @@ access_vlan_id_list:
   - 1000
   - 1001
 
+vlan_flipping:
+  - C_router_vlan_id: 1301
+    I_router_vlan_id: 1302
+  - C_router_vlan_id: 1201
+    I_router_vlan_id: 1202
+
 keep_alive: 127.0.0.1