diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 0cd382ac26..95efd53f6a 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -911,79 +911,101 @@ class Containerize(): mySSH.run('cp docker-compose.y*ml ci-docker-compose.yml', 5) for image in IMAGES: imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge) + if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup': + ret = mySSH.run(f'docker image inspect oai-ci/{imageTag}', reportNonZero=False, silent=self.displayedNewTags) + if ret.returncode != 0: + imageTag = imageTag.replace('oai-gnb', 'oai-gnb-asan') + imageTag = imageTag.replace('oai-nr-ue', 'oai-nr-ue-asan') + imageTag = imageTag.replace('oai-nr-cuup', 'oai-nr-cuup-asan') + if not self.displayedNewTags: + logging.debug(f'\u001B[1m Using sanitized version of {image} with {imageTag}\u001B[0m') mySSH.run(f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{imageTag}@" ci-docker-compose.yml',silent=True) mySSH.run(f'sed -i -e "s@{image}:latest@oai-ci/{imageTag}@" ci-docker-compose.yml',silent=True) # temporary solution for not using the new branch - # Currently support only one svcName = self.services[self.eNB_instance] if svcName == '': logging.warning('no service name giv en: starting all services in ci-docker-compose.yml!') - mySSH.run(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', 30) + ret = mySSH.run(f'docker compose -f {lSourcePath}/{self.yamlPath[self.eNB_instance]}/ci-docker-compose.yml config --services') + if ret.returncode != 0: + HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services") + self.exitStatus = 1 + return + allServices = ret.stdout.splitlines() + deployStatus = mySSH.run(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', 50) + if deployStatus.returncode != 0: + mySSH.close() + self.exitStatus = 1 + logging.error('Could not deploy') + HTML.CreateHtmlTestRow('Could not deploy', 'KO', CONST.ALL_PROCESSES_OK) + return # Checking Status - mySSH.run(f'docker compose --file ci-docker-compose.yml config {svcName}') - result = re.search('container_name: (?P[a-zA-Z0-9\-\_]+)', mySSH.getBefore()) - unhealthyNb = 0 - healthyNb = 0 - startingNb = 0 - containerName = '' - usedImage = '' - imageInfo = '' - if result is not None: - containerName = result.group('container_name') - time.sleep(5) - cnt = 0 - while (cnt < 3): - mySSH.run('docker inspect --format="{{.State.Health.Status}}" ' + containerName, 5) - unhealthyNb = mySSH.getBefore().count('unhealthy') - healthyNb = mySSH.getBefore().count('healthy') - unhealthyNb - startingNb = mySSH.getBefore().count('starting') - if healthyNb == 1: - cnt = 10 - else: - time.sleep(10) - cnt += 1 - - mySSH.run('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName) - for stdoutLine in mySSH.getBefore().split('\n'): - if stdoutLine.count('ImageUsed: oai-ci'): - usedImage = stdoutLine.replace('ImageUsed: oai-ci', 'oai-ci').strip() - logging.debug('Used image is ' + usedImage) - if usedImage != '': - mySSH.run('docker image inspect --format "* Size = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id = {{.Id}}" ' + usedImage, 5, silent=True) + services_list = self.services[self.eNB_instance].split() + if services_list == []: services_list=allServices #handing empty services + for svcName in services_list: + logging.debug('current service in the service list: \033[4m%s\033[0m', svcName) + mySSH.run(f'docker compose --file ci-docker-compose.yml config {svcName}') + result = re.search('container_name: (?P[a-zA-Z0-9\-\_]+)', mySSH.getBefore()) + unhealthyNb = 0 + healthyNb = 0 + startingNb = 0 + containerName = '' + usedImage = '' + imageInfo = '' + if result is not None: + containerName = result.group('container_name') + time.sleep(5) + cnt = 0 + while (cnt < 3): + if svcName != 'db_init': + mySSH.run('docker inspect --format="{{.State.Health.Status}}" ' + containerName, 5) + unhealthyNb = mySSH.getBefore().count('unhealthy') + healthyNb = mySSH.getBefore().count('healthy') - unhealthyNb + startingNb = mySSH.getBefore().count('starting') + if healthyNb == 1: + cnt = 10 + else: + time.sleep(10) + cnt += 1 + else: + # faking health of db_init + unhealthyNb = 0 + healthyNb = 1 + startingNb = 0 + break + mySSH.run('docker inspect --format="ImageUsed: {{.Config.Image}}" ' + containerName) for stdoutLine in mySSH.getBefore().split('\n'): - if re.search('Size = [0-9]', stdoutLine) is not None: - imageInfo += stdoutLine.strip() + '\n' - if re.search('Creation = [0-9]', stdoutLine) is not None: - imageInfo += stdoutLine.strip() + '\n' - if re.search('Id = sha256', stdoutLine) is not None: - imageInfo += stdoutLine.strip() + '\n' - logging.debug(' -- ' + str(healthyNb) + ' healthy container(s)') - logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)') - logging.debug(' -- ' + str(startingNb) + ' still starting container(s)') + if stdoutLine.count('ImageUsed: oai-ci'): + usedImage = stdoutLine.replace('ImageUsed: oai-ci', 'oai-ci').strip() + logging.debug('Used image is ' + usedImage) + if usedImage != '': + mySSH.run('docker image inspect --format "* Size = {{.Size}} bytes\n* Creation = {{.Created}}\n* Id = {{.Id}}" ' + usedImage, 5, silent=True) + for stdoutLine in mySSH.getBefore().split('\n'): + if re.search('Size = [0-9]', stdoutLine) is not None: + imageInfo += stdoutLine.strip() + '\n' + if re.search('Creation = [0-9]', stdoutLine) is not None: + imageInfo += stdoutLine.strip() + '\n' + if re.search('Id = sha256', stdoutLine) is not None: + imageInfo += stdoutLine.strip() + '\n' + logging.debug(' -- ' + str(healthyNb) + ' healthy container(s) for service' + svcName) + logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s) for service' + svcName) + logging.debug(' -- ' + str(startingNb) + ' still starting container(s) for service' + svcName) - self.testCase_id = HTML.testCase_id - self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log' + self.testCase_id = HTML.testCase_id + self.eNB_logFile[self.eNB_instance] = f'{svcName}-{self.testCase_id}.log' - status = False - if healthyNb == 1: - cnt = 0 - while (cnt < 20): - mySSH.run(f'docker logs {containerName} | egrep --text --color=never -i "wait|sync|Starting|ready"') - 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()) - if result is None: - time.sleep(6) - cnt += 1 - else: - cnt = 100 - status = True - logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m') - 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 - logfilename = f'{lSourcePath}/cmake_targets/log/{self.eNB_logFile[self.eNB_instance]}' - mySSH.run(f'docker logs {containerName} > {logfilename}', 30) - mySSH.copyin(logfilename, '.',True) + status = False + if healthyNb == 1: + status = True + logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m') + 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 + logfilename = f'{lSourcePath}/cmake_targets/log/{self.eNB_logFile[self.eNB_instance]}' + mySSH.run(f'docker logs {containerName} > {logfilename}', 30) + cwd = os.getcwd() + logging.debug(f'Deployment Failed, trying to copy the log from {logfilename} at {cwd}') + mySSH.copyin(logfilename,cwd,True) mySSH.close() @@ -1026,7 +1048,6 @@ class Containerize(): 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}') svcName = self.services[self.eNB_instance] forceDown = False if svcName != '': @@ -1051,12 +1072,13 @@ class Containerize(): logging.info(f'stopping services {[s for s, _ in services]}') mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3') + cwd = os.getcwd() copyin_res = True for service_name, container_id in services: # head -n -1 suppresses the final "X exited with status code Y" filename = f'{service_name}-{HTML.testCase_id}.log' - mySSH.run(f'docker logs {container_id} &> {lSourcePath}/cmake_targets/log/{filename}') - copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res + mySSH.run(f'docker logs {container_id} > {lSourcePath}/cmake_targets/log/{filename} 2>&1') + copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', os.path.join(cwd, filename)) and copyin_res mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v') @@ -1066,32 +1088,34 @@ class Containerize(): 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 any(service_name == 'oai-nr-ue' or service_name == 'lte_ue0' for service_name, _ in services): - self.exitStatus == 0 - logging.debug(f'Analyzing UE logfile {filename}') - logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN) - if (logStatus < 0): - HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus) - self.exitStatus = 1 - else: - HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK) else: for service_name, _ in services: - if service_name == 'nv-cubb': - msg = 'Undeploy PNF/Nvidia CUBB' - HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK) - else: - filename = f'{service_name}-{HTML.testCase_id}.log' - logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m') + self.exitStatus == 0 + filename = f'{service_name}-{HTML.testCase_id}.log' + if (any(sub in service_name for sub in ['oai_ue','oai-nr-ue','lte_ue'])): + logging.debug(f'Analyzing UE logfile {filename}') + logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(filename, HTML, RAN) + if (logStatus < 0): + HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus) + self.exitStatus = 1 + else: + HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK) + elif (any(sub in service_name for sub in ['oai_enb','oai-cu','oai-du','oai-gnb'])): + logging.debug(f'\u001B[1m Analyzing XnB 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) + elif service_name == 'nv-cubb': + msg = 'Undeploy PNF/Nvidia CUBB' + HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK) + else: + logging.info(f'Skipping to analysize log for service name {service_name}') # 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(f"{cwd}/*.log", f'{lSourcePath}/cmake_targets/', recursive=True) if self.exitStatus == 0: logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m') else: diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index be9d6c12d8..6519e68d7d 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -798,7 +798,9 @@ class OaiCiTest(): bidirIperf = re.search('--bidir', iperf_opt) is not None client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log' ymlPath = CONTAINERS.yamlPath[0].split('/') - logPath = f'../cmake_targets/log/{ymlPath[1]}' + logPath = f'../cmake_targets/log/{ymlPath[2]}' + # Creating destination log folder if needed on the python executor workspace + os.system(f'mkdir -p {logPath}') 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 diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 499d003acf..96558d997d 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -557,7 +557,11 @@ elif re.match('^LogCollecteNB$', mode, re.IGNORECASE): if RAN.eNBIPAddress == 'none': cmd = 'zip -r enb.log.' + RAN.BuildId + '.zip cmake_targets/log' logging.info(cmd) - zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60) + try: + zipStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=60) + except subprocess.CalledProcessError as e: + logging.error("Command '{}' returned non-zero exit status {}.".format(e.cmd, e.returncode)) + logging.error("Error output:\n{}".format(e.output)) sys.exit(0) RAN.LogCollecteNB() elif re.match('^LogCollectHSS$', mode, re.IGNORECASE): diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index a57d2d9d5a..1a0e2e89e3 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -27,18 +27,16 @@ 1 111111 - 100001 + 800813 000000 000001 000002 000003 000004 - 200000 020001 020002 030011 030012 - 200001 100001 @@ -49,51 +47,60 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy Cassandra Database - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd cassandra db_init - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G CoreNetwork - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G eNB L2 sim - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd oai_enb - 8 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI L2 sim 4G LTE-UE 1 and Proxy - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd proxy oai_ue1 - 10 + 0 + 0 Attach_UE Attach OAI UE l2sim4g_ue - localhost + obelix Ping Ping trf-gen from LTE-UE 1 l2sim4g_ue - localhost + obelix -c 20 192.168.61.11 0 @@ -102,7 +109,7 @@ Ping Ping LTE-UE 1 from trf-gen l2sim4g_ext_dn - localhost + obelix -c 20 12.0.0.2 0 @@ -111,9 +118,9 @@ Iperf Iperf UDP Downlink l2sim4g_ue - localhost + obelix l2sim4g_ext_dn - localhost + obelix -u -t 30 -b 1M -R 25 80 @@ -123,30 +130,18 @@ Iperf Iperf UDP Uplink l2sim4g_ue - localhost + obelix l2sim4g_ext_dn - localhost + obelix -u -t 30 -b 3M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_l2sim_fdd - - - - StatsFromGenObject - Statistics before Traffic Test - yaml_files/4g_l2sim_fdd - - - - StatsFromGenObject - Statistics after Traffic Test - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml index 011c3dbf6a..8ac78f544d 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_l2sim_fdd + ci-scripts/yaml_files/4g_l2sim_fdd + 0 + 0 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 b21d5ed2ed..a637d79cba 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -26,7 +26,7 @@ wrench 111111 - 100011 + 800813 000011 000001 000012 @@ -42,7 +42,12 @@ 100011 - + + Create_Workspace + Creating new Workspace + 0 + 0 + Pull_Local_Registry Pull Images from Local Registry @@ -51,11 +56,12 @@ - DeployGenObject + Deploy_Object Deploy Cassandra Database - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz cassandra db_init - 1 + 0 + 0 @@ -71,41 +77,44 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G CoreNetwork - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (FDD 05MHz) - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz oai_enb0 - 8 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (FDD 05MHz) - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz oai_ue0 - 9 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue - localhost + obelix Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue - localhost + obelix -c 20 192.168.61.11 5 @@ -115,7 +124,7 @@ Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn -c 20 12.0.0.2 - localhost + obelix 5 @@ -127,8 +136,8 @@ -u -t 30 -b 2M -R 25 80 - localhost - localhost + obelix + obelix @@ -139,14 +148,16 @@ -u -t 30 -b 1M 25 80 - localhost - localhost + obelix + obelix - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml index 068a4063f4..f7ac0a00d6 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz + 0 + 0 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 f721573341..642342e7b8 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 @@ -26,7 +26,7 @@ wrench 111111 - 100011 +800813 000013 000002 000014 @@ -45,7 +45,12 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + IdleSleep Sleep @@ -59,26 +64,28 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (FDD 05MHz) - yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 oai_enb0 - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (FDD 05MHz) - yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 oai_ue0 - 2 + 0 + 0 Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue - localhost + obelix -c 20 10.0.1.1 5 @@ -87,7 +94,7 @@ Ping Ping LTE-UE from eNB rfsim4g_enb_nos1 - localhost + obelix -c 20 10.0.1.2 5 @@ -96,9 +103,9 @@ Iperf Iperf UDP DL rfsim4g_ue - localhost + obelix rfsim4g_enb_nos1 - localhost + obelix -u -t 30 -b 2M -R 25 80 @@ -108,18 +115,20 @@ Iperf Iperf UDP UL rfsim4g_ue - localhost + obelix rfsim4g_enb_nos1 - localhost + obelix -u -t 30 -b 1M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml index f528ae0c21..d1b6d6ab93 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + 0 + 0 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 4472728380..cddecd09d0 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -26,7 +26,7 @@ wrench 111111 - 100011 + 800813 000011 000001 000012 @@ -49,13 +49,19 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy Cassandra Database - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz cassandra db_init - 1 + 0 + 0 @@ -71,41 +77,44 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G CoreNetwork - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (FDD 10MHz) - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz oai_enb0 - 8 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (FDD 10MHz) - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz oai_ue0 - 9 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue - localhost + obelix Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue - localhost + obelix -c 20 192.168.61.11 5 @@ -114,7 +123,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn - localhost + obelix -c 20 12.0.0.2 5 @@ -123,9 +132,9 @@ Iperf Iperf UDP DL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 2M -R 25 80 @@ -135,18 +144,20 @@ Iperf Iperf UDP UL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 1M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml index 37295911a5..2cb868e17a 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_10MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz + 0 + 0 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 923ed2fee0..619257cbc1 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -26,7 +26,7 @@ wrench 111111 - 100011 + 800813 000011 000001 000012 @@ -49,13 +49,19 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy Cassandra Database - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz cassandra db_init - 1 + 0 + 0 @@ -71,41 +77,44 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G CoreNetwork - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (FDD 20MHz) - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz oai_enb0 - 8 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (FDD 20MHz) - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz oai_ue0 - 9 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim4g_ue - localhost + obelix Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue - localhost + obelix -c 20 192.168.61.11 5 @@ -114,7 +123,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn - localhost + obelix -c 20 12.0.0.2 5 @@ -123,9 +132,9 @@ Iperf Iperf UDP DL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 2M -R 25 80 @@ -135,18 +144,20 @@ Iperf Iperf UDP UL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 1M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml index 2017aec636..0582267082 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fdd_20MHz + ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index b2e312d22b..d33832d3c2 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -26,7 +26,7 @@ wrench 111111 - 100011 + 800813 000013 000002 000014 @@ -42,7 +42,12 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + IdleSleep Sleep @@ -56,37 +61,41 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (FeMBMS) - yaml_files/4g_rfsimulator_fembms + ci-scripts/yaml_files/4g_rfsimulator_fembms oai_enb0 - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (FeMBMS) - yaml_files/4g_rfsimulator_fembms + ci-scripts/yaml_files/4g_rfsimulator_fembms oai_ue0 - 2 + 0 + 0 Iperf2_Unidir Iperf2 UDP DL rfsim4g_ue_fembms - localhost + obelix rfsim4g_enb_fembms - localhost + obelix -u -t 30 -b 2M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fembms + ci-scripts/yaml_files/4g_rfsimulator_fembms + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml index b127aee300..d78e9794e0 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_fembms + ci-scripts/yaml_files/4g_rfsimulator_fembms + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index 1269cfe07f..04ec93ebf5 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -26,7 +26,7 @@ wrench 111111 - 100011 + 800813 000013 000002 000014 @@ -42,7 +42,12 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + IdleSleep Sleep @@ -56,37 +61,41 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (MBMS) - yaml_files/4g_rfsimulator_mbms + ci-scripts/yaml_files/4g_rfsimulator_mbms oai_enb0 - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (MBMS) - yaml_files/4g_rfsimulator_mbms + ci-scripts/yaml_files/4g_rfsimulator_mbms oai_ue0 - 2 + 0 + 0 Iperf Iperf UDP DL rfsim4g_ue - localhost + obelix rfsim4g_enb_nos1 - localhost + obelix -u -t 30 -b 2M -R 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_mbms + ci-scripts/yaml_files/4g_rfsimulator_mbms + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml index 25b4909a88..3ad172be93 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_mbms + ci-scripts/yaml_files/4g_rfsimulator_mbms + 0 + 0 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 fd57190378..94bc18dc5a 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -27,7 +27,7 @@ 1 111111 - 100011 + 800813 000011 000001 000012 @@ -50,13 +50,19 @@ 0 oai-enb oai-lte-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy Cassandra Database - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz cassandra db_init - 1 + 0 + 0 @@ -72,34 +78,37 @@ - DeployGenObject + Deploy_Object Deploy OAI 4G CoreNetwork - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz oai_hss oai_mme oai_spgwc oai_spgwu trf_gen - 6 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G eNB RF sim (TDD 05MHz) - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz oai_enb0 - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 4G LTE-UE RF sim (TDD 05MHz) - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz oai_ue0 - 8 + 0 + 0 Ping Ping Traffic-Gen from LTE-UE rfsim4g_ue - localhost + obelix -c 20 192.168.61.11 5 @@ -108,7 +117,7 @@ Ping Ping LTE-UE from Traffic-Gen rfsim4g_ext_dn - localhost + obelix -c 20 12.0.0.2 5 @@ -117,9 +126,9 @@ Iperf Iperf UDP DL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 2M -R 25 80 @@ -129,18 +138,20 @@ Iperf Iperf UDP UL rfsim4g_ue - localhost + obelix rfsim4g_ext_dn - localhost + obelix -u -t 30 -b 1M 25 80 - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml index 7e526d4f48..0a6d6bb890 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 4G stack - yaml_files/4g_rfsimulator_tdd_05MHz + ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index 2cdc9c96d2..87827cbdf7 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -26,7 +26,7 @@ wrench 111111 - 100021 + 800813 000021 000022 000023 @@ -42,53 +42,63 @@ 0 oai-gnb oai-nr-cuup oai-nr-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_rfsimulator_e1 + ci-scripts/yaml_files/5g_rfsimulator_e1 mysql oai-amf oai-smf oai-upf - 4 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs) - yaml_files/5g_rfsimulator_e1 + ci-scripts/yaml_files/5g_rfsimulator_e1 oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3 - 11 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator_e1 + ci-scripts/yaml_files/5g_rfsimulator_e1 oai-nr-ue oai-nr-ue2 oai-nr-ue3 - 14 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 - localhost localhost localhost + cacofonix cacofonix cacofonix Ping Ping ext-dn from all NR-UEs rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 - localhost localhost localhost + cacofonix cacofonix cacofonix -c 20 12.1.1.1 -i0.25 5 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_e1 + ci-scripts/yaml_files/5g_rfsimulator_e1 1,0,0,0 1,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml index 4ccf180fd0..3f10e0e32c 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_e1 + ci-scripts/yaml_files/5g_rfsimulator_e1 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 5ad5d20983..56071f4b1b 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -26,7 +26,7 @@ wrench 111111 - 100021 + 800813 000021 000022 000023 @@ -44,35 +44,42 @@ 0 oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_f1_rfsimulator + ci-scripts/yaml_files/5g_f1_rfsimulator mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G CU+DU+UE RF sim SA - yaml_files/5g_f1_rfsimulator + ci-scripts/yaml_files/5g_f1_rfsimulator oai-cu oai-du oai-nr-ue - 8 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + cacofonix Ping Ping ext-dn from all NR-UEs rfsim5g_ue - localhost + cacofonix -c 20 192.168.72.135 -i0.25 5 @@ -80,7 +87,7 @@ Custom_Command Simulate a DL radio channel with noise (3 dB) - localhost + cacofonix echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091 yes @@ -90,9 +97,9 @@ Iperf (DL/5Mbps/UDP)(30 sec) -u -b 5M -t 20 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -102,9 +109,9 @@ Iperf (UL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -112,7 +119,7 @@ Custom_Command Simulate a disruption of DL radio channel (ploss 55)(5 sec) - localhost + cacofonix echo channelmod modify 0 ploss 55 | nc -N 192.168.71.181 8091 && sleep 5 yes @@ -120,7 +127,7 @@ Custom_Command Get UE sync state (UE ID 0) - localhost + cacofonix echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_NOT_SYNC yes @@ -128,7 +135,7 @@ Custom_Command Restoration of the original DL channel conditions (ploss 0)(5 sec) - localhost + cacofonix echo channelmod modify 0 ploss 0 | nc -N 192.168.71.181 8091 && sleep 5 yes @@ -136,17 +143,19 @@ Custom_Command Get UE sync state (UE ID 0) - localhost + cacofonix echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_CONNECTED && sleep 10 yes - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_f1_rfsimulator + ci-scripts/yaml_files/5g_f1_rfsimulator 30,30,100,100 30,30,100,100 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml index e083286a09..18b917697c 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_f1_rfsimulator + ci-scripts/yaml_files/5g_f1_rfsimulator + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index 2c105853c0..4a677ee41f 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -27,7 +27,7 @@ 1 111111 - 100011 + 800813 000011 000012 000013 @@ -45,35 +45,42 @@ 0 oai-gnb-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_fdd_rfsimulator + ci-scripts/yaml_files/5g_fdd_rfsimulator mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB+UE RF sim SA - yaml_files/5g_fdd_rfsimulator + ci-scripts/yaml_files/5g_fdd_rfsimulator oai-gnb oai-nr-ue - 7 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + cacofonix Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -82,7 +89,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 -i 0.25 12.1.1.2 5 @@ -92,9 +99,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 30 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -104,19 +111,21 @@ Iperf (UL/3Mbps/UDP)(30 sec) -u -b 3M -t 30 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_fdd_rfsimulator + ci-scripts/yaml_files/5g_fdd_rfsimulator 1,0,0,0 1,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml index a2cae33f4c..85421f7b6d 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_fdd_rfsimulator + ci-scripts/yaml_files/5g_fdd_rfsimulator + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index 1e8a4e8981..d53e2a4932 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -27,16 +27,14 @@ 1 111111 - 100001 + 800813 000000 000001 000002 000003 000004 - 200000 020001 020002 - 200001 100001 @@ -47,37 +45,46 @@ 0 oai-gnb-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy MySql Database - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd mysql - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB L2 sim SA - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd oai-gnb - 6 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UE L2 sim SA and Proxy - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd proxy oai-nr-ue0 - 8 + 0 + 0 @@ -106,23 +113,13 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd 20,50,100,100 0,0,0,0 - - - - StatsFromGenObject - Statistics before Traffic Test - yaml_files/5g_l2sim_tdd - - - - StatsFromGenObject - Statistics after Traffic Test - yaml_files/5g_l2sim_tdd + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml index 906ce7aa81..36ce7c71f6 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_l2sim_tdd + ci-scripts/yaml_files/5g_l2sim_tdd + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 893b527afe..2145207318 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 000001 000002 000003 @@ -60,75 +60,87 @@ 0 oai-gnb-asan oai-nr-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-gnb - 6 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-nr-ue - 7 + 0 + 0 - DeployGenObject + Deploy_Object Deploy Second OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-nr-ue2 - 8 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-nr-ue3 oai-nr-ue4 oai-nr-ue5 - 11 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-nr-ue6 oai-nr-ue7 oai-nr-ue8 - 14 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UEs (#9, #10) RF sim SA - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator oai-nr-ue9 oai-nr-ue10 - 16 + 0 + 0 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 + cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -137,7 +149,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 -i 0.25 12.1.1.2 5 @@ -146,7 +158,7 @@ Ping Ping ext-dn from Second NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -155,7 +167,7 @@ Ping Ping Second NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 -i 0.25 12.1.1.3 5 @@ -164,7 +176,7 @@ Ping Ping ext-dn from both UEs rfsim5g_ue rfsim5g_ue2 - localhost localhost + cacofonix cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -173,7 +185,7 @@ Ping Ping ext-dn from both UEs rfsim5g_ue rfsim5g_ue2 - localhost localhost + cacofonix cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -182,7 +194,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 + cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix -c 20 192.168.72.135 -i 0.25 -s 1016 5 @@ -192,9 +204,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -204,9 +216,9 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -215,29 +227,31 @@ Attach_UE Attach OAI UE 1 and 2 rfsim5g_ue rfsim5g_ue2 - localhost localhost + cacofonix cacofonix Detach_UE Detach OAI UE 1 and 2 rfsim5g_ue rfsim5g_ue2 - localhost localhost + cacofonix cacofonix 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 + cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator 1,0,0,0 1,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index 8bc5d08a8d..6f4d800d4d 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 000001 000002 000003 @@ -45,35 +45,42 @@ 0 oai-gnb-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_rfsimulator_24prb + ci-scripts/yaml_files/5g_rfsimulator_24prb mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB+UE RFsim SA - yaml_files/5g_rfsimulator_24prb + ci-scripts/yaml_files/5g_rfsimulator_24prb oai-gnb oai-nr-ue - 7 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + cacofonix Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i0.2 192.168.72.135 5 @@ -82,7 +89,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 12.1.1.2 -i0.2 5 @@ -92,9 +99,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -104,19 +111,21 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_24prb + ci-scripts/yaml_files/5g_rfsimulator_24prb 1,0,0,0 1,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml index 9a16ed2723..09084b0503 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_24prb + ci-scripts/yaml_files/5g_rfsimulator_24prb + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index f14ac4bc60..6e1dbef31d 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 000001 000002 000003 @@ -45,35 +45,42 @@ 0 oai-gnb-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_rfsimulator_2x2 + ci-scripts/yaml_files/5g_rfsimulator_2x2 mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB+UE RF sim SA - yaml_files/5g_rfsimulator_2x2 + ci-scripts/yaml_files/5g_rfsimulator_2x2 oai-gnb oai-nr-ue - 7 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + cacofonix Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -82,7 +89,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 -i 0.25 12.1.1.2 5 @@ -92,9 +99,9 @@ Iperf (DL/10Mbps/UDP)(30 sec) -u -b 10M -t 20 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -104,17 +111,19 @@ Iperf (UL/4Mbps/UDP)(30 sec) -u -b 4M -t 20 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_2x2 + ci-scripts/yaml_files/5g_rfsimulator_2x2 + 0 + 0 1,0,0,0 1,0,0,0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml index 62ed318782..5d92987c5b 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_2x2 + ci-scripts/yaml_files/5g_rfsimulator_2x2 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_down.xml b/ci-scripts/xml_files/container_5g_rfsim_down.xml index d1cfc340d4..0c9348e8d6 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator + ci-scripts/yaml_files/5g_rfsimulator + 0 + 0 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 002d10467e..31d9a04790 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml @@ -26,6 +26,7 @@ wrench 111111 + 800813 000020 000021 020021 @@ -40,35 +41,43 @@ 0 oai-gnb oai-nr-ue - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI-DU+nrUE - yaml_files/5g_rfsimulator_accelleran + ci-scripts/yaml_files/5g_rfsimulator_accelleran oai-du oai-nr-ue - 2 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + ofqot Ping Test Connectivity (ping) rfsim5g_ue - localhost + ofqot -c 20 12.1.1.1 0 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_accelleran + ci-scripts/yaml_files/5g_rfsimulator_accelleran + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml index 0a4f9fcbfa..c8960ccae8 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_accelleran + ci-scripts/yaml_files/5g_rfsimulator_accelleran + 0 + 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 be506d86f2..464197ef7a 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -27,7 +27,7 @@ 1 111111 - 100011 + 800813 004000 000010 000011 @@ -49,31 +49,38 @@ Custom_Command Clean-Up any residual volume - localhost + cacofonix docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G gNB RF sim SA - yaml_files/5g_rfsimulator_fdd_phytest + ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest oai-gnb - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G NR-UE RF sim SA - yaml_files/5g_rfsimulator_fdd_phytest + ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest oai-nr-ue - 2 + 0 + 0 Ping Ping gNB from NR-UE rfsim5g_ue - localhost + cacofonix -c20 -i0.2 10.0.1.1 0 @@ -82,7 +89,7 @@ Ping Ping NR-UE from gNB rfsim5g_gnb_nos1 - localhost + cacofonix -c20 -i0.2 10.0.1.2 0 @@ -92,9 +99,9 @@ Iperf (DL/30kbps/UDP)(30 sec) -u -b 0.03M -t 20 -R -c 10.0.1.1 rfsim5g_ue - localhost + cacofonix rfsim5g_gnb_nos1 - localhost + cacofonix 5 90 @@ -104,19 +111,21 @@ Iperf (UL/30kbps/UDP)(30 sec) -u -b 0.03M -t 20 -c 10.0.1.1 rfsim5g_ue - localhost + cacofonix rfsim5g_gnb_nos1 - localhost + cacofonix 5 90 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_fdd_phytest + ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest 10,100,100,100 10,100,100,100 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml index 9036fbc677..14c3f0f32a 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml @@ -32,15 +32,17 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_fdd_phytest + ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest + 0 + 0 Custom_Command Clean-Up any residual volume - localhost + cacofonix docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config 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 4c266b7353..9d1253b31f 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 000000 000001 020001 @@ -43,27 +43,36 @@ oai-gnb-asan oai-nr-ue-asan + + Create_Workspace + Creating new Workspace + 0 + 0 + + - DeployGenObject + Deploy_Object Deploy OAI gNB - yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI NR-UE - yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb oai-gnb oai-nr-ue - 7 + 0 + 0 Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i0.2 192.168.72.135 0 @@ -72,17 +81,19 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 12.1.1.2 -i0.2 0 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb 10,0,0,0 10,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml index 6dd65eaa85..9537b0d5bb 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb + 0 + 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 4949380523..a6b754dacb 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 004000 000000 000001 @@ -47,31 +47,38 @@ Custom_Command Clean-Up any residual volume - localhost + cacofonix docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI gNB - yaml_files/5g_rfsimulator_tdd_dora + ci-scripts/yaml_files/5g_rfsimulator_tdd_dora oai-gnb - 1 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI NR-UE - yaml_files/5g_rfsimulator_tdd_dora + ci-scripts/yaml_files/5g_rfsimulator_tdd_dora oai-nr-ue - 2 + 0 + 0 Ping Ping gNB from NR-UE rfsim5g_ue - localhost + cacofonix -c20 -i0.2 10.0.1.1 0 @@ -80,17 +87,19 @@ Ping Ping NR-UE from gNB rfsim5g_gnb_nos1 - localhost + cacofonix -c20 -i0.2 10.0.1.2 0 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_tdd_dora + ci-scripts/yaml_files/5g_rfsimulator_tdd_dora 0,0,0,0 0,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml index 7042e8885a..35ebe2314a 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml @@ -32,15 +32,17 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_tdd_dora + ci-scripts/yaml_files/5g_rfsimulator_tdd_dora + 0 + 0 Custom_Command Clean-Up any residual volume - localhost + cacofonix docker volume rm 5g_rfsimulator_tdd_dora_rrc.config 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 01a658c18f..6d5d99f595 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -27,7 +27,7 @@ 1 111111 - 100001 + 800813 000001 000002 000003 @@ -45,35 +45,42 @@ 0 oai-gnb-asan oai-nr-ue-asan - + + Create_Workspace + Creating new Workspace + 0 + 0 + - DeployGenObject + Deploy_Object Deploy OAI 5G CoreNetwork - yaml_files/5g_rfsimulator_u0_25prb + ci-scripts/yaml_files/5g_rfsimulator_u0_25prb mysql oai-amf oai-smf oai-upf oai-ext-dn - 5 + 0 + 0 - DeployGenObject + Deploy_Object Deploy OAI 5G gNB+nrUE RF sim SA - yaml_files/5g_rfsimulator_u0_25prb + ci-scripts/yaml_files/5g_rfsimulator_u0_25prb oai-gnb oai-nr-ue - 7 + 0 + 0 Attach_UE Attach OAI UE (Wait for IP) rfsim5g_ue - localhost + cacofonix Ping Ping ext-dn from NR-UE rfsim5g_ue - localhost + cacofonix -c 20 -i 0.25 192.168.72.135 5 @@ -82,7 +89,7 @@ Ping Ping NR-UE from ext-dn rfsim5g_ext_dn - localhost + cacofonix -c 20 -i 0.25 12.1.1.2 5 @@ -92,9 +99,9 @@ Iperf (DL/3Mbps/UDP)(30 sec) -u -b 3M -t 20 -R rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 @@ -104,19 +111,21 @@ Iperf (UL/1Mbps/UDP)(30 sec) -u -b 1M -t 20 rfsim5g_ue - localhost + cacofonix rfsim5g_ext_dn - localhost + cacofonix 5 90 - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_u0_25prb + ci-scripts/yaml_files/5g_rfsimulator_u0_25prb 1,0,0,0 1,0,0,0 + 0 + 0 diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml index 7cd4bb4f1e..78b9aacc95 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml @@ -31,9 +31,11 @@ - UndeployGenObject + Undeploy_Object Undeploy all OAI 5G stack - yaml_files/5g_rfsimulator_u0_25prb + ci-scripts/yaml_files/5g_rfsimulator_u0_25prb + 0 + 0 diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml index afa27629a4..96067b5592 100644 --- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml @@ -31,7 +31,9 @@ 310000 800813 330101 + 800814 330102 + 800815 330103 310001 350000 @@ -92,7 +94,12 @@ 0 gnb_cucp - + + Create_Workspace + Creating new Workspace + 0 + 0 + Deploy_Object Deploy gNB-CU-UP in a container @@ -101,7 +108,12 @@ 0 gnb_cuup - + + Create_Workspace + Creating new Workspace + 0 + 0 + Deploy_Object Deploy gNB-DU (TDD/Band78/40MHz/B200) in a container diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml index 821367cd3f..2c5ae10dba 100644 --- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml +++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml @@ -30,6 +30,7 @@ 110002 800813 130101 + 800814 130102 100001 110000 @@ -94,6 +95,12 @@ 0 gnb_cu + + Create_Workspace + Creating new Workspace + 0 + 0 + Deploy_Object Deploy gNB-DU (FDD/Band1/10MHz/B200) in a container