modified: openair2/RRC/NR/nr_rrc_config.c

CHANGELOG.md

@@ -1,32 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
-
-This release improves existing 5G support and adds various new features.
-
-* 5G gNB
-  - Add support for O-RAN 7.2 fronthaul interface
-    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
-  - Add support for 2-layer UL MIMO
-  - FDD interoperability with COTS UE
-  - Compiles on ARM (through SIMDE)
-  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
-  - Add support for E1AP
-  - Add support for multiple DUs and CU-UPs at one CU-CP
-  - FR2 SA with OAI UE
-  - Improve computational efficiency
-* 5G UE
-  - Cleanup in MAC and RRC towards support of 3rd-party gNB
-  - FR2 SA with OAI gNB
-  - Improve computational efficiency
-
-Overall the stability is improved for the same resource usage.
-
-There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
-interoperability is under testing.
-
-This release also includes many fixes and documentation updates.
-
 ## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##
 
 This release adds support for 5G and maintains previous features:

CMakeLists.txt

@@ -726,6 +726,7 @@ set(SCHED_SRC_NR_UE
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
 target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
+
 # nFAPI
 #################################
 set(NFAPI_COMMON_SRC
@@ -1383,11 +1384,9 @@ set (MAC_NR_SRC_UE
   ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
   ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
   ${NR_UE_MAC_DIR}/config_ue.c
-  ${NR_UE_MAC_DIR}/config_ue_sl.c
   ${NR_UE_MAC_DIR}/mac_vars.c
   ${NR_UE_MAC_DIR}/main_ue_nr.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures.c
-  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
   ${NR_UE_MAC_DIR}/nr_ra_procedures.c
@@ -1435,7 +1434,8 @@ target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 if(E2_AGENT)
   target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_compile_definitions(L2 PRIVATE E2_AGENT)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()
 
 
@@ -1461,7 +1461,8 @@ target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
 if(E2_AGENT)
   target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
 
 add_library(L2_LTE_NR
@@ -1980,7 +1981,8 @@ target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 if(E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_compile_definitions(lte-softmodem PRIVATE E2_AGENT)
+  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()
 
 add_executable(oairu
@@ -2065,8 +2067,6 @@ add_executable(nr-softmodem
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
-include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
-
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
@@ -2080,7 +2080,7 @@ target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()
 
 
@@ -2093,6 +2093,10 @@ endif()
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
   asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
+if(E2_AGENT)
+  target_compile_definitions(nr-softmodem PRIVATE E2_AGENT)
+endif()
+
 
 add_executable(nr-cuup
   executables/nr-cuup.c

ci-scripts/Jenkinsfile-GitLab-Container

@@ -308,6 +308,29 @@ pipeline {
             }
           }
         }
+        stage ("L2-Sim-Test-5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                l2Sim5GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += l2Sim5GStatus
+              }
+            }
+          }
+        }
         stage ("LTE-B200-FDD-LTEBOX-Container") {
           when { expression {do4Gtest} }
           steps {
@@ -539,29 +562,6 @@ pipeline {
             }
           }
         }
-        stage ("SA-AERIAL-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saAERIALStatus
-              }
-            }
-          }
-        }
         stage ("SA-OAIUE-CN5G") {
           when { expression {do5Gtest} }
           steps {

ci-scripts/active_net_interfaces.awk

@@ -0,0 +1,21 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+/inet.*brd/{print "interfaceToUse="$NF"done"}

ci-scripts/add_user_to_conf_file.awk

@@ -0,0 +1,33 @@
+BEGIN{lineIdx=0;captureUEDesc=0}
+{
+    if ($0 ~/UE0/) {
+        captureUEDesc = 1
+    }
+    if (captureUEDesc == 1) {
+        captureLine[lineIdx] = $0
+        lineIdx = lineIdx + 1
+    }
+    print $0
+}
+END {
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       print ""
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UE0/) {
+               mLine = captureLine[k]
+               gsub("UE0", "UE"ueIdx, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/MSIN=/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%08d", 1111+int(ueIdx))
+                   gsub("00001111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+
+       }
+   }
+}

ci-scripts/add_user_to_subscriber_list.awk

@@ -0,0 +1,27 @@
+BEGIN{lineIdx=0}
+{
+    captureLine[lineIdx] = $0
+    lineIdx = lineIdx + 1
+    print $0
+}
+END{
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UserName=/) {
+               mLine = captureLine[k]
+               MSIN=sprintf("%08d", 1111+int(ueIdx))
+               gsub("00001111", MSIN, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/SubscriptionIndex/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%d", 111+int(ueIdx))
+                   gsub("111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+       }
+   }
+}

ci-scripts/checkCodingFormattingRules.sh

@@ -74,9 +74,8 @@ then
        IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
        IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
        IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
-       IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FILE || true`
        IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
        then
            if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
            then
@@ -185,9 +184,8 @@ do
             IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
             IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
             IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
-            IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FULLFILE || true`
             IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
             then
                 if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                 then

ci-scripts/ci_ueinfra.yaml

@@ -9,21 +9,12 @@ idefix:
   MTU: 1500
   Trace: True
   LogStore: /media/usb-drive/ci_qlogs
-
-up2:
-  Host: up2
-  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-sphex_quectel:
-  Host: sphex
-  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+nrmodule2_quectel:
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
   TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 detach
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
   NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
@@ -56,39 +47,6 @@ adb_ue_2:
   MTU: 1500
   LogStore: /media/usb-drive/ci_adb_2-logs
 
-oc-cn5g:
-  Host: avra
-  NetworkScript: echo "inet 172.21.6.102"
-  RunIperf3Server: False
-
-porcepix-cn4g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-porcepix-cn5g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-nano-cn4g:
-  Host: nano
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-ltebox-nano:
-  Host: nano
-  NetworkScript: ip a show dev tun1
-
-sabox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-ltebox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
 amarisoft_ue:
   Host: amariue
   InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
@@ -163,48 +121,6 @@ amarisoft_ue_10:
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
-amarisoft_ue_11:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
-  NetworkScript: ip netns exec ue11 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue11
-  MTU: 1500
-amarisoft_ue_12:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
-  NetworkScript: ip netns exec ue12 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue12
-  MTU: 1500
-amarisoft_ue_13:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
-  NetworkScript: ip netns exec ue13 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue13
-  MTU: 1500
-amarisoft_ue_14:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
-  NetworkScript: ip netns exec ue14 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue14
-  MTU: 1500
-amarisoft_ue_15:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
-  NetworkScript: ip netns exec ue15 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue15
-  MTU: 1500
-amarisoft_ue_16:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
-  NetworkScript: ip netns exec ue16 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue16
-  MTU: 1500
 
 oai_ue_caracal:
   Host: caracal
@@ -339,18 +255,6 @@ rfsim4g_enb_nos1:
   CmdPrefix: docker exec rfsim4g-oai-enb
   IF: oaitun_enb1
 
-rfsim4g_enb_fembms:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enm1
-
-rfsim4g_ue_fembms:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_uem1
-
 l2sim5g_ue:
   Host: localhost
   AttachScript: docker start l2sim-oai-nr-ue0

ci-scripts/cls_cluster.py

@@ -274,11 +274,6 @@ class Cluster:
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True

ci-scripts/cls_cmd.py

@@ -31,8 +31,7 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import sys
-import time
+import sys 
 
 SSHTIMEOUT=7
 
@@ -87,12 +86,6 @@ class Cmd(metaclass=abc.ABCMeta):
 		return
 
 class LocalCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
@@ -107,7 +100,6 @@ class LocalCmd(Cmd):
 				# if we wait for stdout, subprocess does not return before the end of the command
 				# however, we don't want to wait for commands with &, so just return fake command
 				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
-				time.sleep(0.1)
 			else:
 				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
@@ -130,40 +122,12 @@ class LocalCmd(Cmd):
 		if src[0] != '/' or tgt[0] != '/':
 			raise Exception('support only absolute file paths!')
 		opt = '-r' if recursive else ''
-		return self.run(f'cp {opt} {src} {tgt}').returncode == 0
+		self.run(f'cp {opt} {src} {tgt}')
 
 	def copyout(self, src, tgt, recursive=False):
-		return self.copyin(src, tgt, recursive)
-
-def PutFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.put(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while putting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
-
-def GetFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.get(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while getting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
+		self.copyin(src, tgt, recursive)
 
 class RemoteCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, hostname, d=None):
 		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
@@ -212,7 +176,6 @@ class RemoteCmd(Cmd):
 				# however, we don't want to wait for commands with &, so just return fake command
 				self.client.exec_command(line, timeout = 5)
 				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
-				time.sleep(0.1)
 			else:
 				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
 				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
@@ -230,38 +193,36 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			with LocalCmd() as cmd:
-				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-					return False
-				if not PutFile(self.client, abstmpfile, abstmpfile):
-					return False
-				cmd.run(f"rm {abstmpfile}")
-				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.put(abstmpfile, abstmpfile)
+			sftp.close()
+			cmd.run(f"rm {abstmpfile}")
+			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return PutFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.put(src, tgt)
+			sftp.close()
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-				return False
-			if not GetFile(self.client, abstmpfile, abstmpfile):
-				return False
+			self.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.get(abstmpfile, abstmpfile)
+			sftp.close()
 			self.run(f"rm {abstmpfile}")
-			with LocalCmd() as cmd:
-				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return GetFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.get(src, tgt)
+			sftp.close()

ci-scripts/cls_containerize.py

@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan']
 
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -169,27 +169,97 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
-# pyshark livecapture launches 2 processes:
-# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
-# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
-# but in fact the packets are read by the following loop before being in fact
-# really written to loFile.
-# So it is mandatory to keep the loop
-def LaunchPySharkCapture(lIfs, lFilter, loFile):
-	capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
-	for packet in capture.sniff_continuously():
-		pass
+def AnalyzeIperf(cliOptions, clientReport, serverReport):
+	req_bw = 1.0 # default iperf throughput, in Mbps
+	result = re.search('-b *(?P<iperf_bandwidth>[0-9\.]+)(?P<magnitude>[kKMG])', cliOptions)
+	if result is not None:
+		req_bw = float(result.group('iperf_bandwidth'))
+		magn = result.group('magnitude')
+		if magn == "k" or magn == "K":
+			req_bw /= 1000
+		elif magn == "G":
+			req_bw *= 1000
+	req_dur = 10 # default iperf send duration
+	result = re.search('-t *(?P<duration>[0-9]+)', cliOptions)
+	if result is not None:
+		req_dur = int(result.group('duration'))
+
+	reportLine = None
+	# find server report in client status
+	clientReportLines = clientReport.split('\n')
+	for l in range(len(clientReportLines)):
+		res = re.search('read failed: Connection refused', clientReportLines[l])
+		if res is not None:
+			message = 'iperf connection refused by server!'
+			logging.error(f'\u001B[1;37;41mIperf Test FAIL: {message}\u001B[0m')
+			return (False, message)
+		res = re.search('Server Report:', clientReportLines[l])
+		if res is not None and l + 1 < len(clientReportLines):
+			reportLine = clientReportLines[l+1]
+			logging.debug(f'found server report: "{reportLine}"')
+
+	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+	# if we do not find a server report in the client logs, check the server logs
+	# and use the last line which is typically close/identical to server report
+	if reportLine is None:
+		for l in serverReport.split('\n'):
+			res = re.search(statusTemplate, l)
+			if res is not None:
+				reportLine = l
+		if reportLine is None:
+			logging.warning('no report in server status found!')
+			return (False, 'could not parse iperf logs')
+		logging.debug(f'found client status: {reportLine}')
+
+	result = re.search(statusTemplate, reportLine)
+	if result is None:
+		logging.error('could not analyze report from statusTemplate')
+		return (False, 'could not parse iperf logs')
+
+	duration = float(result.group('duration'))
+	bitrate = float(result.group('bitrate'))
+	magn = result.group('magnitude')
+	if magn == "k" or magn == "K":
+		bitrate /= 1000
+	elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+		bitrate *= 1000
+	jitter = float(result.group('jitter'))
+	packetloss = float(result.group('packetloss'))
+
+	logging.debug('\u001B[1;37;44m iperf result \u001B[0m')
+	msg = f'Req Bitrate: {req_bw}'
+	logging.debug(f'\u001B[1;34m{msg}\u001B[0m')
+
+	br_loss = bitrate/req_bw
+	bmsg = f'Bitrate    : {bitrate} (perf {br_loss})'
+	logging.debug(f'\u001B[1;34m{bmsg}\u001B[0m')
+	msg += '\n' + bmsg
+	if br_loss < 0.9:
+		msg += '\nBitrate performance too low (<90%)'
+		logging.debug(f'\u001B[1;37;41mBitrate performance too low (<90%)\u001B[0m')
+		return (False, msg)
+
+	plmsg = f'Packet Loss: {packetloss}%'
+	logging.debug(f'\u001B[1;34m{plmsg}\u001B[0m')
+	msg += '\n' + plmsg
+	if packetloss > 5.0:
+		msg += '\nPacket Loss too high!'
+		logging.debug(f'\u001B[1;37;41mPacket Loss too high \u001B[0m')
+		return (False, msg)
+
+	dmsg = f'Duration   : {duration} (req {req_dur})'
+	logging.debug(f'\u001B[1;34m{dmsg}\u001B[0m')
+	msg += '\n' + dmsg
+	if duration < float(req_dur):
+		msg += '\nDuration of iperf too short!'
+		logging.debug(f'\u001B[1;37;41mDuration of iperf too short\u001B[0m')
+		return (False, msg)
+
+	jmsg = f'Jitter     : {jitter}'
+	logging.debug(f'\u001B[1;34m{jmsg}\u001B[0m')
+	msg += '\n' + jmsg
+	return (True, msg)
 
-def StopPySharkCapture(testcase):
-	with cls_cmd.LocalCmd() as myCmd:
-		cmd = 'killall tshark'
-		myCmd.run(cmd, reportNonZero=False)
-		cmd = 'killall dumpcap'
-		myCmd.run(cmd, reportNonZero=False)
-		time.sleep(5)
-		cmd = f'mv /tmp/capture_{testcase}.pcap ../cmake_targets/log/{testcase}/.'
-		myCmd.run(cmd, timeout=100, reportNonZero=False)
-	return False
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -313,7 +383,6 @@ class Containerize():
 				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
 				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
@@ -350,11 +419,6 @@ class Containerize():
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			forceBaseImageBuild = True
 
@@ -411,11 +475,7 @@ class Containerize():
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2023.11.28.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
-			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2023.11.28.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -447,13 +507,9 @@ class Containerize():
 		# Remove all intermediate build images and clean up
 		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
-
-		# Remove some cached artifacts to prevent out of diskspace problem
-		logging.debug(cmd.run("df -h").stdout)
-		logging.debug(cmd.run("docker system df").stdout)
-		cmd.run(f"{self.cli} buildx prune --filter until=1h --force")
-		logging.debug(cmd.run("df -h").stdout)
-		logging.debug(cmd.run("docker system df").stdout)
+		# Remove any cached artifacts: we don't use the cache for now, prevent
+		# out of diskspace problem
+		cmd.run(f"{self.cli} buildx prune --filter=until=6h --force")
 
 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
@@ -601,26 +657,22 @@ class Containerize():
 		collectInfo['proxy'] = files
 		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
 		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
-
 		allImagesSize = {}
 		if result is not None:
 			imageSize = float(result.group('size')) / 1000000
 			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
 			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
-			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
-			logging.error('proxy size is unknown')
+			logging.debug('proxy size is unknown')
 			allImagesSize['proxy'] = 'unknown'
-			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
+
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
+
+		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 
 	def BuildRunTests(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -894,12 +946,12 @@ class Containerize():
 		if svcName == '':
 			logging.warning('no service name given: starting all services in ci-docker-compose.yml!')
 
-		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
+		mySSH.command(f'docker-compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
 
 		# Checking Status
 		grep = ''
-		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
+		if svcName != '': grep = f' | grep -A3 {svcName}'
+		mySSH.command(f'docker-compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
@@ -947,8 +999,8 @@ class Containerize():
 		if healthyNb == 1:
 			cnt = 0
 			while (cnt < 20):
-				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting|ready"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured|cuPHYController initialized|Received CONFIG.response, gNB is ready', mySSH.getBefore())
+				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
+				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -956,6 +1008,7 @@ class Containerize():
 					cnt = 100
 					status = True
 					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
+					time.sleep(10)
 		else:
 			# containers are unhealthy, so we won't start. However, logs are stored at the end
 			# in UndeployObject so we here store the logs of the unhealthy container to report it
@@ -1000,80 +1053,78 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
-		mySSH = cls_cmd.getConnection(lIpAddr)
-		yamlDir = f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}'
-		mySSH.run(f'cd {yamlDir}')
+		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
+		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
+
 		svcName = self.services[self.eNB_instance]
 		forceDown = False
 		if svcName != '':
 			logging.warning(f'service name given, but will stop all services in ci-docker-compose.yml!')
 			svcName = ''
 
-		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
-		if ret.returncode != 0:
-			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services")
-			self.exitStatus = 1
-			return
+		mySSH.command(f'docker-compose -f ci-docker-compose.yml config --services', '\$', 5)
 		# first line has command, last line has next command prompt
-		allServices = ret.stdout.splitlines()
+		allServices = mySSH.getBefore().split('\r\n')[1:-1]
 		services = []
 		for s in allServices:
-			# outputs the hash if the container is running
-			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
-			running = ret.stdout.splitlines()
+			mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
+			running = mySSH.getBefore().split('\r\n')[2:-1]
 			logging.debug(f'running services: {running}')
-			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
+			if len(running) > 0: # something is running for that service
 				services.append(s)
 		logging.info(f'stopping services {services}')
 
-		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
-		copyin_res = True
+		mySSH.command(f'docker-compose -f ci-docker-compose.yml stop -t3', '\$', 30)
+		time.sleep(5)  # give some time to running containers to stop
 		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
 			filename = f'{svcName}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
-			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
+			mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 120)
 
-		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')
+		mySSH.command('docker-compose -f ci-docker-compose.yml down -v', '\$', 5)
+		mySSH.close()
 
 		# Analyzing log file!
-		if not copyin_res:
-			HTML.htmleNBFailureMsg='Could not copy logfile(s) to analyze it!'
+		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
+		if len(services) > 1:
+			files = '{' + files + '}'
+		copyin_res = 0
+		if len(services) > 0:
+			copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, f'{lSourcePath}/cmake_targets/log/{files}.log', '.')
+		if copyin_res == -1:
+			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
 		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
 			self.exitStatus == 0
-			logging.debug(f'Analyzing UE logfile {filename}')
+			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
 			if (logStatus < 0):
+				fullStatus = False
 				HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
-				self.exitStatus = 1
 			else:
 				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
 			for svcName in services:
-				if svcName == 'nv-cubb':
-					msg = 'Undeploy PNF/Nvidia CUBB'
-					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
+				filename = f'{svcName}-{HTML.testCase_id}.log'
+				logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
+				logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+				if (logStatus < 0):
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
+					self.exitStatus = 1
 				else:
-					filename = f'{svcName}-{HTML.testCase_id}.log'
-					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
-					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
-					if (logStatus < 0):
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-						self.exitStatus = 1
-					else:
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			# all the xNB run logs shall be on the server 0 for logCollecting
 			if self.eNB_serverId[self.eNB_instance] != '0':
-				mySSH.copyout(f'./*.log', f'{lSourcePath}/cmake_targets/', recursive=True)
+				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, f'./{files}.log', f'{self.eNBSourceCodePath}/cmake_targets/')
 		if self.exitStatus == 0:
 			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
-		mySSH.close()
 
 	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
@@ -1204,6 +1255,17 @@ class Containerize():
 			self.UndeployGenObject(HTML, RAN, UE)
 			self.exitStatus = 1
 
+	# pyshark livecapture launches 2 processes:
+	# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
+	# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
+	# but in fact the packets are read by the following loop before being in fact
+	# really written to loFile.
+	# So it is mandatory to keep the loop
+	def LaunchPySharkCapture(self, lIfs, lFilter, loFile):
+		capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
+		for packet in capture.sniff_continuously():
+			pass
+
 	def CaptureOnDockerNetworks(self):
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
@@ -1228,7 +1290,7 @@ class Containerize():
 			myCmd.run(cmd, timeout=5, reportNonZero=False)
 			myCmd.close()
 			return
-		x = threading.Thread(target = LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
+		x = threading.Thread(target = self.LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
 		x.daemon = True
 		x.start()
 
@@ -1313,13 +1375,24 @@ class Containerize():
 					logStatus = UE.AnalyzeLogFile_UE(f'{logPath}/{filename}', HTML, RAN)
 					if (logStatus < 0):
 						fullStatus = False
-						self.exitStatus = 1
 						HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
 					else:
 						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
+
+			if self.tsharkStarted:
+				self.tsharkStarted = True
+				cmd = 'killall tshark'
+				myCmd2.run(cmd, reportNonZero=False)
+				cmd = 'killall dumpcap'
+				myCmd2.run(cmd, reportNonZero=False)
+				time.sleep(5)
+				ymlPath = self.yamlPath[0].split('/')
+				# The working dir is still logPath
+				cmd = f'mv /tmp/capture_{ymlPath[1]}.pcap .'
+				myCmd2.run(cmd, timeout=100, reportNonZero=False)
+				self.tsharkStarted = False
 		myCmd2.close()
-		if self.tsharkStarted:
-			self.tsharkStarted = StopPySharkCapture(ymlPath[1])
+
 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		logging.debug(f'Working dir is back {self.yamlPath[0]}')
 		cmd = 'docker-compose -f docker-compose-ci.yml down -v'
@@ -1373,6 +1446,76 @@ class Containerize():
 
 		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
 
+	def PingExit(self, HTML, RAN, UE, status, message):
+		if status:
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
+		else:
+			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', [message])
+			# Automatic undeployment
+			logging.warning('----------------------------------------')
+			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
+			logging.warning('----------------------------------------')
+			HTML.testCase_id = 'AUTO-UNDEPLOY'
+			HTML.desc = 'Automatic Un-Deployment'
+			self.UndeployGenObject(HTML, RAN, UE)
+			self.exitStatus = 1
+
+	def IperfFromContainer(self, HTML, RAN, UE):
+		myCmd = cls_cmd.LocalCmd()
+		self.exitStatus = 0
+
+		ymlPath = self.yamlPath[0].split('/')
+		logPath = '../cmake_targets/log/' + ymlPath[1]
+		cmd = f'mkdir -p {logPath}'
+		myCmd.run(cmd, silent=True)
+
+		# Start the server process
+		cmd = f'docker exec -d {self.svrContName} /bin/bash -c "nohup iperf {self.svrOptions} > /tmp/iperf_server.log 2>&1"'
+		myCmd.run(cmd)
+		time.sleep(3)
+
+		# Start the client process
+		cmd = f'docker exec {self.cliContName} /bin/bash -c "iperf {self.cliOptions}" 2>&1 | tee {logPath}/iperf_client_{HTML.testCase_id}.log'
+		clientStatus = myCmd.run(cmd, timeout=100)
+
+		# Stop the server process
+		cmd = f'docker exec {self.svrContName} /bin/bash -c "pkill iperf"'
+		myCmd.run(cmd)
+		time.sleep(3)
+		serverStatusFilename = f'{logPath}/iperf_server_{HTML.testCase_id}.log'
+		cmd = f'docker cp {self.svrContName}:/tmp/iperf_server.log {serverStatusFilename}'
+		myCmd.run(cmd, timeout=60)
+		myCmd.close()
+
+		# clientStatus was retrieved above. The serverStatus was
+		# written in the background, then copied to the local machine
+		with open(serverStatusFilename, 'r') as f:
+			serverStatus = f.read()
+		(iperfStatus, msg) = AnalyzeIperf(self.cliOptions, clientStatus.stdout, serverStatus)
+		if iperfStatus:
+			logging.info('\u001B[1m Iperf Test PASS\u001B[0m')
+		else:
+			logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m')
+		self.IperfExit(HTML, RAN, UE, iperfStatus, msg)
+
+	def IperfExit(self, HTML, RAN, UE, status, message):
+		html_cell = f'UE\n{message}'
+		if status:
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', [html_cell])
+		else:
+			logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', [html_cell])
+			# Automatic undeployment
+			logging.warning('----------------------------------------')
+			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
+			logging.warning('----------------------------------------')
+			HTML.testCase_id = 'AUTO-UNDEPLOY'
+			HTML.desc = 'Automatic Un-Deployment'
+			self.UndeployGenObject(HTML, RAN, UE)
+			self.exitStatus = 1
+
+
 	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
 		logging.debug('Checking IP routing on ' + svrName)
 		mySSH = SSH.SSHConnection()

ci-scripts/cls_module_ue.py

@@ -41,7 +41,7 @@ import cls_cmd
 
 class Module_UE:
 
-	def __init__(self, module_name, filename="ci_infra.yaml"):
+	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
@@ -64,8 +64,7 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			self.runIperf3Server = m.get('RunIperf3Server', True)
-			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
+			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -190,9 +189,6 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
-	def getRunIperf3Server(self):
-		return self.runIperf3Server
-
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""
 

ci-scripts/cls_oai_html.py

@@ -437,19 +437,13 @@ class HTMLManagement():
 
 		for k in DataLog['Data']:
 			# TestRow 
-			avg = DataLog['Data'][k][0]
-			maxval = DataLog['Data'][k][1]
-			count = DataLog['Data'][k][2]
-			valnorm = float(DataLog['Data'][k][3])
-			dev = DataLog['DeviationThreshold'][k]
-			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
-				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
+			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
+				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			else:
-				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 

ci-scripts/cls_oaicitest.py

@@ -45,7 +45,6 @@ import signal
 import statistics as stat
 from multiprocessing import SimpleQueue, Lock
 import concurrent.futures
-import json
 
 #import our libs
 import helpreadme as HELP
@@ -53,182 +52,13 @@ import constants as CONST
 import cls_cluster as OC
 import sshconnection
 
-import cls_module
+import cls_module_ue
 import cls_cmd
 
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import matplotlib.pyplot as plt
 import numpy as np
 
-#-----------------------------------------------------------
-# Helper functions used here and in other classes
-#-----------------------------------------------------------
-def Iperf_ComputeModifiedBW(idx, ue_num, profile, args):
-	result = re.search('-b\s*(?P<iperf_bandwidth>[0-9\.]+)(?P<unit>[KMG])', str(args))
-	if result is None:
-		raise ValueError(f'requested iperf bandwidth not found in iperf options "{args}"')
-	iperf_bandwidth = float(result.group('iperf_bandwidth'))
-	if iperf_bandwidth == 0:
-		raise ValueError('iperf bandwidth set to 0 - invalid value')
-	if profile == 'balanced':
-		iperf_bandwidth_new = iperf_bandwidth/ue_num
-	if profile =='single-ue':
-		iperf_bandwidth_new = iperf_bandwidth
-	if profile == 'unbalanced':
-		# residual is 2% of max bw
-		residualBW = iperf_bandwidth / 50
-		if idx == 0:
-			iperf_bandwidth_new = iperf_bandwidth - ((ue_num - 1) * residualBW)
-		else:
-			iperf_bandwidth_new = residualBW
-	iperf_bandwidth_str = result.group(0)
-	iperf_bandwidth_unit = result.group(2)
-	iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}{iperf_bandwidth_unit}"
-	args_new = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(args))
-	if iperf_bandwidth_unit == 'K':
-		iperf_bandwidth_new = iperf_bandwidth_new / 1000
-	return iperf_bandwidth_new, args_new
-
-def Iperf_ComputeTime(args):
-	result = re.search('-t\s*(?P<iperf_time>\d+)', str(args))
-	if result is None:
-		raise Exception('Iperf time not found!')
-	return int(result.group('iperf_time'))
-
-def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
-	if (not os.path.isfile(filename)):
-		return (False, 'Iperf3 TCP: Log file not present')
-	if (os.path.getsize(filename)==0):
-		return (False, 'Iperf3 TCP: Log file is empty')
-
-	with open(filename) as file:
-		filename = json.load(file)
-		try:
-			sender_bitrate   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
-		except Exception as e:
-			return (False, 'Could not compute Iperf3 bitrate!')
-
-	snd_msg = f'Sender Bitrate   : {sender_bitrate} Mbps'
-	rcv_msg = f'Receiver Bitrate : {receiver_bitrate} Mbps'
-	success = True
-	if (iperf_tcp_rate_target is not None):
-		if (int(receiver_bitrate) < int(iperf_tcp_rate_target)):
-			rcv_msg += f" (too low! < {iperf_tcp_rate_target} Mbps)"
-			success = False
-		else:
-			rcv_msg += f" (target : {iperf_tcp_rate_target} Mbps)"
-	return(success, f'{snd_msg}\n{rcv_msg}')
-
-def Iperf_analyzeV3BIDIRJson(filename):
-	if (not os.path.isfile(filename)):
-		return (False, 'Iperf3 Bidir TCP: Log file not present')
-	if (os.path.getsize(filename)==0):
-		return (False, 'Iperf3 Bidir TCP: Log file is empty')
-
-	with open(filename) as file:
-		filename = json.load(file)
-		try:
-			sender_bitrate_dl   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_dl = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
-			sender_bitrate_ul   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_ul = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
-		except Exception as e:
-			return (False, 'Could not compute BIDIR bitrate!')
-
-	msg = f'Sender Bitrate DL   : {sender_bitrate_dl} Mbps\n'
-	msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'
-	msg += f'Sender Bitrate UL   : {sender_bitrate_ul} Mbps\n'
-	msg += f'Receiver Bitrate UL : {receiver_bitrate_ul} Mbps\n'
-	return (True, msg)
-
-def Iperf_analyzeV3UDP(filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
-	if (not os.path.isfile(filename)):
-		return (False, 'Iperf3 UDP: Log file not present')
-	if (os.path.getsize(filename)==0):
-		return (False, 'Iperf3 UDP: Log file is empty')
-	sender_bitrate = None
-	receiver_bitrate = None
-	with open(filename, 'r') as server_file:
-		for line in server_file.readlines():
-			res_sender = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>\d+)/(?P<sentPack>\d+) \((?P<lost>[0-9\.]+).*?\s+(sender)', line)
-			res_receiver = re.search(r'(?P<bitrate>[0-9\.]+)\s+(?P<unit>[KMG]bits\/sec)\s+(?P<jitter>[0-9\.]+\s+ms)\s+(?P<lostPack>\d+)/(?P<receivedPack>\d+) \((?P<lost>[0-9\.]+).*?\s+(receiver)', line)
-			if res_sender is not None:
-				sender_bitrate = res_sender.group('bitrate')
-				sender_unit = res_sender.group('unit')
-				sender_jitter = res_sender.group('jitter')
-				sender_lostPack = res_sender.group('lostPack')
-				sender_sentPack = res_sender.group('sentPack')
-				sender_packetloss = res_sender.group('lost')
-			if res_receiver is not None:
-				receiver_bitrate = res_receiver.group('bitrate')
-				receiver_unit = res_receiver.group('unit')
-				receiver_jitter = res_receiver.group('jitter')
-				receiver_lostPack = res_receiver.group('lostPack')
-				receiver_receivedPack = res_receiver.group('receivedPack')
-				receiver_packetloss = res_receiver.group('lost')
-
-	if receiver_bitrate is not None and sender_bitrate is not None:
-		if sender_unit == 'Kbits/sec':
-			sender_bitrate = float(sender_bitrate) / 1000
-		if receiver_unit == 'Kbits/sec':
-			receiver_bitrate = float(receiver_bitrate) / 1000
-		br_perf = 100 * float(receiver_bitrate) / float(target_bitrate)
-		br_perf = '%.2f ' % br_perf
-		sender_bitrate = '%.2f ' % float(sender_bitrate)
-		receiver_bitrate = '%.2f ' % float(receiver_bitrate)
-		req_msg = f'Sender Bitrate  : {sender_bitrate} Mbps'
-		bir_msg = f'Receiver Bitrate: {receiver_bitrate} Mbps'
-		brl_msg = f'{br_perf}%'
-		jit_msg = f'Jitter          : {receiver_jitter}'
-		pal_msg = f'Packet Loss     : {receiver_packetloss} %'
-		if float(br_perf) < float(iperf_bitrate_threshold):
-			brl_msg = f'too low! < {iperf_bitrate_threshold}%'
-		if float(receiver_packetloss) > float(iperf_packetloss_threshold):
-			pal_msg += f' (too high! > {iperf_packetloss_threshold}%)'
-		result = float(br_perf) >= float(iperf_bitrate_threshold) and float(receiver_packetloss) <= float(iperf_packetloss_threshold)
-		return (result, f'{req_msg}\n{bir_msg} ({brl_msg})\n{jit_msg}\n{pal_msg}')
-	else:
-		return (False, 'Could not analyze iperf report')
-
-def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetloss_threshold, target_bitrate):
-		result = None
-		if (not os.path.isfile(server_filename)):
-			return (False, 'Iperf UDP: Server report not found!')
-		if (os.path.getsize(server_filename)==0):
-			return (False, 'Iperf UDP: Log file is empty')
-		# Computing the requested bandwidth in float
-		statusTemplate = r'(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
-		with open(server_filename, 'r') as server_file:
-			for line in server_file.readlines():
-				result = re.search(statusTemplate, str(line))
-				if result is not None:
-					break
-		if result is None:
-			return (False, 'Could not parse server report!')
-		bitrate = float(result.group('bitrate'))
-		magn = result.group('magnitude')
-		if magn == "k" or magn == "K":
-			bitrate /= 1000
-		elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
-			bitrate *= 1000
-		jitter = float(result.group('jitter'))
-		packetloss = float(result.group('packetloss'))
-		br_perf = float(bitrate)/float(target_bitrate) * 100
-		br_perf = '%.2f ' % br_perf
-
-		result = float(br_perf) >= float(iperf_bitrate_threshold) and float(packetloss) <= float(iperf_packetloss_threshold)
-		req_msg = f'Req Bitrate : {target_bitrate}'
-		bir_msg = f'Bitrate     : {bitrate}'
-		brl_msg = f'Bitrate Perf: {br_perf} %'
-		if float(br_perf) < float(iperf_bitrate_threshold):
-			brl_msg += f' (too low! <{iperf_bitrate_threshold}%)'
-		jit_msg = f'Jitter      : {jitter}'
-		pal_msg = f'Packet Loss : {packetloss}'
-		if float(packetloss) > float(iperf_packetloss_threshold):
-			pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
-		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -256,7 +86,7 @@ class OaiCiTest():
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
 		self.iperf_options = ''
-		self.iperf_tcp_rate_target = ''
+		self.iperf_direction = ''
 		self.nbMaxUEtoAttach = -1
 		self.UEDevices = []
 		self.UEDevicesStatus = []
@@ -283,7 +113,6 @@ class OaiCiTest():
 		self.clean_repository = True
 		self.air_interface=''
 		self.ue_ids = []
-		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
 
@@ -393,7 +222,7 @@ class OaiCiTest():
 
 
 	def InitializeUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -609,7 +438,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AttachUE(self, HTML, RAN, EPC, CONTAINERS):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -624,7 +453,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS)
 
 	def DetachUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -632,7 +461,7 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
 	def DataDisableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -644,7 +473,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 
 	def DataEnableUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -657,7 +486,7 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 
 	def CheckStatusUE(self,HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -761,7 +590,7 @@ class OaiCiTest():
 		if self.ue_ids == []:
 			raise Exception("no module names in self.ue_ids provided")
 
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(ues)
 		pingLock = Lock()
 		with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -775,65 +604,372 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', messages)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
-	def Iperf_Module(self, EPC, ue, svr, RAN, idx, ue_num, CONTAINERS):
+	def Iperf_ComputeTime(self):
+		result = re.search('-t (?P<iperf_time>\d+)', str(self.iperf_args))
+		if result is None:
+			logging.debug('\u001B[1;37;41m Iperf time Not Found! \u001B[0m')
+			sys.exit(1)
+		return result.group('iperf_time')
+
+	def Iperf_ComputeModifiedBW(self, idx, ue_num):
+		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(self.iperf_args))
+		if result is None:
+			logging.error('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
+			sys.exit(1)
+		iperf_bandwidth = result.group('iperf_bandwidth')
+		if self.iperf_profile == 'balanced':
+			iperf_bandwidth_new = float(iperf_bandwidth)/ue_num
+		if self.iperf_profile == 'single-ue':
+			iperf_bandwidth_new = float(iperf_bandwidth)
+		if self.iperf_profile == 'unbalanced':
+			# residual is 2% of max bw
+			residualBW = float(iperf_bandwidth) / 50
+			if idx == 0:
+				iperf_bandwidth_new = float(iperf_bandwidth) - ((ue_num - 1) * residualBW)
+			else:
+				iperf_bandwidth_new = residualBW
+		iperf_bandwidth_str = f'-b {iperf_bandwidth}'
+		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
+		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
+		if result is None:
+			logging.error('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
+			sys.exit(1)
+		return result
+
+	def Iperf_analyzeV2TCPOutput(self, SSH, filename):
+
+		SSH.command(f'awk -f /tmp/tcp_iperf_stats.awk {filename}', '\$', 5)
+		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
+		if result is not None:
+			avgbitrate = result.group('average')
+			maxbitrate = result.group('maximum')
+			minbitrate = result.group('minimum')
+			msg = 'TCP Stats   :\n'
+			if avgbitrate is not None:
+				msg += f'Avg Bitrate : {avgbitrate} \n'
+			if maxbitrate is not None:
+				msg += f'Max Bitrate : {maxbitrate} \n'
+			if minbitrate is not None:
+				msg += f'Min Bitrate : {minbitrate} \n'
+			return (True, msg)
+
+		return (False, "could not analyze log file")
+
+	def Iperf_analyzeV2Output(self, iperf_real_options, EPC, SSH):
+
+		result = re.search('-u', str(iperf_real_options))
+		if result is None:
+			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
+			response = self.Iperf_analyzeV2TCPOutput(SSH, filename)
+			return response
+
+		result = re.search('Server Report:', SSH.getBefore())
+		if result is None:
+			result = re.search('read failed: Connection refused', SSH.getBefore())
+			if result is not None:
+				msg = 'Could not connect to iperf server!'
+				return (False, msg)
+			else:
+				msg = 'Server Report and Connection refused Not Found!'
+				return (False, msg)
+		# Computing the requested bandwidth in float
+		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
+		if result is not None:
+			req_bandwidth = result.group('iperf_bandwidth')
+			req_bw = float(req_bandwidth)
+			result = re.search('-b [0-9\.]+K', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Kbits/sec' % req_bw
+				req_bw = req_bw * 1000
+			result = re.search('-b [0-9\.]+M', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Mbits/sec' % req_bw
+				req_bw = req_bw * 1000000
+			result = re.search('-b [0-9\.]+G', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Gbits/sec' % req_bw
+				req_bw = req_bw * 1000000000
+
+		result = re.search('Server Report:\r\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
+		if result is not None:
+			bitrate = result.group('bitrate')
+			packetloss = result.group('packetloss')
+			jitter = result.group('jitter')
+
+			iperfStatus = True
+			msg = f'Req Bitrate : {req_bandwidth} \n'
+			if bitrate is not None:
+				msg += f'Bitrate     : {bitrate} \n'
+				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
+				if result is not None:
+					actual_bw = float(str(result.group('real_bw')))
+					result = re.search('[0-9\.]+ K', bitrate)
+					if result is not None:
+						actual_bw = actual_bw * 1000
+					result = re.search('[0-9\.]+ M', bitrate)
+					if result is not None:
+						actual_bw = actual_bw * 1000000
+					result = re.search('[0-9\.]+ G', bitrate)
+					if result is not None:
+						actual_bw = actual_bw * 1000000000
+					br_loss = 100 * actual_bw / req_bw
+					bitperf = '%.2f ' % br_loss
+					msg += f'Bitrate Perf: {bitperf} %\n'
+			if packetloss is not None:
+				msg += f'Packet Loss : {packetloss} %\n'
+				if float(packetloss) > float(self.iperf_packetloss_threshold):
+					msg += 'Packet Loss too high!\n'
+					iperfStatus = False
+			if jitter is not None:
+				msg += f'Jitter      : {jitter} \n'
+
+			return (iperfStatus, msg)
+		else:
+			return (False, "could not analyze server log")
+
+
+	def Iperf_analyzeV2BIDIR(self, server_filename, client_filename):
+
+		#check the 2 files are here 
+		if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
+			return (False, 'Bidir TCP: Client or Server Log File not present')
+		#check the 2 files size
+		if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
+			return (False, 'Bidir TCP: Client and Server Log File are empty')
+
+		report_msg = ''
+		#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
+		client_filesize = os.path.getsize(client_filename)
+		if client_filesize == 0:
+			report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
+			report_msg+="Partial report from server file"
+			filename = server_filename
+		else :		
+			report_msg+="Report from client file (UE)"
+			filename = client_filename
+
+		report=[] #used to check if relevant lines were found
+
+		with open(filename, 'r') as f_client:
+			for line in f_client.readlines():
+				result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
+				if result is not None:
+					report.append(str(line))
+					report_msg += f"\n{result.group('role')} {result.group('direction')}\t: {result.group('bitrate')}"
+		if len(report) == 0:
+			return (False, 'Bidir TCP: Could not analyze from Log file')
+
+		return (True, report_msg)
+
+	def Iperf_analyzeV2Server(self, iperf_real_options, filename, type):
+		if (not os.path.isfile(filename)):
+			return (False, 'Could not analyze from server log')
+		# Computing the requested bandwidth in float
+		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
+		if result is None:
+			return (False, 'Could not compute Iperf bandwidth!')
+		else:
+			req_bandwidth = result.group('iperf_bandwidth')
+			req_bw = float(req_bandwidth)
+			result = re.search('-b [0-9\.]+K', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Kbits/sec' % req_bw
+				req_bw = req_bw * 1000
+			result = re.search('-b [0-9\.]+M', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Mbits/sec' % req_bw
+				req_bw = req_bw * 1000000
+			result = re.search('-b [0-9\.]+G', str(iperf_real_options))
+			if result is not None:
+				req_bandwidth = '%.1f Gbits/sec' % req_bw
+				req_bw = req_bw * 1000000000
+
+		server_file = open(filename, 'r')
+		br_sum = 0.0
+		ji_sum = 0.0
+		pl_sum = 0
+		ps_sum = 0
+		row_idx = 0
+		for line in server_file.readlines():
+			if type==0:
+				result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(?P<lostPack>[0-9]+)/ +(?P<sentPack>[0-9]+)', str(line))
+			else:
+				result = re.search('^\[\s+\d\].+  (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(?P<lostPack>[0-9]+)\/\s*(?P<sentPack>[0-9]+)', str(line))
+
+			if result is not None:
+				bitrate = result.group('bitrate')
+				jitter = result.group('jitter')
+				packetlost = result.group('lostPack')
+				packetsent = result.group('sentPack')
+				br = bitrate.split(' ')
+				ji = jitter.split(' ')
+				row_idx = row_idx + 1
+				curr_br = float(br[0])
+				pl_sum = pl_sum + int(packetlost)
+				ps_sum = ps_sum + int(packetsent)
+				if (br[1] == 'Kbits/sec'):
+					curr_br = curr_br * 1000
+				if (br[1] == 'Mbits/sec'):
+					curr_br = curr_br * 1000 * 1000
+				br_sum = curr_br + br_sum
+				ji_sum = float(ji[0]) + ji_sum
+
+		server_file.close()
+
+		if (row_idx > 0):
+			br_sum = br_sum / row_idx
+			ji_sum = ji_sum / row_idx
+			br_loss = 100 * br_sum / req_bw
+			if (br_sum > 1000):
+				br_sum = br_sum / 1000
+				if (br_sum > 1000):
+					br_sum = br_sum / 1000
+					bitrate = '%.2f Mbits/sec' % br_sum
+				else:
+					bitrate = '%.2f Kbits/sec' % br_sum
+			else:
+				bitrate = '%.2f bits/sec' % br_sum
+			bitperf = '%.2f ' % br_loss
+			bitperf += '%'
+			jitter = '%.2f ms' % (ji_sum)
+			if (ps_sum > 0):
+				pl = float(100 * pl_sum / ps_sum)
+				packetloss = '%2.1f ' % (pl)
+				packetloss += '%'
+
+			result = float(br_loss) >= float(self.iperf_bitrate_threshold) and float(pl) <= float(self.iperf_packetloss_threshold)
+			req_msg = f'Req Bitrate : {req_bandwidth}'
+			bir_msg = f'Bitrate     : {bitrate}'
+			brl_msg = f'Bitrate Perf: {bitperf}'
+			if float(br_loss) < float(self.iperf_bitrate_threshold):
+				brl_msg += f' (too low! <{self.iperf_bitrate_threshold}%)'
+			jit_msg = f'Jitter      : {jitter}'
+			pal_msg = f'Packet Loss : {packetloss}'
+			if float(pl) > float(self.iperf_packetloss_threshold):
+				pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
+			return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
+		else:
+			return (False, 'Could not analyze from server log')
+
+	def Iperf_Module(self, EPC, ue, RAN, idx, ue_num):
 		ueIP = ue.getIP()
 		if not ueIP:
 			return (False, f"UE {ue.getName()} has no IP address")
-		svrIP = svr.getIP()
-		if not svrIP:
-			return (False, f"Iperf server {ue.getName()} has no IP address")
-
-		runIperf3Server = svr.getRunIperf3Server()
-		iperf_opt = self.iperf_args
-		jsonReport = "--json"
-		serverReport = ""
-		udpIperf = re.search('-u', iperf_opt) is not None
-		bidirIperf = re.search('--bidir', iperf_opt) is not None
-		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
+		SSH = sshconnection.SSHConnection()
 		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
-		ymlPath = CONTAINERS.yamlPath[0].split('/')
-		logPath = f'../cmake_targets/log/{ymlPath[1]}'
+		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
+		if (re.match('OAI-Rel14-Docker', EPC.Type, re.IGNORECASE)) or (re.match('OAICN5G', EPC.Type, re.IGNORECASE)):
+			#retrieve trf-gen container IP address
+			SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+			SSH.command('docker inspect --format="TRF_IP_ADDR = {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" prod-trf-gen', '\$', 5)
+			result = re.search('TRF_IP_ADDR = (?P<trf_ip_addr>[0-9\.]+)', SSH.getBefore())
+			if result is None:
+				raise Exception("could not corver prod-trf-gen IP address")
+			cn_target_ip = result.group('trf_ip_addr')
+			SSH.close()
+			cn_iperf_prefix = "docker exec  prod-trf-gen" # -w /iperf-2.0.13  necessary?
+		elif (re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE)):
+			cn_target_ip = "172.21.6.102"
+		else: # lteboix, sabox
+			cn_target_ip = "192.172.0.1"
+			cn_iperf_prefix = ""
 
+		iperf_opt = self.iperf_args
+		udpIperf = re.search('-u', iperf_opt) is not None
+		udpSwitch = '-u' if udpIperf else ''
 		if udpIperf:
-			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
-			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
-			jsonReport = ""
-			# note: enable server report collection on the UE side, no need to store and collect server report separately on the server side
-			serverReport = "--get-server-output"
+			iperf_opt = self.Iperf_ComputeModifiedBW(idx, ue_num)
 			logging.info(f'iperf options modified from "{self.iperf_args}" to "{iperf_opt}" for {ue.getName()}')
-		iperf_time = Iperf_ComputeTime(self.iperf_args)
+		iperf_time = int(self.Iperf_ComputeTime())
+		port = f'-p {5001+idx}'
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
-		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
+		iperf_ue = '/data/local/tmp/iperf' if re.search('adb', ue.getName()) else 'iperf'
+
 		ue_header = f'UE {ue.getName()} ({ueIP})'
 
-		if svr.getName() == "rfsim4g_enb_fembms":
-			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-				port = 5002 + idx
-				cmd_ue.run(f'{ue.getCmdPrefix()} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=iperf_time*1.5)
-				cmd_svr.run(f'{svr.getCmdPrefix()} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 2>&1 | tee {client_filename}', timeout=iperf_time*1.5)
-				cmd_ue.run(f'cp {client_filename} {logPath}/{client_filename}')
-				cmd_ue.run(f'cp {server_filename} {logPath}/{server_filename}')
-				status, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-		else:
-			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-				port = 5002 + idx
-				# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
-				if runIperf3Server:
-					cmd_svr.run(f'{svr.getCmdPrefix()} nohup iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=iperf_time*1.5)
-				cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
-				cmd_ue.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=iperf_time*1.5)
-				if svr.getHost() == 'localhost':
-					cmd_ue.run(f'mkdir -p {logPath}')
-					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')
-					cmd_ue.run(f'cp /tmp/{client_filename} {client_filename}')
-				else:
-					cmd_ue.copyin(f'/tmp/{client_filename}', client_filename)
+		if self.iperf_direction == "DL":
+			logging.debug("Iperf in DL requested")
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm {server_filename}')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ueIP} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{client_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf -c {ueIP} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
+			cmd.copyin(f'{EPC.SourceCodePath}/{client_filename}', client_filename)
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.copyin(f'/tmp/{server_filename}', server_filename)
+			cmd.close()
+
 			if udpIperf:
-				status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-			elif bidirIperf:
-				status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
+				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
 			else:
-				status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)
+				cmd = cls_cmd.getConnection(EPC.IPAddress)
+				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"{EPC.SourceCodePath}/{client_filename}")
+				cmd.close()
+
+		elif self.iperf_direction == "UL":
+			logging.debug("Iperf in UL requested")
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf -s {udpSwitch} -t {iperf_time * 1.5} {port} &> {EPC.SourceCodePath}/{server_filename} &')
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm /tmp/{client_filename}')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.copyin(f'/tmp/{client_filename}', client_filename)
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
+			cmd.close()
+
+			if udpIperf:
+				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+			else:
+				cmd = cls_cmd.getConnection(ue.getHost())
+				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"/tmp/{client_filename}")
+				cmd.close()
+
+		elif self.iperf_direction=="BIDIR":
+			logging.debug("Bi-directional iperf requested")
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
+			cmd.run(f'{cn_iperf_prefix} iperf3 -s -i 1 -1 {port} &> {EPC.SourceCodePath}/{server_filename} &')
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm /tmp/{client_filename}')
+			cmd.run(f'iperf3 -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.copyin(f'/tmp/{client_filename}', client_filename)
+			cmd.close()
+
+			cmd = cls_cmd.getConnection(EPC.IPAddress)
+			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
+			cmd.close()
+
+			status, msg = self.Iperf_analyzeV2BIDIR(server_filename, client_filename)
+
+		elif self.iperf_direction == "IPERF3":
+			cmd = cls_cmd.getConnection(ue.getHost())
+			cmd.run(f'rm /tmp/{server_filename}', reportNonZero=False)
+			port = f'{5002+idx}'
+			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ueIP} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
+			cmd.copyin(f'/tmp/{server_filename}', server_filename)
+			cmd.close()
+			if udpIperf:
+				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+			else:
+				cmd = cls_cmd.getConnection(EPC.IPAddress)
+				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f'/tmp/{server_filename}')
+				cmd.close()
+
+		else :
+			raise Exception("Incorrect or missing IPERF direction in XML")
 
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -852,16 +988,12 @@ class OaiCiTest():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_direction "{self.iperf_direction}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
-		if self.ue_ids == [] or self.svr_id == None:
-			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
-		svr = cls_module.Module_UE(self.svr_id)
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Iperf_Module, EPC, ue, svr, RAN, i, len(ues), CONTAINERS) for i, ue in enumerate(ues)]
+			futures = [executor.submit(self.Iperf_Module, EPC, ue, RAN, i, len(ues)) for i, ue in enumerate(ues)]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -995,15 +1127,15 @@ class OaiCiTest():
 					mib_found = True
 				except Exception as e:
 					logging.error(f'\033[91m MIB marker was not found \033[0m')
-			result = re.search("Initial sync: pbch decoded sucessfully", str(line))
+			result = re.search("Measured Carrier Frequency (?P<measured_carrier_frequency>\d{1,15}) Hz", str(line))
 			if result is not None and (not frequency_found):
 				try:
-					mibMsg = f"UE decoded PBCH successfully"
+					mibMsg = f"Measured Carrier Frequency = {result.group('measured_carrier_frequency')} Hz"
 					HTML.htmlUEFailureMsg=HTML.htmlUEFailureMsg + mibMsg + '\n'
 					logging.debug(f'\033[94m{mibMsg}\033[0m')
 					frequency_found = True
 				except Exception as e:
-					logging.error(f'\033[91m UE did not find PBCH\033[0m')
+					logging.error(f'\033[91m Measured Carrier Frequency not found \033[0m')
 			result = re.search("PLMN MCC (?P<mcc>\d{1,3}), MNC (?P<mnc>\d{1,3}), TAC", str(line))
 			if result is not None and (not plmn_found):
 				try:
@@ -1140,7 +1272,7 @@ class OaiCiTest():
 		return global_status
 
 	def TerminateUE(self, HTML):
-		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.terminate) for ue in ues]
 			archives = [f.result() for f in futures]
@@ -1272,7 +1404,7 @@ class OaiCiTest():
 		time.sleep(self.idle_sleep_time)
 		HTML.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', CONST.ALL_PROCESSES_OK)
 
-	def X2_Status(self, idx, fileName, EPC):
+	def X2_Status(self, idx, fileName):
 		cmd = "curl --silent http://" + EPC.IPAddress + ":9999/stats | jq '.' > " + fileName
 		message = cmd + '\n'
 		logging.debug(cmd)

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

@@ -171,6 +171,7 @@ MACRLCs = (
     remote_n_portd  = 2153;
     pusch_TargetSNRx10          = 200;
     pucch_TargetSNRx10          = 200;
+    ulsch_max_frame_inactivity = 1;
   }
 );
 

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -178,6 +178,7 @@ MACRLCs = (
     remote_n_portd  = 2153;
     pusch_TargetSNRx10          = 200;
     pucch_TargetSNRx10          = 200;
+    ulsch_max_frame_inactivity = 1;
   }
 );
 
