TSG-9425 当开启Mirror Traffic且关闭Add VLAN ID时，功能端使用默认的VLAN ID

ansible/install_config/group_vars/HAL_7400MCN0P01R01.yml

@@ -31,6 +31,7 @@ dp_steering_proxy:
 
 dp_traffic_mirror:
   nic_name: eth_mirr_d 
+  traffic_mirror_vlan_id: 0
 
 dp_steering_firewall:
   #deloyment value: mirror,inline, transparent. mirror = one arm + mirror, inline = one arm + series, transparent = two arm + series 

ansible/install_config/group_vars/HAL_7400MCN123P01R01.yml

@@ -10,6 +10,7 @@ workload_zcpd:
 
 dp_traffic_mirror:
   nic_name: eth_mirr_d 
+  traffic_mirror_vlan_id: 0
 
 prefix_path:
   mrzcpd: /opt/tsg/mrzcpd

ansible/install_config/group_vars/HAL_9000NPBP01R01.yml

@@ -10,6 +10,7 @@ workload_zcpd:
 
 dp_traffic_mirror:
   nic_name: eth_vf_mirr
+  traffic_mirror_vlan_id: 2
 
 workload_firewall:
   cpu_affinity: 5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47
@@ -51,7 +52,6 @@ dp_proxy:
 
 dp_certstore:
   location: local
-# “default_vlan_id_for_mac” needs to be modified according to the vlan plan of the device
 
 monitor:
   enable_redis_exporter: 0

ansible/install_config/group_vars/HAL_SERVER.yml

@@ -10,6 +10,7 @@ workload_zcpd:
 
 dp_traffic_mirror:
   nic_name: eth_pf_mirr
+  traffic_mirror_vlan_id: 0
 
 workload_firewall:
   cpu_affinity: 17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99
@@ -52,8 +53,6 @@ dp_proxy:
 
 dp_certstore:
   location: local
-# “default_vlan_id_for_mac” needs to be modified according to the vlan plan of the device
-
 
 wannat_wangw:
   wangw_conf:

ansible/install_config/group_vars/rpm_version.yml

@@ -62,8 +62,8 @@ sapp_rpm_version:
   sapp-pr: sapp-pr-4.2.71.153e167
 
 tfe_rpm_version:
-  tfe: tfe-4.5.31.aae7383
-  tfe-pr: tfe-pr-4.5.31.aae7383
+  tfe: tfe-4.5.32.9493831
+  tfe-pr: tfe-pr-4.5.32.9493831
 
 tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-4.3.1.6038e0a

ansible/roles/firewall/templates/main.conf.j2.j2

@@ -148,7 +148,7 @@ dns_flood_thresh="{{ ddossketch.dns_flood_report_thresh }}"
 [TRAFFIC_MIRROR]
 TRAFFIC_MIRROR_ENABLE=1
 NIC_NAME={{ dp_traffic_mirror.nic_name }}
-DEFAULT_VLAN_ID=2
+DEFAULT_VLAN_ID={{ dp_traffic_mirror.traffic_mirror_vlan_id }}
 {% endif %}
 [RADIUS_PLUG]
 {% raw %}{% set tags_list = [] %}

ansible/roles/tfe/templates/tfe.conf.j2.j2

@@ -201,6 +201,7 @@ type={{ dp_proxy.traffic_mirror_type }}
 
 table_info=resource/pangu/table_info_traffic_mirror.conf
 stat_file=log/traffic_mirror.status
+default_vlan_id={{ dp_traffic_mirror.traffic_mirror_vlan_id }}
 
 [kafka]
 enable=1