Changes to tests and test names, updates tmplate
diff --git a/TestON/tests/IntentEventTP/IntentEventTP.params b/TestON/tests/IntentEventTP/IntentEventTP.params
new file mode 100644
index 0000000..4a921a3
--- /dev/null
+++ b/TestON/tests/IntentEventTP/IntentEventTP.params
@@ -0,0 +1,49 @@
+<PARAMS>
+
+ <testcases>1,3,2,3,2,3</testcases>
+
+ <ENV>
+ <cellName>defaultCell</cellName>
+ <cellFeatures>onos-app-demo,onos-rest,onos-core,onos-app-proxyarp,onos-app-metrics,onos-app-metrics-intent,onos-app-metrics-topology</cellFeatures>
+ </ENV>
+
+ <SCALE>1</SCALE>
+
+ <GIT>
+ <autopull>on</autopull>
+ <checkout>master</checkout>
+ </GIT>
+
+ <CTRL>
+ <USER>admin</USER>
+ <ip1>10.128.5.51</ip1>
+ <port1>6633</port1>
+ <ip2>10.128.5.52</ip2>
+ <port2>6633</port2>
+ <ip3>10.128.5.53</ip3>
+ <port3>6633</port3>
+ </CTRL>
+
+ <MN>
+ <ip1>10.128.5.59</ip1>
+ </MN>
+
+ <BENCH>
+ <user>admin</user>
+ <ip1>10.128.5.55</ip1>
+ </BENCH>
+
+ <TEST>
+ <loadstart>curl --fail http://localhost:8181/onos/demo/intents/setup -H "Content-Type:application/json" -d '{"type" : "random"}'</loadstart>
+ <loadstop>curl --fail http://localhost:8181/onos/demo/intents/teardown</loadstop>
+ <arping>py [h.cmd("arping -c 1 -w 1 10.0.0.225") for h in net.hosts]</arping>
+ <metric1>intents-events-metrics|grep "Intent Installed Events"</metric1>
+ <duration>300</duration>
+ <log_interval>25</log_interval>
+ </TEST>
+
+ <JSON>
+ <intents_rate>intentInstalledRate</intents_rate>
+ </JSON>
+
+</PARAMS>
diff --git a/TestON/tests/IntentEventTP/IntentEventTP.py b/TestON/tests/IntentEventTP/IntentEventTP.py
new file mode 100644
index 0000000..c40ebf9
--- /dev/null
+++ b/TestON/tests/IntentEventTP/IntentEventTP.py
@@ -0,0 +1,242 @@
+# ScaleOutTemplate -> NullProviderTest
+#
+# CASE1 starts number of nodes specified in param file
+#
+# cameron@onlab.us
+
+
+class IntentEventTP:
+
+ def __init__( self ):
+ self.default = ''
+
+ def CASE1( self, main ):
+ import os.path
+ global clusterCount
+ global ONOSIp
+ clusterCount = 1
+ ONOSIp = []
+ checkoutBranch = main.params[ 'GIT' ][ 'checkout' ]
+ gitPull = main.params[ 'GIT' ][ 'autopull' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
+ BENCHUser = main.params[ 'BENCH' ][ 'user' ]
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOSIp.append(ONOS1Ip)
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOSIp.append(ONOS2Ip)
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ ONOSIp.append(ONOS3Ip)
+ MN1Ip = main.params[ 'MN' ][ 'ip1' ]
+ Features= main.params[ 'ENV' ][ 'cellFeatures' ]
+
+
+ main.ONOSbench.createCellFile(BENCHIp, cellName, MN1Ip,str(Features), ONOS1Ip, ONOS2Ip, ONOS3Ip)
+
+ main.log.step( "Cleaning Enviornment..." )
+ main.ONOSbench.onosUninstall( ONOS1Ip )
+ main.ONOSbench.onosUninstall( ONOS2Ip )
+ main.ONOSbench.onosUninstall( ONOS3Ip )
+
+ main.step( "Git checkout and pull " + checkoutBranch )
+ if gitPull == 'on':
+ checkoutResult = main.ONOSbench.gitCheckout( checkoutBranch )
+ pullResult = main.ONOSbench.gitPull()
+
+ else:
+ checkoutResult = main.TRUE
+ pullResult = main.TRUE
+ main.log.info( "Skipped git checkout and pull" )
+
+ #mvnResult = main.ONOSbench.cleanInstall()
+
+ main.step( "Set cell for ONOS cli env" )
+ main.ONOS1cli.setCell( cellName )
+ main.ONOS2cli.setCell( cellName )
+ main.ONOS3cli.setCell( cellName )
+
+ main.log.info("Modifying org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg: Turning off flicker ")
+ homeDir = os.path.expanduser('~')
+ main.log.info(homeDir)
+ localPath = "/ONOS/tools/package/etc/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg"
+ filePath = homeDir + localPath
+ main.log.info(filePath)
+
+ configFile = open(filePath, 'w+')
+ main.log.info("file opened")
+ configFile.write("# Sample configurations for the NullLinkProvider.\n")
+ configFile.write("# \n")
+ configFile.write("# If enabled, generates LinkDetected and LinkVanished events\n")
+ configFile.write("# to make the link appear to be flapping.\n")
+ configFile.write("#\n")
+ configFile.write("# flicker = true\n")
+ configFile.write("#\n")
+ configFile.write("# If enabled, sets the time between LinkEvent generation,\n")
+ configFile.write("# in milliseconds.\n")
+ configFile.write("#\n")
+ configFile.write("# eventRate = 2000\n")
+
+ configFile.close()
+ main.log.info("Closing config file")
+
+ main.step( "Creating ONOS package" )
+ packageResult = main.ONOSbench.onosPackage()
+
+ main.step( "Installing ONOS package" )
+ install1Result = main.ONOSbench.onosInstall( node=ONOS1Ip )
+
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ main.step( "Applying cell file to environment" )
+ cellApplyResult = main.ONOSbench.setCell( cellName )
+ main.step( "verify cells" )
+ verifyCellResult = main.ONOSbench.verifyCell()
+
+ main.step( "Set cell for ONOS cli env" )
+ cli1 = main.ONOS1cli.startOnosCli( ONOS1Ip )
+
+ ###### UPGRADE FOR SCALABLILTY ######
+ jenkinsReport = open('IntentEventTP.csv', 'w')
+ jenkinsReport.write("T1 - Node 1, T2 - Node 1, T2 - Node 2, T3 - Node 1, T3 - Node 2, T3 - Node 3\n")
+ jenkinsReport.close
+ #####################################
+
+ def CASE2( self, main ):
+ ''
+ 'Increase number of nodes and initiate CLI'
+ ''
+ import time
+
+ global clusterCount
+
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ #ONOS4Ip = main.params[ 'CTRL' ][ 'ip4' ]
+ #ONOS5Ip = main.params[ 'CTRL' ][ 'ip5' ]
+ #ONOS6Ip = main.params[ 'CTRL' ][ 'ip6' ]
+ #ONOS7Ip = main.params[ 'CTRL' ][ 'ip7' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ scale = int( main.params[ 'SCALE' ] )
+
+ # Cluster size increased everytime the case is defined
+ clusterCount += scale
+
+ main.log.report( "Increasing cluster size to " +
+ str( clusterCount ) )
+ installResult = main.FALSE
+
+ if scale == 2:
+ if clusterCount == 3:
+ main.log.info( "Installing nodes 2 and 3" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli2 = main.ONOS2cli.startOnosCli(ONOS2Ip)
+ cli3 = main.ONOS3cli.startOnosCli(ONOS3Ip)
+
+
+ #elif clusterCount == 5:
+
+ # main.log.info( "Installing nodes 4 and 5" )
+ # node4Result = main.ONOSbench.onosInstall( node=ONOS4Ip )
+ # node5Result = main.ONOSbench.onosInstall( node=ONOS5Ip )
+ # installResult = node4Result and node5Result
+ # time.sleep( 5 )
+
+ # main.ONOS4cli.startOnosCli( ONOS4Ip )
+ # main.ONOS5cli.startOnosCli( ONOS5Ip )
+
+ #elif clusterCount == 7:
+
+ # main.log.info( "Installing nodes 4 and 5" )
+ # node6Result = main.ONOSbench.onosInstall( node=ONOS6Ip )
+ # node7Result = main.ONOSbench.onosInstall( node=ONOS7Ip )
+ # installResult = node6Result and node7Result
+ # time.sleep( 5 )
+
+ # main.ONOS6cli.startOnosCli( ONOS6Ip )
+ # main.ONOS7cli.startOnosCli( ONOS7Ip )
+ #
+
+ if scale == 1:
+ if clusterCount == 2:
+ main.log.info( "Installing node 2" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ cli2 = main.ONOS2cli.startOnosCli(ONOS2Ip)
+
+ if clusterCount == 3: main.log.info( "Installing node 3" )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli3 = main.ONOS3cli.startOnosCli(ONOS3Ip)
+
+
+ def CASE3( self, main ):
+
+ import os.path
+ import sys
+ import json
+ import time
+
+ main.log.info("Cluster Count = " + str(clusterCount))
+
+ defaultSwPort = main.params[ 'CTRL' ][ 'port1' ]
+ intentsRate = main.params['JSON']['intents_rate']
+
+ for i in range( 0,clusterCount ): #iterates over nodes
+ switchNum = i
+ while switchNum < 7: #iterates over applicable switches
+ main.Mininet1.assignSwController(sw = switchNum + 1, ip1 = ONOSIp[i], port1 = defaultSwPort)
+ main.log.info("ONOS " + str(i + 1) + " assigned switch : " + str(switchNum+1))
+ switchNum += clusterCount
+
+ main.log.info("running arping")
+ mnArp = main.params['TEST']['arping']
+ main.Mininet1.handle.sendline( mnArp )
+
+ generateLoad = main.params[ 'TEST' ][ 'loadstart' ]
+
+ for node in range(1, clusterCount+1):
+ exec "a = main.ONOS%s.handle.sendline" %str(node)
+ a(generateLoad)
+ main.log.info("Load initiated on node " + str(node))
+
+ #
+ # TODO: Confirm Load somehow
+ #
+
+ getMetric = main.params[ 'TEST' ][ 'metric1' ]
+ testDuration = main.params[ 'TEST' ][ 'duration' ]
+ stop = time.time() + float( testDuration )
+
+ main.log.info( "Starting test loop for " + str(testDuration) + " seconds..." )
+ logInterval = main.params[ 'TEST' ][ 'log_interval' ]
+
+
+ rateResult = [0,0,0,0,0,0,0,0]
+ while time.time() < stop:
+ time.sleep( float( logInterval ) )
+ for node in range (1, clusterCount + 1):
+ exec "a = main.ONOS%scli.intentsEventsMetrics" %str(node)
+ intentsJsonObj = json.loads(a())
+
+ main.log.info( "Node " + str(node) + " rate: " + str( intentsJsonObj[ intentsRate ][ 'm1_rate' ] ) )
+ rateResult[node] = round(intentsJsonObj[ intentsRate ][ 'm1_rate' ], 2)
+
+ stopLoad = main.params[ 'TEST' ][ 'loadstop' ]
+
+ jenkinsReport = open('IntentEventTP.csv', 'a')
+ for node in range(1, clusterCount + 1):
+ main.log.report("Cluster Size = " + str(clusterCount) + " Final on node " + str(node) + ": " + str(rateResult[node]))
+ exec "a = main.ONOS%s.handle.sendline" %str(node)
+ a(stopLoad)
+ jenkinsReport.write(str(rateResult[node]))
+ jenkinsReport.write(", ")
+ jenkinsReport.close()
+
+
+
+
+
+
+
+
+
+
diff --git a/TestON/tests/IntentEventTP/IntentEventTP.topo b/TestON/tests/IntentEventTP/IntentEventTP.topo
new file mode 100644
index 0000000..8f0662e
--- /dev/null
+++ b/TestON/tests/IntentEventTP/IntentEventTP.topo
@@ -0,0 +1,85 @@
+<TOPOLOGY>
+
+ <COMPONENT>
+
+ <ONOSbench>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>1</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOSbench>
+
+ <ONOS1cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1cli>
+
+ <ONOS2cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>3</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2cli>
+
+ <ONOS3cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>4</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3cli>
+
+ <ONOS1>
+ <host>10.128.5.51</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1>
+
+ <ONOS2>
+ <host>10.128.5.52</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>6</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2>
+
+ <ONOS3>
+ <host>10.128.5.53</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>7</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3>
+
+ <Mininet1>
+ <host>10.128.5.59</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>MininetCliDriver</type>
+ <connect_order>8</connect_order>
+ <COMPONENTS>
+ <arg1> --custom ~/topo-intentTPtest.py </arg1>
+ <arg2> --mac --topo mytopo</arg2>
+ <arg3> </arg3>
+ <controller> remote </controller>
+ </COMPONENTS>
+ </Mininet1>
+
+ </COMPONENT>
+
+</TOPOLOGY>
+
diff --git a/TestON/tests/IntentEventTP/__init__.py b/TestON/tests/IntentEventTP/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/IntentEventTP/__init__.py
diff --git a/TestON/tests/IntentsLoad/IntentsLoad.params b/TestON/tests/IntentsLoad/IntentsLoad.params
index 20e9835..cac20df 100644
--- a/TestON/tests/IntentsLoad/IntentsLoad.params
+++ b/TestON/tests/IntentsLoad/IntentsLoad.params
@@ -1,6 +1,6 @@
<PARAMS>
- <testcases>1,2,2,5</testcases>
+ <testcases>1,3,2,4,2,5</testcases>
<ENV>
<cellName>cam_cells</cellName>
diff --git a/TestON/tests/IntentsLoad/IntentsLoad.py b/TestON/tests/IntentsLoad/IntentsLoad.py
index 2605351..9342596 100644
--- a/TestON/tests/IntentsLoad/IntentsLoad.py
+++ b/TestON/tests/IntentsLoad/IntentsLoad.py
@@ -192,6 +192,8 @@
msg = ( "Final rate on node 1: " + str( lastRate1 ) )
main.log.report( msg )
+ ############## Insert jenkins csv file setup #############
+
def CASE4( self, main ): # 2 node scale
import time
import json
diff --git a/TestON/tests/LinkEventTP/.IntentsLoad.py.swo b/TestON/tests/LinkEventTP/.IntentsLoad.py.swo
new file mode 100644
index 0000000..fe9088a
--- /dev/null
+++ b/TestON/tests/LinkEventTP/.IntentsLoad.py.swo
Binary files differ
diff --git a/TestON/tests/LinkEventTP/LinkEventTP.params b/TestON/tests/LinkEventTP/LinkEventTP.params
new file mode 100644
index 0000000..95d0be3
--- /dev/null
+++ b/TestON/tests/LinkEventTP/LinkEventTP.params
@@ -0,0 +1,46 @@
+<PARAMS>
+
+ <testcases>1,3,2,4,2,5</testcases>
+
+ <ENV>
+ <cellName>network_tp_test</cellName>
+ </ENV>
+
+ <SCALE>1</SCALE>
+
+ <GIT>
+ <autopull>off</autopull>
+ <checkout>master</checkout>
+ </GIT>
+
+ <CTRL>
+ <USER>admin</USER>
+ <ip1>10.128.5.51</ip1>
+ <port1>6633</port1>
+ <ip2>10.128.5.52</ip2>
+ <port2>6633</port2>
+ <ip3>10.128.5.53</ip3>
+ <port3>6633</port3>
+ </CTRL>
+
+ <BENCH>
+ <user>admin</user>
+ <ip1>10.128.5.55</ip1>
+ </BENCH>
+
+ <TEST> # duration = time the test loop runs
+ # log_interval = how often the data is reported
+ # wait = time between tests, used to let the averages run down
+
+ <metric1>topologyLinkEventRate</metric1>
+ <flickerRate>1</flickerRate>
+ <duration>600</duration>
+ <log_interval>30</log_interval>
+ <wait>30</wait>
+ </TEST>
+
+ <JSON>
+ <intents_rate>intentInstalledRate</intents_rate>
+ </JSON>
+
+</PARAMS>
diff --git a/TestON/tests/LinkEventTP/LinkEventTP.py b/TestON/tests/LinkEventTP/LinkEventTP.py
new file mode 100644
index 0000000..0e327a3
--- /dev/null
+++ b/TestON/tests/LinkEventTP/LinkEventTP.py
@@ -0,0 +1,287 @@
+# ScaleOutTemplate --> LinkEventTp
+#
+# CASE1 starts number of nodes specified in param file
+#
+# cameron@onlab.us
+
+import sys
+import os
+
+
+class LinkEventTP:
+
+ def __init__( self ):
+ self.default = ''
+
+ def CASE1( self, main ):
+ import os.path
+ global clusterCount
+ clusterCount = 1
+
+ checkoutBranch = main.params[ 'GIT' ][ 'checkout' ]
+ gitPull = main.params[ 'GIT' ][ 'autopull' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
+ BENCHUser = main.params[ 'BENCH' ][ 'user' ]
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ flickerRate = main.params[ 'TEST' ][ 'flickerRate']
+
+
+ main.log.step( "Cleaning Enviornment..." )
+ main.ONOSbench.onosUninstall( ONOS1Ip )
+ main.ONOSbench.onosUninstall( ONOS2Ip )
+ main.ONOSbench.onosUninstall( ONOS3Ip )
+
+ main.step( "Git checkout and pull " + checkoutBranch )
+ if gitPull == 'on':
+ checkoutResult = main.ONOSbench.gitCheckout( checkoutBranch )
+ pullResult = main.ONOSbench.gitPull()
+
+ else:
+ checkoutResult = main.TRUE
+ pullResult = main.TRUE
+ main.log.info( "Skipped git checkout and pull" )
+
+ #mvnResult = main.ONOSbench.cleanInstall()
+
+ main.step( "Set cell for ONOS cli env" )
+ main.ONOS1cli.setCell( cellName )
+ main.ONOS2cli.setCell( cellName )
+ main.ONOS3cli.setCell( cellName )
+
+ ### configuring file to enable flicker ###
+ main.log.info(" Configuring null provider to enable flicker. Flicker Rate = " + flickerRate )
+ homeDir = os.path.expanduser('~')
+ main.log.info(homeDir)
+ localPath = "/ONOS/tools/package/etc/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg"
+ filePath = homeDir + localPath
+ main.log.info(filePath)
+
+ configFile = open(filePath, 'w+')
+ main.log.info("file opened")
+ configFile.write("# Sample configurations for the NullLinkProvider.\n")
+ configFile.write("# \n")
+ configFile.write("# If enabled, generates LinkDetected and LinkVanished events\n")
+ configFile.write("# to make the link appear to be flapping.\n")
+ configFile.write("#\n")
+ configFile.write("flicker = true\n")
+ configFile.write("#\n")
+ configFile.write("# If enabled, sets the time between LinkEvent generation,\n")
+ configFile.write("# in milliseconds.\n")
+ configFile.write("#\n")
+ configFile.write("eventRate = " + flickerRate)
+ configFile.close()
+ main.log.info("Configuration completed")
+ ### ###
+
+ main.step( "Creating ONOS package" )
+ packageResult = main.ONOSbench.onosPackage() # no file or directory
+
+ main.step( "Installing ONOS package" )
+ install1Result = main.ONOSbench.onosInstall( node=ONOS1Ip )
+
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ main.step( "Applying cell file to environment" )
+ cellApplyResult = main.ONOSbench.setCell( cellName )
+ main.step( "verify cells" )
+ verifyCellResult = main.ONOSbench.verifyCell()
+
+ main.step( "Set cell for ONOS cli env" )
+ main.ONOS1cli.setCell( cellName )
+
+ cli1 = main.ONOS1cli.startOnosCli( ONOS1Ip )
+
+ def CASE2( self, main ):
+ """
+ Increase number of nodes and initiate CLI
+ """
+ import time
+
+ global clusterCount
+
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ #ONOS4Ip = main.params[ 'CTRL' ][ 'ip4' ]
+ #ONOS5Ip = main.params[ 'CTRL' ][ 'ip5' ]
+ #ONOS6Ip = main.params[ 'CTRL' ][ 'ip6' ]
+ #ONOS7Ip = main.params[ 'CTRL' ][ 'ip7' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ scale = int( main.params[ 'SCALE' ] )
+
+ # Cluster size increased everytime the case is defined
+ clusterCount += scale
+
+ main.log.report( "Increasing cluster size to " +
+ str( clusterCount ) )
+ installResult = main.FALSE
+
+ if scale == 2:
+ if clusterCount == 3:
+ main.log.info( "Installing nodes 2 and 3" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli2 = main.ONOS2cli.startOnosCli( ONOS2Ip )
+ cli3 = main.ONOS3cli.startOnosCli( ONOS3Ip )
+
+ if scale == 1:
+ if clusterCount == 2:
+ main.log.info( "Installing node 2" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ cli2 = main.ONOS2cli.startOnosCli( ONOS2Ip )
+
+ if clusterCount == 3:
+ main.log.info( "Installing node 3" )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli3 = main.ONOS3cli.startOnosCli( ONOS3Ip )
+
+
+ def CASE3( self, main ):
+ import time
+ import json
+ import string
+ import csv
+
+ testDelay = main.params[ 'TEST' ][ 'wait']
+ time.sleep( float( testDelay ) )
+
+ getMetric = main.params[ 'TEST' ][ 'metric1' ]
+ testDuration = main.params[ 'TEST' ][ 'duration' ]
+ stop = time.time() + float( testDuration )
+
+ main.ONOS1cli.featureInstall("onos-null")
+
+ msg = ( "Starting test loop for " + str(testDuration) + " seconds" )
+ main.log.info( msg )
+ logInterval = main.params[ 'TEST' ][ 'log_interval' ]
+
+ while time.time() < stop:
+ time.sleep( float( logInterval ) )
+
+ JsonStr1 = main.ONOS1cli.topologyEventsMetrics()
+ JsonObj1 = json.loads( JsonStr1 )
+ msg = ( "Node 1 TP: " + str( JsonObj1[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate1 = round(JsonObj1[ getMetric ][ 'm1_rate' ],2)
+
+ msg = ( "Final TP on node 1: " + str( lastRate1 ) )
+ main.log.report( msg )
+
+
+
+ jenkinsReport = open('NetworkTPnode.csv', 'w')
+ jenkinsReport.write("T1 - Node 1, T2 - Node 1, T2 - Node 2, T3 - Node 1, T3 - Node 2, T3 - Node 3\n")
+ jenkinsReport.write(str(lastRate1))
+ jenkinsReport.write(", ")
+ jenkinsReport.close()
+
+
+
+ def CASE4( self, main ):
+ import time
+ import json
+ import string
+
+ testDelay = main.params[ 'TEST' ][ 'wait']
+ time.sleep( float( testDelay ) )
+
+ getMetric = main.params[ 'TEST' ][ 'metric1' ]
+ testDuration = main.params[ 'TEST' ][ 'duration' ]
+ stop = time.time() + float( testDuration )
+
+ main.ONOS2cli.featureInstall("onos-null")
+
+ msg = ( "Starting test loop for " + str(testDuration) + " seconds" )
+ main.log.info( msg )
+ logInterval = main.params[ 'TEST' ][ 'log_interval' ]
+
+ while time.time() < stop:
+ time.sleep( float( logInterval ) )
+
+ JsonStr1 = main.ONOS1cli.topologyEventsMetrics()
+ JsonObj1 = json.loads( JsonStr1 )
+ msg = ( "Node 1 TP: " + str( JsonObj1[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate1 = round(JsonObj1[ getMetric ][ 'm1_rate' ],2)
+
+
+ JsonStr2 = main.ONOS2cli.topologyEventsMetrics()
+ JsonObj2 = json.loads( JsonStr2 )
+ msg = ( "Node 2 TP: " + str( JsonObj2[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate2 = round(JsonObj2[ getMetric ][ 'm1_rate' ],2)
+
+
+ msg = ( "Final TP on node 1: " + str( lastRate1 ) )
+ main.log.report( msg )
+
+ msg = ( "Final TP on node 2: " + str( lastRate2 ) )
+ main.log.report( msg )
+
+
+ jenkinsReport = open('NetworkTPnode.csv', 'a')
+ jenkinsReport.write(str(lastRate1))
+ jenkinsReport.write(", ")
+ jenkinsReport.write(str(lastRate2))
+ jenkinsReport.write(", ")
+ jenkinsReport.close()
+
+
+ def CASE5( self, main ):
+ import time
+ import json
+ import string
+
+ testDelay = main.params[ 'TEST' ][ 'wait']
+ time.sleep( float( testDelay ) )
+
+ getMetric = main.params[ 'TEST' ][ 'metric1' ]
+ testDuration = main.params[ 'TEST' ][ 'duration' ]
+ stop = time.time() + float( testDuration )
+
+ main.ONOS3cli.featureInstall("onos-null")
+
+ msg = ( "Starting test loop for " + str(testDuration) + " seconds" )
+ main.log.info( msg )
+ logInterval = main.params[ 'TEST' ][ 'log_interval' ]
+
+ while time.time() < stop:
+ time.sleep( float( logInterval ) )
+
+ JsonStr1 = main.ONOS1cli.topologyEventsMetrics()
+ JsonObj1 = json.loads( JsonStr1 )
+ msg = ( "Node 1 TP: " + str( JsonObj1[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate1 = round(JsonObj1[ getMetric ][ 'm1_rate' ],2)
+
+ JsonStr2 = main.ONOS2cli.topologyEventsMetrics()
+ JsonObj2 = json.loads( JsonStr2 )
+ msg = ( "Node 2 TP: " + str( JsonObj2[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate2 = round(JsonObj2[ getMetric ][ 'm1_rate' ],2)
+
+ JsonStr3 = main.ONOS3cli.topologyEventsMetrics()
+ JsonObj3 = json.loads( JsonStr3 )
+ msg = ( "Node 3 TP: " + str( JsonObj3[ getMetric ][ 'm1_rate' ] ) )
+ main.log.info( msg )
+ lastRate3 = round(JsonObj3[ getMetric ][ 'm1_rate' ],2)
+
+ msg = ( "Final TP on node 1: " + str( lastRate1 ) )
+ main.log.report( msg )
+
+ msg = ( "Final TP on node 2: " + str( lastRate2 ) )
+ main.log.report( msg )
+
+ msg = ( "Final TP on node 3: " + str( lastRate3 ) )
+ main.log.report( msg )
+
+ jenkinsReport = open('NetworkTPnode.csv', 'a')
+ jenkinsReport.write(str(lastRate1))
+ jenkinsReport.write(", ")
+ jenkinsReport.write(str(lastRate2))
+ jenkinsReport.write(", ")
+ jenkinsReport.write(str(lastRate3))
+ jenkinsReport.close()
+
diff --git a/TestON/tests/LinkEventTP/LinkEventTP.topo b/TestON/tests/LinkEventTP/LinkEventTP.topo
new file mode 100644
index 0000000..dda5114
--- /dev/null
+++ b/TestON/tests/LinkEventTP/LinkEventTP.topo
@@ -0,0 +1,70 @@
+<TOPOLOGY>
+
+ <COMPONENT>
+
+ <ONOSbench>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>1</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOSbench>
+
+ <ONOS1cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1cli>
+
+ <ONOS2cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>3</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2cli>
+
+ <ONOS3cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>4</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3cli>
+
+ <ONOS1>
+ <host>10.128.5.51</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1>
+
+ <ONOS2>
+ <host>10.128.5.52</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>6</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2>
+
+ <ONOS3>
+ <host>10.128.5.53</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>7</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3>
+ </COMPONENT>
+
+</TOPOLOGY>
+
diff --git a/TestON/tests/LinkEventTP/__init__.py b/TestON/tests/LinkEventTP/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/LinkEventTP/__init__.py
diff --git a/TestON/tests/ScaleOutTemplate/README b/TestON/tests/ScaleOutTemplate/README
new file mode 100644
index 0000000..2d5ae1c
--- /dev/null
+++ b/TestON/tests/ScaleOutTemplate/README
@@ -0,0 +1,22 @@
+-------------------
+----Setup Guide----
+-------------------
+
+CASE 1: init case; cleans and sets up enviornment, starts up node 1
+
+CASE 2: Increments scale case; starts up additional nodes, determined by 'SCALE' in params
+ Ex: cluster size = 1 and scale = 2 ==> call CASE2 ==> cluster size = 3
+
+Params file:
+ SCALE = cluster scale step size
+ availableNodes = number of nodes you have provided data for in .topo file
+
+ ENV:
+ cellName = desired name of cell file to be created at runtime
+ cellFeatures = list of features desired
+ NOTE: webconsole, onos-api, onos-cli and onos-openflow are loaded automatically.
+ adjust your test and feature list accordingly
+ TEST:
+ skipCleanInstall = set yes if you want to skip for the sake of test debugging, otherwise set no
+
+
diff --git a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
index 4dacc99..94ce2be 100644
--- a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
+++ b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
@@ -1,13 +1,15 @@
<PARAMS>
- <testcases>1,2</testcases>
+ <testcases>1,2,2</testcases>
+ <SCALE>1</SCALE>
+ <availableNodes>3</availableNodes>
+
<ENV>
- <cellName>cam_cells</cellName>
+ <cellName>defaultCell</cellName>
+ <cellFeatures></cellFeatures>
</ENV>
- <SCALE>2</SCALE>
-
<GIT>
<autopull>on</autopull>
<checkout>master</checkout>
@@ -15,12 +17,28 @@
<CTRL>
<USER>admin</USER>
+
<ip1>10.128.5.51</ip1>
<port1>6633</port1>
+
<ip2>10.128.5.52</ip2>
<port2>6633</port2>
+
<ip3>10.128.5.53</ip3>
<port3>6633</port3>
+
+ <ip4>10.128.5.51</ip4>
+ <port4>6633</port4>
+
+ <ip5>10.128.5.52</ip5>
+ <port5>6633</port5>
+
+ <ip6>10.128.5.53</ip6>
+ <port6>6633</port6>
+
+ <ip7>10.128.5.53</ip7>
+ <port7>6633</port7>
+
</CTRL>
<MN>
@@ -33,6 +51,7 @@
</BENCH>
<TEST>
+ <skipCleanInstall>yes</skipCleanInstall>
</TEST>
<JSON>
diff --git a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.py b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.py
index b5a1e2e..abdc78c 100644
--- a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.py
+++ b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.py
@@ -13,26 +13,47 @@
def __init__( self ):
self.default = ''
- def CASE1( self, main ):
-
- global clusterCount
+ def CASE1( self, main ): #This is the initialization case
+ #this case will clean up all nodes
+ #but only node 1 is started in this case
+
+ global clusterCount #number of nodes running
+ global ONOSIp #list of ONOS IP addresses
clusterCount = 1
+ ONOSIp = [ 0 ]
+ #Load values from params file
checkoutBranch = main.params[ 'GIT' ][ 'checkout' ]
gitPull = main.params[ 'GIT' ][ 'autopull' ]
cellName = main.params[ 'ENV' ][ 'cellName' ]
+ Features= main.params[ 'ENV' ][ 'cellFeatures' ]
BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
BENCHUser = main.params[ 'BENCH' ][ 'user' ]
- ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
- ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
- ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
MN1Ip = main.params[ 'MN' ][ 'ip1' ]
+ maxNodes = int(main.params[ 'availableNodes' ])
+ Features = main.params[ 'ENV' ][ 'cellFeatures' ]
+ skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
+ #Populate ONOSIp with ips from params
+ for i in range(1, maxNodes + 1):
+ ipString = 'ip' + str(i)
+ ONOSIp.append(main.params[ 'CTRL' ][ ipString ])
+
+ #construct the cell file
+ main.log.info("Creating cell file")
+ exec "a = main.ONOSbench.createCellFile"
+ cellIp = []
+ for node in range (1, maxNodes + 1):
+ cellIp.append(ONOSIp[node])
+ a(BENCHIp,cellName,MN1Ip,str(Features), *cellIp)
+
+ #Uninstall everywhere
main.log.step( "Cleaning Enviornment..." )
- main.ONOSbench.onosUninstall( ONOS1Ip )
- main.ONOSbench.onosUninstall( ONOS2Ip )
- main.ONOSbench.onosUninstall( ONOS3Ip )
+ for i in range(1, maxNodes + 1):
+ main.log.info(" Uninstalling ONOS " + str(i) )
+ main.ONOSbench.onosUninstall( ONOSIp[i] )
+ #git
main.step( "Git checkout and pull " + checkoutBranch )
if gitPull == 'on':
checkoutResult = main.ONOSbench.gitCheckout( checkoutBranch )
@@ -42,19 +63,19 @@
checkoutResult = main.TRUE
pullResult = main.TRUE
main.log.info( "Skipped git checkout and pull" )
-
- #mvnResult = main.ONOSbench.cleanInstall()
+
+ #mvn clean install, for debugging set param 'skipCleanInstall' to yes to speed up test
+ if skipMvn != "yes":
+ mvnResult = main.ONOSbench.cleanInstall()
main.step( "Set cell for ONOS cli env" )
main.ONOS1cli.setCell( cellName )
- main.ONOS2cli.setCell( cellName )
- main.ONOS3cli.setCell( cellName )
-
+
main.step( "Creating ONOS package" )
packageResult = main.ONOSbench.onosPackage()
main.step( "Installing ONOS package" )
- install1Result = main.ONOSbench.onosInstall( node=ONOS1Ip )
+ install1Result = main.ONOSbench.onosInstall( node=ONOSIp[1] )
cellName = main.params[ 'ENV' ][ 'cellName' ]
main.step( "Applying cell file to environment" )
@@ -63,73 +84,29 @@
verifyCellResult = main.ONOSbench.verifyCell()
main.step( "Set cell for ONOS cli env" )
- main.ONOS1cli.setCell()
- cli1 = main.ONOS1cli.startOnosCli( ONOS1Ip )
+ cli1 = main.ONOS1cli.startOnosCli( ONOSIp[1] )
def CASE2( self, main ):
- ''
+ # This case increases the cluster size by whatever scale is
+ # Note: 'scale' is the size of the step
+ # if scaling is not a part of your test, simply run this case
+ # once after CASE1 to set up your enviornment for your desired
+ # cluster size. If scaling is a part of you test call this case each time
+ # you want to increase cluster size
+
+ ''
'Increase number of nodes and initiate CLI'
''
import time
-
global clusterCount
- ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
- ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
- ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
- #ONOS4Ip = main.params[ 'CTRL' ][ 'ip4' ]
- #ONOS5Ip = main.params[ 'CTRL' ][ 'ip5' ]
- #ONOS6Ip = main.params[ 'CTRL' ][ 'ip6' ]
- #ONOS7Ip = main.params[ 'CTRL' ][ 'ip7' ]
- cellName = main.params[ 'ENV' ][ 'cellName' ]
scale = int( main.params[ 'SCALE' ] )
-
- # Cluster size increased everytime the case is defined
clusterCount += scale
- main.log.report( "Increasing cluster size to " +
- str( clusterCount ) )
- installResult = main.FALSE
-
- if scale == 2:
- if clusterCount == 3:
- main.log.info( "Installing nodes 2 and 3" )
- install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
- install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
- cli2 = main.ONOS1cli.startOnosCli(ONOS1_ip)
- cli3 = main.ONOS1cli.startOnosCli(ONOS2_ip)
-
-
- #elif clusterCount == 5:
-
- # main.log.info( "Installing nodes 4 and 5" )
- # node4Result = main.ONOSbench.onosInstall( node=ONOS4Ip )
- # node5Result = main.ONOSbench.onosInstall( node=ONOS5Ip )
- # installResult = node4Result and node5Result
- # time.sleep( 5 )
-
- # main.ONOS4cli.startOnosCli( ONOS4Ip )
- # main.ONOS5cli.startOnosCli( ONOS5Ip )
-
- #elif clusterCount == 7:
-
- # main.log.info( "Installing nodes 4 and 5" )
- # node6Result = main.ONOSbench.onosInstall( node=ONOS6Ip )
- # node7Result = main.ONOSbench.onosInstall( node=ONOS7Ip )
- # installResult = node6Result and node7Result
- # time.sleep( 5 )
-
- # main.ONOS6cli.startOnosCli( ONOS6Ip )
- # main.ONOS7cli.startOnosCli( ONOS7Ip )
- #
-
- if scale == 1:
- if clusterCount == 2:
- main.log.info( "Installing node 2" )
- install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
- cli2 = main.ONOS1cli.startOnosCli(ONOS2_ip)
-
- if clusterCount == 3:
- main.log.info( "Installing node 3" )
- install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
- cli3 = main.ONOS1cli.startOnosCli(ONOS3_ip)
+ main.log.report( "Increasing cluster size to " + str( clusterCount ) )
+ for node in range((clusterCount - scale) + 1, clusterCount + 1):
+ main.log.info("Starting ONOS " + str(node) + " at IP: " + ONOSIp[node])
+ main.ONOSbench.onosInstall( ONOSIp[node])
+ exec "a = main.ONOS%scli.startOnosCli" %str(node)
+ a(ONOSIp[node])
+
diff --git a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
index 88c4d35..8bd5a9f 100644
--- a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
+++ b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
@@ -37,13 +37,13 @@
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS3cli>
-
+
<ONOS1>
<host>10.128.5.51</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
- <connect_order>5</connect_order>
+ <connect_order>9</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1>
@@ -52,7 +52,7 @@
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
- <connect_order>6</connect_order>
+ <connect_order>10</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS2>
@@ -61,7 +61,7 @@
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
- <connect_order>7</connect_order>
+ <connect_order>11</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS3>
@@ -70,7 +70,7 @@
<user>admin</user>
<password>onos_test</password>
<type>MininetCliDriver</type>
- <connect_order>8</connect_order>
+ <connect_order>16</connect_order>
<COMPONENTS>
<arg1> --custom ~/mininet/custom/topo-2sw-2host.py </arg1>
<arg2> --arp --mac --topo mytopo</arg2>
diff --git a/TestON/tests/pushTestIntents/__init__.py b/TestON/tests/pushTestIntents/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/pushTestIntents/__init__.py
diff --git a/TestON/tests/pushTestIntents/pushTestIntents.params b/TestON/tests/pushTestIntents/pushTestIntents.params
new file mode 100644
index 0000000..f4de821
--- /dev/null
+++ b/TestON/tests/pushTestIntents/pushTestIntents.params
@@ -0,0 +1,48 @@
+<PARAMS>
+
+ <testcases>1,3</testcases>
+
+ <ENV>
+ <cellName>defaultCell</cellName>
+ <cellFeatures></cellFeatures>
+ </ENV>
+
+ <SCALE>1</SCALE>
+
+ <GIT>
+ <autopull>on</autopull>
+ <checkout>master</checkout>
+ </GIT>
+
+ <CTRL>
+ <USER>admin</USER>
+ <ip1>10.128.5.51</ip1>
+ <port1>6633</port1>
+ <ip2>10.128.5.52</ip2>
+ <port2>6633</port2>
+ <ip3>10.128.5.53</ip3>
+ <port3>6633</port3>
+ </CTRL>
+
+ <MN>
+ <ip1>10.128.5.59</ip1>
+ </MN>
+
+ <BENCH>
+ <user>admin</user>
+ <ip1>10.128.5.55</ip1>
+ </BENCH>
+
+ <TEST>
+ <loadstart>curl --fail http://localhost:8181/onos/demo/intents/setup -H "Content-Type:application/json" -d '{"type" : "random"}'</loadstart>
+ <loadstop>curl --fail http://localhost:8181/onos/demo/intents/teardown</loadstop>
+ <arping>py [h.cmd("arping -c 1 -w 1 10.0.0.225") for h in net.hosts]</arping>
+ <metric1>push-test-intents</metric1>
+ <cycles>30</cycles>
+ <batch>1,10,100,1000,10000</batch> #can be any value/length, must not have spaces next to commas!
+ </TEST>
+
+ <JSON>
+ </JSON>
+
+</PARAMS>
diff --git a/TestON/tests/pushTestIntents/pushTestIntents.py b/TestON/tests/pushTestIntents/pushTestIntents.py
new file mode 100644
index 0000000..5463acf
--- /dev/null
+++ b/TestON/tests/pushTestIntents/pushTestIntents.py
@@ -0,0 +1,208 @@
+# ScaleOutTemplate
+#
+# CASE1 starts number of nodes specified in param file
+#
+# cameron@onlab.us
+
+import sys
+import os
+
+
+class pushTestIntents:
+
+ def __init__( self ):
+ self.default = ''
+
+ def CASE1( self, main ):
+
+ global clusterCount
+ clusterCount = 1
+
+ checkoutBranch = main.params[ 'GIT' ][ 'checkout' ]
+ gitPull = main.params[ 'GIT' ][ 'autopull' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
+ BENCHUser = main.params[ 'BENCH' ][ 'user' ]
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ MN1Ip = main.params[ 'MN' ][ 'ip1' ]
+ Features= main.params[ 'ENV' ][ 'cellFeatures' ]
+
+ main.ONOSbench.createCellFile(BENCHIp, cellName, MN1Ip,str(Features), ONOS1Ip, ONOS2Ip, ONOS3Ip)
+
+ main.log.step( "Cleaning Enviornment..." )
+ main.ONOSbench.onosUninstall( ONOS1Ip )
+ main.ONOSbench.onosUninstall( ONOS2Ip )
+ main.ONOSbench.onosUninstall( ONOS3Ip )
+
+ main.step( "Git checkout and pull " + checkoutBranch )
+ if gitPull == 'on':
+ checkoutResult = main.ONOSbench.gitCheckout( checkoutBranch )
+ pullResult = main.ONOSbench.gitPull()
+
+ else:
+ checkoutResult = main.TRUE
+ pullResult = main.TRUE
+ main.log.info( "Skipped git checkout and pull" )
+
+ #mvnResult = main.ONOSbench.cleanInstall()
+
+ main.step( "Set cell for ONOS cli env" )
+ main.ONOS1cli.setCell( cellName )
+ main.ONOS2cli.setCell( cellName )
+ main.ONOS3cli.setCell( cellName )
+
+ main.step( "Creating ONOS package" )
+ packageResult = main.ONOSbench.onosPackage()
+
+ main.step( "Installing ONOS package" )
+ install1Result = main.ONOSbench.onosInstall( node=ONOS1Ip )
+
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ main.step( "Applying cell file to environment" )
+ cellApplyResult = main.ONOSbench.setCell( cellName )
+ main.step( "verify cells" )
+ verifyCellResult = main.ONOSbench.verifyCell()
+
+ main.step( "Set cell for ONOS cli env" )
+ cli1 = main.ONOS1cli.startOnosCli( ONOS1Ip )
+
+ def CASE2( self, main ):
+ ''
+ 'Increase number of nodes and initiate CLI'
+ ''
+ import time
+
+ global clusterCount
+
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ ONOS2Ip = main.params[ 'CTRL' ][ 'ip2' ]
+ ONOS3Ip = main.params[ 'CTRL' ][ 'ip3' ]
+ #ONOS4Ip = main.params[ 'CTRL' ][ 'ip4' ]
+ #ONOS5Ip = main.params[ 'CTRL' ][ 'ip5' ]
+ #ONOS6Ip = main.params[ 'CTRL' ][ 'ip6' ]
+ #ONOS7Ip = main.params[ 'CTRL' ][ 'ip7' ]
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ scale = int( main.params[ 'SCALE' ] )
+
+ # Cluster size increased everytime the case is run
+ clusterCount += scale
+
+ main.log.report( "Increasing cluster size to " +
+ str( clusterCount ) )
+ installResult = main.FALSE
+
+ if scale == 2:
+ if clusterCount == 3:
+ main.log.info( "Installing nodes 2 and 3" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli2 = main.ONOS2cli.startOnosCli(ONOS2Ip)
+ cli3 = main.ONOS3cli.startOnosCli(ONOS3Ip)
+
+
+ #elif clusterCount == 5:
+
+ # main.log.info( "Installing nodes 4 and 5" )
+ # node4Result = main.ONOSbench.onosInstall( node=ONOS4Ip )
+ # node5Result = main.ONOSbench.onosInstall( node=ONOS5Ip )
+ # installResult = node4Result and node5Result
+ # time.sleep( 5 )
+
+ # main.ONOS4cli.startOnosCli( ONOS4Ip )
+ # main.ONOS5cli.startOnosCli( ONOS5Ip )
+
+ #elif clusterCount == 7:
+
+ # main.log.info( "Installing nodes 4 and 5" )
+ # node6Result = main.ONOSbench.onosInstall( node=ONOS6Ip )
+ # node7Result = main.ONOSbench.onosInstall( node=ONOS7Ip )
+ # installResult = node6Result and node7Result
+ # time.sleep( 5 )
+
+ # main.ONOS6cli.startOnosCli( ONOS6Ip )
+ # main.ONOS7cli.startOnosCli( ONOS7Ip )
+ #
+
+ if scale == 1:
+ if clusterCount == 2:
+ main.log.info( "Installing node 2" )
+ install2Result = main.ONOSbench.onosInstall( node=ONOS2Ip )
+ cli2 = main.ONOS2cli.startOnosCli(ONOS2_ip)
+
+ if clusterCount == 3:
+ main.log.info( "Installing node 3" )
+ install3Result = main.ONOSbench.onosInstall( node=ONOS3Ip )
+ cli3 = main.ONOS3cli.startOnosCli(ONOS3_ip)
+
+
+ def CASE3( self, main ):
+
+ import subprocess
+ ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
+ defaultSwPort = main.params[ 'CTRL' ][ 'port1' ]
+
+ main.Mininet1.assignSwController(
+ sw="1",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="2",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="3",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="4",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="5",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="6",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+ main.Mininet1.assignSwController(
+ sw="7",
+ ip1=ONOS1Ip,
+ port1=defaultSwPort )
+
+ mnArp = main.params[ 'TEST' ][ 'arping' ]
+ main.Mininet1.handle.sendline( mnArp )
+
+ getMetric = main.params[ 'TEST' ][ 'metric1' ]
+
+ batch = main.params[ 'TEST' ][ 'batch' ]
+ batchSize = batch.split(",")
+ iterations = main.params[ 'TEST' ][ 'cycles' ]
+
+ for size in batchSize:
+ commandString = """ "onos """ + ONOS1Ip + " '" + getMetric + " " + size + "'" + """" """
+ output = subprocess.check_output(commandString,shell=True)
+ outjson=json.loads(output)
+ print outjson
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestON/tests/pushTestIntents/pushTestIntents.topo b/TestON/tests/pushTestIntents/pushTestIntents.topo
new file mode 100644
index 0000000..88c4d35
--- /dev/null
+++ b/TestON/tests/pushTestIntents/pushTestIntents.topo
@@ -0,0 +1,85 @@
+<TOPOLOGY>
+
+ <COMPONENT>
+
+ <ONOSbench>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>1</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOSbench>
+
+ <ONOS1cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1cli>
+
+ <ONOS2cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>3</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2cli>
+
+ <ONOS3cli>
+ <host>10.128.5.55</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosCliDriver</type>
+ <connect_order>4</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3cli>
+
+ <ONOS1>
+ <host>10.128.5.51</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>5</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1>
+
+ <ONOS2>
+ <host>10.128.5.52</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>6</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS2>
+
+ <ONOS3>
+ <host>10.128.5.53</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>OnosDriver</type>
+ <connect_order>7</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS3>
+
+ <Mininet1>
+ <host>10.128.5.59</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>MininetCliDriver</type>
+ <connect_order>8</connect_order>
+ <COMPONENTS>
+ <arg1> --custom ~/mininet/custom/topo-2sw-2host.py </arg1>
+ <arg2> --arp --mac --topo mytopo</arg2>
+ <arg3> </arg3>
+ <controller> remote </controller>
+ </COMPONENTS>
+ </Mininet1>
+
+ </COMPONENT>
+
+</TOPOLOGY>
+