update sapp from v4.2.37.ead1db6 to v4.2.39.3c2b02b;

TSG-5511,
TSG-6647,
TSG-6703,
修复sapp -g参数测试breakpad mini core上传功能失效的BUG,
add sapp config file well_known_port.conf;
delete sapp asymmetric_presence_layer.conf;

ansible/install_config/group_vars/rpm_version.yml

@@ -53,7 +53,7 @@ mrzcpd_rpm_version:
   mrzcpd: mrzcpd-4.4.5.cebe25a
 
 sapp_rpm_version:
-  sapp: sapp-4.2.37.ead1db6
+  sapp: sapp-4.2.39.3c2b02b
   tcpdump_mesa: tcpdump_mesa-1.0.5.793bb53
 
 tfe_rpm_version:

ansible/roles/sapp/tasks/main.yml

@@ -56,23 +56,6 @@
     dest: /home/mesasoft/sapp_run/etc/asymmetric_addr_layer.conf
   tags: template
 
-- name: Template the asymmetric_presence_layer.conf.j2 - tsg_9140
-  template:
-    src: "{{ role_path }}/templates/asymmetric_presence_layer.conf.j2.9000NPBP01R01"
-    dest: /home/mesasoft/sapp_run/etc/asymmetric_presence_layer.conf
-  tags: template
-  when:
-    - PROFILE_ID == '9000-NPB-P01R01'
-
-- name: Template the asymmetric_presence_layer.conf.j2 - tsg-7400
-  template:
-    src: "{{ role_path }}/templates/asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01"
-    dest: /opt/tsg/tsg-os-provision/templates/asymmetric_presence_layer.conf.j2
-  tags: template
-  when:
-    - PROFILE_ID == '7400-MCN0-P01R01'
-
-
 - name: Template the necessary_plug_list.conf - tsg_9140
   template:
     src: "{{ role_path }}/templates/necessary_plug_list.conf.j2.9000NPBP01R01"
@@ -123,6 +106,13 @@
     dest: /opt/tsg/tsg-os-provision/templates/gdev.conf.j2
   tags: template
 
+- name: Template the well_known_port.conf
+  template:
+    src: "{{ role_path }}/templates/well_known_port.conf.j2"
+    dest: /opt/tsg/tsg-os-provision/templates/well_known_port.conf
+  tags: template
+
+
 - name: "Create /usr/lib/systemd/system/sapp.service.d/ directory if it does not exist"
   file:
     path: "{{ item }}"

ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.9000NPBP01R01

@@ -1,3 +0,0 @@
-#layer name definition:  ipv4, ipv6, ethernet,vlan, arp, gre, mpls, pppoe, tcp, udp, l2tp, ppp, pptp, gtp
-#pattern: asymmetric_layer_name    under_of_this_asymmetric_layer[layer_index]   upper_of_this_asymmetric_layer[layer_index]
-#

ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01

@@ -1,7 +0,0 @@
-#layer name definition:  ipv4, ipv6, ethernet,vlan, arp, gre, mpls, pppoe, tcp, udp, l2tp, ppp, pptp, gtp
-#pattern: asymmetric_layer_name    under_of_this_asymmetric_layer[layer_index]   upper_of_this_asymmetric_layer[layer_index]
-{% raw %}{% if npb_device == 'tera' %}
-mpls    ethernet[0]    ipv4[1]
-mpls    ethernet[0]    ipv6[1]
-{% endif %}
-{% endraw %}

ansible/roles/sapp/templates/sapp.toml.j2.j2

@@ -215,7 +215,8 @@ dictator_enable=1
     cfg_file_stream_compare_layer="etc/stream_compare_layer.conf"
     cfg_file_vlan_flipping="etc/vlan_flipping_map.conf"
     cfg_file_asymmetric_addr_layer="etc/asymmetric_addr_layer.conf"
-
+	cfg_file_well_known_port="etc/well_known_port.conf"
+	
 [SECONDARY_DATA_LINK]
     data_file_sysinfo_log="sysinfo.log"
     data_file_field_stat_log="fs2_sysinfo.log"

ansible/roles/sapp/templates/well_known_port.conf.j2

@@ -0,0 +1,9 @@
+# The following ports are considered as server, when creating a new UDP stream or TCP stream without SYN(SYN/ACK) packet.
+# You can add other ports according to your needs.
+[TCP]
+#http
+8080
+
+[UDP]
+#OICQ
+8000