From c4963ed16d91318ee95b5aa9c521df763c3f8c7a Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 22 Dec 2022 10:49:52 +0100
Subject: [PATCH] CI: support cmd_prefix for OAI UE

---
 ci-scripts/cls_oaicitest.py                | 3 ++-
 ci-scripts/main.py                         | 2 ++
 ci-scripts/xml_files/fr1_sa_oaiue_n310.xml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index dbf720cf64..e21176c176 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -193,6 +193,7 @@ class OaiCiTest():
 		self.expectedNbOfConnectedUEs = 0
 		self.ue_id = '' #used for module identification
 		self.ue_trace ='' #used to enable QLog trace for Module UE, passed to Module UE object at InitializeUE()
+		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
 
 	def BuildOAIUE(self,HTML):
@@ -489,7 +490,7 @@ class OaiCiTest():
 			copyin_res = SSH.copyin(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath + '/cmake_targets/reconfig.raw', '.')
 			if (copyin_res == 0):
 				SSH.copyout(self.UEIPAddress, self.UEUserName, self.UEPassword, './reconfig.raw', self.UESourceCodePath + '/cmake_targets/ran_build/build')
-		SSH.command('echo "ulimit -c unlimited && ./'+ self.air_interface +' ' + self.Initialize_OAI_UE_args + '" > ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+		SSH.command(f'echo "ulimit -c unlimited && {self.cmd_prefix} ./{self.air_interface} {self.Initialize_OAI_UE_args}" > ./my-lte-uesoftmodem-run{self.UE_instance}.sh', '\$', 5)
 		SSH.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
 		SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
 		self.UELogFile = 'ue_' + self.testCase_id + '.log'
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 76fd6830e9..322b6a5c72 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -287,6 +287,8 @@ def GetParametersFromXML(action):
 			#CiTestObj.air_interface = 'ocp-enb'
 			logging.error('OCP UE -- NOT SUPPORTED')
 
+		CiTestObj.cmd_prefix = test.findtext('cmd_prefix') or ""
+
 	elif action == 'Terminate_OAI_UE':
 		UE_instance=test.findtext('UE_instance')
 		if (UE_instance is None):
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
index 468005f54f..b0eb281b6d 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -61,6 +61,7 @@
 		<eNB_Trace>yes</eNB_Trace>
 		<eNB_Stats>yes</eNB_Stats>
 		<USRP_IPAddress>172.21.19.14</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0</cmd_prefix>
 	</testCase>
 
 	<testCase id="000001">