@@ -186,7 +187,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 100;
+  pucch0_dtx_threshold = 150;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -1,262 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-sa = 1;
-nfapi = "AERIAL";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                    }
-                  );
-                  });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-    do_SRS                = 0;
-    min_rxtxtime          = 2;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
-      absoluteFrequencySSB                                          = 649920;
-      #652860; #should be 649920
-#647520;
-#647540;
-#649920;
-#650208;
-#647540;
-      dl_frequencyBand                                              = 78;
-      # this is 3300.24 MHz
-      dl_absoluteFrequencyPointA                                    = 646724;
-#649104;
-#646724;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 98
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         = -90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5; #6;
-      nrofDownlinkSlots                                             = 3; #7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1; #2;
-      nrofUplinkSymbols                                             = 0;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc           = 1;
-  local_s_if_name  = "lo:";
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.2"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-  tr_s_preference             = "aerial";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200; # 150;
-  pucch_TargetSNRx10          = 200; #200;
-  ulsch_max_frame_inactivity  = 10;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};

ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf

@@ -1,42 +1,41 @@
-Active_gNBs = ( "gNB-OAI");
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-sa = 1;
-
 gNBs =
 (
  {
     ////////// Identification parameters:
     gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-    nr_cellid = 12345678L;
+    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
 
     tr_s_preference     = "local_mac"
 
     ////////// Physical parameters:
 
-    sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
 	
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
 
-      physCellId                                                    = 10;
+      physCellId                                                    = 0;
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2071387;
+      # this is pointA + 23 PRBs@120kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 2071241;
       dl_frequencyBand                                                 = 261;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2071001;
+      dl_absoluteFrequencyPointA                                       = 2070833;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -51,7 +50,7 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 1;
+        initialDLBWPcontrolResourceSetZero                                      = 12;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
@@ -86,12 +85,12 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 7;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 7;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
         ra_ContentionResolutionTimer                                = 7;
@@ -102,7 +101,8 @@ gNBs =
         prach_RootSequenceIndex                                     = 1;
         # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
         #  
-        msg1_SubcarrierSpacing                                      = 3;
+        msg1_SubcarrierSpacing                                      = 3,
+
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
         restrictedSetConfig                                         = 0,
@@ -119,7 +119,7 @@ gNBs =
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
       ssb_PositionsInBurst_PR                                       = 3;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+      ssb_PositionsInBurst_Bitmap                                   = 0x0001000100010001L;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -152,6 +152,7 @@ gNBs =
 
   );
 
+
     # ------- SCTP definitions
     SCTP :
     {
@@ -161,58 +162,91 @@ gNBs =
     };
 
 
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.18.99";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
                             }
                           );
 
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "192.168.18.199";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
+
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.18.198/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.18.198/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.18.198/24";
+        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
 );
 
