From 35e2a36f5d95990eb9babd465a8325efc413ae36 Mon Sep 17 00:00:00 2001
From: liuxueli <liuxueli@iieac.cn>
Date: Mon, 3 Apr 2023 19:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0tsg=5Fmaster=E3=80=81firewal?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81:=20TSG-14177=20-?=
 =?UTF-8?q?=20TSG=E5=91=BD=E4=B8=ADSecurity=20Policy=E5=90=8E=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=AD=96=E7=95=A5ID=E5=8F=91=E9=80=81=E7=9B=B8?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84Metric=20TSG-13778=20-=20TSG=20master?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81MAAT4=20TSG-13779=20-=20Firewall=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81MAAT4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/install_config/group_vars/rpm_version.yml      | 4 ++--
 ansible/roles/firewall/templates/maat.conf.j2.j2       | 6 +++---
 ansible/roles/traffic-engine/files/helm/conf/maat.conf | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index df47cbd9..95aca3c2 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -4,7 +4,7 @@ certstore_rpm_version:
 firewall_rpm_version:
   capture_packet_plug: capture_packet_plug-4.1.5.b9783ff
   conn_telemetry: conn_telemetry-1.0.3.4ef6df6
-  firewall: firewall-1.0.8.caa4b57
+  firewall: firewall-2.0.0.fbdb9af
   tsg_conn_sketch:  tsg_conn_sketch-3.4.2.7c84a19
   gtp_signaling_plug: gtp_signaling_plug-1.0.5.8d64946
   tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
@@ -77,7 +77,7 @@ tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-4.5.5.7a60af1
 
 tsg_master_rpm_version:
-  tsg_master: tsg_master-5.10.8.8819217
+  tsg_master: tsg_master-6.0.0.39cdb03
 
 shaping_master_rpm_version:
   shaping_master: shaping_master-1.1.4.b434f47
diff --git a/ansible/roles/firewall/templates/maat.conf.j2.j2 b/ansible/roles/firewall/templates/maat.conf.j2.j2
index d6207a92..2dbe4d2f 100644
--- a/ansible/roles/firewall/templates/maat.conf.j2.j2
+++ b/ansible/roles/firewall/templates/maat.conf.j2.j2
@@ -1,9 +1,9 @@
 [STATIC]
 ###0:location 1:json 2:redis
-MAAT_MODE=2
+MAAT_MODE=redis
 STAT_SWITCH=1
 PERF_SWITCH=1
-TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
+TABLE_INFO=tsgconf/tsg_static_tableinfo.json
 STAT_FILE=tsg_static_maat.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={% raw %}{{ cm_policy_server_ip }}
@@ -39,7 +39,7 @@ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
 MAAT_MODE=2
 STAT_SWITCH=1
 PERF_SWITCH=1
-TABLE_INFO=tsgconf/capture_packet_tableinfo.conf
+TABLE_INFO=tsgconf/capture_packet_tableinfo.json
 STAT_FILE=capture_packet.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={% raw %}{{ cm_policy_server_ip }}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/maat.conf b/ansible/roles/traffic-engine/files/helm/conf/maat.conf
index da2d6aad..7c0fbcd6 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/maat.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/maat.conf
@@ -1,9 +1,9 @@
 [STATIC]
 ###0:location 1:json 2:redis
-MAAT_MODE=2
+MAAT_MODE=redis
 STAT_SWITCH=1
 PERF_SWITCH=1
-TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
+TABLE_INFO=tsgconf/tsg_static_tableinfo.json
 STAT_FILE=tsg_static_maat.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={{ .Values.external_resources.cm.address }}
@@ -33,7 +33,7 @@ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
 MAAT_MODE=2
 STAT_SWITCH=1
 PERF_SWITCH=1
-TABLE_INFO=tsgconf/capture_packet_tableinfo.conf
+TABLE_INFO=tsgconf/capture_packet_tableinfo.json
 STAT_FILE=capture_packet.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={{ .Values.external_resources.cm.address }}