From 55a767b7de9be371cb320896b091b575adbee113 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 22 Jun 2021 16:36:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E5=B0=86vlan=5Fflipping=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8A=A0=E5=85=A5=E5=88=B0zone=5Fgroup=5Flis?= =?UTF-8?q?t=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mrglobal.conf.j2.j2.7400MCN0P01R01 | 6 ++--- ...lan_flipping_map.conf.j2.j2.7400MCN0P01R01 | 4 +-- .../tsg-os-provision/provision.yml.sample | 27 ++++++++++++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 index 96279ab7..08f28f71 100644 --- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 @@ -12,9 +12,9 @@ vlan-id-allow=1000,1001,4000,4001 {% endif %} {% if NPB_device == 'tera' %} {% 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) }} +{% for zone_group in zone_group_list %} +{{ mrzcpd_vlanid_allow_list.append(zone_group.internal.vlan_id) }} +{{ mrzcpd_vlanid_allow_list.append(zone_group.external.vlan_id) }} {% endfor %} vlan-id-allow={{ mrzcpd_vlanid_allow_list | join(",") }},4000,4001 {% endif %} 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 913aaefa..f9bfe260 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,8 @@ #C_router_vlan_id I_router_vlan_id mac_flipping_enable {% raw %} {% if NPB_device == 'tera' %} -{% for vlan_info in vlan_flipping %} -{{ vlan_info.C_router_vlan_id }} {{ vlan_info.I_router_vlan_id }} 1 +{% for zone_group in zone_group_list %} +{{ zone_group.zone_group.internal.vlan_id }} {{ zone_group.external.vlan_id }} 1 {% endfor %} {% if NPB_device == 'direct' %} 1000 1001 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 a8aba858..90f4744e 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 @@ -38,12 +38,27 @@ cache: # NPB_device value in [inline_device, tera,direct] NPB_device: inline_device - -vlan_flipping: - - C_router_vlan_id: 1301 - I_router_vlan_id: 1302 - - C_router_vlan_id: 1201 - I_router_vlan_id: 1202 +zone_group_list: + - internal: + vlan_id: 1301 + tracking_ip: + ipv4: 127.0.0.1 + ipv6: '\:\:1' + external: + vlan_id: 1302 + tracking_ip: + ipv4: 127.0.0.1 + ipv6: '\:\:1' + - internal: + vlan_id: 1201 + tracking_ip: + ipv4: 127.0.0.1 + ipv6: '\:\:1' + external: + vlan_id: 1202 + tracking_ip: + ipv4: 127.0.0.1 + ipv6: '\:\:1' keep_alive: 127.0.0.1