-MACRLCs = ({
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-});
+MACRLCs = (
+	{
+	    num_cc                      = 1;
+	    tr_s_preference             = "local_L1";
+	    tr_n_preference             = "local_RRC";
+	    pusch_TargetSNRx10          = 200;
+            pucch_TargetSNRx10          = 200;
+    }
+);
 
 L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold   = 120;
-  #pucch0_dtx_threshold = 120;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
 
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  sl_ahead       = 12;
-  bands          = [261];
-  max_pdschReferenceSignalPower = -27;
-  eNB_instances  = [0];
-});
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 1;
+         nb_rx          = 1;
+         att_tx         = 0;
+         att_rx         = 0;
+         bands          = [7];
+         sl_ahead       = 12;
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 75;
+         eNB_instances  = [0];
+	 sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
+         if_freq = 5124520000L;
+	 clock_src = "external";
+	 time_src = "external";
+    }
+);  
 
 rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -230,6 +264,14 @@ security = {
   drb_integrity = "no";
 };
 
-log_config: {
-  global_log_level                      ="info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+    };
+

ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf

@@ -1,242 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts = 2;
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 621312;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 273;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES : {
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = ({
-  num_cc = 1;
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
-});
-
-L1s = ({
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-});
-
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 2
-  nb_rx          = 2
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 50;
-  eNB_instances  = [0];
-  bf_weights = [0x00007fff, 0x0000];
-  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-});
-
-THREAD_STRUCT = ({
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-});
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-};

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf

@@ -200,6 +200,7 @@ MACRLCs = (
     tr_n_preference     = "local_RRC";
     pusch_TargetSNRx10  = 200;
     pucch_TargetSNRx10  = 200;
+    ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf

@@ -202,6 +202,7 @@ MACRLCs = (
   num_cc                     = 1;
   tr_s_preference            = "local_L1";
   tr_n_preference            = "local_RRC";
+  ulsch_max_frame_inactivity = 0;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -187,6 +187,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 0;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -197,6 +197,8 @@ MACRLCs = (
   tr_n_preference  = "local_RRC";
   pusch_TargetSNRx10 = 180;
   pucch_TargetSNRx10 = 200;
+  ulsch_max_frame_inactivity = 1;
+  ul_max_mcs = 16;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf

@@ -85,7 +85,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
@@ -188,6 +188,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   #pusch_TargetSNRx10         = 150;
   #pucch_TargetSNRx10         = 200;
+  ulsch_max_frame_inactivity  = 0;
   dl_max_mcs                  = 16; # there are retransmissions if more
 }
 );

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf

@@ -88,7 +88,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;

ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf

@@ -190,6 +190,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 220;
     pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf

@@ -184,6 +184,7 @@ MACRLCs = (
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 10;
   ul_max_mcs                  = 9;
 }
 );

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf

