diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index 8ffb1c2083..31706446f6 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -249,13 +249,13 @@ lte_oai_ue_carabe: MTU: 1500 rfsim5g_gnb_nos1: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1 CmdPrefix: docker exec rfsim5g-oai-gnb IF: oaitun_enb1 rfsim5g_ue: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue IF: oaitun_ue1 @@ -264,7 +264,7 @@ rfsim5g_ue: MTU: 1500 rfsim5g_ue2: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue2 IF: oaitun_ue1 @@ -273,7 +273,7 @@ rfsim5g_ue2: MTU: 1500 rfsim5g_ue3: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue3 IF: oaitun_ue1 @@ -282,7 +282,7 @@ rfsim5g_ue3: MTU: 1500 rfsim5g_ue4: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue4 IF: oaitun_ue1 @@ -291,7 +291,7 @@ rfsim5g_ue4: MTU: 1500 rfsim5g_ue5: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue5 IF: oaitun_ue1 @@ -300,7 +300,7 @@ rfsim5g_ue5: MTU: 1500 rfsim5g_ue6: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue6 IF: oaitun_ue1 @@ -309,7 +309,7 @@ rfsim5g_ue6: MTU: 1500 rfsim5g_ue7: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue7 IF: oaitun_ue1 @@ -318,7 +318,7 @@ rfsim5g_ue7: MTU: 1500 rfsim5g_ue8: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue8 IF: oaitun_ue1 @@ -327,7 +327,7 @@ rfsim5g_ue8: MTU: 1500 rfsim5g_ue9: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue9 IF: oaitun_ue1 @@ -336,7 +336,7 @@ rfsim5g_ue9: MTU: 1500 rfsim5g_ue10: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim5g-oai-nr-ue10 IF: oaitun_ue1 @@ -345,12 +345,12 @@ rfsim5g_ue10: MTU: 1500 rfsim5g_ext_dn: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0 CmdPrefix: docker exec rfsim5g-oai-ext-dn rfsim4g_ue: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1 CmdPrefix: docker exec rfsim4g-oai-lte-ue0 IF: oaitun_ue1 @@ -359,30 +359,30 @@ rfsim4g_ue: MTU: 1500 rfsim4g_ext_dn: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0 CmdPrefix: docker exec rfsim4g-trf-gen rfsim4g_enb_nos1: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1 CmdPrefix: docker exec rfsim4g-oai-enb IF: oaitun_enb1 rfsim4g_enb_fembms: - Host: localhost + Host: "%%current_host%%" 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 + Host: "%%current_host%%" 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 + Host: "%%current_host%%" AttachScript: docker start l2sim-oai-nr-ue0 DetachScript: docker stop l2sim-oai-nr-ue0 NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1 @@ -391,12 +391,12 @@ l2sim5g_ue: MTU: 1500 l2sim5g_ext_dn: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0 CmdPrefix: docker exec l2sim-oai-ext-dn l2sim4g_ue: - Host: localhost + Host: "%%current_host%%" AttachScript: docker start l2sim4g-oai-lte-ue1 DetachScript: docker stop l2sim4g-oai-lte-ue1 NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1 @@ -405,6 +405,6 @@ l2sim4g_ue: MTU: 1500 l2sim4g_ext_dn: - Host: localhost + Host: "%%current_host%%" NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0 CmdPrefix: docker exec l2sim4g-trf-gen diff --git a/ci-scripts/cls_module.py b/ci-scripts/cls_module.py index ef758a2933..c56638777c 100644 --- a/ci-scripts/cls_module.py +++ b/ci-scripts/cls_module.py @@ -41,14 +41,18 @@ import cls_cmd class Module_UE: - def __init__(self, module_name, filename="ci_infra.yaml"): + def __init__(self, module_name, node=None, filename="ci_infra.yaml"): with open(filename, 'r') as f: all_ues = yaml.load(f, Loader=yaml.FullLoader) m = all_ues.get(module_name) if m is None: raise Exception(f'no such module name "{module_name}" in "{filename}"') self.module_name = module_name - self.host = m['Host'] + self.host = m['Host'] if m['Host'] != "%%current_host%%" else None + if node is None and self.host is None: + raise Exception(f'node not provided when needed') + elif node is not None and self.host is None: + self.host = node self.cmd_dict = { "attach": m.get('AttachScript'), "detach": m.get('DetachScript'), diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index 53a9aefda6..be9d6c12d8 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -280,6 +280,8 @@ class OaiCiTest(): self.clean_repository = True self.air_interface='' self.ue_ids = [] + self.nodes = [] + self.svr_node = None self.svr_id = None self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem @@ -606,7 +608,10 @@ 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] + if len(self.ue_ids) == len(self.nodes): + ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] + else: + ues = [cls_module.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] @@ -621,7 +626,10 @@ 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] + if len(self.ue_ids) == len(self.nodes): + ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] + else: + ues = [cls_module.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] @@ -757,8 +765,10 @@ 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] + if len(self.ue_ids) == len(self.nodes): + ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] + else: + ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids] logging.debug(ues) pingLock = Lock() with concurrent.futures.ThreadPoolExecutor() as executor: @@ -845,9 +855,11 @@ class OaiCiTest(): 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) + if len(self.ue_ids) == len(self.nodes): + ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)] + else: + ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids] + svr = cls_module.Module_UE(self.svr_id,self.svr_node) 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)] diff --git a/ci-scripts/main.py b/ci-scripts/main.py index ed002c1fa2..bc526072d5 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -217,6 +217,8 @@ def GetParametersFromXML(action): elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE': CiTestObj.ue_ids = test.findtext('id').split(' ') + if test.findtext('nodes'): + CiTestObj.nodes = test.findtext('nodes').split(' ') elif action == 'Build_OAI_UE': CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args') @@ -263,12 +265,18 @@ def GetParametersFromXML(action): CiTestObj.ping_args = test.findtext('ping_args') CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold') CiTestObj.ue_ids = test.findtext('id').split(' ') + if test.findtext('nodes'): + CiTestObj.nodes = test.findtext('nodes').split(' ') ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or '' 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 + if test.findtext('nodes'): + CiTestObj.nodes = test.findtext('nodes').split(' ') + if test.findtext('svr_node'): + CiTestObj.svr_node = test.findtext('svr_node') 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' diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index de7baff19b..a57d2d9d5a 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -86,12 +86,14 @@ Attach_UE Attach OAI UE l2sim4g_ue + localhost Ping Ping trf-gen from LTE-UE 1 l2sim4g_ue + localhost -c 20 192.168.61.11 0 @@ -100,6 +102,7 @@ Ping Ping LTE-UE 1 from trf-gen l2sim4g_ext_dn + localhost -c 20 12.0.0.2 0 @@ -108,7 +111,9 @@ Iperf Iperf UDP Downlink l2sim4g_ue + localhost l2sim4g_ext_dn + localhost -u -t 30 -b 1M -R 25 80 @@ -118,7 +123,9 @@ Iperf Iperf UDP Uplink l2sim4g_ue + localhost l2sim4g_ext_dn + localhost -u -t 30 -b 3M 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index 36b67a70b4..b21d5ed2ed 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -98,12 +98,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue + localhost Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue + localhost -c 20 192.168.61.11 5 @@ -113,6 +115,7 @@ Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn -c 20 12.0.0.2 + localhost 5 @@ -124,6 +127,8 @@ -u -t 30 -b 2M -R 25 80 + localhost + localhost @@ -134,6 +139,8 @@ -u -t 30 -b 1M 25 80 + localhost + localhost diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index 655cbf0d82..f721573341 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -78,6 +78,7 @@ Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue + localhost -c 20 10.0.1.1 5 @@ -86,6 +87,7 @@ Ping Ping LTE-UE from eNB rfsim4g_enb_nos1 + localhost -c 20 10.0.1.2 5 @@ -94,7 +96,9 @@ Iperf Iperf UDP DL rfsim4g_ue + localhost rfsim4g_enb_nos1 + localhost -u -t 30 -b 2M -R 25 80 @@ -104,7 +108,9 @@ Iperf Iperf UDP UL rfsim4g_ue + localhost rfsim4g_enb_nos1 + localhost -u -t 30 -b 1M 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index f37812ecb2..4472728380 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -98,12 +98,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue + localhost Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue + localhost -c 20 192.168.61.11 5 @@ -112,6 +114,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn + localhost -c 20 12.0.0.2 5 @@ -120,7 +123,9 @@ Iperf Iperf UDP DL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 2M -R 25 80 @@ -130,7 +135,9 @@ Iperf Iperf UDP UL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 1M 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index db157a5138..923ed2fee0 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -98,12 +98,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue + localhost Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue + localhost -c 20 192.168.61.11 5 @@ -112,6 +114,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn + localhost -c 20 12.0.0.2 5 @@ -120,7 +123,9 @@ Iperf Iperf UDP DL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 2M -R 25 80 @@ -130,7 +135,9 @@ Iperf Iperf UDP UL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 1M 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index bd15657c23..b2e312d22b 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -75,7 +75,9 @@ Iperf2_Unidir Iperf2 UDP DL rfsim4g_ue_fembms + localhost rfsim4g_enb_fembms + localhost -u -t 30 -b 2M 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index 3dc26454a1..1269cfe07f 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -75,7 +75,9 @@ Iperf Iperf UDP DL rfsim4g_ue + localhost rfsim4g_enb_nos1 + localhost -u -t 30 -b 2M -R 25 80 diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml index a5501f2879..fd57190378 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -99,6 +99,7 @@ Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue + localhost -c 20 192.168.61.11 5 @@ -107,6 +108,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn + localhost -c 20 12.0.0.2 5 @@ -115,7 +117,9 @@ Iperf Iperf UDP DL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 2M -R 25 80 @@ -125,7 +129,9 @@ Iperf Iperf UDP UL rfsim4g_ue + localhost rfsim4g_ext_dn + localhost -u -t 30 -b 1M 25 80 diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index 3d9bec6b9d..2cdc9c96d2 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -71,12 +71,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 + localhost localhost localhost Ping Ping ext-dn from all NR-UEs rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 + localhost localhost localhost -c 20 12.1.1.1 -i0.25 5 diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index be31c6202a..5ad5d20983 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -65,12 +65,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Ping ext-dn from all NR-UEs rfsim5g_ue + localhost -c 20 192.168.72.135 -i0.25 5 @@ -88,7 +90,9 @@ Iperf (DL/5Mbps/UDP)(30 sec) -u -b 5M -t 20 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -98,7 +102,9 @@ Iperf (UL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index 92629a4700..2c105853c0 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -66,12 +66,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i 0.25 192.168.72.135 5 @@ -80,6 +82,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 -i 0.25 12.1.1.2 5 @@ -89,7 +92,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 30 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -99,7 +104,9 @@ Iperf (UL/3Mbps/UDP)(30 sec) -u -b 3M -t 30 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index 8fcdcd6cb0..1e8a4e8981 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -84,12 +84,14 @@ Attach_UE Attach OAI UE l2sim5g_ue + localhost Ping Ping ext-dn from NR-UE l2sim5g_ue + localhost -c 20 192.168.72.135 5 @@ -98,6 +100,7 @@ Ping Ping NR-UE from ext-dn l2sim5g_ext_dn + localhost -c 20 12.1.1.2 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 3751b256f2..893b527afe 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -121,12 +121,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10 + localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i 0.25 192.168.72.135 5 @@ -135,6 +137,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 -i 0.25 12.1.1.2 5 @@ -143,6 +146,7 @@ Ping Ping ext-dn from Second NR-UE rfsim5g_ue + localhost -c 20 -i 0.25 192.168.72.135 5 @@ -151,6 +155,7 @@ Ping Ping Second NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 -i 0.25 12.1.1.3 5 @@ -159,6 +164,7 @@ Ping Ping ext-dn from both UEs rfsim5g_ue rfsim5g_ue2 + localhost localhost -c 20 -i 0.25 192.168.72.135 5 @@ -167,6 +173,7 @@ Ping Ping ext-dn from both UEs rfsim5g_ue rfsim5g_ue2 + localhost localhost -c 20 -i 0.25 192.168.72.135 5 @@ -175,6 +182,7 @@ Ping Ping ext-dn from all UEs rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10 + localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost -c 20 192.168.72.135 -i 0.25 -s 1016 5 @@ -184,7 +192,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -194,7 +204,9 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -203,18 +215,21 @@ Attach_UE Attach OAI UE 1 and 2 rfsim5g_ue rfsim5g_ue2 + localhost localhost Detach_UE Detach OAI UE 1 and 2 rfsim5g_ue rfsim5g_ue2 + localhost localhost Detach_UE Detach OAI UE 2 to 10 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10 + localhost localhost localhost localhost localhost localhost localhost localhost diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index e970c7ae3f..8bc5d08a8d 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -66,12 +66,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i0.2 192.168.72.135 5 @@ -80,6 +82,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 12.1.1.2 -i0.2 5 @@ -89,7 +92,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -99,7 +104,9 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index 1cd9314e1b..f14ac4bc60 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -66,12 +66,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i 0.25 192.168.72.135 5 @@ -80,6 +82,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 -i 0.25 12.1.1.2 5 @@ -89,7 +92,9 @@ Iperf (DL/10Mbps/UDP)(30 sec) -u -b 10M -t 20 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -99,7 +104,9 @@ Iperf (UL/4Mbps/UDP)(30 sec) -u -b 4M -t 20 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml index fe02da00a0..002d10467e 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml @@ -53,12 +53,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Test Connectivity (ping) rfsim5g_ue + localhost -c 20 12.1.1.1 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml index 7c50eb7fea..be506d86f2 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -73,6 +73,7 @@ Ping Ping gNB from NR-UE rfsim5g_ue + localhost -c20 -i0.2 10.0.1.1 0 @@ -81,6 +82,7 @@ Ping Ping NR-UE from gNB rfsim5g_gnb_nos1 + localhost -c20 -i0.2 10.0.1.2 0 @@ -90,7 +92,9 @@ Iperf (DL/30kbps/UDP)(30 sec) -u -b 0.03M -t 20 -R -c 10.0.1.1 rfsim5g_ue + localhost rfsim5g_gnb_nos1 + localhost 5 90 @@ -100,7 +104,9 @@ Iperf (UL/30kbps/UDP)(30 sec) -u -b 0.03M -t 20 -c 10.0.1.1 rfsim5g_ue + localhost rfsim5g_gnb_nos1 + localhost 5 90 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml index e6127a766e..4c266b7353 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -63,6 +63,7 @@ Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i0.2 192.168.72.135 0 @@ -71,6 +72,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 12.1.1.2 -i0.2 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml index 306b8e4e05..4949380523 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -71,6 +71,7 @@ Ping Ping gNB from NR-UE rfsim5g_ue + localhost -c20 -i0.2 10.0.1.1 0 @@ -79,6 +80,7 @@ Ping Ping NR-UE from gNB rfsim5g_gnb_nos1 + localhost -c20 -i0.2 10.0.1.2 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml index 64f19e1314..01a658c18f 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -66,12 +66,14 @@ Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue + localhost Ping Ping ext-dn from NR-UE rfsim5g_ue + localhost -c 20 -i 0.25 192.168.72.135 5 @@ -80,6 +82,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn + localhost -c 20 -i 0.25 12.1.1.2 5 @@ -89,7 +92,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90 @@ -99,7 +104,9 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue + localhost rfsim5g_ext_dn + localhost 5 90