Skip to content

O
OpenXG-RAN
Commit 2612f263 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

CI: fix a few remaining getters 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 7dc726f8
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
ci-scripts/ran.py
View file @ 2612f263
...@@ -348,9 +348,9 @@ class RANManagement(): ...@@ -348,9 +348,9 @@ class RANManagement():
# If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB # If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
result = re.search('T_stdout', str(self.Initialize_eNB_args)) result = re.search('T_stdout', str(self.Initialize_eNB_args))
if (result is not None) and (self.epcObj is not None): if (result is not None) and (self.epcObj is not None):
localEpcIpAddr = self.epcObj.GetIPAddress() localEpcIpAddr = self.epcObj.IPAddress
localEpcUserName = self.epcObj.GetUserName() localEpcUserName = self.epcObj.UserName
localEpcPassword = self.epcObj.GetPassword() localEpcPassword = self.epcObj.Password
mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword) mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
mySSH.command('ip addr show | awk -f /tmp/active_net_interfaces.awk | egrep -v "lo|tun"', '\$', 5) mySSH.command('ip addr show | awk -f /tmp/active_net_interfaces.awk | egrep -v "lo|tun"', '\$', 5)
result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore()) result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore())
...@@ -457,9 +457,9 @@ class RANManagement(): ...@@ -457,9 +457,9 @@ class RANManagement():
# In case of T tracer recording, we need to kill tshark on EPC side # In case of T tracer recording, we need to kill tshark on EPC side
result = re.search('T_stdout', str(self.Initialize_eNB_args)) result = re.search('T_stdout', str(self.Initialize_eNB_args))
if (result is not None) and (self.epcObj is not None): if (result is not None) and (self.epcObj is not None):
localEpcIpAddr = self.epcObj.GetIPAddress() localEpcIpAddr = self.epcObj.IPAddress
localEpcUserName = self.epcObj.GetUserName() localEpcUserName = self.epcObj.UserName
localEpcPassword = self.epcObj.GetPassword() localEpcPassword = self.epcObj.Password
mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword) mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
logging.debug('\u001B[1m Stopping tshark \u001B[0m') logging.debug('\u001B[1m Stopping tshark \u001B[0m')
mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5) mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
...@@ -588,9 +588,9 @@ class RANManagement(): ...@@ -588,9 +588,9 @@ class RANManagement():
# If tracer options is on, stopping tshark on EPC side # If tracer options is on, stopping tshark on EPC side
result = re.search('T_stdout', str(self.Initialize_eNB_args)) result = re.search('T_stdout', str(self.Initialize_eNB_args))
if (result is not None) and (self.epcObj is not None): if (result is not None) and (self.epcObj is not None):
localEpcIpAddr = self.epcObj.GetIPAddress() localEpcIpAddr = self.epcObj.IPAddress
localEpcUserName = self.epcObj.GetUserName() localEpcUserName = self.epcObj.UserName
localEpcPassword = self.epcObj.GetPassword() localEpcPassword = self.epcObj.Password
mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword) mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
logging.debug('\u001B[1m Stopping tshark \u001B[0m') logging.debug('\u001B[1m Stopping tshark \u001B[0m')
mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5) mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment