From 972c58c31fa03f0a7a7b39da26efd1ac4a4769cd Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Thu, 28 Dec 2023 15:30:26 +0800
Subject: [PATCH] =?UTF-8?q?feature:TSG-18248:=E5=88=A0=E9=99=A4firewall.lo?=
 =?UTF-8?q?gs.contains=5Fnat=5Flinkinfo=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/firewall/templates/main.conf.j2.j2             | 5 -----
 ansible/roles/traffic-engine/files/helm/conf/main.conf       | 5 -----
 ansible/roles/traffic-engine/files/helm/values.yaml          | 1 -
 .../files/config_sample/provision.default.yml.7400MCN0P01R01 | 1 -
 4 files changed, 12 deletions(-)

diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2
index 5cb50790..55ea29f9 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -22,11 +22,6 @@ SEND_APP_ID_SWITCH=1
 {% else %}
 SEND_APP_ID_SWITCH=0
 {% endif %}
-{% if sessionrecord.enable_contains_nat_linkinfo == 1 %}
-SEND_NAT_LINKINFO_SWITCH=1
-{% else %}
-SEND_NAT_LINKINFO_SWITCH=0
-{% endif %}
 {% if sessionrecord.enable_interim_record == 1 %}
 SEND_INTERIM_RECORD=1
 {% else %}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf
index 871f02dd..caeb721f 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/main.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf
@@ -22,11 +22,6 @@ SEND_APP_ID_SWITCH=1
 {{- else }}
 SEND_APP_ID_SWITCH=0
 {{- end }}
-{{- if eq .Values.firewall.logs.contains_nat_linkinfo.enable .Values.define_enable_val_yes }}
-SEND_NAT_LINKINFO_SWITCH=1
-{{- else }}
-SEND_NAT_LINKINFO_SWITCH=0
-{{- end }}
 SEND_INTERCEPT_LOG=1
 TCP_MIN_PKTS=3
 TCP_MIN_BYTES=5
diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml
index 450bd2b6..174d17a3 100644
--- a/ansible/roles/traffic-engine/files/helm/values.yaml
+++ b/ansible/roles/traffic-engine/files/helm/values.yaml
@@ -64,7 +64,6 @@ firewall:
   enable_smartoffload: no
   logs:
     contains_app_id: yes
-    contains_nat_linkinfo: yes
     contains_dns_resource_record: yes
 
 appsketch:
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
index cd652f05..631dc028 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
@@ -19,7 +19,6 @@ sessionrecord:
   enable_interim_record: 1
   enable_transcation_record: 1
   enable_contains_app_id: 0
-  enable_contains_nat_linkinfo: 0
   enable_contains_dns_resource_record: 0
 
 capturepacket: