Remove configured interface for dynamic clustering
Fixes issues with test servers having different names for default
interface. Still allows someone to configure which interface if there
are multiple configured on a server
Change-Id: I4d095ef44926b2109626f064abab102f1550066f
diff --git a/TestON/tests/HA/HAscaling/HAscaling.params b/TestON/tests/HA/HAscaling/HAscaling.params
index 035b12b..8478214 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.params
+++ b/TestON/tests/HA/HAscaling/HAscaling.params
@@ -30,7 +30,7 @@
<scaling>1,3b,3,3b,5b,5,5b,7b,7,7b,5b,5,5b,3b,3,3b,1</scaling>
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>
diff --git a/TestON/tests/HA/HAscaling/HAscaling.params.fabric b/TestON/tests/HA/HAscaling/HAscaling.params.fabric
index b3a9fcf..1566713 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.params.fabric
+++ b/TestON/tests/HA/HAscaling/HAscaling.params.fabric
@@ -30,7 +30,7 @@
<scaling>1,3b,3,3b,5b,5,5b,7b,7,7b,5b,5,5b,3b,3,3b,1</scaling>
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>
diff --git a/TestON/tests/HA/HAscaling/HAscaling.params.intents b/TestON/tests/HA/HAscaling/HAscaling.params.intents
index 0ce1246..53b96b5 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.params.intents
+++ b/TestON/tests/HA/HAscaling/HAscaling.params.intents
@@ -30,7 +30,7 @@
<scaling>1,3b,3,3b,5b,5,5b,7b,7,7b,5b,5,5b,3b,3,3b,1</scaling>
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>
diff --git a/TestON/tests/HA/HAscaling/dependencies/Server.py b/TestON/tests/HA/HAscaling/dependencies/Server.py
index dbb1247..0c5e743 100644
--- a/TestON/tests/HA/HAscaling/dependencies/Server.py
+++ b/TestON/tests/HA/HAscaling/dependencies/Server.py
@@ -59,7 +59,7 @@
handle = component.handle
# cd to rootDir
handle.sendline( "cd " + str( rootDir ) )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
# Start server
cmd = "python -m SimpleHTTPServer {}".format( port )
if logDir:
@@ -68,15 +68,19 @@
cmd += "&> {dev/null}" # Throw away all output
cmd += " &"
handle.sendline( cmd )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
response = handle.before
# Return to home dir
handle.sendline( "cd " + component.home )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
response += handle.before
if "Exit" in response:
main.log.error( "Error starting server. Check server log for details" )
main.log.debug( handle.before )
+ # Show the log
+ handle.sendline( "cat {}".format( logDir ))
+ handle.expect( component.prompt )
+ main.log.debug( handle.before )
retValue = main.FALSE
# capture PID for later use
# EX: [ 1 ] 67987
@@ -108,7 +112,7 @@
handle = self.component.handle
cmd = "sudo kill {}".format( self.PID )
handle.sendline( cmd )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
# TODO: What is bad output? cannot sudo?
else:
main.log.error( "Component handle is not set" )
@@ -147,16 +151,16 @@
handle = self.component.handle
# cd to rootDir
handle.sendline( "cd " + str( self.rootDir ) )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
cmd = "./onos-gen-partitions {} {} ".format( filename, nodes )
if equal:
cmd += "-e"
handle.sendline( cmd )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
response = handle.before
# Return to home dir
handle.sendline( "cd " + self.component.home )
- handle.expect( "\$" )
+ handle.expect( component.prompt )
response += handle.before
if "Traceback" in response:
main.log.error( handle.before )
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.params b/TestON/tests/HA/HAswapNodes/HAswapNodes.params
index 7cac443..8ed012a 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.params
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.params
@@ -29,7 +29,7 @@
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.params.fabric b/TestON/tests/HA/HAswapNodes/HAswapNodes.params.fabric
index 37aca8f..7ba6fd4 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.params.fabric
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.params.fabric
@@ -29,7 +29,7 @@
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.params.intents b/TestON/tests/HA/HAswapNodes/HAswapNodes.params.intents
index fe7c881..ec9b84b 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.params.intents
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.params.intents
@@ -29,7 +29,7 @@
<server>
<port>8000</port>
- <interface>eth0</interface>
+ <interface></interface>
</server>
<apps></apps>
<ONOS_Configuration>