TSG-7234 调整Proxy的解密流量转发的配置，以适配TSG-9140下解密流量转发需求

ansible/install_config/group_vars/rpm_version.yml

@@ -53,7 +53,7 @@ sapp_rpm_version:
   tcpdump_mesa: tcpdump_mesa-1.0.6.faa4eba
 
 tfe_rpm_version:
-  tfe: tfe-4.5.6.319afbc
+  tfe: tfe-4.5.7.67be58f
 
 tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-4.0.2.d0ba885

ansible/install_config/group_vars/stage_one_7400MCN123P01R01.yml

@@ -29,6 +29,7 @@ tfe:
       enable: 1
       device: eth_mirr_d
       type: 1
+      default_vlan_id_for_mac: 0
 
 cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}'
 

ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml

@@ -54,6 +54,7 @@ sapp:
     nic_name: eth_vf_raw
   prefix_path: /opt/tsg/sapp
 
+# “default_vlan_id_for_mac” needs to be modified according to the vlan plan of the device 
 tfe:
   tfe_env_config:
     TFE_DEVICE_DATA_INCOMING: eth_vf_tfe
@@ -71,9 +72,10 @@ tfe:
     kafka:
       NIC_NAME: eth_vf_ctl
     traffic_mirror:
-      enable: 0
-      device: lo
-      type: 0
+      enable: 1
+      device: eth_vf_mirr
+      type: 1
+      default_vlan_id_for_mac: 300
 
 tsg_diagnose:
   docker_compose_yml:

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

@@ -175,10 +175,10 @@ statsd_set_prometheus_url_path=/metrics
 [traffic_mirror]
 enable={{ tfe.tfe_conf.traffic_mirror.enable }}
 device={{ tfe.tfe_conf.traffic_mirror.device }}
-type={{ tfe.tfe_conf.traffic_mirror.type }}
-
 # 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO
-type=0
+type={{ tfe.tfe_conf.traffic_mirror.type }}
+default_vlan_id_for_mac={{ tfe.tfe_conf.traffic_mirror.default_vlan_id_for_mac }}
+
 table_info=resource/pangu/table_info_traffic_mirror.conf
 stat_file=log/traffic_mirror.status