@@ -203,6 +203,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 220;
     pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf

@@ -204,6 +204,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
 #    pucch_TargetSNRx10 = 150;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -82,7 +82,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
@@ -186,6 +186,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 1;
 }
 );
 

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -192,6 +192,8 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
+    ulsch_max_frame_inactivity = 10;
+    ul_max_mcs         = 28;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf

@@ -184,6 +184,7 @@ MACRLCs = (
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 0;
 }
 );
 

ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -208,6 +208,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 1;
   }
 );
 

ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -199,6 +199,7 @@ MACRLCs = (
     tr_n_preference     = "local_RRC";
     pusch_TargetSNRx10  = 200;
     pucch_TargetSNRx10  = 200;
+    ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -186,6 +186,7 @@ MACRLCs = (
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 0;
 }
 );
 

ci-scripts/datalog_rt_stats.100.2x2.yaml

@@ -1,34 +0,0 @@
-#this is a configuration file
-#used to build real time processing statistics 
-#for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.100.2x2.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref : 
-  feprx : 150.0
-  feptx_prec : 0.0
-  feptx_ofdm : 65.0
-  feptx_total : 177.0
-  L1 Tx processing : 700.0
-  DLSCH encoding : 226.0
-  L1 Rx processing : 640.0
-  PUSCH inner-receiver : 400.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 15.0
-  UL Indication : 3.0
-  Slot Indication : 17.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.25
-  UL Indication : 1.00
-  Slot Indication : 0.50

ci-scripts/datalog_rt_stats.1x1.60.yaml

@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.1x1.60.yaml
+Title : Processing Time (us)
 ColNames :
   - Metric
   - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref :
   feprx : 46.0
   feptx_prec : 15.0
   feptx_ofdm : 35.0
   feptx_total : 57.0
-  L1 Tx processing : 260.0
-  DLSCH encoding : 160.0
-  L1 Rx processing : 420.0
-  PUSCH inner-receiver : 170.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 8.0
-  UL Indication : 3.0
-  Slot Indication : 8.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  L1 Tx processing : 210.0
+  DLSCH encoding : 137.0
+  L1 Rx processing : 345.0
+  PUSCH inner-receiver : 210.0
+  PUSCH decoding : 2200.0
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 60.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25

ci-scripts/datalog_rt_stats.2x2.yaml

@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.2x2.yaml
+Title : Processing Time (us)
 ColNames :
   - Metric
   - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
   feprx : 120.0
   feptx_prec : 30.0
@@ -15,20 +15,18 @@ Ref :
   DLSCH encoding : 230.0
   L1 Rx processing : 175.0
   PUSCH inner-receiver : 100.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 11.0
-  UL Indication : 3.0
-  Slot Indication : 14.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.25
+  PUSCH decoding : 180.0 
+  DL & UL scheduling timing : 37.0
+  UL Indication : 38.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.60.2x2.yaml
+Title : Processing Time (us)
 ColNames :
   - Metric
   - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
   feprx : 84.0
   feptx_prec : 14.0
@@ -15,20 +15,20 @@ Ref :
   DLSCH encoding : 177.0
   L1 Rx processing : 345.0
   PUSCH inner-receiver : 210.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 13.0
-  UL Indication : 3.0
-  Slot Indication : 15.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.35
-  UL Indication : 1.00
-  Slot Indication : 0.35
+  PUSCH decoding : 2200.0
+  Schedule Response : 111.0
+  DL & UL scheduling timing : 20.0
+  UL Indication : 127.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25

ci-scripts/datalog_rt_stats.default.yaml

@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.default.yaml
+Title : Processing Time (us)
 ColNames :
   - Metric
   - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
   feprx : 43.0
   feptx_prec : 13.0
   feptx_ofdm : 33.0
   feptx_total : 55.0
-  L1 Tx processing : 220.0
-  DLSCH encoding : 130.0
-  L1 Rx processing : 387.0
+  L1 Tx processing : 170.0
+  DLSCH encoding : 118.0
+  L1 Rx processing : 305.0
   PUSCH inner-receiver : 150.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 6.0
-  UL Indication : 3.0
-  Slot Indication : 7.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  PUSCH decoding : 2200.0
+  Schedule Response : 30.0
+  DL & UL scheduling timing : 10.0
+  UL Indication : 40.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25

ci-scripts/epc.py

@@ -262,12 +262,10 @@ class EPCManagement():
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
 			if re.search('start-mini-as-ue', self.cfgDeploy):
 				dFile = 'docker-compose-mini-nrf-asue.yaml'
