feature:TSG-8379:在provision中添加开关，控制是否开启DNS会话记录/RTP会话记录/RADIUS会话记录功能

ansible/roles/firewall/tasks/main.yml

@@ -26,8 +26,8 @@
  
 - name: "Template the /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf"
   template:
-    src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2"
-    dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
+    src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2.j2"
+    dest: /opt/tsg/tsg-os-provision/templates/tsg_conn_sketch.inf.j2
   tags: template
 
 - name: "Template the conf/http/http.conf"

ansible/roles/firewall/templates/main.conf.j2.j2

@@ -152,7 +152,22 @@ DEFAULT_VLAN_ID=2
 {% endif %}
 
 [RADIUS_PLUG]
-DEVICE_TAGS={"tags":[{"tag":"device_group","value":"BeiJing-XXG"}]}
+{% raw %}{% set tags_list = [] %}
+{% if data_center.name is defined %}
+{% set tag_json = "{\"tag\":\"" ~ "data_center" ~ "\",\"value\":\"" ~ data_center.name ~ "\"}" %}
+{{tags_list.append(tag_json)}}{% endif %}
+{% if device.tags is defined %}
+{% for device_tag in device.tags %}
+{% for key,value in device_tag.items() %}
+{% set tag_json = "{\"tag\":\"" ~ key ~ "\",\"value\":\"" ~ value ~ "\"}" %}
+{{tags_list.append(tag_json)}}{% endfor %}
+{% endfor %}
+{% endif %}
+{% if data_center.name is not defined and device.tags is not defined %}
+{{ device.tags }}
+{% endif %}
+DEVICE_TAGS={"tags":[{{ tags_list | join(",") }}]}
+{% endraw %}
 PACKET_TYPE_FLAG=16
 COLLECT_TOPIC=RADIUS-RECORD
 SERVICE_ID=162

ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2

@@ -25,17 +25,23 @@ FUNC_NAME=tsg_record_http_entry
 FUNC_FLAG=SSL_CLIENT_HELLO,SSL_SERVER_HELLO,SSL_APPLICATION_DATA,SSL_CERTIFICATE_DETAIL
 FUNC_NAME=tsg_record_ssl_entry
 
+{% raw %}{% if sessionrecord.enable_dns_record == 1 %}
 [DNS]
 FUNC_FLAG=ALL
 FUNC_NAME=tsg_record_dns_entry
+{% endif %}
+{% endraw %}
 
 [MAIL]
 FUNC_FLAG=ALL
 FUNC_NAME=tsg_record_mail_entry
 
+{% raw %}{% if sessionrecord.enable_rtp_record == 1 %}
 [RTP]
 FUNC_FLAG=ALL
 FUNC_NAME=tsg_record_rtp_entry
+{% endif %}
+{% endraw %}
 
 [SIP]
 FUNC_FLAG=ALL

ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01

@@ -69,5 +69,7 @@
 {% if npb_device == 'tera' %}
 ./plug/business/http_healthcheck/http_healthcheck.inf
 {% endif %}
-{% endraw %}
-./plug/business/radius_collect_plug/radius_collect_plug.inf
+{% if radius.enable == 1 %}
+./plug/business/radius_collect_plug/radius_collect_plug.inf
+{% endif %}
+{% endraw %}

ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01

@@ -66,5 +66,7 @@
 {% if app.identify_by.user_defined_signature == 1 %}
 ./plug/business/app_sketch_local/app_sketch_local.inf
 {% endif %}
-{% endraw %}
-./plug/business/radius_collect_plug/radius_collect_plug.inf
+{% if radius.enable == 1 %}
+./plug/business/radius_collect_plug/radius_collect_plug.inf
+{% endif %}
+{% endraw %}

ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01

@@ -12,10 +12,15 @@ proxy:
 
 sessionrecord:
   enable: 1
+  enable_dns_record: 1
+  enable_rtp_record: 1
 
 capturepacket:
   enable: 1
-  
+
+radius:
+  enable: 1
+
 wannat:
   enable: 0
   natgw_address: "127.0.0.1"

ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01

@@ -11,10 +11,15 @@ proxy:
 
 sessionrecord:
   enable: 1
+  enable_dns_record: 1
+  enable_rtp_record: 1
 
 capturepacket:
   enable: 1
-  
+
+radius:
+  enable: 1
+
 wannat:
   enable: 0
   natgw_address: "127.0.0.1"

ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01

@@ -21,10 +21,15 @@ proxy:
 
 sessionrecord:
   enable: 0/1
+  enable_dns_record: 0/1
+  enable_rtp_record: 0/1
 
 capturepacket:
   enable: 0/1
 
+radius:
+  enable: 0/1
+
 wannat:
   enable: 0/1
   natgw_address: "127.0.0.1"

ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01

@@ -21,10 +21,15 @@ proxy:
 
 sessionrecord:
   enable: 0/1
+  enable_dns_record: 0/1
+  enable_rtp_record: 0/1
 
 capturepacket:
   enable: 0/1
-  
+
+radius:
+  enable: 0/1
+
 wannat:
   enable: 0/1
   natgw_address: "127.0.0.1"

ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01

@@ -152,7 +152,13 @@
         src: "../templates/maat.conf.j2"
         dest: /opt/tsg/sapp/tsgconf/maat.conf
       tags: firewall
-  
+
+    - name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
+      template:
+        src: "../templates/tsg_conn_sketch.inf.j2"
+        dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
+      tags: firewall
+
     - name: "tsg-os-provision: Template the sapp.toml"
       template:
         src: "../templates/sapp.toml.j2"

ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01

@@ -97,7 +97,13 @@
         src: "../templates/maat.conf.j2"
         dest: /opt/tsg/sapp/tsgconf/maat.conf
       tags: firewall
-  
+
+    - name: "tsg-os-provision: Template the tsg_conn_sketch.inf"
+      template:
+        src: "../templates/tsg_conn_sketch.inf.j2"
+        dest: /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
+      tags: firewall
+
     - name: "tsg-os-provision: Template the sapp.toml"
       template:
         src: "../templates/sapp.toml.j2"