Stability fixes for SR Tests and small fixes for running ONOS in docker
- move checkOptions to component driver
- use karafTimeout for SR tests
- Fix some docker options
- Make sure mn docker can resolve own hostname
- Fix config file ip format for DHCP relay app
Change-Id: I85e8c52384e0fb478462fa9bbaf0b31a599b632b
(cherry picked from commit 521ecde3f8d28288303ea11129faa0cfd86b9bcd)
diff --git a/TestON/drivers/common/cli/networkdriver.py b/TestON/drivers/common/cli/networkdriver.py
index 968973d..c151aab 100755
--- a/TestON/drivers/common/cli/networkdriver.py
+++ b/TestON/drivers/common/cli/networkdriver.py
@@ -53,11 +53,6 @@
super( NetworkDriver, self ).__init__()
self.graph = Graph()
- def checkOptions( self, var, defaultVar ):
- if var is None or var == "":
- return defaultVar
- return var
-
def connect( self, **connectargs ):
"""
Creates ssh handle for the SDN network "bench".
@@ -635,7 +630,7 @@
output = dstHost.checkFilter()
main.log.debug( output )
if output:
- #TODO: parse output?
+ # TODO: parse output?
packets = dstHost.readPackets()
for packet in packets.splitlines():
main.log.debug( packet )