-			elif re.search('basic', self.cfgDeploy):\
-				dFile = 'docker-compose-basic-nrf.yaml'
 			else:
 				dFile = 'docker-compose-mini-nrf.yaml'
 			mySSH.command('docker-compose -f ' + dFile + ' ps -a', '\$', 60)
@@ -584,7 +582,7 @@ class EPCManagement():
 				mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)
 
 			logging.debug('Terminating OAI CN5G')
-			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)

ci-scripts/main.py

@@ -268,11 +268,10 @@ def GetParametersFromXML(action):
 	elif action == 'Iperf':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
+		CiTestObj.iperf_direction = test.findtext('direction')
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
 		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
 		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
-		CiTestObj.iperf_tcp_rate_target = test.findtext('iperf_tcp_rate_target') or None
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
@@ -376,6 +375,20 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
 
+	elif action == 'IperfFromContainer':
+		string_field = test.findtext('server_container_name')
+		if (string_field is not None):
+			CONTAINERS.svrContName = string_field
+		string_field = test.findtext('server_options')
+		if (string_field is not None):
+			CONTAINERS.svrOptions = string_field
+		string_field = test.findtext('client_container_name')
+		if (string_field is not None):
+			CONTAINERS.cliContName = string_field
+		string_field = test.findtext('client_options')
+		if (string_field is not None):
+			CONTAINERS.cliOptions = string_field
+
 	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest' or action == 'Run_LDPCt1Test':
 		ldpc.runargs = test.findtext('physim_run_args')
 
@@ -611,6 +624,10 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			if RAN.eNBIPAddress == ''  or RAN.eNBUserName == '' or RAN.eNBPassword == '' or RAN.eNBSourceCodePath == '':
 				HELP.eNBSrvHelp(RAN.eNBIPAddress, RAN.eNBUserName, RAN.eNBPassword, RAN.eNBSourceCodePath)
 			sys.exit('Insufficient Parameter')
+
+		if (EPC.IPAddress!= '') and (EPC.IPAddress != 'none'):
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, cwd + "/tcp_iperf_stats.awk", "/tmp")
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, cwd + "/active_net_interfaces.awk", "/tmp")
 	else:
 		if CiTestObj.UEIPAddress == '' or CiTestObj.ranRepository == '' or CiTestObj.ranBranch == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '' or CiTestObj.UESourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)

ci-scripts/mbim_scripts/mbim-set-ip.sh

@@ -1,221 +0,0 @@
-#!/bin/bash
-
-# Modified by Karim Boutiba (karim.boutiba@eurecom.fr)
-# mbim-set-ip script version 1.1
-# Modified mbimcli IPv4 IPv6 parsing script based on parts of project https://github.com/grandcentrix/thinkpad-x260-modem-scripts
-# Licensed under the Apache License, Version 2.0
-# Modified by Jörgen Storvist, Techship http://www.techship.com
-# Further details in the Techship FAQ sections on using MBIM and setting correct modes in cellular modules:
-# https://techship.com/faq/how-to-set-up-a-simple-data-connection-over-the-mbim-interface-using-libmbim-and-driver-cdc-mbim-in-linux/
-#
-# Installation & Usage: 
-#
-# Verify that the cellular module is exposing the MBIM interface over the USB interface. 
-# Use mbimcli to check status for the cellular connection and enter the PIN code if necessary. 
-# Configure mbim-network.conf and place in /etc/ (example file included in the archive, check link bellow for details).
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# Start the mbim data connection with command:
-# mbim-network <MBIM-INTERFACE> start
-# Ensure execution of mbim-set-ip script with sufficient system priviledges
-# ./mbim-set-ip <MBIM-INTERFACE> <NETWORK-INTERFACE>
-#
-# Examples:
-# mbimcli -d /dev/cdc-wdm0 -p --query-device-caps
-# mbimcli -d /dev/cdc-wdm0 -p --enter-pin=1234
-# mbim-network /dev/cdc-wdm0 start
-# ./mbim-set-ip /dev/cdc-wdm0 wwan0
-#
-# You should now be able to ping over the data connection.
-# IP v4 ping: (only if IPv4 address was acquired from cellular module)
-# ping -4 -I wwan0 8.8.8.8
-# ping -4 -I wwan0 google.com
-
-# IP v6 ping: (only if IPv6 address was acquired from cellular module)
-# ping -6 -I wwan0 2001:4860:4860::8888
-# ping -6 -I wwan0 google.com
-#
-# The script relies on the linux tools mbimcli, ip, systemd-resolve
-# (Tested on libmbim 1.16.0 running on Ubuntu 18.10 cosmic (development) with kernel version 4.15.0)
-
-# Details on mbim-network and mbimcli
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# https://www.freedesktop.org/software/libmbim/man/latest/mbimcli.1.html
-
-ipv4_addresses=()
-ipv4_gateway=""
-ipv4_dns=()
-ipv4_mtu=""
-ipv6_addresses=()
-ipv6_gateway=""
-ipv6_dns=()
-ipv6_mtu=""
-
-#CONTROL-IFACE
-CONTROLDEV="$1" 
-#WWAN-IFACE
-DEV="$2" 
-SESSION="$3"
-echo $SESSION
-echo "Requesting IPv4 and IPv6 information through mbimcli proxy:"
-mbimcli -d $CONTROLDEV -p --query-ip-configuration
-IPDATA=$(mbimcli -d $CONTROLDEV -p --query-ip-configuration=$SESSION)
-
-function parse_ip {
-	#      IP [0]: '10.134.203.177/30'
-	local line_re="IP \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local ip_cnt=${BASH_REMATCH[1]}
-		local ip=${BASH_REMATCH[2]}
-	fi
-	echo "$ip"
-}
-
-function parse_gateway {
-	#    Gateway: '10.134.203.178'
-	local line_re="Gateway: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local gw=${BASH_REMATCH[1]}
-	fi
-	echo "$gw"
-}
-
-function parse_dns {
-	#      DNS [0]: '10.134.203.177/30'
-	local line_re="DNS \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local dns_cnt=${BASH_REMATCH[1]}
-		local dns=${BASH_REMATCH[2]}
-	fi
-	echo "$dns"
-}
-
-function parse_mtu {
-	#        MTU: '1500'
-	local line_re="MTU: '([0-9]+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local mtu=${BASH_REMATCH[1]}
-	fi
-	echo "$mtu"
-}
-while read -r line || [[ -n "$line" ]] ; do
-	[ -z "$line" ] && continue
-	case "$line" in
-		*"IPv4 configuration available: 'none'"*)
-		       	state="start"
-		        continue
-			;;
-		*"IPv4 configuration available"*)
-			state="ipv4"
-			continue
-			;;
-		*"IPv6 configuration available: 'none'"*)
-		        state="start"
-		        continue
-			;;
-		*"IPv6 configuration available"*)
-			state="ipv6"
-			continue
-			;;
-		*)
-			;;
-	esac
-	case "$state" in
-		"ipv4")
-
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv4_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv4_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv4_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv4_mtu="$row"
-				continue
-				;;
-			*)
-				;;
-			esac
-			;;
-
-		"ipv6")
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv6_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv6_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv6_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv6_mtu="$row"
-				continue
-				;;
-			*)
-				continue
-				;;
-			esac
-		;;
-	*)
-		continue
-	;;
-	esac
-done <<< "$IPDATA"
-
-execfile=$(mktemp)
-
-printf "ip link set $DEV down\n" >> $execfile
-printf "ip addr flush dev $DEV \n" >> $execfile
-printf "ip -6 addr flush dev $DEV \n" >> $execfile
-printf "ip link set $DEV up\n" >> $execfile
-
-if [[ "${#ipv4_addresses[@]}" > 0 ]]; then
-	printf "ip addr add %s dev $DEV broadcast +\n" "${ipv4_addresses[@]}" >> $execfile
-	printf "ip route add 192.168.61.0/24 via $ipv4_gateway dev $DEV\n" >> $execfile
-
-	if [ -n "$ipv4_mtu" ]; then
-		printf "ip link set mtu $ipv4_mtu dev $DEV \n" >> $execfile
-	fi
-	if [[ "${#ipv4_dns[@]}" > 0 ]]; then
-		printf "resolvectl -4 --interface=$DEV --set-dns=%s\n" "${ipv4_dns[@]}" >>$execfile
-	fi
-fi
-
-if [[ "${#ipv6_addresses[@]}" > 0 ]]; then
-	printf "ip -6 addr add %s dev $DEV\n" "${ipv6_addresses[@]}" >> $execfile
-	printf "ip -6 route add default via $ipv6_gateway dev $DEV\n" >> $execfile
-	if [ -n "$ipv6_mtu" ]; then
-		printf "ip -6 link set mtu $ipv6_mtu dev $DEV\n" >> $execfile
-	fi
-	if [[ "${#ipv6_dns[@]}" > 0 ]]; then
-		printf "systemd-resolve -6 --interface=$DEV --set-dns=%s\n" "${ipv6_dns[@]}" >>$execfile
-	fi
-fi
-echo "Applying the following network interface configurations:"
-cat $execfile
-bash $execfile
-rm $execfile
-echo "Network interface configurations completed."

ci-scripts/mbim_scripts/start_quectel_mbim.sh

@@ -1,10 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
-sleep 1
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=on
-sleep 2
-sudo mbimcli -p -d /dev/cdc-wdm0 --attach-packet-service
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --connect=session-id=0,access-string=oai.ipv4,ip-type=ipv4
-sudo /opt/mbim/mbim-set-ip.sh /dev/cdc-wdm0 wwan0 0

ci-scripts/mbim_scripts/stop_quectel_mbim.sh

@@ -1,3 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off

ci-scripts/ran.py

@@ -366,6 +366,7 @@ class RANManagement():
 		self.testCase_id = HTML.testCase_id
 		mySSH = SSH.SSHConnection()
 		cwd = os.getcwd()
+		mySSH.copyout(lIpAddr,lUserName,lPassWord, cwd + "/active_net_interfaces.awk", "/tmp")
 		
 		#Get pcap on enb and/or gnb if enabled in the xml 
 		if self.eNB_Trace=='yes':
@@ -1178,10 +1179,8 @@ class RANManagement():
 				self.datalog_rt_stats=datalog_rt_stats
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
-					valnorm = float(datalog_rt_stats['Data'][k][3])
-					dev = datalog_rt_stats['DeviationThreshold'][k]
-					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
-						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
+					if float(datalog_rt_stats['Data'][k][3])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
+						logging.debug('\u001B[1;30;43m datalog_rt_stats metric ' + k + '=' + datalog_rt_stats['Data'][k][3] + ' > threshold ' + str(datalog_rt_stats['Threshold'][k]) + ' \u001B[0m')
 						RealTimeProcessingIssue = True
 			else:
 				statMsg = 'No real time stats found in the log file\n'

ci-scripts/stats_monitor_conf.yaml

@@ -24,9 +24,9 @@ gnb :
     DLSCH encoding:
     L1 Rx processing:
     PUSCH inner-receiver:
+    PUSCH decoding:
     DL & UL scheduling timing:
     UL Indication:
-    Slot Indication:
   graph : 
     page1:
       dlsch_err:
@@ -44,6 +44,6 @@ gnb :
       rt.L1 Rx processing:
     page4:
       rt.PUSCH inner-receiver:
+      rt.PUSCH decoding:
       rt.DL & UL scheduling timing:
       rt.UL Indication:
-      rt.Slot Indication:

ci-scripts/tcp_iperf_stats.awk

@@ -0,0 +1,38 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+BEGIN{max=0;min=10000}
+{
+    if ($0 ~/Mbits/) {
+        if ($0 ~/KBytes/) {
+            split($0,a,"KBytes")
+        } else {
+            split($0,a,"MBytes")
+        }
+        split(a[2],b)
+        if (b[1]>max) {
+            max=b[1]
+        }
+        if (b[1]<min) {
+            min=b[1]
+        }
+     }
+}
+END{print "Avg Bitrate : " b[1] " Mbits/sec Max Bitrate : " max " Mbits/sec Min Bitrate : " min " Mbits/sec"}

ci-scripts/xml_class_list.yml

@@ -41,6 +41,7 @@
   - Deploy_Run_PhySim
   - DeployGenObject
   - UndeployGenObject
+  - IperfFromContainer
   - StatsFromGenObject
   - LicenceAndFormattingCheck
   - Push_Local_Registry

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -105,23 +105,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
+                <class>IperfFromContainer</class>
                 <desc>Iperf UDP Downlink</desc>
-                <id>l2sim4g_ue</id>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <server_container_name>l2sim4g-oai-lte-ue1</server_container_name>
+                <client_container_name>l2sim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
+                <class>IperfFromContainer</class>
                 <desc>Iperf UDP Uplink</desc>
-                <id>l2sim4g_ue</id>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 3M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <server_container_name>l2sim4g-trf-gen</server_container_name>
+                <client_container_name>l2sim4g-oai-lte-ue1</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 3M</client_options>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -110,24 +110,22 @@
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        <testCase id="030011">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
         </testCase>
 
