7400 adapt:stage1 阶段sapp的网卡、cpu affinity core从配置文件读取

ansible/install_config/group_vars/stage_one_tsg_7400.yml

@@ -41,4 +41,18 @@ mrzcpd:
     device:
       nic_mirr: eth_mirr_d
     service:
-      iocore: 53,54 
+      iocore: 53,54 
+
+sapp:
+  gdev_conf:
+    Module:
+      pcapdevice: eth_raw
+      sendto_gdev_card: eth_raw
+  sapp_toml:
+    CPU:
+      worker_threads: 42
+      send_only_threads_max: 1
+      bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43
+    PACKET_IO:
+      packet_io_internal_interface:
+        name: eth_raw

ansible/install_config/group_vars/stage_one_tsg_9140.yml

@@ -28,4 +28,18 @@ mrzcpd:
       nic_raw: enp1s2
       nic_to_tfe: enp130s2
     service:
-      iocore: 52,53,54,55
+      iocore: 52,53,54,55
+
+sapp:
+  gdev_conf:
+    Module:
+      pcapdevice: enp1s2
+      sendto_gdev_card: enp1s2
+  sapp_toml:
+    CPU:
+      worker_threads: 22
+      send_only_threads_max: 1
+      bind_mask: 15,16,17,18,19,20,21,22,23,24,25,26,27,42,43,44,45,46,47,48,49,50,51
+    PACKET_IO:
+      packet_io_internal_interface:
+        name: enp1s2

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

@@ -1,12 +1,6 @@
 [Module]
-{% if PROFILE_ID == '9000-NPB-P01R01' %}
-pcapdevice=enp1s2
-sendto_gdev_card=enp1s2
-{% endif %}
-{% if PROFILE_ID == '7400-MCN0-P01R01' %}
-pcapdevice=eth_raw
-sendto_gdev_card=eth_raw
-{% endif %}
+pcapdevice={{ sapp.gdev_conf.Module.pcapdevice }}
+sendto_gdev_card={{ sapp.gdev_conf.Module.sendto_gdev_card }}
 
 {% if PROFILE_ID == '9000-NPB-P01R01' %}
 {% raw %}

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

@@ -1,31 +0,0 @@
-#以下插件如果加载,初始化失败, sapp平台会退出;
-#插件的路径来自配置文件 ./plug/conflist.inf, 不需要加段落标识[platform],[protocol],[business]等.
-#If the following plugins fail to initialize, the sapp platform will exit.
-#The name of the plugin comes from the configuration ./plug/conflist.inf, section identification is not required.
-
-./plug/platform/app_proto_identify/app_proto_identify.inf
-./plug/platform/tsg_master/tsg_master.inf
-./plug/protocol/mesa_sip/mesa_sip.inf
-./plug/protocol/rtp/rtp.inf
-./plug/protocol/ssl/ssl.inf
-./plug/protocol/http/http.inf
-./plug/protocol/dns/dns.inf
-./plug/protocol/mail/mail.inf
-./plug/protocol/ftp/ftp.inf
-./plug/protocol/quic/quic.inf
-./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
-./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
-./plug/business/capture_packet_plug/capture_packet_plug.inf
-./plug/business/kni/kni.inf
-./plug/business/fw_ssl_plug/fw_ssl_plug.inf
-./plug/business/fw_http_plug/fw_http_plug.inf
-./plug/business/fw_dns_plug/fw_dns_plug.inf
-./plug/business/fw_mail_plug/fw_mail_plug.inf
-./plug/business/fw_ftp_plug/fw_ftp_plug.inf
-./plug/business/fw_quic_plug/fw_quic_plug.inf
-./plug/business/fw_voip_plug/fw_voip_plug.inf
-./plug/business/conn_telemetry/conn_telemetry.inf
-./plug/business/app_sketch_local/app_sketch_local.inf
-./plug/protocol/gtp/gtp.inf
-./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
-./plug/platform/app_proto_engine/app_proto_engine.inf

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

@@ -10,16 +10,9 @@ instance_name = "sapp4"
 
 [CPU]
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
-{% if PROFILE_ID == '9000-NPB-P01R01' %}
-worker_threads=22
-send_only_threads_max=1
-bind_mask=[15,16,17,18,19,20,21,22,23,24,25,26,27,42,43,44,45,46,47,48,49,50,51]
-{% endif %}
-{% if PROFILE_ID == '7400-MCN0-P01R01' %}
-worker_threads=42
-send_only_threads_max=1
-bind_mask=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43]
-{% endif %}
+worker_threads={{ sapp.sapp_toml.CPU.worker_threads }}
+send_only_threads_max={{ sapp.sapp_toml.CPU.send_only_threads_max }}
+bind_mask=[{{ sapp.sapp_toml.CPU.bind_mask }}]
 
 [MEM]
 dictator_enable=1
@@ -85,12 +78,7 @@ dictator_enable=1
 ### note, interface.type options: [pag,pcap,marsio]
     [packet_io.internal.interface]
         type=marsio
-{% if PROFILE_ID == '9000-NPB-P01R01' %}
-        name=enp1s2
-{% endif %}
-{% if PROFILE_ID == '7400-MCN0-P01R01' %}
-        name=enp1s4
-{% endif %}
+        name={{ sapp.sapp_toml.PACKET_IO.packet_io_internal_interface.name }}
     [packet_io.external.interface]
         type=pcap
     name=lo