[thci] fix RA configuration for eth0 in the host device (#7506)

`accept_ra` was not being set properly for host reference device.

Some cleanup is added for simplification.
This commit is contained in:
Eduardo Montoya
2022-03-23 05:25:25 +01:00
committed by GitHub
parent 6992c0177b
commit 95aaae9fdb
2 changed files with 5 additions and 19 deletions
-5
View File
@@ -592,16 +592,11 @@ class OpenThreadTHCI(object):
if self.__useDefaultDomainPrefix:
self.__addDefaultDomainPrefix()
self._deviceBeforeThreadStart()
self.__executeCommand('ifconfig up')
self.__executeCommand('thread start')
self.isPowerDown = False
return True
def _deviceBeforeThreadStart(self):
pass
def __stopOpenThread(self):
"""stop OpenThread stack
+5 -14
View File
@@ -305,8 +305,6 @@ class OpenThread_BR(OpenThreadTHCI, IThci):
else:
self.__handle = SerialHandle(self.port, 115200)
self.__afterConnect()
def _disconnect(self):
if self.__handle:
self.__handle.close()
@@ -326,10 +324,14 @@ class OpenThread_BR(OpenThreadTHCI, IThci):
def _deviceAfterReset(self):
self.__dumpSyslog()
self.__truncateSyslog()
self.__enableAcceptRa()
if not self.IsHost:
self.bash('systemctl restart otbr-agent')
self.__restartAgentService()
time.sleep(2)
def __enableAcceptRa(self):
self.bash('sysctl net.ipv6.conf.eth0.accept_ra=2')
def _beforeRegisterMulticast(self, sAddr='ff04::1234:777a:1', timeout=300):
"""subscribe to the given ipv6 address (sAddr) in interface and send MLR.req OTA
@@ -555,9 +557,6 @@ class OpenThread_BR(OpenThreadTHCI, IThci):
assert self.__syslog_skip_lines is not None
self.__syslog_skip_lines = None
def _deviceBeforeThreadStart(self):
self.bash('sysctl net.ipv6.conf.eth0.accept_ra=2')
@watched
def __startRadvdService(self, setDp=False):
assert self.IsHost, "radvd service runs on Host only"
@@ -627,14 +626,6 @@ class OpenThread_BR(OpenThreadTHCI, IThci):
for line in output:
self.__cli_output_lines.append(line)
def __afterConnect(self):
self.__truncateSyslog()
self.__checkServiceStatus()
def __checkServiceStatus(self):
self.bash('service radvd stop')
self.bash('systemctl restart otbr-agent')
def __restartAgentService(self):
self.bash('systemctl restart otbr-agent')