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/component.py b/TestON/drivers/component.py
index c3d3297..3585244 100644
--- a/TestON/drivers/component.py
+++ b/TestON/drivers/component.py
@@ -59,6 +59,11 @@
else:
raise error
+ def checkOptions( self, var, defaultVar ):
+ if var is None or var == "":
+ return defaultVar
+ return var
+
def connect( self ):
vars( main )[ self.name + 'log' ] = logging.getLogger( self.name )