-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        <testCase id="030012">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-trf-gen</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -91,23 +91,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-oai-enb</client_container_name>
+                <server_options>-B 10.0.1.2 -u -i 1 -s</server_options>
+                <client_options>-B 10.0.1.1 -c 10.0.1.2 -u -i 1 -t 30 -b 2M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-oai-enb</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-B 10.0.1.1 -u -i 1 -s</server_options>
+                <client_options>-B 10.0.1.2 -c 10.0.1.1 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -111,23 +111,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-trf-gen</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -111,23 +111,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-trf-gen</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -72,13 +72,12 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue_fembms</id>
-                <svr_id>rfsim4g_enb_fembms</svr_id>
-                <iperf_args>-u -t 30 -b 2M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Push MBMS traffic</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-oai-enb</client_container_name>
+                <server_options>-sui1 -B 10.0.2.2</server_options>
+                <client_options>-uc 10.0.2.2 -i1 -t10 -b2M -B10.0.2.1</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -72,13 +72,12 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Push MBMS traffic</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-oai-enb</client_container_name>
+                <server_options>-sui1 -B 10.0.2.2</server_options>
+                <client_options>-uc 10.0.2.2 -i1 -t10 -b2M -B10.0.2.1</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -112,23 +112,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-trf-gen</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -30,7 +30,6 @@
  000021
  000022
  000023
- 000024
  020021
  100021
         </TestCaseRequestedList>
@@ -40,7 +39,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000021">
@@ -67,12 +66,6 @@
                 <nb_healthy>14</nb_healthy>
         </testCase>
 
-        <testCase id="000024">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-        </testCase>
-
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -29,7 +29,6 @@
  100021
  000021
  000022
- 000023
  020021
  030021
  030022
@@ -60,12 +59,6 @@
                 <nb_healthy>8</nb_healthy>
         </testCase>
 
-        <testCase id="000023">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-        </testCase>
-
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
@@ -75,23 +68,21 @@
         </testCase>
 
         <testCase id="030021">
