OMPUB-159:新增v21.06适配mirror流量的DPI安装包

roles/sapp/templates/asymmetric_presence_layer.conf.j2

@@ -1,8 +1,3 @@
 #layer name definition:  ipv4, ipv6, ethernet,vlan, arp, gre, mpls, pppoe, tcp, udp, l2tp, ppp, pptp, gtp
 #pattern: asymmetric_layer_name    under_of_this_asymmetric_layer[layer_index]   upper_of_this_asymmetric_layer[layer_index]
-{% if tsg_access_type == 2 and tsg_running_type == 2 %}
-mpls    ethernet[0]    ipv4[1]
-mpls    ethernet[0]    ipv6[1]
-{% else %}
-#
-{% endif %}
+#

roles/sapp/templates/conflist.inf.j2

@@ -1,16 +1,5 @@
 [platform]
-{% if tsg_access_type == 1 %}
-./plug/platform/g_device_plug/g_device_plug.inf
-#./plug/platform/http_healthcheck/http_healthcheck.inf
-{% else %}
-#./plug/platform/g_device_plug/g_device_plug.inf
-#./plug/platform/http_healthcheck/http_healthcheck.inf
-{% endif %}
-./plug/platform/app_proto_identify/app_proto_identify.inf
 ./plug/platform/tsg_master/tsg_master.inf
-{% if tsg_app.enable == 1 %}
-./plug/platform/app_master/app_master.inf
-{% endif %}
 
 [protocol]
 ./plug/protocol/mesa_sip/mesa_sip.inf
@@ -26,8 +15,6 @@
 
 [business]
 ./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
-./plug/business/capture_packet_plug/capture_packet_plug.inf
-./plug/business/kni/kni.inf
 ./plug/business/fw_ssl_plug/fw_ssl_plug.inf
 ./plug/business/fw_http_plug/fw_http_plug.inf
 ./plug/business/fw_dns_plug/fw_dns_plug.inf
@@ -36,10 +23,4 @@
 ./plug/business/fw_quic_plug/fw_quic_plug.inf
 ./plug/business/fw_voip_plug/fw_voip_plug.inf
 ./plug/business/conn_telemetry/conn_telemetry.inf
-{% if tsg_app.enable == 1 %}
-./plug/business/app_sketch_local/app_sketch_local.inf
-{% endif %}
-{% if tsg_access_type == 2 %}
-./plug/platform/http_healthcheck/http_healthcheck.inf
-{% endif %}
-./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
+./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf

roles/sapp/templates/gdev.conf.j2

@@ -1,11 +0,0 @@
-[Module]
-{% if tsg_running_type == 2 %}
-pcapdevice={{ nic_data_incoming.name }}
-sendto_gdev_card={{ nic_data_incoming.name }}
-sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
-{% else %}
-pcapdevice={{ inline_device_config.data_incoming }}
-sendto_gdev_card={{ inline_device_config.data_incoming }}
-sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
-{% endif %}
-gdev_status_switch=1

roles/sapp/templates/sapp.service.j2

@@ -1,9 +1,7 @@
 [Unit]
 Description=sapp service
-{% if tsg_running_type != 0 %}
 Requires=mrzcpd.service
 After=mrzcpd.service
-{% endif %}
 [Service]
 Type=notify
 WorkingDirectory=/home/mesasoft/sapp_run

roles/sapp/templates/sapp.toml.j2

@@ -9,18 +9,10 @@
 instance_name = "sapp4"
 
 [CPU]
-{% if tsg_access_type == 0 %}
-worker_threads=1
-{% else %}
 worker_threads={{ sapp.worker_threads }}
-{% endif %}
 send_only_threads_max={{ sapp.send_only_threads_max }}
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
-{% if tsg_access_type == 0 %}
-bind_mask=[]
-{% else %}
 bind_mask=[{{ sapp.bind_mask }}]
-{% endif %}
 
 [MEM]
 dictator_enable=0
@@ -33,11 +25,7 @@ dictator_enable=0
     l2_l3_tunnel_support=1
 
 ### note, optional value is [none, vxlan]
-    {% if tsg_access_type == 5 or tsg_access_type == 1 %}
-    overlay_mode=vxlan
-    {% else %}
     overlay_mode=none
-    {% endif %}
     stream_compare_layer_cfg_file="etc/stream_compare_layer.conf"
     vlan_flipping_cfg_file="etc/vlan_flipping_map.conf"
     asymmetric_presence_layer_cfg_file="etc/asymmetric_presence_layer.conf"
@@ -46,14 +34,12 @@ dictator_enable=0
 
     [packet_io.feature]
 	
-	{% if tsg_access_type == 4 or tsg_access_type == 5 %}
 	### note, used to represent inbound or outbound direction value,
 	### because it comes from Third party device, so it needs to be specified manually,
 	### if inbound_route_dir=1, then outbound_route_dir=0, vice versa,
 	### in other words, outbound_route_dir = 1 ^ inbound_route_dir;
-	inbound_route_dir={{ sapp.inbound_route_dir }}
-	{% endif %}
-	
+	inbound_route_dir=1
+
 ### note, BSD_packet_filter, if you do not want to set any filter rule, keep it empty as ""
     BSD_packet_filter=""
 
@@ -80,34 +66,16 @@ dictator_enable=0
    
 ### note, depolyment.mode options: [mirror, inline, transparent]
     [packet_io.depolyment]
-    {% if tsg_access_type == 0 %}
-    mode=transparent
-    {% else %}
-    mode=inline
-    {% endif %}
+    mode=mirror
 
 ### note, interface.type options: [pag,pcap,marsio]
     [packet_io.internal.interface]
-    {% if tsg_access_type == 0 %}
-    type=pcap
-    name={{packet_io.internal_interface}}
-    {% else %}
     type=marsio
-    {% if tsg_access_type == 4 or tsg_access_type == 5 %}
-    name={{ATCA_data_incoming.vf0_name}}
-    {% else %}
-    name={{nic_data_incoming.name}}
-    {% endif %}
-    {% endif %}
+    name={{ data_incoming_nic_list | join(",") }}
 
     [packet_io.external.interface]
-    {% if tsg_access_type == 0 %}
-    type=pcap
-    name={{packet_io.external_interface}}
-    {% else %}
     type=pcap
     name=lo
-    {% endif %}
 
     [packet_io.polling]
 ### note, polling_priority = call sapp_recv_pkt every call polling_entry times,     

roles/sapp/templates/vlan_flipping_map.conf.j2

@@ -1,16 +0,0 @@
-#for inline a device vlan flipping 
-#数据包来自C路由器端, 即C2I(I2E)方向, 
-#数据包来自I路由器端, 即I2C(E2I)方向, 
-#平台会根据vlan_id,设置当前包route_dir的值, 以便上层业务插件做两个方向的流量统计,
-#如果一对vlan_id写反了, 网络是通的, 但是I2E,E2I的流量统计就颠倒了.
-#配置文件格式, pattern:
-#来自C路由器vlan_id	  	来自I路由器vlan_id   	是否开启mac地址翻转
-#C_router_vlan_id  I_router_vlan_id mac_flipping_enable
-{% if tsg_access_type == 2 and tsg_running_type == 2 %}
-1301	1302	1
-1201	1202	1
-4000	4001	0
-{% else %}
-4000	4001	0
-{% endif %}
-