diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 4692574709..3ad8fafd21 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -651,9 +651,10 @@ class Containerize(): mySSH.command('echo oaicicd | docker login --password-stdin -u oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Login Succeeded', mySSH.getBefore()) is None: - logging.error('Could not log into local registry') + msg = 'Could not log into local registry' + logging.error(msg) mySSH.close() - HTML.CreateHtmlTestRow('Could not log into local registry', 'KO', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) return False orgTag = 'develop' @@ -666,17 +667,21 @@ class Containerize(): mySSH.command(f'docker push {tagToUse}', '\$', 120) if re.search(': digest:', mySSH.getBefore()) is None: logging.debug(mySSH.getBefore()) - logging.error(f'Could not push {image} to local registry : {tagToUse}') + msg = f'Could not push {image} to local registry : {tagToUse}' + logging.error(msg) mySSH.close() - HTML.CreateHtmlTestRow(f'Could not push {image} to local registry : {tagToUse}', 'KO', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) return False + # TODO: once we are done migrating all types of tests, rmi also {image}:{orgTag} + # so when we pull on builder as a test server, it will really pull mySSH.command(f'docker rmi {tagToUse}', '\$', 5) mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5) if re.search('Removing login credentials', mySSH.getBefore()) is None: - logging.error('Could not log off from local registry') + msg = 'Could not log off from local registry' + logging.error(msg) mySSH.close() - HTML.CreateHtmlTestRow('Could not log off from local registry', 'KO', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) return False mySSH.close() @@ -684,6 +689,8 @@ class Containerize(): return True def Pull_Image_from_Local_Registry(self, HTML): + # This method can be called either onto a remote server (different from python executor) + # or directly on the python executor (ie lIpAddr == 'none') if self.testSvrId == '0': lIpAddr = self.eNBIPAddress lUserName = self.eNBUserName @@ -702,43 +709,68 @@ class Containerize(): if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter') - logging.debug('Pulling images onto server: ' + lIpAddr) - mySSH = SSH.SSHConnection() - mySSH.open(lIpAddr, lUserName, lPassWord) + if lIpAddr != 'none': + logging.debug('Pulling images onto server: ' + lIpAddr) + mySSH = SSH.SSHConnection() + mySSH.open(lIpAddr, lUserName, lPassWord) + else: + logging.debug('Pulling images locally') - mySSH.command('echo oaicicd | docker login --password-stdin -u oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5) - if re.search('Login Succeeded', mySSH.getBefore()) is None: - logging.error('Could not log into local registry') - mySSH.close() - HTML.CreateHtmlTestRow('Could not log into local registry', 'KO', CONST.ALL_PROCESSES_OK) + cmd = 'echo oaicicd | docker login --password-stdin -u oaicicd porcepix.sboai.cs.eurecom.fr' + if lIpAddr != 'none': + mySSH.command(cmd, '\$', 5) + response = mySSH.getBefore() + else: + logging.info(cmd) + response = subprocess.check_output(cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT) + if re.search('Login Succeeded', response) is None: + msg = 'Could not log into local registry' + logging.error(msg) + if lIpAddr != 'none': + mySSH.close() + HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) return False - orgTag = 'develop' - if self.ranAllowMerge: - orgTag = 'ci-temp' - for image in self.imageToPull: tagToUse = self.ImageTagToUse(image) - mySSH.command(f'docker pull {tagToUse}', '\$', 120) - if re.search('Status: Downloaded newer image for |Status: Image is up to date for', mySSH.getBefore()) is None: - logging.debug(mySSH.getBefore()) - logging.error(f'Could not pull {image} from local registry : {tagToUse}') - mySSH.close() - HTML.CreateHtmlTestRow(f'Could not pull {image} from local registry : {tagToUse}', 'KO', CONST.ALL_PROCESSES_OK) + cmd = f'docker pull {tagToUse}' + if lIpAddr != 'none': + mySSH.command(cmd, '\$', 120) + response = mySSH.getBefore() + else: + logging.info(cmd) + response = subprocess.check_output(cmd, shell=True, universal_newlines=True) + if re.search('Status: Downloaded newer image for |Status: Image is up to date for', response) is None: + logging.debug(response) + msg = f'Could not pull {image} from local registry : {tagToUse}' + logging.error(msg) + if lIpAddr != 'none': + mySSH.close() + HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK) return False - mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5) - if re.search('Removing login credentials', mySSH.getBefore()) is None: - logging.error('Could not log off from local registry') + cmd = 'docker logout porcepix.sboai.cs.eurecom.fr' + if lIpAddr != 'none': + mySSH.command(cmd, '\$', 5) + response = mySSH.getBefore() + else: + logging.info(cmd) + response = subprocess.check_output(cmd, shell=True, universal_newlines=True) + if re.search('Removing login credentials', response) is None: + msg = 'Could not log off from local registry' + logging.error(msg) mySSH.close() - HTML.CreateHtmlTestRow('Could not log off from local registry', 'KO', CONST.ALL_PROCESSES_OK) + HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK) return False - mySSH.close() + if lIpAddr != 'none': + mySSH.close() HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True def Clean_Test_Server_Images(self, HTML): + # This method can be called either onto a remote server (different from python executor) + # or directly on the python executor (ie lIpAddr == 'none') if self.testSvrId == '0': lIpAddr = self.eNBIPAddress lUserName = self.eNBUserName @@ -757,20 +789,24 @@ class Containerize(): if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '': HELP.GenericHelp(CONST.Version) sys.exit('Insufficient Parameter') - logging.debug('Removing test images from server: ' + lIpAddr) - mySSH = SSH.SSHConnection() - mySSH.open(lIpAddr, lUserName, lPassWord) + if lIpAddr != 'none': + logging.debug('Removing test images from server: ' + lIpAddr) + mySSH = SSH.SSHConnection() + mySSH.open(lIpAddr, lUserName, lPassWord) + else: + logging.debug('Removing test images locally') - orgTag = 'develop' - if self.ranAllowMerge: - orgTag = 'ci-temp' - tagToUse = self.ImageTagToUse(self.imageToPull) imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru'] for image in imageNames: - tagToUse = self.ImageTagToUse(image) - mySSH.command(f'docker rmi {tagToUse} || true', '\$', 5) + cmd = f'docker rmi {self.ImageTagToUse(image)} || true' + if lIpAddr != 'none': + mySSH.command(cmd, '\$', 5) + else: + logging.info(cmd) + subprocess.run(cmd, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) - mySSH.close() + if lIpAddr != 'none': + mySSH.close() HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK) return True @@ -958,33 +994,40 @@ class Containerize(): def DeployGenObject(self, HTML, RAN, UE): self.exitStatus = 0 - logging.info('\u001B[1m Checking Services to deploy\u001B[0m') + logging.debug('\u001B[1m Checking Services to deploy\u001B[0m') cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose config --services' - logging.debug(cmd) + logging.info(cmd) try: listServices = subprocess.check_output(cmd, shell=True, universal_newlines=True) except Exception as e: self.exitStatus = 1 HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK) return + displayUsedTag = False for reqSvc in self.services[0].split(' '): res = re.search(reqSvc, listServices) if res is None: logging.error(reqSvc + ' not found in specified docker-compose') self.exitStatus = 1 + res = re.search('oai-gnb|oai-nr-ue|oai-cu|oai-du|oai_enb|oai_ue', reqSvc) + if res is not None: + displayUsedTag = True if (self.exitStatus == 1): HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK) return - if (self.ranAllowMerge): - cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@ci-temp@" docker-compose.y*ml > docker-compose-ci.yml' - else: - cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@develop@" docker-compose.y*ml > docker-compose-ci.yml' - logging.debug(cmd) - subprocess.run(cmd, shell=True) + cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml' + imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru'] + for image in imageNames: + tagToUse = self.ImageTagToUse(image) + cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' + subprocess.run(cmd, shell=True) + if displayUsedTag: + tagToUse = self.ImageTagToUse('oai-xxx') + logging.info(f'\u001B[1m Using Image Tag: {tagToUse}\u001B[0m') cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml up -d ' + self.services[0] - logging.debug(cmd) + logging.info(cmd) try: deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) except Exception as e: @@ -993,7 +1036,7 @@ class Containerize(): HTML.CreateHtmlTestRow('Could not deploy', 'KO', CONST.ALL_PROCESSES_OK) return - logging.info('\u001B[1m Checking if all deployed healthy\u001B[0m') + logging.debug('\u001B[1m Checking if all deployed healthy\u001B[0m') cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps -a' count = 0 healthy = 0 @@ -1088,7 +1131,7 @@ class Containerize(): cmd += ' -w /tmp/capture_' ymlPath = self.yamlPath[0].split('/') cmd += ymlPath[1] + '.pcap > /tmp/tshark.log 2>&1 &' - logging.debug(cmd) + logging.info(cmd) networkNames = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) self.tsharkStarted = True @@ -1097,22 +1140,23 @@ class Containerize(): ymlPath = self.yamlPath[0].split('/') logPath = '../cmake_targets/log/' + ymlPath[1] - if (self.ranAllowMerge): - cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@ci-temp@" docker-compose.y*ml > docker-compose-ci.yml' - else: - cmd = 'cd ' + self.yamlPath[0] + ' && sed -e "s@develop@develop@" docker-compose.y*ml > docker-compose-ci.yml' - logging.debug(cmd) + cmd = 'cd ' + self.yamlPath[0] + ' && cp docker-compose.y*ml docker-compose-ci.yml' subprocess.run(cmd, shell=True) + imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru'] + for image in imageNames: + tagToUse = self.ImageTagToUse(image) + cmd = f'cd {self.yamlPath[0]} && sed -i -e "s@{image}:develop@{tagToUse}@" docker-compose-ci.yml' + subprocess.run(cmd, shell=True) # check which containers are running for log recovery later cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all' - logging.debug(cmd) + logging.info(cmd) deployStatusLogs = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) # Stop the containers to shut down objects logging.debug('\u001B[1m Stopping containers \u001B[0m') cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml stop' - logging.debug(cmd) + logging.info(cmd) try: deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) except Exception as e: @@ -1134,16 +1178,16 @@ class Containerize(): anyLogs = True cName = res.group('container_name') cmd = 'cd ' + self.yamlPath[0] + ' && docker logs ' + cName + ' > ' + cName + '.log 2>&1' - logging.debug(cmd) + logging.info(cmd) subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) if re.search('magma-mme', cName) is not None: cmd = 'cd ' + self.yamlPath[0] + ' && docker cp -L ' + cName + ':/var/log/mme.log ' + cName + '-full.log' - logging.debug(cmd) + logging.info(cmd) subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) fullStatus = True if anyLogs: cmd = 'mkdir -p '+ logPath + ' && cp ' + self.yamlPath[0] + '/*.log ' + logPath - logging.debug(cmd) + logging.info(cmd) deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) # Analyzing log file(s)! @@ -1193,25 +1237,25 @@ class Containerize(): HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK) cmd = 'rm ' + self.yamlPath[0] + '/*.log' - logging.debug(cmd) + logging.info(cmd) deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) if self.tsharkStarted: self.tsharkStarted = True ymlPath = self.yamlPath[0].split('/') cmd = 'sudo chmod 666 /tmp/capture_' + ymlPath[1] + '.pcap' - logging.debug(cmd) + logging.info(cmd) copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) cmd = 'cp /tmp/capture_' + ymlPath[1] + '.pcap ' + logPath - logging.debug(cmd) + logging.info(cmd) copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) cmd = 'sudo rm /tmp/capture_' + ymlPath[1] + '.pcap' - logging.debug(cmd) + logging.info(cmd) copyStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) self.tsharkStarted = False logging.debug('\u001B[1m Undeploying \u001B[0m') cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml down' - logging.debug(cmd) + logging.info(cmd) try: deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) except Exception as e: @@ -1224,7 +1268,7 @@ class Containerize(): self.deployedContainers = [] # Cleaning any created tmp volume cmd = 'docker volume prune --force || true' - logging.debug(cmd) + logging.info(cmd) deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) if fullStatus: @@ -1232,7 +1276,7 @@ class Containerize(): logging.info('\u001B[1m Undeploying OAI Object(s) PASS\u001B[0m') else: HTML.CreateHtmlTestRow('n/a', 'KO', CONST.ALL_PROCESSES_OK) - logging.info('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m') + logging.error('\u001B[1m Undeploying OAI Object(s) FAIL\u001B[0m') def StatsFromGenObject(self, HTML): self.exitStatus = 0 @@ -1241,7 +1285,7 @@ class Containerize(): # if the containers are running, recover the logs! cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all' - logging.debug(cmd) + logging.info(cmd) deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) cmd = 'docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.MemPerc}}" ' anyLogs = False @@ -1257,7 +1301,7 @@ class Containerize(): cmd += res.group('container_name') + ' ' message = '' if anyLogs: - logging.debug(cmd) + logging.info(cmd) stats = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) for statLine in stats.split('\n'): logging.debug(statLine) @@ -1277,7 +1321,7 @@ class Containerize(): cmd = 'docker exec ' + self.pingContName + ' /bin/bash -c "ping ' + self.pingOptions + '" 2>&1 | tee ' + logPath + '/ping_' + HTML.testCase_id + '.log || true' - logging.debug(cmd) + logging.info(cmd) deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) result = re.search(', (?P[0-9\.]+)% packet loss, time [0-9\.]+ms', deployStatus) @@ -1334,9 +1378,9 @@ class Containerize(): logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m') HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', 1, html_queue) # Automatic undeployment - logging.debug('----------------------------------------') - logging.debug('\u001B[1m Starting Automatic undeployment \u001B[0m') - logging.debug('----------------------------------------') + 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) @@ -1352,23 +1396,23 @@ class Containerize(): # Start the server process cmd = 'docker exec -d ' + self.svrContName + ' /bin/bash -c "nohup iperf ' + self.svrOptions + ' > /tmp/iperf_server.log 2>&1" || true' - logging.debug(cmd) + logging.info(cmd) serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) time.sleep(5) # Start the client process cmd = 'docker exec ' + self.cliContName + ' /bin/bash -c "iperf ' + self.cliOptions + '" 2>&1 | tee '+ logPath + '/iperf_client_' + HTML.testCase_id + '.log || true' - logging.debug(cmd) + logging.info(cmd) clientStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100) # Stop the server process cmd = 'docker exec ' + self.svrContName + ' /bin/bash -c "pkill iperf" || true' - logging.debug(cmd) + logging.info(cmd) serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=10) time.sleep(5) cmd = 'docker cp ' + self.svrContName + ':/tmp/iperf_server.log '+ logPath + '/iperf_server_' + HTML.testCase_id + '.log' - logging.debug(cmd) + logging.info(cmd) serverStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30) # Analyze client output diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml index 3ac32e1989..3c6361459c 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml @@ -26,6 +26,7 @@ wrench 1 + 111111 100001 000000 000001 @@ -42,6 +43,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + DeployGenObject Deploy Cassandra Database 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 ec0f2523e2..011c3dbf6a 100644 --- a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml +++ b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml @@ -26,6 +26,7 @@ trash 100002 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_l2sim_fdd + + Clean_Test_Server_Images + Clean Test Images on Test Server + 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 a598b2bdc1..4e927d3243 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -25,6 +25,7 @@ Monolithic eNB - FDD 05MHz wrench + 111111 100011 000011 000001 @@ -42,6 +43,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + DeployGenObject Deploy Cassandra Database @@ -74,7 +87,7 @@ DeployGenObject Deploy OAI 4G eNB RF sim (FDD 05MHz) yaml_files/4g_rfsimulator_fdd_05MHz - enb + oai_enb0 8 @@ -97,7 +110,7 @@ PingFromContainer Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen + rfsim4g-trf-gen -c 20 12.0.0.2 5 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 1c3b1d5a7c..068a4063f4 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 @@ -26,6 +26,7 @@ trash 100011 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_rfsimulator_fdd_05MHz + + Clean_Test_Server_Images + Clean Test Images on Test Server + 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 07ea358ad5..a2c56125ec 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 @@ -25,6 +25,7 @@ Monolithic eNB - FDD 05MHz - noS1 wrench + 111111 100011 000013 000001 @@ -38,6 +39,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + IdleSleep Sleep @@ -54,7 +67,7 @@ DeployGenObject Deploy OAI 4G eNB RF sim (FDD 05MHz) yaml_files/4g_rfsimulator_fdd_05MHz_noS1 - enb + oai_enb0 1 @@ -77,7 +90,7 @@ PingFromContainer Ping LTE-UE from eNB - rfsim4g-oai-enb + rfsim4g-oai-enb -I oaitun_enb1 -c 20 10.0.1.2 5 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 6db1dfd9de..f528ae0c21 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 @@ -26,6 +26,7 @@ trash 100011 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_rfsimulator_fdd_05MHz_noS1 + + Clean_Test_Server_Images + Clean Test Images on Test Server + 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 29acfa3b09..0d8dfa1161 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -25,6 +25,7 @@ Monolithic eNB - FDD 10MHz wrench + 111111 100011 000011 000001 @@ -42,6 +43,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + DeployGenObject Deploy Cassandra Database @@ -74,7 +87,7 @@ DeployGenObject Deploy OAI 4G eNB RF sim (FDD 10MHz) yaml_files/4g_rfsimulator_fdd_10MHz - enb + oai_enb0 8 @@ -97,7 +110,7 @@ PingFromContainer Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen + rfsim4g-trf-gen -c 20 12.0.0.2 5 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 7d03d56ff4..37295911a5 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 @@ -26,6 +26,7 @@ trash 100011 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_rfsimulator_fdd_10MHz + + Clean_Test_Server_Images + Clean Test Images on Test Server + 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 74f712ebda..c666128e39 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -25,6 +25,7 @@ Monolithic eNB - FDD 20MHz wrench + 111111 100011 000011 000001 @@ -42,6 +43,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + DeployGenObject Deploy Cassandra Database @@ -74,7 +87,7 @@ DeployGenObject Deploy OAI 4G eNB RF sim (FDD 20MHz) yaml_files/4g_rfsimulator_fdd_20MHz - enb + oai_enb0 8 @@ -97,7 +110,7 @@ PingFromContainer Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen + rfsim4g-trf-gen -c 20 12.0.0.2 5 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 0a721c5091..2017aec636 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 @@ -26,6 +26,7 @@ trash 100011 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_rfsimulator_fdd_20MHz + + Clean_Test_Server_Images + Clean Test Images on Test Server + 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 7a29e50f39..0a638df278 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml @@ -24,8 +24,9 @@ rfsim-4glte-tdd05mhz Monolithic eNB - TDD 05MHz wrench - 1 + 1 + 111111 100011 000011 000001 @@ -43,6 +44,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-enb + + + oai-lte-ue + + + DeployGenObject Deploy Cassandra Database @@ -75,7 +88,7 @@ DeployGenObject Deploy OAI 4G eNB RF sim (TDD 05MHz) yaml_files/4g_rfsimulator_tdd_05MHz - enb + oai_enb0 7 @@ -98,7 +111,7 @@ PingFromContainer Ping LTE-UE from Traffic-Gen - rfsim4g-trf-gen + rfsim4g-trf-gen -c 20 12.0.0.2 5 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 7e27bac73c..7e526d4f48 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 @@ -26,6 +26,7 @@ trash 100011 + 222222 @@ -35,4 +36,10 @@ yaml_files/4g_rfsimulator_tdd_05MHz + + Clean_Test_Server_Images + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 61157f72df..295d544122 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -25,6 +25,7 @@ CU-DU F1 split wrench + 111111 100021 000020 000021 @@ -38,6 +39,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-gnb + + + oai-nr-ue + + + DeployGenObject Deploy MySql Database @@ -89,7 +102,7 @@ PingFromContainer Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn + rfsim5g-oai-ext-dn -c 20 12.1.1.2 5 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 bb640381cf..e083286a09 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml @@ -26,6 +26,7 @@ trash 100022 + 222222 @@ -35,4 +36,10 @@ yaml_files/5g_f1_rfsimulator + + Clean_Test_Server_Images + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index 578d5f221f..7de6007b01 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -26,6 +26,7 @@ wrench 1 + 111111 100011 000010 000011 @@ -39,6 +40,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-gnb + + + oai-nr-ue + + + DeployGenObject Deploy MySql Database @@ -82,7 +95,7 @@ PingFromContainer Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn + rfsim5g-oai-ext-dn -c 20 12.1.1.2 5 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 12648ca750..a2cae33f4c 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml @@ -26,6 +26,7 @@ trash 100012 + 222222 @@ -35,4 +36,10 @@ yaml_files/5g_fdd_rfsimulator + + Clean_Test_Server_Images + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index cc3c1ae391..9aa7be0b20 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -26,6 +26,7 @@ wrench 1 + 111111 100001 000000 000001 @@ -40,6 +41,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-gnb + + + oai-nr-ue + + + DeployGenObject Deploy MySql Database 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 d3630cd905..906ce7aa81 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd_down.xml @@ -26,6 +26,7 @@ trash 100002 + 222222 @@ -35,4 +36,10 @@ yaml_files/5g_l2sim_tdd + + Clean_Test_Server_Images + Clean Test Images on Test Server + 0 + + diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 5ad400ecc1..09ec6e07d7 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -26,6 +26,7 @@ wrench 1 + 111111 100001 000000 000001 @@ -42,6 +43,18 @@ + + Pull_Local_Registry + Pull Images from Local Registry + 0 + + oai-gnb + + + oai-nr-ue + + + DeployGenObject Deploy MySql Database @@ -93,7 +106,7 @@ PingFromContainer Ping NR-UE from ext-dn - rfsim5g-oai-ext-dn + rfsim5g-oai-ext-dn -c 20 12.1.1.2 5 @@ -109,7 +122,7 @@ PingFromContainer Ping Second NR-UE from ext-dn - rfsim5g-oai-ext-dn + rfsim5g-oai-ext-dn -c 20 12.1.1.3 5 diff --git a/ci-scripts/xml_files/container_5g_rfsim_down.xml b/ci-scripts/xml_files/container_5g_rfsim_down.xml index 028ff61864..a2f048a7f4 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_down.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_down.xml @@ -26,6 +26,7 @@ trash 100002 + 222222 @@ -35,4 +36,10 @@ yaml_files/5g_rfsimulator + + Clean_Test_Server_Images + Clean Test Images on Test Server + 0 + +