From ee8cfe0e0e63aef851e14e9a98bb067c8d40ecbc Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Tue, 16 Mar 2021 09:55:42 +0100
Subject: [PATCH] fix dependency path for dpdk lib

increasing timeout for command related to waitbuild

debug

removing parallel build of xNB

updating test xml with benetel conf files
---
 ci-scripts/ran.py                                |  1 +
 .../xml_files/benetel_multi_node_build.xml       | 16 +---------------
 ci-scripts/xml_files/benetel_nsa_base.xml        |  4 ++--
 cmake_targets/CMakeLists.txt                     |  3 +++
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 774d7f19c6..5a88a096a3 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -239,6 +239,7 @@ class RANManagement():
 		while (count > 0) and buildOAIprocess:
 			mySSH.command('ps aux | grep --color=never build_ | grep -v grep', '\$', 6)
 			result = re.search('build_oai', mySSH.getBefore())
+			print(result)
 			if result is None:
 				buildOAIprocess = False
 			else:
diff --git a/ci-scripts/xml_files/benetel_multi_node_build.xml b/ci-scripts/xml_files/benetel_multi_node_build.xml
index 6f9ebdd1d1..7d22675568 100644
--- a/ci-scripts/xml_files/benetel_multi_node_build.xml
+++ b/ci-scripts/xml_files/benetel_multi_node_build.xml
@@ -26,7 +26,6 @@
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
  000001 000002
- 000003 000004
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
@@ -36,15 +35,8 @@
 		<Build_eNB_args>--eNB -t benetel4g -w None</Build_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
 	</testCase>
 
-	<testCase id="000004">
-		<class>WaitEndBuild_eNB</class>
-		<desc>Wait for end of Build eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
 
 	<testCase id="000002">
 		<class>Build_eNB</class>
@@ -52,15 +44,9 @@
 		<Build_eNB_args>--gNB -t benetel5g -w None</Build_eNB_args>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
 	</testCase>
 
-	<testCase id="000003">
-		<class>WaitEndBuild_eNB</class>
-		<desc>Wait for end of Build gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-	</testCase>
+
 
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/benetel_nsa_base.xml b/ci-scripts/xml_files/benetel_nsa_base.xml
index 01a5398225..0404c14a09 100644
--- a/ci-scripts/xml_files/benetel_nsa_base.xml
+++ b/ci-scripts/xml_files/benetel_nsa_base.xml
@@ -70,7 +70,7 @@
 	<testCase id="030000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.fr1.25PRB.usrpb210.conf</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-4g.conf</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>lte</air_interface>
@@ -80,7 +80,7 @@
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf -E</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -E</Initialize_eNB_args>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 		<air_interface>nr</air_interface>
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index e11c850b8e..28bd461c34 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -926,6 +926,9 @@ set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidd
 # Benetel 4G library
 ######################################################################
 
+
+include_directories ("/usr/include/dpdk")
+
 set(HWLIB_BENETEL_4G_SOURCE
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/benetel.c
   ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/shared_buffers.c