From aa7840088975c5f299561cb3966b50409e5a5e0f Mon Sep 17 00:00:00 2001
From: wangmenglan <wangmenglan@geedgenetworks.com>
Date: Fri, 5 Jul 2024 11:56:51 +0800
Subject: [PATCH] TSG-21715 update Clixon to 1.2.41

---
 ansible/install_config/group_vars/rpm_version.yml  |  2 +-
 .../files/script/build_clixon_default_db.sh        |  8 ++++++++
 .../roles/tsg-os-HAL/files/script/tsg-os-HAL.sh    | 14 --------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 707a7506..3c9e5d2f 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -91,7 +91,7 @@ hasp_tools_rpm_version:
 tsg_os_clixon_rpm_version:
   cligen: cligen-5.8.0-release
   clixon: clixon-5.8.3-89803bb
-  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.40.56ffe6b
+  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.41.5b3e8d1
 
 sce_rpm_version:
   sce: sce-1.3.2.a0f1eca
diff --git a/ansible/roles/tsg-os-HAL/files/script/build_clixon_default_db.sh b/ansible/roles/tsg-os-HAL/files/script/build_clixon_default_db.sh
index cc05f7cd..69573184 100644
--- a/ansible/roles/tsg-os-HAL/files/script/build_clixon_default_db.sh
+++ b/ansible/roles/tsg-os-HAL/files/script/build_clixon_default_db.sh
@@ -9,6 +9,14 @@ build_default_db()
          <packet_io_engine_cores>${IOCORE}</packet_io_engine_cores>
          <workload_cores>${WORKLOAD_CORE}</workload_cores>
       </resources>
+      <packet_io_engine>
+         <pktmbuf_max_size>${MRZCPD_SZ_DATA}</pktmbuf_max_size>
+         <pktmbuf_queue_size>${MRZCPD_SZ_TUNNEL}</pktmbuf_queue_size>
+         <pktmbuf_pool_create_mode>${MRZCPD_CREATE_MODE}</pktmbuf_pool_create_mode>
+         <pktmbuf_pool_max_elements_count>${MRZCPD_DIRECT_PKTMBUF}</pktmbuf_pool_max_elements_count>
+         <enable_check_pktmbuf_leak>${MRZCPD_CHECK_BUFFER_LEAK}</enable_check_pktmbuf_leak>
+         <enable_poll_wait_throttle>${MRZCPD_POLL_WAIT_THROTTLE}</enable_poll_wait_throttle>
+      </packet_io_engine>
    </system>
 </config>"
     echo ${resources} | xmlstarlet fo > ${tsg_clixon_default_db_file}
diff --git a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
index 148f9a05..66f57706 100644
--- a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
+++ b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh
@@ -5,7 +5,6 @@ set -x
 tsg_os_HAL_cfg_file="/etc/sysconfig/tsg-os-HAL.conf"
 
 tsg_clixon_cfg_file="/opt/tsg/clixon/etc/mgnt-srv.conf"
-mrzcpd_conf_file="/var/run/share/container_mrzcpd.conf"
 cpu_partitioning_conf_file='/etc/tuned/cpu-partitioning-variables.conf'
 tsg_clixon_default_db_file='/etc/clixon/default_db'
 
@@ -81,17 +80,6 @@ set_clixon_configuration()
     [ -f ${tsg_clixon_cfg_file} ] && sed -i "s/^nf_count=.*$/nf_count=${NF_COUNT}/g" ${tsg_clixon_cfg_file}
 }
 
-set_mrzcpd_configuration()
-{
-    echo "sz_indirect_pktmbuf=${MRZCPD_INDIRECT_PKTMBUF}" > ${mrzcpd_conf_file}
-    echo "sz_direct_pktmbuf=${MRZCPD_DIRECT_PKTMBUF}" >> ${mrzcpd_conf_file}
-    echo "poll_wait_throttle=${MRZCPD_POLL_WAIT_THROTTLE}" >> ${mrzcpd_conf_file}
-    echo "sz_data=${MRZCPD_SZ_DATA}" >> ${mrzcpd_conf_file}
-    echo "sz_tunnel=${MRZCPD_SZ_TUNNEL}" >> ${mrzcpd_conf_file}
-    echo "check_buffer_leak=${MRZCPD_CHECK_BUFFER_LEAK}" >> ${mrzcpd_conf_file}
-    echo "create_mode=${MRZCPD_CREATE_MODE}" >> ${mrzcpd_conf_file}
-}
-
 calculate_hugepages()
 {
     if [ ! -n "$HUGEPAGES" ]; then
@@ -290,9 +278,7 @@ calculate_mrzcpd_indirect_pktmbuf
 calculate_mrzcpd_sz_tunnel
 calculate_mrzcpd_direct_pktmbuf
 
-set_k3s_configuration ${mem_num}
 set_clixon_configuration
-set_mrzcpd_configuration
 
 # add sn to k8s node annotations.
 read_device_type