-                <class>Iperf</class>
-                <desc>Iperf (DL/20Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 20M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
         </testCase>
 
         <testCase id="030022">
-                <class>Iperf</class>
-                <desc>Iperf (UL/5Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 5M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
         </testCase>
 
         <testCase id="100021">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -28,6 +28,7 @@
         <TestCaseRequestedList>
  111111
  100011
+ 000010
  000011
  000012
  000013
@@ -46,26 +47,36 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="000010">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
         <testCase id="000011">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000012">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-gnb</services>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020011">
@@ -85,23 +96,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 3M</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -180,23 +180,21 @@
         </testCase>
 
         <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
         </testCase>
 
         <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
         </testCase>
 
         <testCase id="333333">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -28,6 +28,7 @@
         <TestCaseRequestedList>
  111111
  100001
+ 000000
  000001
  000002
  000003
@@ -46,26 +47,36 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-gnb</services>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">
@@ -85,23 +96,21 @@
         </testCase>
 
         <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 5 -b 3M</client_options>
         </testCase>
 
         <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 5 -b 1M</client_options>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -28,6 +28,7 @@
         <TestCaseRequestedList>
  111111
  100001
+ 000000
  000001
  000002
  000003
@@ -46,26 +47,36 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-gnb</services>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">
@@ -85,23 +96,21 @@
         </testCase>
 
         <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 3M</client_options>
         </testCase>
 
         <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 1M</client_options>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -43,16 +43,18 @@
 
         <testCase id="000020">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI-DU+nrUE</desc>
+                <desc>Deploy OAI-DU</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-du oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <services>oai-du</services>
+                <nb_healthy>1</nb_healthy>
         </testCase>
 
         <testCase id="000021">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
+                <class>DeployGenObject</class>
+                <desc>Deploy nrUE</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
         </testCase>
 
         <testCase id="020021">

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -50,7 +50,7 @@
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
             <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
+            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
         </testCase>
 
         <testCase id="000010">
@@ -86,23 +86,21 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 0.03M -t 30 -R -c 10.0.1.1</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-gnb</client_container_name>
+                <server_options>-sui1 -B10.0.1.2</server_options>
+                <client_options>-uc10.0.1.2 -i1 -t10 -b30k -B10.0.1.1</client_options>
         </testCase>
 
         <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 0.03M -t 30 -c 10.0.1.1</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-gnb</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-sui1 -B10.0.1.1</server_options>
+                <client_options>-uc10.0.1.1 -i1 -t10 -b30k -B10.0.1.2</client_options>
         </testCase>
 
         <testCase id="100011">

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -22,12 +22,13 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic FR2 gNB</htmlTabName>
+        <htmlTabName>Monolithic FR2 do-ra gNB</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
  111111
  100001
+ 004000
  000000
  000001
  020001
@@ -43,35 +44,42 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+	<testCase id="004000">
+            <class>Custom_Command</class>
+            <desc>Clean-Up any residual volume</desc>
+            <node>localhost</node>
+            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
+        </testCase>
+
         <testCase id="000000">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI gNB</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-gnb</services>
+                <nb_healthy>1</nb_healthy>
         </testCase>
 
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI NR-UE</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
+                <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <ping_args>-c 20 -i0.2 192.168.72.135</ping_args>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
                 <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
+                <desc>Ping NR-UE from gNB</desc>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
@@ -79,8 +87,8 @@
                 <class>UndeployGenObject</class>
                 <desc>Undeploy all OAI 5G stack</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <d_retx_th>10,0,0,0</d_retx_th>
-                <u_retx_th>10,0,0,0</u_retx_th>
+                <d_retx_th>0,0,0,0</d_retx_th>
+                <u_retx_th>0,0,0,0</u_retx_th>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml

@@ -26,6 +26,7 @@
         <htmlTabIcon>trash</htmlTabIcon>
         <TestCaseRequestedList>
  100002
+ 004000
  222222
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -36,6 +37,13 @@
                 <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
         </testCase>
 
+	<testCase id="004000">
+            <class>Custom_Command</class>
+            <desc>Clean-Up any residual volume</desc>
+            <node>localhost</node>
+            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
+        </testCase>
+
         <testCase id="222222">
                 <class>Clean_Test_Server_Images</class>
                 <desc>Clean Test Images on Test Server</desc>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -48,7 +48,7 @@
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
             <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
+            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -28,6 +28,7 @@
         <TestCaseRequestedList>
  111111
  100001
+ 000000
  000001
  000002
  000003
@@ -46,26 +47,36 @@
                 <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
                 <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-gnb</services>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">
@@ -85,23 +96,21 @@
         </testCase>
 
         <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 3M</client_options>
         </testCase>
 
         <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 1M -t 30</iperf_args>
-                <id>rfsim5g_ue</id>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 1M</client_options>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -118,82 +118,91 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     <testCase id="040603">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040604">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040605">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040606">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040607">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -126,57 +126,62 @@
     <testCase id="040633">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040634">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 15M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040636">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040671">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040672">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 9M -t 30</iperf_args>
+        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040673">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -112,83 +112,92 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040613">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040614">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040615">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040616">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040617">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 18M -t 30</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 18M -t 30</iperf_args>
+        <iperf_args>-u -b 18M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -105,22 +105,22 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040612">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040650">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 20M -t 30</iperf_args>
+        <iperf_args>-u -b 20M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -134,38 +134,41 @@
     <testCase id="040613">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040616">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30</iperf_args>
+        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>lte_oai_ue_carabe</id>
-        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml

@@ -25,29 +25,11 @@
     <htmlTabName>Images Clean-Up</htmlTabName>
     <htmlTabIcon>trash</htmlTabIcon>
     <TestCaseRequestedList>
-000000
-111111
 222222
 333333
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="000000">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="111111">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy LTE-UE</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
     <testCase id="222222">
         <class>Clean_Test_Server_Images</class>
         <desc>Clean Test Images on eNB Test Server</desc>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -111,84 +111,92 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     <testCase id="040623">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040624">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040625">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(unbalanced profile)</desc>
-        <iperf_args>-u -b 70M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040626">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040627">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/12Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 12M -t 30</iperf_args>
+        <iperf_args>-u -b 12M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/17Mbps/UDP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-u -b 17M -t 30</iperf_args>
+        <iperf_args>-u -b 17M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -119,93 +119,100 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     <testCase id="040601">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040602">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040603">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040604">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040605">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040642">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040644">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -127,72 +127,80 @@
     <testCase id="040631">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040632">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040634">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040635">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040681">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040682">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040684">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040685">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml

@@ -109,86 +109,99 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     <testCase id="040601">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040606">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 6.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040603">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 6.5M -t 30</iperf_args>
+        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040608">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
     </testCase>
 
     <testCase id="040605">
         <class>Iperf</class>
         <desc>iperf (5MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
 
     <testCase id="040641">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040646">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040643">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040648">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040645">
         <class>Iperf</class>
         <desc>iperf (5MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -109,93 +109,100 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     <testCase id="040611">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040612">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040613">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040614">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040615">
         <class>Iperf</class>
         <desc>iperf (10MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040651">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040652">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040653">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040654">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040655">
         <class>Iperf</class>
         <desc>iperf (10MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -109,91 +109,99 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     <testCase id="040621">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040622">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040623">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/13.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 13.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040624">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040625">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040661">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 2M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040662">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 2M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040663">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/2Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 2M -t 30</iperf_args>
+        <iperf_args>-u -b 2M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040664">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040665">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -111,95 +111,102 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     <testCase id="040626">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040627">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040628">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 27.5M -t 30 -R</iperf_args>
+        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040629">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>DL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040630">
         <class>Iperf</class>
         <desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30 -R</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040666">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040667">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040668">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
-        <iperf_args>-u -b 7M -t 30</iperf_args>
+        <iperf_args>-u -b 7M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>unbalanced</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040669">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <iperf_profile>single-ue</iperf_profile>
+        <direction>UL</direction>
         <id>adb_ue_1</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
     <testCase id="040670">
         <class>Iperf</class>
         <desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
-        <iperf_args>-t 30</iperf_args>
+        <iperf_args>-t 30 -i 1 -fm</iperf_args>
+        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+        <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
-        <svr_id>ltebox-nano</svr_id>
     </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml

@@ -1,54 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-    <htmlTabRef>images-clean-up</htmlTabRef>
-    <htmlTabName>Images Clean-Up</htmlTabName>
-    <htmlTabIcon>trash</htmlTabIcon>
-    <TestCaseRequestedList>
-111111
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111111">
-      <class>Detach_UE</class>
-      <desc>Detach UE</desc>
-      <id>up2</id>
-    </testCase>
-
-    <testCase id="222222">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images</desc>
-        <test_svr_id>0</test_svr_id>
-    </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml

@@ -30,7 +30,7 @@
 
 111111
 100000
-010010
+010000
 030101
 010001
 000001
@@ -39,6 +39,7 @@
 070000
 070001
 010010
+010002
 030201
 
 </TestCaseRequestedList>
@@ -79,16 +80,28 @@
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
+  <testCase id="010000">
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
   <testCase id="010001">
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
   </testCase>
 
   <testCase id="050000">
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -97,8 +110,8 @@
  <testCase id="050001">
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
-    <id>up2</id>
-    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
    </testCase>
@@ -106,27 +119,29 @@
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 26M -t 60 -R</iperf_args>
-    <id>up2</id>
-    <svr_id>porcepix-cn4g</svr_id>
+    <iperf_args>-u -b 26M -t 60</iperf_args>
+    <direction>DL</direction>
+    <id>nrmodule2_quectel</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
    </testCase>
 
    <testCase id="070001">
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
-     <id>up2</id>
-     <svr_id>porcepix-cn4g</svr_id>
+     <direction>UL</direction>
+     <id>nrmodule2_quectel</id>
      <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
      <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+     <iperf_profile>single-ue</iperf_profile>
    </testCase>
 
   <testCase id="010010">
     <class>Detach_UE</class>
     <desc>Detach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
   </testCase>
 
   <testCase id="030201">

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -30,7 +30,7 @@
 
 111111
 100000
-010010
+010000
 030101
 010001
 000001
@@ -39,6 +39,7 @@
 070000
 070001
 010010
+010002
 030201
 
 </TestCaseRequestedList>
@@ -79,16 +80,28 @@
     <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
+  <testCase id="010000">
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
   <testCase id="010001">
     <class>Attach_UE</class>
     <desc>Attach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
   </testCase>
 
   <testCase id="050000">
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -97,8 +110,8 @@
  <testCase id="050001">
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
-    <id>up2</id>
-    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
    </testCase>
@@ -106,27 +119,29 @@
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 1M -t 60 -R</iperf_args>
-    <id>up2</id>
-    <svr_id>porcepix-cn4g</svr_id>
+    <iperf_args>-u -b 1M -t 60</iperf_args>
+    <direction>DL</direction>
+    <id>nrmodule2_quectel</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
    </testCase>
 
    <testCase id="070001">
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
-     <id>up2</id>
-     <svr_id>porcepix-cn4g</svr_id>
+     <direction>UL</direction>
+     <id>nrmodule2_quectel</id>
      <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
      <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+     <iperf_profile>single-ue</iperf_profile>
    </testCase>
 
   <testCase id="010010">
     <class>Detach_UE</class>
     <desc>Detach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
   </testCase>
 
   <testCase id="030201">

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -186,29 +186,32 @@
 	<testCase id="070000">
 		<class>Iperf</class>
 		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 60 -R</iperf_args>
+		<iperf_args>-u -b 70M -t 60 -i 1 -fm</iperf_args>
+		<direction>DL</direction>
 		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
 	<testCase id="070001">
 		<class>Iperf</class>
 		<desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 8M -t 60</iperf_args>
+		<iperf_args>-u -b 8M -t 60 -i 1 -fm</iperf_args>
+		<direction>UL</direction>
 		<id>idefix</id>
-		<svr_id>ltebox-nepes</svr_id>
 		<iperf_packetloss_threshold>1</iperf_packetloss_threshold>
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
 
     <testCase id="070002">
         <class>Iperf</class>
         <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
         <iperf_args>-t 10 --bidir</iperf_args>
+        <direction>BIDIR</direction>
         <id>idefix</id>
-	<svr_id>ltebox-nepes</svr_id>
+        <iperf_profile>single-ue</iperf_profile>
     </testCase>
 
     <testCase id="030201">

ci-scripts/xml_files/container_nsa_b200_terminate.xml

@@ -26,8 +26,6 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
- 010001
- 010002
  030202
  030201
  222220
@@ -35,17 +33,6 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id= "010001">
-      <class>Detach_UE</class>
-      <desc>Detach UE</desc>
-      <id>idefix</id>
-    </testCase>
-    <testCase id="010002">
-      <class>Terminate_UE</class>
-      <desc>Terminate Quectel</desc>
-      <id>idefix</id>
-    </testCase>
-
     <testCase id="030201">
         <class>Undeploy_Object</class>
         <desc>Undeploy eNB</desc>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -1,139 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA</htmlTabRef>
-        <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <repeatCount>1</repeatCount>
-        <TestCaseRequestedList>
-                111111
-                000222
-                001111
-                002222
-                002223
-                000111
-                100000
-                000011
-                000022
-                000033
-                000222
-                003333
-                222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-aerial</images_to_pull>
-        </testCase>
-
-        <testCase id="001111">
-                <class>Initialize_UE</class>
-                <desc>Initialize Quectel</desc>
-                <id>sphex_quectel</id>
-        </testCase>
-
-        <testCase id="002222">
-                <class>Deploy_Object</class>
-                <desc>Deploy PNF/Nvidia CUBB in a container</desc>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
-                <services>nv-cubb</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="002223">
-                <class>Deploy_Object</class>
-                <desc>Deploy VNF in a container</desc>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
-                <services>oai-gnb-aerial</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000111">
-                <class>Attach_UE</class>
-                <desc>Attach Quectel</desc>
-                <id>sphex_quectel</id>
-        </testCase>
-
-        <testCase id="100000">
-                <class>Custom_Command</class>
-                <desc>Adding a IP route</desc>
-                <node>sphex</node>
-                <command>sudo ip route add 192.168.71.128/26 via 12.1.1.151 dev wwan0</command>
-        </testCase>
-
-        <testCase id="000011">
-                <class>Ping</class>
-                <desc>Ping: 100pings in 20sec</desc>
-                <id>sphex_quectel</id>
-                <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="000022">
-                <class>Iperf</class>
-                <desc>iperf (DL/UDP/80M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 80M -t 30 -R</iperf_args>
-                <svr_id>porcepix-cn5g</svr_id>
-                <id>sphex_quectel</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000033">
-                <class>Iperf</class>
-                <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 40M -t 30</iperf_args>
-                <svr_id>porcepix-cn5g</svr_id>
-                <id>sphex_quectel</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000222">
-                <class>Detach_UE</class>
-                <desc>Detach Quectel</desc>
-                <id>sphex_quectel</id>
-        </testCase>
-
-        <testCase id="003333">
-                <class>Terminate_UE</class>
-                <desc>Terminate Quectel</desc>
-                <id>sphex_quectel</id>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Undeploy_Object</class>
-                <desc>Undeploy gNB</desc>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-                <d_retx_th>20,100,100,100</d_retx_th>
-                <u_retx_th>20,100,100,100</u_retx_th>
-        </testCase>
-</testCaseList>
-

ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml

@@ -1,61 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-aerial-cleanup</htmlTabRef>
-  <htmlTabName>CleanUp AERIAL</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    000000
-    111111
-    222222
-    333333
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="000000">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="111111">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Detach_UE</class>
-    <desc>Terminate UE</desc>
-    <id>sphex_quectel</id>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Terminate_UE</class>
-    <desc>Terminate UE</desc>
-    <id>sphex_quectel</id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -40,17 +40,9 @@
     002008
     002009
     002010
-    002011
-    002012
-    002013
-    002014
-    002015
     000100
     000010
     000020
-    002016
-    000030
-    000040
     000200
     003000
     004000
@@ -140,97 +132,42 @@
     <id>amarisoft_ue_10</id>
   </testCase>
 
-  <testCase id="002011">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_11</id>
-  </testCase>
-
-  <testCase id="002012">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_12</id>
-  </testCase>
-
-  <testCase id="002013">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_13</id>
-  </testCase>
-
-  <testCase id="002014">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_14</id>
-  </testCase>
-
-  <testCase id="002015">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_15</id>
-  </testCase>
-
   <testCase id="000010">
     <class>Iperf</class>
     <desc>iperf (DL/7Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 70M -t 30 -R</iperf_args>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <iperf_args>-u -b 70M -t 30 -i 1 -R</iperf_args>
+    <direction>IPERF3</direction>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
     <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g</svr_id>
-  </testCase>
-
-  <testCase id="000030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <iperf_tcp_rate_target>4</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g</svr_id>
   </testCase>
 
   <testCase id="000020">
     <class>Iperf</class>
     <desc>iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 36M -t 30</iperf_args>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <iperf_args>-u -b 36M -t 30 -i 1 </iperf_args>
+    <direction>IPERF3</direction>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
     <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g</svr_id>
-  </testCase>
-
-  <testCase id="000040">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <svr_id>oc-cn5g</svr_id>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
-    <iperf_tcp_rate_target>1</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g</svr_id>
   </testCase>
 
   <testCase id="000100">
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
-  <testCase id="002016">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_16</id>
-  </testCase>
-
   <testCase id="000200">
     <class>Ping</class>
-    <desc>Ping: 50pings in 10sec, multi-ue</desc>
-    <id>amarisoft_ue_16</id>
-    <ping_args>-c 50 -i 0.2 %cn_ip%</ping_args>
+    <desc>Ping: 100pings in 20sec, multi-ue</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
@@ -238,7 +175,7 @@
   <testCase id="003000">
     <class>Detach_UE</class>
     <desc>Detach UE</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15 amarisoft_ue_16</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
   </testCase>
 
   <testCase id="004000">

ci-scripts/xml_files/container_sa_aw2s_asue_cleanup.xml

@@ -27,29 +27,20 @@
   <TestCaseRequestedList>
     111111
     222222
-    333333
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="111111">
-    <class>Terminate_UE</class>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_ue</id>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="333333">
     <class>Clean_Test_Server_Images</class>
     <desc>Clean Test Images on Test Server</desc>
     <test_svr_id>0</test_svr_id>
   </testCase>
 
+  <testCase id="222222">
+    <class>Terminate_UE</class>
+    <desc>Terminate UE</desc>
+    <id>amarisoft_ue</id>
+  </testCase>
+
 </testCaseList>
 

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -36,8 +36,6 @@
     070000
     070001
     070002
-    070003
-    070004
     060001
     000002
     060002
@@ -138,47 +136,32 @@
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/30Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 30M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 30M -t 30 -i 1 -fm</iperf_args>
+    <direction>DL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="070001">
     <class>Iperf</class>
     <desc>iperf (UL/3.5Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 3.5M -t 30</iperf_args>
+    <iperf_args>-u -b 3.5M -t 30 -i 1 -fm</iperf_args>
+    <direction>UL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="070002">
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 10 --bidir</iperf_args>
+    <direction>BIDIR</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-  </testCase>
-
-  <testCase id="070003">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="070004">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="060001">

ci-scripts/xml_files/container_sa_b200_terminate.xml

@@ -26,23 +26,10 @@
   <htmlTabIcon>tasks</htmlTabIcon>
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
-  010001
-  010002
   030201
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
   <testCase id="030201">
     <class>Undeploy_Object</class>
     <desc>Undeploy gNB</desc>

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -37,12 +37,6 @@
     370001
     370000
     370002
-    370003
-    370004
-    360001
-    100002
-    360002
-    350000
     310011
     310002
     330201
@@ -120,9 +114,9 @@
 
   <testCase id="350000">
     <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
+    <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
-    <ping_args>-c 20 -i 0.2 %cn_ip%</ping_args>
+    <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
@@ -130,68 +124,32 @@
   <testCase id="370000">
     <class>Iperf</class>
     <desc>iperf (DL/80Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 80M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
+    <direction>DL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="370001">
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 8M -t 30</iperf_args>
+    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
+    <direction>UL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="370002">
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 20 --bidir</iperf_args>
+    <direction>BIDIR</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-  </testCase>
-
-  <testCase id="370003">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>30</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="370004">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>15</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="360001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU)</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-  <testCase id="360002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-  <testCase id="100002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="330201">

ci-scripts/xml_files/container_sa_e1_b200_terminate.xml

@@ -26,24 +26,11 @@
   <htmlTabIcon>tasks</htmlTabIcon>
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
-  010001
-  010002
   330201
   222222
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
   <testCase id="330201">
     <class>Undeploy_Object</class>
     <desc>Undeploy CU-CP/CU-UP/DU</desc>

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -49,8 +49,6 @@
     170001
     170000
     170002
-    170003
-    170004
     110011
     110002
     100001
@@ -162,47 +160,32 @@
   <testCase id="170000">
     <class>Iperf</class>
     <desc>iperf (DL/50Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 50M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 50M -t 30 -i 1 -fm</iperf_args>
+    <direction>DL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="170001">
     <class>Iperf</class>
     <desc>iperf (UL/25Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 25M -t 30</iperf_args>
+    <iperf_args>-u -b 25M -t 30 -i 1 -fm</iperf_args>
+    <direction>UL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="170002">
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-t 60 --bidir</iperf_args>
+    <direction>BIDIR</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-  </testCase>
-
-  <testCase id="170003">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>45</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="170004">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>25</iperf_tcp_rate_target>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="160001">

ci-scripts/xml_files/container_sa_f1_b200_terminate.xml

@@ -26,23 +26,10 @@
   <htmlTabIcon>tasks</htmlTabIcon>
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
-  010001
-  010002
   230201
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
-  <testCase id= "010001">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
   <testCase id="230201">
     <class>Undeploy_Object</class>
     <desc>Undeploy CU-DU</desc>

ci-scripts/xml_files/container_sa_n310_nrue.xml

@@ -91,8 +91,8 @@
     <class>Iperf</class>
     <desc>iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+    <direction>IPERF3</direction>
     <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
@@ -101,8 +101,8 @@
     <class>Iperf</class>
     <desc>iperf (UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 5M -t 30 -i 1 </iperf_args>
+    <direction>IPERF3</direction>
     <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>

ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml

@@ -27,34 +27,16 @@
   <TestCaseRequestedList>
     111111
     222222
-    333333
-    444444
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="111111">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy nr UE</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-    <eNB_instance>1</eNB_instance>
-    <eNB_serverId>1</eNB_serverId>
-  </testCase>
-
-  <testCase id="333333">
     <class>Clean_Test_Server_Images</class>
     <desc>Clean Test Images on Test Server</desc>
     <test_svr_id>0</test_svr_id>
   </testCase>
 
-  <testCase id="444444">
+  <testCase id="222222">
     <class>Clean_Test_Server_Images</class>
     <desc>Clean Test Images on Test Server</desc>
     <test_svr_id>1</test_svr_id>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -36,8 +36,6 @@
     270000
     270001
     270002
-    270003
-    270004
     260001
     200002
     260002
@@ -132,47 +130,32 @@
   <testCase id="270000">
     <class>Iperf</class>
     <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 80M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
+    <direction>DL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="270001">
     <class>Iperf</class>
     <desc>iperf (UL/6Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 6M -t 30</iperf_args>
+    <iperf_args>-u -b 6M -t 30 -i 1 -fm</iperf_args>
+    <direction>UL</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="270002">
     <class>Iperf</class>
     <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 10 --bidir</iperf_args>
+    <direction>BIDIR</direction>
     <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-  </testCase>
-
-  <testCase id="270003">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>35</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="270004">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>5</iperf_tcp_rate_target>
+    <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="260001">