From e7225e12cb12e008f3f6bae25353b9add25334da Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 5 Nov 2024 19:13:26 +0100 Subject: [PATCH] Remove CheckAndAddRoute(), replace with scripts on machines Remove CheckAndAddRoute(), as it is complicated to read, uses a multitude of hostname/IP/password combinations. Replace with scripts on the machines, which, as of this commit, are: - porcepix: ~/after-reboot.sh - ofqot: ~/after-reboot.sh - nepes: ~/after-reboot.sh - obelix: ~/how-to-resetup-obelix-out-of-reboot.sh --- ci-scripts/cls_containerize.py | 118 --------------------------------- ci-scripts/main.py | 20 ------ 2 files changed, 138 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index fa4afb865c..ee05f91a27 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -1071,121 +1071,3 @@ class Containerize(): else: logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m') return success - - def CheckAndAddRoute(self, svrName, ipAddr, userName, password): - logging.debug('Checking IP routing on ' + svrName) - mySSH = SSH.SSHConnection() - if svrName == 'porcepix': - mySSH.open(ipAddr, userName, password) - # Check if route to asterix gnb exists - mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10) - result = re.search('172.21.16.127', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10) - # Check if route to obelix enb exists - mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10) - result = re.search('172.21.16.128', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10) - # Check if forwarding is enabled - mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10) - result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10) - # Check if iptables forwarding is accepted - mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10) - result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10) - mySSH.close() - if svrName == 'asterix': - mySSH.open(ipAddr, userName, password) - # Check if route to porcepix epc exists - mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10) - result = re.search('172.21.16.136', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev em1', '\$', 10) - # Check if route to porcepix cn5g exists - mySSH.command('ip route | grep --colour=never "192.168.70.128/26"', '\$', 10) - result = re.search('172.21.16.136', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.70.128/26 via 172.21.16.136 dev em1', '\$', 10) - # Check if X2 route to obelix enb exists - mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10) - result = re.search('172.21.16.128', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev em1', '\$', 10) - # Check if forwarding is enabled - mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10) - result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10) - # Check if iptables forwarding is accepted - mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10) - result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10) - mySSH.close() - if svrName == 'obelix': - mySSH.open(ipAddr, userName, password) - # Check if route to porcepix epc exists - mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10) - result = re.search('172.21.16.136', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev eno1', '\$', 10) - # Check if X2 route to asterix gnb exists - mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10) - result = re.search('172.21.16.127', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10) - # Check if X2 route to nepes gnb exists - mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10) - result = re.search('172.21.16.137', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10) - # Check if forwarding is enabled - mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10) - result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10) - # Check if iptables forwarding is accepted - mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10) - result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10) - mySSH.close() - if svrName == 'nepes': - mySSH.open(ipAddr, userName, password) - # Check if route to ofqot gnb exists - mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10) - result = re.search('172.21.16.109', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10) - mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10) - result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10) - # Check if iptables forwarding is accepted - mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10) - result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10) - mySSH.close() - if svrName == 'ofqot': - mySSH.open(ipAddr, userName, password) - # Check if X2 route to nepes enb/epc exists - mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10) - result = re.search('172.21.16.137', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10) - # Check if forwarding is enabled - mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10) - result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10) - # Check if iptables forwarding is accepted - mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10) - result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore()) - if result is None: - mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10) - mySSH.close() diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 2e163f28ba..f92401267a 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -693,26 +693,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re HTML.CreateHtmlTabHeader() - # On CI bench w/ containers, we need to validate if IP routes are set - if EPC.IPAddress == '172.21.16.136': - CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password) - if EPC.IPAddress == '172.21.16.137': - CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password) - if CONTAINERS.eNBIPAddress == '172.21.16.127': - CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword) - if CONTAINERS.eNB1IPAddress == '172.21.16.127': - CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password) - if CONTAINERS.eNBIPAddress == '172.21.16.128': - CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword) - if CONTAINERS.eNB1IPAddress == '172.21.16.128': - CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password) - if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot': - CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword) - if CONTAINERS.eNBIPAddress == '172.21.16.137': - CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword) - if CONTAINERS.eNB1IPAddress == '172.21.16.137': - CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password) - task_set_succeeded = True HTML.startTime=int(round(time.time() * 1000))