Fixed minor error in teston.py and some conflict issues with master
diff --git a/TestON/tests/FuncIntent/FuncIntent.py b/TestON/tests/FuncIntent/FuncIntent.py
index 5c58f18..b0ff4c2 100644
--- a/TestON/tests/FuncIntent/FuncIntent.py
+++ b/TestON/tests/FuncIntent/FuncIntent.py
@@ -33,7 +33,6 @@
init = False
except NameError:
init = False
-
#Local variables
cellName = main.params[ 'ENV' ][ 'cellName' ]
apps = main.params[ 'ENV' ][ 'cellApps' ]
@@ -41,6 +40,10 @@
benchIp = os.environ[ 'OCN' ]
benchUser = main.params[ 'BENCH' ][ 'user' ]
topology = main.params[ 'MININET' ][ 'topo' ]
+ #benchIp = main.params[ 'BENCH' ][ 'ip1' ]
+ benchUser = main.params[ 'BENCH' ][ 'user' ]
+ topology = main.params[ 'MININET' ][ 'topo' ]
+ #maxNodes = int( main.params[ 'availableNodes' ] )
main.numSwitch = int( main.params[ 'MININET' ][ 'switch' ] )
main.numLinks = int( main.params[ 'MININET' ][ 'links' ] )
main.numCtrls = main.params[ 'CTRL' ][ 'num' ]
@@ -60,6 +63,7 @@
if init == False:
init = True
+ #main.ONOSip = []
main.ONOSport = []
main.scale = ( main.params[ 'SCALE' ] ).split( "," )
main.numCtrls = int( main.scale[ 0 ] )
@@ -82,26 +86,32 @@
else:
main.log.warn( "Did not pull new code so skipping mvn " +
"clean install" )
-
globalONOSip = main.ONOSbench.getOnosIps()
-
+
maxNodes = ( len(globalONOSip) - 2 )
main.numCtrls = int( main.scale[ 0 ] )
main.scale.remove( main.scale[ 0 ] )
main.ONOSip = []
- for i in range( maxNodes ):
+ for i in range( maxNodes ):
main.ONOSip.append( globalONOSip[i] )
+ # Populate main.ONOSip with ips from params
+ #for i in range( 1, maxNodes + 1):
+ # main.ONOSip.append( main.params[ 'CTRL' ][ 'ip' + str( i ) ] )
+ # main.ONOSport.append( main.params[ 'CTRL' ][ 'port' +
+ # str( i ) ])
+ ONOSip = main.ONOSbench.getOnosIpFromEnv()
+ main.log.info("\t\t CLUSTER IPs: \n\n" + str(ONOSip) + "\n\n")
-
+ main.numCtrls = int( main.scale[ 0 ] )
+ main.scale.remove( main.scale[ 0 ] )
#kill off all onos processes
main.log.info( "Safety check, killing all ONOS processes" +
" before initiating enviornment setup" )
for i in range( maxNodes ):
- main.ONOSbench.onosDie( globalONOSip[ i ] )
-
+ main.ONOSbench.onosDie( main.ONOSip[ i ] )
"""
main.step( "Apply cell to environment" )
cellResult = main.ONOSbench.setCell( cellName )
@@ -121,7 +131,6 @@
onpass="Successfully removed raft logs",
onfail="Failed to remove raft logs" )
"""
-
print "NODE COUNT = ", main.numCtrls
main.log.info( "Creating cell file" )
cellIp = []
@@ -194,7 +203,7 @@
actual=stepResult,
onpass="ONOS service is ready",
onfail="ONOS service did not start properly" )
-
+
main.step( "Start ONOS cli" )
cliResult = main.TRUE
for i in range( main.numCtrls ):
@@ -205,11 +214,10 @@
actual=stepResult,
onpass="Successfully start ONOS cli",
onfail="Failed to start ONOS cli" )
-
- def CASE9( self, main ):
- main.log.info("Error report: \n")
- main.ONOSbench.logReport(globalONOSip[0],["WARN","ERROR","stuff"],"d")
+ def CASE9( self, main ):
+ main.log.info("Error report: \n")
+ main.ONOSbench.logReport(globalONOSip[0],["WARN","ERROR","stuff"],"d")
def CASE11( self, main ):
"""
@@ -238,12 +246,12 @@
main.step( "Assigning switches to controllers" )
assignResult = main.TRUE
- for i in range( main.numSwitch ):
+ for i in range( 1, ( main.numSwitch + 1 ) ):
main.Mininet1.assignSwController( sw=str( i ),
count=1,
ip1=main.ONOSip[ 0 ],
port1=main.ONOSport[ 0 ] )
- for i in range( main.numSwitch ):
+ for i in range( 1, ( main.numSwitch + 1 ) ):
response = main.Mininet1.getSwController( "s" + str( i ) )
print( "Response is " + str( response ) )
if re.search( "tcp:" + main.ONOSip[ 0 ], response ):