From 7560c6a1bea755f9eae97f0aeef8924c6fc57414 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 22 Aug 2022 16:27:49 +0800 Subject: [PATCH] =?UTF-8?q?feature:TSG-11765:=E6=96=B0=E5=A2=9Eprovision.y?= =?UTF-8?q?ml=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=97=A5=E5=BF=97=E7=9A=84Transcation?= =?UTF-8?q?=E5=92=8Cinterim=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/firewall/templates/main.conf.j2.j2 | 10 ++++++++++ .../config_sample/provision.default.yml.7400MCN0P01R01 | 2 ++ .../config_sample/provision.default.yml.9000NPBP01R01 | 2 ++ .../files/config_sample/provision.default.yml.SERVER | 2 ++ .../provision.default.yml.TSGXNXR620G40R01P0804 | 2 ++ .../provision.default.yml.TSGXNXR620G40R01P1403 | 2 ++ .../config_sample/provision.yml.sample.7400MCN0P01R01 | 2 ++ .../config_sample/provision.yml.sample.9000NPBP01R01 | 2 ++ .../files/config_sample/provision.yml.sample.SERVER | 2 ++ .../provision.yml.sample.TSGXNXR620G40R01P0804 | 2 ++ .../provision.yml.sample.TSGXNXR620G40R01P1403 | 2 ++ 11 files changed, 30 insertions(+) diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 1508e895..8b9eaa3d 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -99,8 +99,18 @@ udp_min_bytes=5 log_service=2 interim_service=6 transaction_service=7 +{% raw %} +{% if sessionrecord.enable_interim_record == 1 %} interim_service_switch=1 +{% else %} +interim_service_switch=0 +{% endif %} +{% if sessionrecord.enable_transcation_record == 1 %} transaction_service_switch=1 +{% else %} +transaction_service_switch=0 +{% endif %} +{% endraw %} interim_intervals_time = 120 sendlog_in_tcp_close=1 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 a9fed924..764a30de 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 @@ -14,6 +14,8 @@ sessionrecord: enable: 1 enable_dns_record: 1 enable_rtp_record: 1 + enable_interim_record: 1 + enable_transcation_record: 1 capturepacket: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 index 1ac2facb..aa526c7b 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 @@ -13,6 +13,8 @@ sessionrecord: enable: 1 enable_dns_record: 1 enable_rtp_record: 1 + enable_interim_record: 1 + enable_transcation_record: 1 capturepacket: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER index ba60b925..ba4a7b63 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER @@ -13,6 +13,8 @@ sessionrecord: enable: 1 enable_dns_record: 1 enable_rtp_record: 1 + enable_interim_record: 1 + enable_transcation_record: 1 capturepacket: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 index 51fef03c..b00ca0cd 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 @@ -14,6 +14,8 @@ sessionrecord: enable: 1 enable_dns_record: 1 enable_rtp_record: 1 + enable_interim_record: 1 + enable_transcation_record: 1 capturepacket: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 index 37089d7a..b0dfc6af 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 @@ -14,6 +14,8 @@ sessionrecord: enable: 1 enable_dns_record: 1 enable_rtp_record: 1 + enable_interim_record: 1 + enable_transcation_record: 1 capturepacket: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 index a63a439b..8ba01803 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 @@ -23,6 +23,8 @@ sessionrecord: enable: 0/1 enable_dns_record: 0/1 enable_rtp_record: 0/1 + enable_interim_record: 0/1 + enable_transcation_record: 0/1 capturepacket: enable: 0/1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 index 1574783d..9f0075a6 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 @@ -23,6 +23,8 @@ sessionrecord: enable: 0/1 enable_dns_record: 0/1 enable_rtp_record: 0/1 + enable_interim_record: 0/1 + enable_transcation_record: 0/1 capturepacket: enable: 0/1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER index ec6a5d24..6387ff25 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER @@ -23,6 +23,8 @@ sessionrecord: enable: 0/1 enable_dns_record: 0/1 enable_rtp_record: 0/1 + enable_interim_record: 0/1 + enable_transcation_record: 0/1 capturepacket: enable: 0/1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804 index 1dc91dc5..34cf25ed 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804 @@ -22,6 +22,8 @@ sessionrecord: enable: 0/1 enable_dns_record: 0/1 enable_rtp_record: 0/1 + enable_interim_record: 0/1 + enable_transcation_record: 0/1 capturepacket: enable: 0/1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403 index 1ba868b1..7afe75ec 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403 @@ -20,6 +20,8 @@ sessionrecord: enable: 0/1 enable_dns_record: 0/1 enable_rtp_record: 0/1 + enable_interim_record: 0/1 + enable_transcation_record: 0/1 capturepacket: enable: 0/1