From de0d5fa9d801ade4f96ca971d90b0fafe3bf452d Mon Sep 17 00:00:00 2001
From: liuxueli <liuxueli@iieac.cn>
Date: Wed, 5 Jul 2023 20:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3capture=5Fpacket=5Fplug?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E9=83=A8=E7=BD=B2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/sapp/templates/conflist.inf.j2.j2             | 6 +++---
 ansible/roles/sapp/templates/necessary_plug_list.conf.j2    | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/conflist.inf   | 6 +++---
 .../traffic-engine/files/helm/conf/necessary_plug_list.conf | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2
index 88d06d4d..9390ad2f 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2
@@ -13,6 +13,9 @@
 {% endif %}
 {% endif %}
 ./plug/platform/session_flags/session_flags.inf
+{% if capturepacket.enable == 1 %}
+./plug/platform/capture_packet_plug/capture_packet_plug.inf
+{% endif %}
 ./plug/platform/tsg_master/tsg_master.inf
 {% if app.identify_by.builtin_app_engine == 1 %}
 ./plug/platform/app_proto_engine/app_proto_engine.inf
@@ -58,9 +61,6 @@
 ./plug/business/session_record/session_record.inf
 {% endif %}
 {% endif %}
-{% if capturepacket.enable == 1 %}
-./plug/business/capture_packet_plug/capture_packet_plug.inf
-{% endif %}
 {% if proxy.enable == 1 %}
 ./plug/business/kni/kni.inf
 {% endif %}
diff --git a/ansible/roles/sapp/templates/necessary_plug_list.conf.j2 b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
index 077a8633..aeecfac7 100644
--- a/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
+++ b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
@@ -6,6 +6,7 @@
 ./plug/platform/wannat/wangw.inf
 ./plug/platform/wire_graft/wire_graft.inf
 ./plug/platform/app_proto_identify/app_proto_identify.inf   1
+./plug/platform/capture_packet_plug/capture_packet_plug.inf 1
 ./plug/platform/tsg_master/tsg_master.inf
 ./plug/protocol/sip/sip.inf
 ./plug/protocol/rtp/rtp.inf
@@ -21,7 +22,6 @@
 ./plug/protocol/bgp/bgp.inf
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 ./plug/business/session_record/session_record.inf 1
-./plug/business/capture_packet_plug/capture_packet_plug.inf 1
 ./plug/business/kni/kni.inf
 ./plug/business/fw_dns_plug/fw_dns_plug.inf
 ./plug/business/conn_telemetry/conn_telemetry.inf
diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
index 4bbf4ea7..12ecf90f 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
+++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
@@ -7,6 +7,9 @@
 {{- if eq .Values.session_flags.enable .Values.define_enable_val_yes }}
 ./plug/platform/session_flags/session_flags.inf
 {{- end }}
+{{- if eq .Values.packet_capture.enable .Values.define_enable_val_yes }}
+./plug/platform/capture_packet_plug/capture_packet_plug.inf
+{{- end }}
 ./plug/platform/tsg_master/tsg_master.inf
 {{- if eq .Values.appsketch.enable .Values.define_enable_val_yes }}
 {{- if eq .Values.appsketch.builtin_engine .Values.define_enable_val_yes }}
@@ -78,9 +81,6 @@
 {{- if eq .Values.sessionrecord.enable .Values.define_enable_val_yes }}
 ./plug/business/session_record/session_record.inf
 {{- end }}
-{{- if eq .Values.packet_capture.enable .Values.define_enable_val_yes }}
-./plug/business/capture_packet_plug/capture_packet_plug.inf
-{{- end }}
 {{- if eq .Values.decoders.GTPC .Values.define_enable_val_yes }}
 ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
 {{- end }}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf b/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf
index 077a8633..aeecfac7 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/necessary_plug_list.conf
@@ -6,6 +6,7 @@
 ./plug/platform/wannat/wangw.inf
 ./plug/platform/wire_graft/wire_graft.inf
 ./plug/platform/app_proto_identify/app_proto_identify.inf   1
+./plug/platform/capture_packet_plug/capture_packet_plug.inf 1
 ./plug/platform/tsg_master/tsg_master.inf
 ./plug/protocol/sip/sip.inf
 ./plug/protocol/rtp/rtp.inf
@@ -21,7 +22,6 @@
 ./plug/protocol/bgp/bgp.inf
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 ./plug/business/session_record/session_record.inf 1
-./plug/business/capture_packet_plug/capture_packet_plug.inf 1
 ./plug/business/kni/kni.inf
 ./plug/business/fw_dns_plug/fw_dns_plug.inf
 ./plug/business/conn_telemetry/conn_telemetry.inf