Removed PortTest folder
diff --git a/TestON/tests/PortTest/PortTest.params b/TestON/tests/PortTest/PortTest.params
deleted file mode 100755
index 2d1f421..0000000
--- a/TestON/tests/PortTest/PortTest.params
+++ /dev/null
@@ -1,48 +0,0 @@
-<PARAMS>
-
- <testcases>1,4,9</testcases>
- #Environment variables
- <ENV>
- <cellName>driver_test</cellName>
- </ENV>
-
- <CTRL>
- <ip1>10.128.20.11</ip1>
- <port1>6633</port1>
- </CTRL>
-
- <PING>
- <source1>h8</source1>
- <source2>h9</source2>
- <source3>h10</source3>
- <source4>h11</source4>
- <source5>h12</source5>
- <source6>h13</source6>
- <source7>h14</source7>
- <source8>h15</source8>
- <source9>h16</source9>
- <source10>h17</source10>
- <target1>10.0.0.18</target1>
- <target2>10.0.0.19</target2>
- <target3>10.0.0.20</target3>
- <target4>10.0.0.21</target4>
- <target5>10.0.0.22</target5>
- <target6>10.0.0.23</target6>
- <target7>10.0.0.24</target7>
- <target8>10.0.0.25</target8>
- <target9>10.0.0.26</target9>
- <target10>10.0.0.27</target10>
- </PING>
-
- <timers>
- <LinkDiscovery>5</LinkDiscovery>
- <SwitchDiscovery>15</SwitchDiscovery>
- </timers>
-
- <OPTICAL>
- <jsonfile> /home/admin/ONOS/tools/test/topos/oe-nonlinear-4.json </jsonfile>
- </OPTICAL>
-
-
-
-</PARAMS>
diff --git a/TestON/tests/PortTest/PortTest.py b/TestON/tests/PortTest/PortTest.py
deleted file mode 100644
index bb2b1cf..0000000
--- a/TestON/tests/PortTest/PortTest.py
+++ /dev/null
@@ -1,162 +0,0 @@
-"""
-Description: This test is an example of a simple single node ONOS test
-
-List of test cases:
-CASE1: Compile ONOS and push it to the test machine
-CASE2: Assign mastership to controller
-CASE3: Pingall
-"""
-class PingallExample:
-
- def __init__( self ):
- self.default = ''
-
- def CASE1( self, main ):
- """
- CASE1 is to compile ONOS and push it to the test machines
-
- Startup sequence:
- git pull
- mvn clean install
- onos-package
- cell <name>
- onos-verify-cell
- onos-install -f
- onos-wait-for-start
- """
- desc = "ONOS Single node cluster restart HA test - initialization"
- main.log.report( desc )
- main.case( "Setting up test environment" )
-
- # load some vairables from the params file
- PULLCODE = False
- if main.params[ 'Git' ] == 'True':
- PULLCODE = True
- cellName = main.params[ 'ENV' ][ 'cellName' ]
-
- ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
-
- main.step( "Applying cell variable to environment" )
- cellResult = main.ONOSbench.setCell( cellName )
- verifyResult = main.ONOSbench.verifyCell()
-
- main.log.report( "Uninstalling ONOS" )
- main.ONOSbench.onosUninstall( ONOS1Ip )
-
- cleanInstallResult = main.TRUE
- gitPullResult = main.TRUE
-
- main.step( "Compiling the latest version of ONOS" )
- if PULLCODE:
- main.step( "Git checkout and pull master" )
- main.ONOSbench.gitCheckout( "master" )
- gitPullResult = main.ONOSbench.gitPull()
-
- main.step( "Using mvn clean & install" )
- cleanInstallResult = main.TRUE
- if gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- main.ONOSbench.getVersion( report=True )
-
- cellResult = main.ONOSbench.setCell( cellName )
- verifyResult = main.ONOSbench.verifyCell()
- main.step( "Creating ONOS package" )
- packageResult = main.ONOSbench.onosPackage()
-
- main.step( "Installing ONOS package" )
- onos1InstallResult = main.ONOSbench.onosInstall( options="-f",
- node=ONOS1Ip )
-
- main.step( "Checking if ONOS is up yet" )
- for i in range( 2 ):
- onos1Isup = main.ONOSbench.isup( ONOS1Ip )
- if onos1Isup:
- break
- if not onos1Isup:
- main.log.report( "ONOS1 didn't start!" )
-
- # TODO: if it becomes an issue, we can retry this step a few times
-
- cliResult = main.ONOScli1.startOnosCli( ONOS1Ip )
-
- case1Result = ( cleanInstallResult and packageResult and
- cellResult and verifyResult and
- onos1InstallResult and
- onos1Isup and cliResult )
-
- utilities.assert_equals( expect=main.TRUE, actual=case1Result,
- onpass="Test startup successful",
- onfail="Test startup NOT successful" )
-
- if case1Result == main.FALSE:
- main.cleanup()
- main.exit()
-
- def CASE2( self, main ):
- """
- Assign mastership to controller
- """
- import re
-
- main.log.report( "Assigning switches to controller" )
- main.case( "Assigning Controller" )
- main.step( "Assign switches to controller" )
-
- ONOS1Ip = main.params[ 'CTRL' ][ 'ip1' ]
- ONOS1Port = main.params[ 'CTRL' ][ 'port1' ]
-
- for i in range( 1, 14 ):
- main.Mininet1.assignSwController(
- sw=str( i ),
- ip1=ONOS1Ip,
- port1=ONOS1Port )
-
- mastershipCheck = main.TRUE
- for i in range( 1, 14 ):
- response = main.Mininet1.getSwController( "s" + str( i ) )
- try:
- main.log.info( str( response ) )
- except:
- main.log.info( repr( response ) )
- if re.search( "tcp:" + ONOS1Ip, response ):
- mastershipCheck = mastershipCheck and main.TRUE
- else:
- mastershipCheck = main.FALSE
- if mastershipCheck == main.TRUE:
- main.log.report( "Switch mastership assigned correctly" )
- utilities.assert_equals(
- expect=main.TRUE,
- actual=mastershipCheck,
- onpass="Switch mastership assigned correctly",
- onfail="Switches not assigned correctly to controllers" )
-
- def CASE3( self, main ):
- """
- Assign intents
- """
- import time
-
- main.log.report( "Run Pingall" )
- main.case( "Run Pingall" )
-
- # install onos-app-fwd
- main.log.info( "Install reactive forwarding app" )
- main.ONOScli1.featureInstall( "onos-app-fwd" )
-
- # REACTIVE FWD test
- pingResult = main.FALSE
- time1 = time.time()
- pingResult = main.Mininet1.pingall()
- time2 = time.time()
- main.log.info( "Time for pingall: %2f seconds" % ( time2 - time1 ) )
-
- # uninstall onos-app-fwd
- main.log.info( "Uninstall reactive forwarding app" )
- main.ONOScli1.featureUninstall( "onos-app-fwd" )
-
- utilities.assert_equals( expect=main.TRUE, actual=pingResult,
- onpass="All hosts are reachable",
- onfail="Some pings failed" )
diff --git a/TestON/tests/PortTest/PortTest.topo b/TestON/tests/PortTest/PortTest.topo
deleted file mode 100755
index 7dff686..0000000
--- a/TestON/tests/PortTest/PortTest.topo
+++ /dev/null
@@ -1,103 +0,0 @@
-<TOPOLOGY>
- <COMPONENT>
-
- <ONOSbench>
- <host>10.128.10.11</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosDriver</type>
- <connect_order>1</connect_order>
- <COMPONENTS> </COMPONENTS>
- </ONOSbench>
-
- <ONOS1>
- <host>10.128.10.11</host>
- <user>sdn</user>
- <password>sdn</password>
- <type>OnosDriver</type>
- <connect_order>2</connect_order>
- <COMPONENTS> </COMPONENTS>
- </ONOS1>
-
- <ONOS2>
- <host>10.128.10.11</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>3</connect_order>
- <COMPONENTS> </COMPONENTS>
- </ONOS2>
-
- <ONOS3>
- <host>10.128.10.11</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>4</connect_order>
- <COMPONENTS> </COMPONENTS>
- </ONOS3>
-
-
- <Mininet1>
- <host>10.128.10.11</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>MininetCliDriver</type>
- <connect_order>5</connect_order>
- <COMPONENTS>
- #Specify the Option for mininet
- <arg1> --custom ~/mininet/custom/topo-HA.py </arg1>
- <arg2> --topo mytopo </arg2>
- <arg3> --switch ovs,protocols=OpenFlow10 </arg3>
- <controller> remote </controller>
- </COMPONENTS>
- </Mininet1>
-
- <Mininet2>
- <host>10.128.10.11</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>RemoteMininetDriver</type>
- <connect_order>6</connect_order>
- <COMPONENTS>
- #Specify the Option for mininet
- <arg1> --custom ~/mininet/custom/topo-HA.py </arg1>
- <arg2> --topo mytopo </arg2>
- <arg3> --switch ovs,protocols=OpenFlow13 </arg3>
- <controller> remote </controller>
- </COMPONENTS>
- </Mininet2>
-
- <LincOE1>
- <host>10.128.20.30</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>LincOEDriver</type>
- <connect_order>7</connect_order>
- <COMPONENTS>
- <arg1> </arg1>
- </COMPONENTS>
- </LincOE1>
-
- <LincOE2>
- <host>10.128.20.30</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>RemoteMininetDriver</type>
- <connect_order>8</connect_order>
- <COMPONENTS>
- <arg1> sudo python /home/admin/optical.py </arg1>
- <arg2> </arg2>
- </COMPONENTS>
- </LincOE2>
-
- <LincOE3>
- <host>10.128.20.30</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>LincOEDriver</type>
- <connect_order>9</connect_order>
- </LincOE3>
-
- </COMPONENT>
-</TOPOLOGY>