[ONOS-7039] [ONOS-7044] Fix PEP8 Warnings in TestON
Change-Id: Ied79ff9caff5487a6df50466307f757468d7ca3a
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
index 3e21612..b7825e8 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
CHOTestMonkey class
Author: you@onlab.us
@@ -95,7 +94,7 @@
main.caseResult = main.TRUE
stepResult = main.testSetUp.envSetup()
except Exception as e:
- main.testSetUp.envSetupException(e)
+ main.testSetUp.envSetupException( e )
main.testSetUp.evnSetupConclusion( stepResult )
diff --git a/TestON/tests/CHOTestMonkey/dependencies/EventGenerator.py b/TestON/tests/CHOTestMonkey/dependencies/EventGenerator.py
index c19715e..7100fae 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/EventGenerator.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/EventGenerator.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains the event generator class for CHOTestMonkey
Author: you@onlab.us
@@ -129,10 +128,10 @@
This function triggers an event from inside of CHOTestMonkey
"""
import time
- if not typeIndex in EventType().map.keys():
+ if typeIndex not in EventType().map.keys():
main.log.warn( "Event Generator - Unknown event type: " + str( typeIndex ) )
return
- if not scheduleMethod in EventScheduleMethod().map.keys():
+ if scheduleMethod not in EventScheduleMethod().map.keys():
main.log.warn( "Event Generator - Unknown event schedule method: " + str( scheduleMethod ) )
return
while not main.eventScheduler.isAvailable():
@@ -145,7 +144,7 @@
"""
if typeIndex > 100:
# Handle group events
- if not typeIndex in main.enabledEvents.keys():
+ if typeIndex not in main.enabledEvents.keys():
main.log.warn( "Event Generator - event type %s not enabled" % ( typeIndex ) )
return
function = getattr( self, main.enabledEvents[ typeIndex ] )
diff --git a/TestON/tests/CHOTestMonkey/dependencies/EventTrigger.py b/TestON/tests/CHOTestMonkey/dependencies/EventTrigger.py
index 878071e..2bfdd35 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/EventTrigger.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/EventTrigger.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
Insert network/ONOS/app events into CHOTestMonkey
Author: you@onlab.us
@@ -104,5 +103,5 @@
print e
if __name__ == '__main__':
- #testLoop( 2 )
+ # testLoop( 2 )
replayFromFile()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/GraphHelper.py b/TestON/tests/CHOTestMonkey/dependencies/GraphHelper.py
index 8ae1ff0..f2ae618 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/GraphHelper.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/GraphHelper.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
Graph algorithm implementations for CHOTestMonkey
Author: you@onlab.us
@@ -71,14 +70,14 @@
else:
key = self.DFI[ neighbor.index ]
if key in self.backEdges.keys():
- if not link in self.backEdges[ key ] and\
- not backwardLink in self.backEdges[ key ]:
+ if link not in self.backEdges[ key ] and\
+ backwardLink not in self.backEdges[ key ]:
self.backEdges[ key ].append( backwardLink )
else:
tempKey = self.DFI[ device.index ]
if tempKey in self.backEdges.keys():
- if not link in self.backEdges[ tempKey ] and\
- not backwardLink in self.backEdges[ tempKey ]:
+ if link not in self.backEdges[ tempKey ] and\
+ backwardLink not in self.backEdges[ tempKey ]:
self.backEdges[ key ] = [ backwardLink ]
else:
self.backEdges[ key ] = [ backwardLink ]
diff --git a/TestON/tests/CHOTestMonkey/dependencies/cli.py b/TestON/tests/CHOTestMonkey/dependencies/cli.py
index aa080f5..6e67107 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/cli.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/cli.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
Start CLI for CHOTestMonkey
Author: you@onlab.us
diff --git a/TestON/tests/CHOTestMonkey/dependencies/elements/NetworkElement.py b/TestON/tests/CHOTestMonkey/dependencies/elements/NetworkElement.py
index b6e1520..50d6159 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/elements/NetworkElement.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/elements/NetworkElement.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains device, host and link class for CHOTestMonkey
Author: you@onlab.us
diff --git a/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py b/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
index e18e0b3..688324c 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains intent class for CHOTestMonkey
Author: you@onlab.us
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
index 45df912..8d347c1 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains classes for CHOTestMonkey that are related to application event
Author: you@onlab.us
@@ -88,7 +87,7 @@
def startEvent( self, args ):
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
if self.typeIndex == EventType().APP_INTENT_HOST_ADD or self.typeIndex == EventType().APP_INTENT_HOST_DEL:
if len( args ) < 3:
main.log.warn( "%s - Not enough arguments: %s" % ( self.typeString, args ) )
@@ -237,7 +236,7 @@
def startEvent( self, args ):
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
if self.typeIndex == EventType().APP_INTENT_POINT_ADD or self.typeIndex == EventType().APP_INTENT_POINT_DEL:
if len( args ) < 3:
main.log.warn( "%s - Not enough arguments: %s" % ( self.typeString, args ) )
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
index fc03203..579b17f 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains classes for CHOTestMonkey that are related to check event
Author: you@onlab.us
@@ -152,7 +151,7 @@
if controller.isUp():
with controller.CLILock:
topoState = controller.CLI.checkStatus( upDeviceNum, upLinkNum )
- #if not topoState:
+ # if not topoState:
# main.log.warn( "Topo Check - link or device number discoverd by ONOS%s is incorrect" % ( controller.index ) )
# checkResult = EventStates().FAIL
# Compare ONOS and Mininet topologies
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/Event.py b/TestON/tests/CHOTestMonkey/dependencies/events/Event.py
index 2a637e6..e6b9e25 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/Event.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/Event.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains the Event class for CHOTestMonkey
Author: you@onlab.us
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
index 4d676cd..5632e12 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains classes for CHOTestMonkey that are related to network event
Author: you@onlab.us
@@ -42,7 +41,7 @@
args are the names of the two link ends, e.g. [ 's1', 's2' ]
"""
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
if len( args ) < 2:
main.log.warn( "%s - Not enough arguments: %s" % ( self.typeString, args ) )
return EventStates().ABORT
@@ -178,7 +177,7 @@
args are the names of the device, e.g. 's1'
"""
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
if len( args ) < 1:
main.log.warn( "%s - Not enough arguments: %s" % ( self.typeString, args ) )
return EventStates().ABORT
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
index e8b7281..1630066 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains classes for CHOTestMonkey that are related to application event
Author: you@onlab.us
@@ -34,7 +33,7 @@
def startEvent( self, args ):
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
result = EventStates().PASS
if self.typeIndex == EventType().ONOS_ONOS_DOWN or self.typeIndex == EventType().ONOS_ONOS_UP:
if len( args ) < 1:
@@ -123,7 +122,7 @@
def startEvent( self, args ):
with self.eventLock:
- #main.log.info( "%s - starting event" % ( self.typeString ) )
+ # main.log.info( "%s - starting event" % ( self.typeString ) )
result = self.startCfgEvent( args )
return result
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/TestEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/TestEvent.py
index a7f99b9..866c219 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/TestEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/TestEvent.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +8,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
This file contains classes for CHOTestMonkey that are related to check event
Author: you@onlab.us
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAtt.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAtt.py
old mode 100755
new mode 100644
index c464f19..8cc532e
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAtt.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAtt.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
Custom topology for Mininet
"""
@@ -35,6 +34,7 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class attTopo( Topo ):
def __init__( self, **opts ):
@@ -98,106 +98,107 @@
PHNX_host = self.addHost( 'h25' )
# add edges between switch and corresponding host
- self.addLink( NY54 , NY54_host )
- self.addLink( CMBR , CMBR_host )
- self.addLink( CHCG , CHCG_host )
- self.addLink( CLEV , CLEV_host )
- self.addLink( RLGH , RLGH_host )
- self.addLink( ATLN , ATLN_host )
- self.addLink( PHLA , PHLA_host )
- self.addLink( WASH , WASH_host )
- self.addLink( NSVL , NSVL_host )
- self.addLink( STLS , STLS_host )
- self.addLink( NWOR , NWOR_host )
- self.addLink( HSTN , HSTN_host )
- self.addLink( SNAN , SNAN_host )
- self.addLink( DLLS , DLLS_host )
- self.addLink( ORLD , ORLD_host )
- self.addLink( DNVR , DNVR_host )
- self.addLink( KSCY , KSCY_host )
- self.addLink( SNFN , SNFN_host )
- self.addLink( SCRM , SCRM_host )
- self.addLink( PTLD , PTLD_host )
- self.addLink( STTL , STTL_host )
- self.addLink( SLKC , SLKC_host )
- self.addLink( LA03 , LA03_host )
- self.addLink( SNDG , SNDG_host )
- self.addLink( PHNX , PHNX_host )
+ self.addLink( NY54, NY54_host )
+ self.addLink( CMBR, CMBR_host )
+ self.addLink( CHCG, CHCG_host )
+ self.addLink( CLEV, CLEV_host )
+ self.addLink( RLGH, RLGH_host )
+ self.addLink( ATLN, ATLN_host )
+ self.addLink( PHLA, PHLA_host )
+ self.addLink( WASH, WASH_host )
+ self.addLink( NSVL, NSVL_host )
+ self.addLink( STLS, STLS_host )
+ self.addLink( NWOR, NWOR_host )
+ self.addLink( HSTN, HSTN_host )
+ self.addLink( SNAN, SNAN_host )
+ self.addLink( DLLS, DLLS_host )
+ self.addLink( ORLD, ORLD_host )
+ self.addLink( DNVR, DNVR_host )
+ self.addLink( KSCY, KSCY_host )
+ self.addLink( SNFN, SNFN_host )
+ self.addLink( SCRM, SCRM_host )
+ self.addLink( PTLD, PTLD_host )
+ self.addLink( STTL, STTL_host )
+ self.addLink( SLKC, SLKC_host )
+ self.addLink( LA03, LA03_host )
+ self.addLink( SNDG, SNDG_host )
+ self.addLink( PHNX, PHNX_host )
# add edges between switches
- self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms')
- self.addLink( NY54 , CHCG, bw=10, delay='0.806374975652ms')
- self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms')
- self.addLink( NY54 , WASH, bw=10, delay='0.605826192092ms')
- self.addLink( CMBR , PHLA, bw=10, delay='1.4018238197ms')
- self.addLink( CHCG , CLEV, bw=10, delay='0.232315346482ms')
- self.addLink( CHCG , PHLA, bw=10, delay='1.07297714274ms')
- self.addLink( CHCG , STLS, bw=10, delay='1.12827896944ms')
- self.addLink( CHCG , DNVR, bw=10, delay='1.35964770335ms')
- self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms')
- self.addLink( CHCG , SNFN, bw=10, delay='0.620743405435ms')
- self.addLink( CHCG , STTL, bw=10, delay='0.93027212534ms')
- self.addLink( CHCG , SLKC, bw=10, delay='0.735621751348ms')
- self.addLink( CLEV , NSVL, bw=10, delay='0.523419372248ms')
- self.addLink( CLEV , STLS, bw=10, delay='1.00360290845ms')
- self.addLink( CLEV , PHLA, bw=10, delay='0.882912133249ms')
- self.addLink( RLGH , ATLN, bw=10, delay='1.1644489729ms')
- self.addLink( RLGH , WASH, bw=10, delay='1.48176810502ms')
- self.addLink( ATLN , WASH, bw=10, delay='0.557636936322ms')
- self.addLink( ATLN , NSVL, bw=10, delay='1.32869749865ms')
- self.addLink( ATLN , STLS, bw=10, delay='0.767705554748ms')
- self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms')
- self.addLink( ATLN , ORLD, bw=10, delay='1.46119152532ms')
- self.addLink( PHLA , WASH, bw=10, delay='0.372209320106ms')
- self.addLink( NSVL , STLS, bw=10, delay='1.43250491305ms')
- self.addLink( NSVL , DLLS, bw=10, delay='1.67698215288ms')
- self.addLink( STLS , DLLS, bw=10, delay='0.256389964194ms')
- self.addLink( STLS , KSCY, bw=10, delay='0.395511571791ms')
- self.addLink( STLS , LA03, bw=10, delay='0.257085227363ms')
- self.addLink( NWOR , HSTN, bw=10, delay='0.0952906633914ms')
- self.addLink( NWOR , DLLS, bw=10, delay='1.60231329739ms')
- self.addLink( NWOR , ORLD, bw=10, delay='0.692731063896ms')
- self.addLink( HSTN , SNAN, bw=10, delay='0.284150653798ms')
- self.addLink( HSTN , DLLS, bw=10, delay='1.65690128332ms')
- self.addLink( HSTN , ORLD, bw=10, delay='0.731886304782ms')
- self.addLink( SNAN , PHNX, bw=10, delay='1.34258627257ms')
- self.addLink( SNAN , DLLS, bw=10, delay='1.50063532341ms')
- self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms')
- self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms')
- self.addLink( DLLS , SNFN, bw=10, delay='0.74304274592ms')
- self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms')
- self.addLink( DNVR , KSCY, bw=10, delay='0.223328790403ms')
- self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms')
- self.addLink( DNVR , SLKC, bw=10, delay='0.631898982721ms')
- self.addLink( KSCY , SNFN, bw=10, delay='0.922778522233ms')
- self.addLink( SNFN , SCRM, bw=10, delay='0.630352278097ms')
- self.addLink( SNFN , PTLD, bw=10, delay='0.828572513655ms')
- self.addLink( SNFN , STTL, bw=10, delay='1.54076081649ms')
- self.addLink( SNFN , SLKC, bw=10, delay='0.621507502625ms')
- self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms')
- self.addLink( SCRM , SLKC, bw=10, delay='0.461350343644ms')
- self.addLink( PTLD , STTL, bw=10, delay='1.17591515181ms')
- self.addLink( SLKC , LA03, bw=10, delay='0.243225267023ms')
- self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms')
- self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms')
- self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms')
+ self.addLink( NY54, CMBR, bw=10, delay='0.979030824185ms' )
+ self.addLink( NY54, CHCG, bw=10, delay='0.806374975652ms' )
+ self.addLink( NY54, PHLA, bw=10, delay='0.686192970166ms' )
+ self.addLink( NY54, WASH, bw=10, delay='0.605826192092ms' )
+ self.addLink( CMBR, PHLA, bw=10, delay='1.4018238197ms' )
+ self.addLink( CHCG, CLEV, bw=10, delay='0.232315346482ms' )
+ self.addLink( CHCG, PHLA, bw=10, delay='1.07297714274ms' )
+ self.addLink( CHCG, STLS, bw=10, delay='1.12827896944ms' )
+ self.addLink( CHCG, DNVR, bw=10, delay='1.35964770335ms' )
+ self.addLink( CHCG, KSCY, bw=10, delay='1.5199778541ms' )
+ self.addLink( CHCG, SNFN, bw=10, delay='0.620743405435ms' )
+ self.addLink( CHCG, STTL, bw=10, delay='0.93027212534ms' )
+ self.addLink( CHCG, SLKC, bw=10, delay='0.735621751348ms' )
+ self.addLink( CLEV, NSVL, bw=10, delay='0.523419372248ms' )
+ self.addLink( CLEV, STLS, bw=10, delay='1.00360290845ms' )
+ self.addLink( CLEV, PHLA, bw=10, delay='0.882912133249ms' )
+ self.addLink( RLGH, ATLN, bw=10, delay='1.1644489729ms' )
+ self.addLink( RLGH, WASH, bw=10, delay='1.48176810502ms' )
+ self.addLink( ATLN, WASH, bw=10, delay='0.557636936322ms' )
+ self.addLink( ATLN, NSVL, bw=10, delay='1.32869749865ms' )
+ self.addLink( ATLN, STLS, bw=10, delay='0.767705554748ms' )
+ self.addLink( ATLN, DLLS, bw=10, delay='0.544782086448ms' )
+ self.addLink( ATLN, ORLD, bw=10, delay='1.46119152532ms' )
+ self.addLink( PHLA, WASH, bw=10, delay='0.372209320106ms' )
+ self.addLink( NSVL, STLS, bw=10, delay='1.43250491305ms' )
+ self.addLink( NSVL, DLLS, bw=10, delay='1.67698215288ms' )
+ self.addLink( STLS, DLLS, bw=10, delay='0.256389964194ms' )
+ self.addLink( STLS, KSCY, bw=10, delay='0.395511571791ms' )
+ self.addLink( STLS, LA03, bw=10, delay='0.257085227363ms' )
+ self.addLink( NWOR, HSTN, bw=10, delay='0.0952906633914ms' )
+ self.addLink( NWOR, DLLS, bw=10, delay='1.60231329739ms' )
+ self.addLink( NWOR, ORLD, bw=10, delay='0.692731063896ms' )
+ self.addLink( HSTN, SNAN, bw=10, delay='0.284150653798ms' )
+ self.addLink( HSTN, DLLS, bw=10, delay='1.65690128332ms' )
+ self.addLink( HSTN, ORLD, bw=10, delay='0.731886304782ms' )
+ self.addLink( SNAN, PHNX, bw=10, delay='1.34258627257ms' )
+ self.addLink( SNAN, DLLS, bw=10, delay='1.50063532341ms' )
+ self.addLink( DLLS, DNVR, bw=10, delay='0.251471593235ms' )
+ self.addLink( DLLS, KSCY, bw=10, delay='0.18026026737ms' )
+ self.addLink( DLLS, SNFN, bw=10, delay='0.74304274592ms' )
+ self.addLink( DLLS, LA03, bw=10, delay='0.506439293357ms' )
+ self.addLink( DNVR, KSCY, bw=10, delay='0.223328790403ms' )
+ self.addLink( DNVR, SNFN, bw=10, delay='0.889017541903ms' )
+ self.addLink( DNVR, SLKC, bw=10, delay='0.631898982721ms' )
+ self.addLink( KSCY, SNFN, bw=10, delay='0.922778522233ms' )
+ self.addLink( SNFN, SCRM, bw=10, delay='0.630352278097ms' )
+ self.addLink( SNFN, PTLD, bw=10, delay='0.828572513655ms' )
+ self.addLink( SNFN, STTL, bw=10, delay='1.54076081649ms' )
+ self.addLink( SNFN, SLKC, bw=10, delay='0.621507502625ms' )
+ self.addLink( SNFN, LA03, bw=10, delay='0.602936230151ms' )
+ self.addLink( SCRM, SLKC, bw=10, delay='0.461350343644ms' )
+ self.addLink( PTLD, STTL, bw=10, delay='1.17591515181ms' )
+ self.addLink( SLKC, LA03, bw=10, delay='0.243225267023ms' )
+ self.addLink( LA03, SNDG, bw=10, delay='0.681264950821ms' )
+ self.addLink( LA03, PHNX, bw=10, delay='0.343709457969ms' )
+ self.addLink( SNDG, PHNX, bw=10, delay='0.345064487693ms' )
topos = { 'att': ( lambda: attTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = attTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, link=TCLink, autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, link=TCLink, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAttIpv6.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAttIpv6.py
old mode 100755
new mode 100644
index 44133c6..8475efc
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAttIpv6.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoAttIpv6.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
"""
Custom topology for Mininet
"""
@@ -35,13 +34,16 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class dualStackHost( Host ):
+
def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) )
return r
+
class attTopo( Topo ):
def __init__( self, **opts ):
@@ -104,106 +106,107 @@
PHNX_host = self.addHost( 'h25', ip='10.1.0.25/24', cls=dualStackHost, v6Addr='1000::25/64' )
# add edges between switch and corresponding host
- self.addLink( NY54 , NY54_host )
- self.addLink( CMBR , CMBR_host )
- self.addLink( CHCG , CHCG_host )
- self.addLink( CLEV , CLEV_host )
- self.addLink( RLGH , RLGH_host )
- self.addLink( ATLN , ATLN_host )
- self.addLink( PHLA , PHLA_host )
- self.addLink( WASH , WASH_host )
- self.addLink( NSVL , NSVL_host )
- self.addLink( STLS , STLS_host )
- self.addLink( NWOR , NWOR_host )
- self.addLink( HSTN , HSTN_host )
- self.addLink( SNAN , SNAN_host )
- self.addLink( DLLS , DLLS_host )
- self.addLink( ORLD , ORLD_host )
- self.addLink( DNVR , DNVR_host )
- self.addLink( KSCY , KSCY_host )
- self.addLink( SNFN , SNFN_host )
- self.addLink( SCRM , SCRM_host )
- self.addLink( PTLD , PTLD_host )
- self.addLink( STTL , STTL_host )
- self.addLink( SLKC , SLKC_host )
- self.addLink( LA03 , LA03_host )
- self.addLink( SNDG , SNDG_host )
- self.addLink( PHNX , PHNX_host )
+ self.addLink( NY54, NY54_host )
+ self.addLink( CMBR, CMBR_host )
+ self.addLink( CHCG, CHCG_host )
+ self.addLink( CLEV, CLEV_host )
+ self.addLink( RLGH, RLGH_host )
+ self.addLink( ATLN, ATLN_host )
+ self.addLink( PHLA, PHLA_host )
+ self.addLink( WASH, WASH_host )
+ self.addLink( NSVL, NSVL_host )
+ self.addLink( STLS, STLS_host )
+ self.addLink( NWOR, NWOR_host )
+ self.addLink( HSTN, HSTN_host )
+ self.addLink( SNAN, SNAN_host )
+ self.addLink( DLLS, DLLS_host )
+ self.addLink( ORLD, ORLD_host )
+ self.addLink( DNVR, DNVR_host )
+ self.addLink( KSCY, KSCY_host )
+ self.addLink( SNFN, SNFN_host )
+ self.addLink( SCRM, SCRM_host )
+ self.addLink( PTLD, PTLD_host )
+ self.addLink( STTL, STTL_host )
+ self.addLink( SLKC, SLKC_host )
+ self.addLink( LA03, LA03_host )
+ self.addLink( SNDG, SNDG_host )
+ self.addLink( PHNX, PHNX_host )
# add edges between switches
- self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms')
- self.addLink( NY54 , CHCG, bw=10, delay='0.806374975652ms')
- self.addLink( NY54 , PHLA, bw=10, delay='0.686192970166ms')
- self.addLink( NY54 , WASH, bw=10, delay='0.605826192092ms')
- self.addLink( CMBR , PHLA, bw=10, delay='1.4018238197ms')
- self.addLink( CHCG , CLEV, bw=10, delay='0.232315346482ms')
- self.addLink( CHCG , PHLA, bw=10, delay='1.07297714274ms')
- self.addLink( CHCG , STLS, bw=10, delay='1.12827896944ms')
- self.addLink( CHCG , DNVR, bw=10, delay='1.35964770335ms')
- self.addLink( CHCG , KSCY, bw=10, delay='1.5199778541ms')
- self.addLink( CHCG , SNFN, bw=10, delay='0.620743405435ms')
- self.addLink( CHCG , STTL, bw=10, delay='0.93027212534ms')
- self.addLink( CHCG , SLKC, bw=10, delay='0.735621751348ms')
- self.addLink( CLEV , NSVL, bw=10, delay='0.523419372248ms')
- self.addLink( CLEV , STLS, bw=10, delay='1.00360290845ms')
- self.addLink( CLEV , PHLA, bw=10, delay='0.882912133249ms')
- self.addLink( RLGH , ATLN, bw=10, delay='1.1644489729ms')
- self.addLink( RLGH , WASH, bw=10, delay='1.48176810502ms')
- self.addLink( ATLN , WASH, bw=10, delay='0.557636936322ms')
- self.addLink( ATLN , NSVL, bw=10, delay='1.32869749865ms')
- self.addLink( ATLN , STLS, bw=10, delay='0.767705554748ms')
- self.addLink( ATLN , DLLS, bw=10, delay='0.544782086448ms')
- self.addLink( ATLN , ORLD, bw=10, delay='1.46119152532ms')
- self.addLink( PHLA , WASH, bw=10, delay='0.372209320106ms')
- self.addLink( NSVL , STLS, bw=10, delay='1.43250491305ms')
- self.addLink( NSVL , DLLS, bw=10, delay='1.67698215288ms')
- self.addLink( STLS , DLLS, bw=10, delay='0.256389964194ms')
- self.addLink( STLS , KSCY, bw=10, delay='0.395511571791ms')
- self.addLink( STLS , LA03, bw=10, delay='0.257085227363ms')
- self.addLink( NWOR , HSTN, bw=10, delay='0.0952906633914ms')
- self.addLink( NWOR , DLLS, bw=10, delay='1.60231329739ms')
- self.addLink( NWOR , ORLD, bw=10, delay='0.692731063896ms')
- self.addLink( HSTN , SNAN, bw=10, delay='0.284150653798ms')
- self.addLink( HSTN , DLLS, bw=10, delay='1.65690128332ms')
- self.addLink( HSTN , ORLD, bw=10, delay='0.731886304782ms')
- self.addLink( SNAN , PHNX, bw=10, delay='1.34258627257ms')
- self.addLink( SNAN , DLLS, bw=10, delay='1.50063532341ms')
- self.addLink( DLLS , DNVR, bw=10, delay='0.251471593235ms')
- self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms')
- self.addLink( DLLS , SNFN, bw=10, delay='0.74304274592ms')
- self.addLink( DLLS , LA03, bw=10, delay='0.506439293357ms')
- self.addLink( DNVR , KSCY, bw=10, delay='0.223328790403ms')
- self.addLink( DNVR , SNFN, bw=10, delay='0.889017541903ms')
- self.addLink( DNVR , SLKC, bw=10, delay='0.631898982721ms')
- self.addLink( KSCY , SNFN, bw=10, delay='0.922778522233ms')
- self.addLink( SNFN , SCRM, bw=10, delay='0.630352278097ms')
- self.addLink( SNFN , PTLD, bw=10, delay='0.828572513655ms')
- self.addLink( SNFN , STTL, bw=10, delay='1.54076081649ms')
- self.addLink( SNFN , SLKC, bw=10, delay='0.621507502625ms')
- self.addLink( SNFN , LA03, bw=10, delay='0.602936230151ms')
- self.addLink( SCRM , SLKC, bw=10, delay='0.461350343644ms')
- self.addLink( PTLD , STTL, bw=10, delay='1.17591515181ms')
- self.addLink( SLKC , LA03, bw=10, delay='0.243225267023ms')
- self.addLink( LA03 , SNDG, bw=10, delay='0.681264950821ms')
- self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms')
- self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms')
+ self.addLink( NY54, CMBR, bw=10, delay='0.979030824185ms' )
+ self.addLink( NY54, CHCG, bw=10, delay='0.806374975652ms' )
+ self.addLink( NY54, PHLA, bw=10, delay='0.686192970166ms' )
+ self.addLink( NY54, WASH, bw=10, delay='0.605826192092ms' )
+ self.addLink( CMBR, PHLA, bw=10, delay='1.4018238197ms' )
+ self.addLink( CHCG, CLEV, bw=10, delay='0.232315346482ms' )
+ self.addLink( CHCG, PHLA, bw=10, delay='1.07297714274ms' )
+ self.addLink( CHCG, STLS, bw=10, delay='1.12827896944ms' )
+ self.addLink( CHCG, DNVR, bw=10, delay='1.35964770335ms' )
+ self.addLink( CHCG, KSCY, bw=10, delay='1.5199778541ms' )
+ self.addLink( CHCG, SNFN, bw=10, delay='0.620743405435ms' )
+ self.addLink( CHCG, STTL, bw=10, delay='0.93027212534ms' )
+ self.addLink( CHCG, SLKC, bw=10, delay='0.735621751348ms' )
+ self.addLink( CLEV, NSVL, bw=10, delay='0.523419372248ms' )
+ self.addLink( CLEV, STLS, bw=10, delay='1.00360290845ms' )
+ self.addLink( CLEV, PHLA, bw=10, delay='0.882912133249ms' )
+ self.addLink( RLGH, ATLN, bw=10, delay='1.1644489729ms' )
+ self.addLink( RLGH, WASH, bw=10, delay='1.48176810502ms' )
+ self.addLink( ATLN, WASH, bw=10, delay='0.557636936322ms' )
+ self.addLink( ATLN, NSVL, bw=10, delay='1.32869749865ms' )
+ self.addLink( ATLN, STLS, bw=10, delay='0.767705554748ms' )
+ self.addLink( ATLN, DLLS, bw=10, delay='0.544782086448ms' )
+ self.addLink( ATLN, ORLD, bw=10, delay='1.46119152532ms' )
+ self.addLink( PHLA, WASH, bw=10, delay='0.372209320106ms' )
+ self.addLink( NSVL, STLS, bw=10, delay='1.43250491305ms' )
+ self.addLink( NSVL, DLLS, bw=10, delay='1.67698215288ms' )
+ self.addLink( STLS, DLLS, bw=10, delay='0.256389964194ms' )
+ self.addLink( STLS, KSCY, bw=10, delay='0.395511571791ms' )
+ self.addLink( STLS, LA03, bw=10, delay='0.257085227363ms' )
+ self.addLink( NWOR, HSTN, bw=10, delay='0.0952906633914ms' )
+ self.addLink( NWOR, DLLS, bw=10, delay='1.60231329739ms' )
+ self.addLink( NWOR, ORLD, bw=10, delay='0.692731063896ms' )
+ self.addLink( HSTN, SNAN, bw=10, delay='0.284150653798ms' )
+ self.addLink( HSTN, DLLS, bw=10, delay='1.65690128332ms' )
+ self.addLink( HSTN, ORLD, bw=10, delay='0.731886304782ms' )
+ self.addLink( SNAN, PHNX, bw=10, delay='1.34258627257ms' )
+ self.addLink( SNAN, DLLS, bw=10, delay='1.50063532341ms' )
+ self.addLink( DLLS, DNVR, bw=10, delay='0.251471593235ms' )
+ self.addLink( DLLS, KSCY, bw=10, delay='0.18026026737ms' )
+ self.addLink( DLLS, SNFN, bw=10, delay='0.74304274592ms' )
+ self.addLink( DLLS, LA03, bw=10, delay='0.506439293357ms' )
+ self.addLink( DNVR, KSCY, bw=10, delay='0.223328790403ms' )
+ self.addLink( DNVR, SNFN, bw=10, delay='0.889017541903ms' )
+ self.addLink( DNVR, SLKC, bw=10, delay='0.631898982721ms' )
+ self.addLink( KSCY, SNFN, bw=10, delay='0.922778522233ms' )
+ self.addLink( SNFN, SCRM, bw=10, delay='0.630352278097ms' )
+ self.addLink( SNFN, PTLD, bw=10, delay='0.828572513655ms' )
+ self.addLink( SNFN, STTL, bw=10, delay='1.54076081649ms' )
+ self.addLink( SNFN, SLKC, bw=10, delay='0.621507502625ms' )
+ self.addLink( SNFN, LA03, bw=10, delay='0.602936230151ms' )
+ self.addLink( SCRM, SLKC, bw=10, delay='0.461350343644ms' )
+ self.addLink( PTLD, STTL, bw=10, delay='1.17591515181ms' )
+ self.addLink( SLKC, LA03, bw=10, delay='0.243225267023ms' )
+ self.addLink( LA03, SNDG, bw=10, delay='0.681264950821ms' )
+ self.addLink( LA03, PHNX, bw=10, delay='0.343709457969ms' )
+ self.addLink( SNDG, PHNX, bw=10, delay='0.345064487693ms' )
topos = { 'att': ( lambda: attTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = attTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, link=TCLink, autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, link=TCLink, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordal.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordal.py
old mode 100755
new mode 100644
index 7515d8f..3cb030b
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordal.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordal.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import RemoteController
@@ -32,6 +31,7 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class chordalTopo( Topo ):
def __init__( self, **opts ):
@@ -95,348 +95,349 @@
s25_host = self.addHost( 'h25' )
# add edges between switch and corresponding host
- self.addLink( s1 , s1_host )
- self.addLink( s2 , s2_host )
- self.addLink( s3 , s3_host )
- self.addLink( s4 , s4_host )
- self.addLink( s5 , s5_host )
- self.addLink( s6 , s6_host )
- self.addLink( s7 , s7_host )
- self.addLink( s8 , s8_host )
- self.addLink( s9 , s9_host )
- self.addLink( s10 , s10_host )
- self.addLink( s11 , s11_host )
- self.addLink( s12 , s12_host )
- self.addLink( s13 , s13_host )
- self.addLink( s14 , s14_host )
- self.addLink( s15 , s15_host )
- self.addLink( s16 , s16_host )
- self.addLink( s17 , s17_host )
- self.addLink( s18 , s18_host )
- self.addLink( s19 , s19_host )
- self.addLink( s20 , s20_host )
- self.addLink( s21 , s21_host )
- self.addLink( s22 , s22_host )
- self.addLink( s23 , s23_host )
- self.addLink( s24 , s24_host )
- self.addLink( s25 , s25_host )
- self.addLink(s1, s2)
- self.addLink(s1, s3)
- self.addLink(s1, s4)
- self.addLink(s1, s5)
- self.addLink(s1, s6)
- self.addLink(s1, s7)
- self.addLink(s1, s8)
- self.addLink(s1, s9)
- self.addLink(s1, s10)
- self.addLink(s1, s11)
- self.addLink(s1, s12)
- self.addLink(s1, s13)
- self.addLink(s1, s14)
- self.addLink(s1, s15)
- self.addLink(s1, s16)
- self.addLink(s1, s17)
- self.addLink(s1, s18)
- self.addLink(s1, s19)
- self.addLink(s1, s20)
- self.addLink(s1, s21)
- self.addLink(s1, s22)
- self.addLink(s1, s23)
- self.addLink(s1, s24)
- self.addLink(s1, s25)
- self.addLink(s2, s3)
- self.addLink(s2, s4)
- self.addLink(s2, s5)
- self.addLink(s2, s6)
- self.addLink(s2, s7)
- self.addLink(s2, s8)
- self.addLink(s2, s9)
- self.addLink(s2, s10)
- self.addLink(s2, s11)
- self.addLink(s2, s12)
- self.addLink(s2, s13)
- self.addLink(s2, s14)
- self.addLink(s2, s15)
- self.addLink(s2, s16)
- self.addLink(s2, s17)
- self.addLink(s2, s18)
- self.addLink(s2, s19)
- self.addLink(s2, s20)
- self.addLink(s2, s21)
- self.addLink(s2, s22)
- self.addLink(s2, s23)
- self.addLink(s2, s24)
- self.addLink(s2, s25)
- self.addLink(s3, s4)
- self.addLink(s3, s5)
- self.addLink(s3, s6)
- self.addLink(s3, s7)
- self.addLink(s3, s8)
- self.addLink(s3, s9)
- self.addLink(s3, s10)
- self.addLink(s3, s11)
- self.addLink(s3, s12)
- self.addLink(s3, s13)
- self.addLink(s3, s14)
- self.addLink(s3, s15)
- self.addLink(s3, s16)
- self.addLink(s3, s17)
- self.addLink(s3, s18)
- self.addLink(s3, s19)
- self.addLink(s3, s20)
- self.addLink(s3, s21)
- self.addLink(s3, s22)
- self.addLink(s3, s23)
- self.addLink(s3, s24)
- self.addLink(s3, s25)
- self.addLink(s4, s5)
- self.addLink(s4, s6)
- self.addLink(s4, s7)
- self.addLink(s4, s8)
- self.addLink(s4, s9)
- self.addLink(s4, s10)
- self.addLink(s4, s11)
- self.addLink(s4, s12)
- self.addLink(s4, s13)
- self.addLink(s4, s14)
- self.addLink(s4, s15)
- self.addLink(s4, s16)
- self.addLink(s4, s17)
- self.addLink(s4, s18)
- self.addLink(s4, s19)
- self.addLink(s4, s20)
- self.addLink(s4, s21)
- self.addLink(s4, s22)
- self.addLink(s4, s23)
- self.addLink(s4, s24)
- self.addLink(s4, s25)
- self.addLink(s5, s6)
- self.addLink(s5, s7)
- self.addLink(s5, s8)
- self.addLink(s5, s9)
- self.addLink(s5, s10)
- self.addLink(s5, s11)
- self.addLink(s5, s12)
- self.addLink(s5, s13)
- self.addLink(s5, s14)
- self.addLink(s5, s15)
- self.addLink(s5, s16)
- self.addLink(s5, s17)
- self.addLink(s5, s18)
- self.addLink(s5, s19)
- self.addLink(s5, s20)
- self.addLink(s5, s21)
- self.addLink(s5, s22)
- self.addLink(s5, s23)
- self.addLink(s5, s24)
- self.addLink(s5, s25)
- self.addLink(s6, s7)
- self.addLink(s6, s8)
- self.addLink(s6, s9)
- self.addLink(s6, s10)
- self.addLink(s6, s11)
- self.addLink(s6, s12)
- self.addLink(s6, s13)
- self.addLink(s6, s14)
- self.addLink(s6, s15)
- self.addLink(s6, s16)
- self.addLink(s6, s17)
- self.addLink(s6, s18)
- self.addLink(s6, s19)
- self.addLink(s6, s20)
- self.addLink(s6, s21)
- self.addLink(s6, s22)
- self.addLink(s6, s23)
- self.addLink(s6, s24)
- self.addLink(s6, s25)
- self.addLink(s7, s8)
- self.addLink(s7, s9)
- self.addLink(s7, s10)
- self.addLink(s7, s11)
- self.addLink(s7, s12)
- self.addLink(s7, s13)
- self.addLink(s7, s14)
- self.addLink(s7, s15)
- self.addLink(s7, s16)
- self.addLink(s7, s17)
- self.addLink(s7, s18)
- self.addLink(s7, s19)
- self.addLink(s7, s20)
- self.addLink(s7, s21)
- self.addLink(s7, s22)
- self.addLink(s7, s23)
- self.addLink(s7, s24)
- self.addLink(s7, s25)
- self.addLink(s8, s9)
- self.addLink(s8, s10)
- self.addLink(s8, s11)
- self.addLink(s8, s12)
- self.addLink(s8, s13)
- self.addLink(s8, s14)
- self.addLink(s8, s15)
- self.addLink(s8, s16)
- self.addLink(s8, s17)
- self.addLink(s8, s18)
- self.addLink(s8, s19)
- self.addLink(s8, s20)
- self.addLink(s8, s21)
- self.addLink(s8, s22)
- self.addLink(s8, s23)
- self.addLink(s8, s24)
- self.addLink(s8, s25)
- self.addLink(s9, s10)
- self.addLink(s9, s11)
- self.addLink(s9, s12)
- self.addLink(s9, s13)
- self.addLink(s9, s14)
- self.addLink(s9, s15)
- self.addLink(s9, s16)
- self.addLink(s9, s17)
- self.addLink(s9, s18)
- self.addLink(s9, s19)
- self.addLink(s9, s20)
- self.addLink(s9, s21)
- self.addLink(s9, s22)
- self.addLink(s9, s23)
- self.addLink(s9, s24)
- self.addLink(s9, s25)
- self.addLink(s10, s11)
- self.addLink(s10, s12)
- self.addLink(s10, s13)
- self.addLink(s10, s14)
- self.addLink(s10, s15)
- self.addLink(s10, s16)
- self.addLink(s10, s17)
- self.addLink(s10, s18)
- self.addLink(s10, s19)
- self.addLink(s10, s20)
- self.addLink(s10, s21)
- self.addLink(s10, s22)
- self.addLink(s10, s23)
- self.addLink(s10, s24)
- self.addLink(s10, s25)
- self.addLink(s11, s12)
- self.addLink(s11, s13)
- self.addLink(s11, s14)
- self.addLink(s11, s15)
- self.addLink(s11, s16)
- self.addLink(s11, s17)
- self.addLink(s11, s18)
- self.addLink(s11, s19)
- self.addLink(s11, s20)
- self.addLink(s11, s21)
- self.addLink(s11, s22)
- self.addLink(s11, s23)
- self.addLink(s11, s24)
- self.addLink(s11, s25)
- self.addLink(s12, s13)
- self.addLink(s12, s14)
- self.addLink(s12, s15)
- self.addLink(s12, s16)
- self.addLink(s12, s17)
- self.addLink(s12, s18)
- self.addLink(s12, s19)
- self.addLink(s12, s20)
- self.addLink(s12, s21)
- self.addLink(s12, s22)
- self.addLink(s12, s23)
- self.addLink(s12, s24)
- self.addLink(s12, s25)
- self.addLink(s13, s14)
- self.addLink(s13, s15)
- self.addLink(s13, s16)
- self.addLink(s13, s17)
- self.addLink(s13, s18)
- self.addLink(s13, s19)
- self.addLink(s13, s20)
- self.addLink(s13, s21)
- self.addLink(s13, s22)
- self.addLink(s13, s23)
- self.addLink(s13, s24)
- self.addLink(s13, s25)
- self.addLink(s14, s15)
- self.addLink(s14, s16)
- self.addLink(s14, s17)
- self.addLink(s14, s18)
- self.addLink(s14, s19)
- self.addLink(s14, s20)
- self.addLink(s14, s21)
- self.addLink(s14, s22)
- self.addLink(s14, s23)
- self.addLink(s14, s24)
- self.addLink(s14, s25)
- self.addLink(s15, s16)
- self.addLink(s15, s17)
- self.addLink(s15, s18)
- self.addLink(s15, s19)
- self.addLink(s15, s20)
- self.addLink(s15, s21)
- self.addLink(s15, s22)
- self.addLink(s15, s23)
- self.addLink(s15, s24)
- self.addLink(s15, s25)
- self.addLink(s16, s17)
- self.addLink(s16, s18)
- self.addLink(s16, s19)
- self.addLink(s16, s20)
- self.addLink(s16, s21)
- self.addLink(s16, s22)
- self.addLink(s16, s23)
- self.addLink(s16, s24)
- self.addLink(s16, s25)
- self.addLink(s17, s18)
- self.addLink(s17, s19)
- self.addLink(s17, s20)
- self.addLink(s17, s21)
- self.addLink(s17, s22)
- self.addLink(s17, s23)
- self.addLink(s17, s24)
- self.addLink(s17, s25)
- self.addLink(s18, s19)
- self.addLink(s18, s20)
- self.addLink(s18, s21)
- self.addLink(s18, s22)
- self.addLink(s18, s23)
- self.addLink(s18, s24)
- self.addLink(s18, s25)
- self.addLink(s19, s20)
- self.addLink(s19, s21)
- self.addLink(s19, s22)
- self.addLink(s19, s23)
- self.addLink(s19, s24)
- self.addLink(s19, s25)
- self.addLink(s20, s21)
- self.addLink(s20, s22)
- self.addLink(s20, s23)
- self.addLink(s20, s24)
- self.addLink(s20, s25)
- self.addLink(s21, s22)
- self.addLink(s21, s23)
- self.addLink(s21, s24)
- self.addLink(s21, s25)
- self.addLink(s22, s23)
- self.addLink(s22, s24)
- self.addLink(s22, s25)
- self.addLink(s23, s24)
- self.addLink(s23, s25)
- self.addLink(s24, s25)
+ self.addLink( s1, s1_host )
+ self.addLink( s2, s2_host )
+ self.addLink( s3, s3_host )
+ self.addLink( s4, s4_host )
+ self.addLink( s5, s5_host )
+ self.addLink( s6, s6_host )
+ self.addLink( s7, s7_host )
+ self.addLink( s8, s8_host )
+ self.addLink( s9, s9_host )
+ self.addLink( s10, s10_host )
+ self.addLink( s11, s11_host )
+ self.addLink( s12, s12_host )
+ self.addLink( s13, s13_host )
+ self.addLink( s14, s14_host )
+ self.addLink( s15, s15_host )
+ self.addLink( s16, s16_host )
+ self.addLink( s17, s17_host )
+ self.addLink( s18, s18_host )
+ self.addLink( s19, s19_host )
+ self.addLink( s20, s20_host )
+ self.addLink( s21, s21_host )
+ self.addLink( s22, s22_host )
+ self.addLink( s23, s23_host )
+ self.addLink( s24, s24_host )
+ self.addLink( s25, s25_host )
+ self.addLink( s1, s2 )
+ self.addLink( s1, s3 )
+ self.addLink( s1, s4 )
+ self.addLink( s1, s5 )
+ self.addLink( s1, s6 )
+ self.addLink( s1, s7 )
+ self.addLink( s1, s8 )
+ self.addLink( s1, s9 )
+ self.addLink( s1, s10 )
+ self.addLink( s1, s11 )
+ self.addLink( s1, s12 )
+ self.addLink( s1, s13 )
+ self.addLink( s1, s14 )
+ self.addLink( s1, s15 )
+ self.addLink( s1, s16 )
+ self.addLink( s1, s17 )
+ self.addLink( s1, s18 )
+ self.addLink( s1, s19 )
+ self.addLink( s1, s20 )
+ self.addLink( s1, s21 )
+ self.addLink( s1, s22 )
+ self.addLink( s1, s23 )
+ self.addLink( s1, s24 )
+ self.addLink( s1, s25 )
+ self.addLink( s2, s3 )
+ self.addLink( s2, s4 )
+ self.addLink( s2, s5 )
+ self.addLink( s2, s6 )
+ self.addLink( s2, s7 )
+ self.addLink( s2, s8 )
+ self.addLink( s2, s9 )
+ self.addLink( s2, s10 )
+ self.addLink( s2, s11 )
+ self.addLink( s2, s12 )
+ self.addLink( s2, s13 )
+ self.addLink( s2, s14 )
+ self.addLink( s2, s15 )
+ self.addLink( s2, s16 )
+ self.addLink( s2, s17 )
+ self.addLink( s2, s18 )
+ self.addLink( s2, s19 )
+ self.addLink( s2, s20 )
+ self.addLink( s2, s21 )
+ self.addLink( s2, s22 )
+ self.addLink( s2, s23 )
+ self.addLink( s2, s24 )
+ self.addLink( s2, s25 )
+ self.addLink( s3, s4 )
+ self.addLink( s3, s5 )
+ self.addLink( s3, s6 )
+ self.addLink( s3, s7 )
+ self.addLink( s3, s8 )
+ self.addLink( s3, s9 )
+ self.addLink( s3, s10 )
+ self.addLink( s3, s11 )
+ self.addLink( s3, s12 )
+ self.addLink( s3, s13 )
+ self.addLink( s3, s14 )
+ self.addLink( s3, s15 )
+ self.addLink( s3, s16 )
+ self.addLink( s3, s17 )
+ self.addLink( s3, s18 )
+ self.addLink( s3, s19 )
+ self.addLink( s3, s20 )
+ self.addLink( s3, s21 )
+ self.addLink( s3, s22 )
+ self.addLink( s3, s23 )
+ self.addLink( s3, s24 )
+ self.addLink( s3, s25 )
+ self.addLink( s4, s5 )
+ self.addLink( s4, s6 )
+ self.addLink( s4, s7 )
+ self.addLink( s4, s8 )
+ self.addLink( s4, s9 )
+ self.addLink( s4, s10 )
+ self.addLink( s4, s11 )
+ self.addLink( s4, s12 )
+ self.addLink( s4, s13 )
+ self.addLink( s4, s14 )
+ self.addLink( s4, s15 )
+ self.addLink( s4, s16 )
+ self.addLink( s4, s17 )
+ self.addLink( s4, s18 )
+ self.addLink( s4, s19 )
+ self.addLink( s4, s20 )
+ self.addLink( s4, s21 )
+ self.addLink( s4, s22 )
+ self.addLink( s4, s23 )
+ self.addLink( s4, s24 )
+ self.addLink( s4, s25 )
+ self.addLink( s5, s6 )
+ self.addLink( s5, s7 )
+ self.addLink( s5, s8 )
+ self.addLink( s5, s9 )
+ self.addLink( s5, s10 )
+ self.addLink( s5, s11 )
+ self.addLink( s5, s12 )
+ self.addLink( s5, s13 )
+ self.addLink( s5, s14 )
+ self.addLink( s5, s15 )
+ self.addLink( s5, s16 )
+ self.addLink( s5, s17 )
+ self.addLink( s5, s18 )
+ self.addLink( s5, s19 )
+ self.addLink( s5, s20 )
+ self.addLink( s5, s21 )
+ self.addLink( s5, s22 )
+ self.addLink( s5, s23 )
+ self.addLink( s5, s24 )
+ self.addLink( s5, s25 )
+ self.addLink( s6, s7 )
+ self.addLink( s6, s8 )
+ self.addLink( s6, s9 )
+ self.addLink( s6, s10 )
+ self.addLink( s6, s11 )
+ self.addLink( s6, s12 )
+ self.addLink( s6, s13 )
+ self.addLink( s6, s14 )
+ self.addLink( s6, s15 )
+ self.addLink( s6, s16 )
+ self.addLink( s6, s17 )
+ self.addLink( s6, s18 )
+ self.addLink( s6, s19 )
+ self.addLink( s6, s20 )
+ self.addLink( s6, s21 )
+ self.addLink( s6, s22 )
+ self.addLink( s6, s23 )
+ self.addLink( s6, s24 )
+ self.addLink( s6, s25 )
+ self.addLink( s7, s8 )
+ self.addLink( s7, s9 )
+ self.addLink( s7, s10 )
+ self.addLink( s7, s11 )
+ self.addLink( s7, s12 )
+ self.addLink( s7, s13 )
+ self.addLink( s7, s14 )
+ self.addLink( s7, s15 )
+ self.addLink( s7, s16 )
+ self.addLink( s7, s17 )
+ self.addLink( s7, s18 )
+ self.addLink( s7, s19 )
+ self.addLink( s7, s20 )
+ self.addLink( s7, s21 )
+ self.addLink( s7, s22 )
+ self.addLink( s7, s23 )
+ self.addLink( s7, s24 )
+ self.addLink( s7, s25 )
+ self.addLink( s8, s9 )
+ self.addLink( s8, s10 )
+ self.addLink( s8, s11 )
+ self.addLink( s8, s12 )
+ self.addLink( s8, s13 )
+ self.addLink( s8, s14 )
+ self.addLink( s8, s15 )
+ self.addLink( s8, s16 )
+ self.addLink( s8, s17 )
+ self.addLink( s8, s18 )
+ self.addLink( s8, s19 )
+ self.addLink( s8, s20 )
+ self.addLink( s8, s21 )
+ self.addLink( s8, s22 )
+ self.addLink( s8, s23 )
+ self.addLink( s8, s24 )
+ self.addLink( s8, s25 )
+ self.addLink( s9, s10 )
+ self.addLink( s9, s11 )
+ self.addLink( s9, s12 )
+ self.addLink( s9, s13 )
+ self.addLink( s9, s14 )
+ self.addLink( s9, s15 )
+ self.addLink( s9, s16 )
+ self.addLink( s9, s17 )
+ self.addLink( s9, s18 )
+ self.addLink( s9, s19 )
+ self.addLink( s9, s20 )
+ self.addLink( s9, s21 )
+ self.addLink( s9, s22 )
+ self.addLink( s9, s23 )
+ self.addLink( s9, s24 )
+ self.addLink( s9, s25 )
+ self.addLink( s10, s11 )
+ self.addLink( s10, s12 )
+ self.addLink( s10, s13 )
+ self.addLink( s10, s14 )
+ self.addLink( s10, s15 )
+ self.addLink( s10, s16 )
+ self.addLink( s10, s17 )
+ self.addLink( s10, s18 )
+ self.addLink( s10, s19 )
+ self.addLink( s10, s20 )
+ self.addLink( s10, s21 )
+ self.addLink( s10, s22 )
+ self.addLink( s10, s23 )
+ self.addLink( s10, s24 )
+ self.addLink( s10, s25 )
+ self.addLink( s11, s12 )
+ self.addLink( s11, s13 )
+ self.addLink( s11, s14 )
+ self.addLink( s11, s15 )
+ self.addLink( s11, s16 )
+ self.addLink( s11, s17 )
+ self.addLink( s11, s18 )
+ self.addLink( s11, s19 )
+ self.addLink( s11, s20 )
+ self.addLink( s11, s21 )
+ self.addLink( s11, s22 )
+ self.addLink( s11, s23 )
+ self.addLink( s11, s24 )
+ self.addLink( s11, s25 )
+ self.addLink( s12, s13 )
+ self.addLink( s12, s14 )
+ self.addLink( s12, s15 )
+ self.addLink( s12, s16 )
+ self.addLink( s12, s17 )
+ self.addLink( s12, s18 )
+ self.addLink( s12, s19 )
+ self.addLink( s12, s20 )
+ self.addLink( s12, s21 )
+ self.addLink( s12, s22 )
+ self.addLink( s12, s23 )
+ self.addLink( s12, s24 )
+ self.addLink( s12, s25 )
+ self.addLink( s13, s14 )
+ self.addLink( s13, s15 )
+ self.addLink( s13, s16 )
+ self.addLink( s13, s17 )
+ self.addLink( s13, s18 )
+ self.addLink( s13, s19 )
+ self.addLink( s13, s20 )
+ self.addLink( s13, s21 )
+ self.addLink( s13, s22 )
+ self.addLink( s13, s23 )
+ self.addLink( s13, s24 )
+ self.addLink( s13, s25 )
+ self.addLink( s14, s15 )
+ self.addLink( s14, s16 )
+ self.addLink( s14, s17 )
+ self.addLink( s14, s18 )
+ self.addLink( s14, s19 )
+ self.addLink( s14, s20 )
+ self.addLink( s14, s21 )
+ self.addLink( s14, s22 )
+ self.addLink( s14, s23 )
+ self.addLink( s14, s24 )
+ self.addLink( s14, s25 )
+ self.addLink( s15, s16 )
+ self.addLink( s15, s17 )
+ self.addLink( s15, s18 )
+ self.addLink( s15, s19 )
+ self.addLink( s15, s20 )
+ self.addLink( s15, s21 )
+ self.addLink( s15, s22 )
+ self.addLink( s15, s23 )
+ self.addLink( s15, s24 )
+ self.addLink( s15, s25 )
+ self.addLink( s16, s17 )
+ self.addLink( s16, s18 )
+ self.addLink( s16, s19 )
+ self.addLink( s16, s20 )
+ self.addLink( s16, s21 )
+ self.addLink( s16, s22 )
+ self.addLink( s16, s23 )
+ self.addLink( s16, s24 )
+ self.addLink( s16, s25 )
+ self.addLink( s17, s18 )
+ self.addLink( s17, s19 )
+ self.addLink( s17, s20 )
+ self.addLink( s17, s21 )
+ self.addLink( s17, s22 )
+ self.addLink( s17, s23 )
+ self.addLink( s17, s24 )
+ self.addLink( s17, s25 )
+ self.addLink( s18, s19 )
+ self.addLink( s18, s20 )
+ self.addLink( s18, s21 )
+ self.addLink( s18, s22 )
+ self.addLink( s18, s23 )
+ self.addLink( s18, s24 )
+ self.addLink( s18, s25 )
+ self.addLink( s19, s20 )
+ self.addLink( s19, s21 )
+ self.addLink( s19, s22 )
+ self.addLink( s19, s23 )
+ self.addLink( s19, s24 )
+ self.addLink( s19, s25 )
+ self.addLink( s20, s21 )
+ self.addLink( s20, s22 )
+ self.addLink( s20, s23 )
+ self.addLink( s20, s24 )
+ self.addLink( s20, s25 )
+ self.addLink( s21, s22 )
+ self.addLink( s21, s23 )
+ self.addLink( s21, s24 )
+ self.addLink( s21, s25 )
+ self.addLink( s22, s23 )
+ self.addLink( s22, s24 )
+ self.addLink( s22, s25 )
+ self.addLink( s23, s24 )
+ self.addLink( s23, s25 )
+ self.addLink( s24, s25 )
topos = { 'chordal': ( lambda: chordalTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = chordalTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch,autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordalIpv6.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordalIpv6.py
old mode 100755
new mode 100644
index 929949d..907fec9
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordalIpv6.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoChordalIpv6.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import Host, RemoteController
@@ -32,13 +31,16 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class dualStackHost( Host ):
+
def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) )
return r
+
class chordalTopo( Topo ):
def __init__( self, **opts ):
@@ -101,348 +103,349 @@
s25_host = self.addHost( 'h25', ip='10.1.0.25/24', cls=dualStackHost, v6Addr='1000::25/64' )
# add edges between switch and corresponding host
- self.addLink( s1 , s1_host )
- self.addLink( s2 , s2_host )
- self.addLink( s3 , s3_host )
- self.addLink( s4 , s4_host )
- self.addLink( s5 , s5_host )
- self.addLink( s6 , s6_host )
- self.addLink( s7 , s7_host )
- self.addLink( s8 , s8_host )
- self.addLink( s9 , s9_host )
- self.addLink( s10 , s10_host )
- self.addLink( s11 , s11_host )
- self.addLink( s12 , s12_host )
- self.addLink( s13 , s13_host )
- self.addLink( s14 , s14_host )
- self.addLink( s15 , s15_host )
- self.addLink( s16 , s16_host )
- self.addLink( s17 , s17_host )
- self.addLink( s18 , s18_host )
- self.addLink( s19 , s19_host )
- self.addLink( s20 , s20_host )
- self.addLink( s21 , s21_host )
- self.addLink( s22 , s22_host )
- self.addLink( s23 , s23_host )
- self.addLink( s24 , s24_host )
- self.addLink( s25 , s25_host )
- self.addLink(s1, s2)
- self.addLink(s1, s3)
- self.addLink(s1, s4)
- self.addLink(s1, s5)
- self.addLink(s1, s6)
- self.addLink(s1, s7)
- self.addLink(s1, s8)
- self.addLink(s1, s9)
- self.addLink(s1, s10)
- self.addLink(s1, s11)
- self.addLink(s1, s12)
- self.addLink(s1, s13)
- self.addLink(s1, s14)
- self.addLink(s1, s15)
- self.addLink(s1, s16)
- self.addLink(s1, s17)
- self.addLink(s1, s18)
- self.addLink(s1, s19)
- self.addLink(s1, s20)
- self.addLink(s1, s21)
- self.addLink(s1, s22)
- self.addLink(s1, s23)
- self.addLink(s1, s24)
- self.addLink(s1, s25)
- self.addLink(s2, s3)
- self.addLink(s2, s4)
- self.addLink(s2, s5)
- self.addLink(s2, s6)
- self.addLink(s2, s7)
- self.addLink(s2, s8)
- self.addLink(s2, s9)
- self.addLink(s2, s10)
- self.addLink(s2, s11)
- self.addLink(s2, s12)
- self.addLink(s2, s13)
- self.addLink(s2, s14)
- self.addLink(s2, s15)
- self.addLink(s2, s16)
- self.addLink(s2, s17)
- self.addLink(s2, s18)
- self.addLink(s2, s19)
- self.addLink(s2, s20)
- self.addLink(s2, s21)
- self.addLink(s2, s22)
- self.addLink(s2, s23)
- self.addLink(s2, s24)
- self.addLink(s2, s25)
- self.addLink(s3, s4)
- self.addLink(s3, s5)
- self.addLink(s3, s6)
- self.addLink(s3, s7)
- self.addLink(s3, s8)
- self.addLink(s3, s9)
- self.addLink(s3, s10)
- self.addLink(s3, s11)
- self.addLink(s3, s12)
- self.addLink(s3, s13)
- self.addLink(s3, s14)
- self.addLink(s3, s15)
- self.addLink(s3, s16)
- self.addLink(s3, s17)
- self.addLink(s3, s18)
- self.addLink(s3, s19)
- self.addLink(s3, s20)
- self.addLink(s3, s21)
- self.addLink(s3, s22)
- self.addLink(s3, s23)
- self.addLink(s3, s24)
- self.addLink(s3, s25)
- self.addLink(s4, s5)
- self.addLink(s4, s6)
- self.addLink(s4, s7)
- self.addLink(s4, s8)
- self.addLink(s4, s9)
- self.addLink(s4, s10)
- self.addLink(s4, s11)
- self.addLink(s4, s12)
- self.addLink(s4, s13)
- self.addLink(s4, s14)
- self.addLink(s4, s15)
- self.addLink(s4, s16)
- self.addLink(s4, s17)
- self.addLink(s4, s18)
- self.addLink(s4, s19)
- self.addLink(s4, s20)
- self.addLink(s4, s21)
- self.addLink(s4, s22)
- self.addLink(s4, s23)
- self.addLink(s4, s24)
- self.addLink(s4, s25)
- self.addLink(s5, s6)
- self.addLink(s5, s7)
- self.addLink(s5, s8)
- self.addLink(s5, s9)
- self.addLink(s5, s10)
- self.addLink(s5, s11)
- self.addLink(s5, s12)
- self.addLink(s5, s13)
- self.addLink(s5, s14)
- self.addLink(s5, s15)
- self.addLink(s5, s16)
- self.addLink(s5, s17)
- self.addLink(s5, s18)
- self.addLink(s5, s19)
- self.addLink(s5, s20)
- self.addLink(s5, s21)
- self.addLink(s5, s22)
- self.addLink(s5, s23)
- self.addLink(s5, s24)
- self.addLink(s5, s25)
- self.addLink(s6, s7)
- self.addLink(s6, s8)
- self.addLink(s6, s9)
- self.addLink(s6, s10)
- self.addLink(s6, s11)
- self.addLink(s6, s12)
- self.addLink(s6, s13)
- self.addLink(s6, s14)
- self.addLink(s6, s15)
- self.addLink(s6, s16)
- self.addLink(s6, s17)
- self.addLink(s6, s18)
- self.addLink(s6, s19)
- self.addLink(s6, s20)
- self.addLink(s6, s21)
- self.addLink(s6, s22)
- self.addLink(s6, s23)
- self.addLink(s6, s24)
- self.addLink(s6, s25)
- self.addLink(s7, s8)
- self.addLink(s7, s9)
- self.addLink(s7, s10)
- self.addLink(s7, s11)
- self.addLink(s7, s12)
- self.addLink(s7, s13)
- self.addLink(s7, s14)
- self.addLink(s7, s15)
- self.addLink(s7, s16)
- self.addLink(s7, s17)
- self.addLink(s7, s18)
- self.addLink(s7, s19)
- self.addLink(s7, s20)
- self.addLink(s7, s21)
- self.addLink(s7, s22)
- self.addLink(s7, s23)
- self.addLink(s7, s24)
- self.addLink(s7, s25)
- self.addLink(s8, s9)
- self.addLink(s8, s10)
- self.addLink(s8, s11)
- self.addLink(s8, s12)
- self.addLink(s8, s13)
- self.addLink(s8, s14)
- self.addLink(s8, s15)
- self.addLink(s8, s16)
- self.addLink(s8, s17)
- self.addLink(s8, s18)
- self.addLink(s8, s19)
- self.addLink(s8, s20)
- self.addLink(s8, s21)
- self.addLink(s8, s22)
- self.addLink(s8, s23)
- self.addLink(s8, s24)
- self.addLink(s8, s25)
- self.addLink(s9, s10)
- self.addLink(s9, s11)
- self.addLink(s9, s12)
- self.addLink(s9, s13)
- self.addLink(s9, s14)
- self.addLink(s9, s15)
- self.addLink(s9, s16)
- self.addLink(s9, s17)
- self.addLink(s9, s18)
- self.addLink(s9, s19)
- self.addLink(s9, s20)
- self.addLink(s9, s21)
- self.addLink(s9, s22)
- self.addLink(s9, s23)
- self.addLink(s9, s24)
- self.addLink(s9, s25)
- self.addLink(s10, s11)
- self.addLink(s10, s12)
- self.addLink(s10, s13)
- self.addLink(s10, s14)
- self.addLink(s10, s15)
- self.addLink(s10, s16)
- self.addLink(s10, s17)
- self.addLink(s10, s18)
- self.addLink(s10, s19)
- self.addLink(s10, s20)
- self.addLink(s10, s21)
- self.addLink(s10, s22)
- self.addLink(s10, s23)
- self.addLink(s10, s24)
- self.addLink(s10, s25)
- self.addLink(s11, s12)
- self.addLink(s11, s13)
- self.addLink(s11, s14)
- self.addLink(s11, s15)
- self.addLink(s11, s16)
- self.addLink(s11, s17)
- self.addLink(s11, s18)
- self.addLink(s11, s19)
- self.addLink(s11, s20)
- self.addLink(s11, s21)
- self.addLink(s11, s22)
- self.addLink(s11, s23)
- self.addLink(s11, s24)
- self.addLink(s11, s25)
- self.addLink(s12, s13)
- self.addLink(s12, s14)
- self.addLink(s12, s15)
- self.addLink(s12, s16)
- self.addLink(s12, s17)
- self.addLink(s12, s18)
- self.addLink(s12, s19)
- self.addLink(s12, s20)
- self.addLink(s12, s21)
- self.addLink(s12, s22)
- self.addLink(s12, s23)
- self.addLink(s12, s24)
- self.addLink(s12, s25)
- self.addLink(s13, s14)
- self.addLink(s13, s15)
- self.addLink(s13, s16)
- self.addLink(s13, s17)
- self.addLink(s13, s18)
- self.addLink(s13, s19)
- self.addLink(s13, s20)
- self.addLink(s13, s21)
- self.addLink(s13, s22)
- self.addLink(s13, s23)
- self.addLink(s13, s24)
- self.addLink(s13, s25)
- self.addLink(s14, s15)
- self.addLink(s14, s16)
- self.addLink(s14, s17)
- self.addLink(s14, s18)
- self.addLink(s14, s19)
- self.addLink(s14, s20)
- self.addLink(s14, s21)
- self.addLink(s14, s22)
- self.addLink(s14, s23)
- self.addLink(s14, s24)
- self.addLink(s14, s25)
- self.addLink(s15, s16)
- self.addLink(s15, s17)
- self.addLink(s15, s18)
- self.addLink(s15, s19)
- self.addLink(s15, s20)
- self.addLink(s15, s21)
- self.addLink(s15, s22)
- self.addLink(s15, s23)
- self.addLink(s15, s24)
- self.addLink(s15, s25)
- self.addLink(s16, s17)
- self.addLink(s16, s18)
- self.addLink(s16, s19)
- self.addLink(s16, s20)
- self.addLink(s16, s21)
- self.addLink(s16, s22)
- self.addLink(s16, s23)
- self.addLink(s16, s24)
- self.addLink(s16, s25)
- self.addLink(s17, s18)
- self.addLink(s17, s19)
- self.addLink(s17, s20)
- self.addLink(s17, s21)
- self.addLink(s17, s22)
- self.addLink(s17, s23)
- self.addLink(s17, s24)
- self.addLink(s17, s25)
- self.addLink(s18, s19)
- self.addLink(s18, s20)
- self.addLink(s18, s21)
- self.addLink(s18, s22)
- self.addLink(s18, s23)
- self.addLink(s18, s24)
- self.addLink(s18, s25)
- self.addLink(s19, s20)
- self.addLink(s19, s21)
- self.addLink(s19, s22)
- self.addLink(s19, s23)
- self.addLink(s19, s24)
- self.addLink(s19, s25)
- self.addLink(s20, s21)
- self.addLink(s20, s22)
- self.addLink(s20, s23)
- self.addLink(s20, s24)
- self.addLink(s20, s25)
- self.addLink(s21, s22)
- self.addLink(s21, s23)
- self.addLink(s21, s24)
- self.addLink(s21, s25)
- self.addLink(s22, s23)
- self.addLink(s22, s24)
- self.addLink(s22, s25)
- self.addLink(s23, s24)
- self.addLink(s23, s25)
- self.addLink(s24, s25)
+ self.addLink( s1, s1_host )
+ self.addLink( s2, s2_host )
+ self.addLink( s3, s3_host )
+ self.addLink( s4, s4_host )
+ self.addLink( s5, s5_host )
+ self.addLink( s6, s6_host )
+ self.addLink( s7, s7_host )
+ self.addLink( s8, s8_host )
+ self.addLink( s9, s9_host )
+ self.addLink( s10, s10_host )
+ self.addLink( s11, s11_host )
+ self.addLink( s12, s12_host )
+ self.addLink( s13, s13_host )
+ self.addLink( s14, s14_host )
+ self.addLink( s15, s15_host )
+ self.addLink( s16, s16_host )
+ self.addLink( s17, s17_host )
+ self.addLink( s18, s18_host )
+ self.addLink( s19, s19_host )
+ self.addLink( s20, s20_host )
+ self.addLink( s21, s21_host )
+ self.addLink( s22, s22_host )
+ self.addLink( s23, s23_host )
+ self.addLink( s24, s24_host )
+ self.addLink( s25, s25_host )
+ self.addLink( s1, s2 )
+ self.addLink( s1, s3 )
+ self.addLink( s1, s4 )
+ self.addLink( s1, s5 )
+ self.addLink( s1, s6 )
+ self.addLink( s1, s7 )
+ self.addLink( s1, s8 )
+ self.addLink( s1, s9 )
+ self.addLink( s1, s10 )
+ self.addLink( s1, s11 )
+ self.addLink( s1, s12 )
+ self.addLink( s1, s13 )
+ self.addLink( s1, s14 )
+ self.addLink( s1, s15 )
+ self.addLink( s1, s16 )
+ self.addLink( s1, s17 )
+ self.addLink( s1, s18 )
+ self.addLink( s1, s19 )
+ self.addLink( s1, s20 )
+ self.addLink( s1, s21 )
+ self.addLink( s1, s22 )
+ self.addLink( s1, s23 )
+ self.addLink( s1, s24 )
+ self.addLink( s1, s25 )
+ self.addLink( s2, s3 )
+ self.addLink( s2, s4 )
+ self.addLink( s2, s5 )
+ self.addLink( s2, s6 )
+ self.addLink( s2, s7 )
+ self.addLink( s2, s8 )
+ self.addLink( s2, s9 )
+ self.addLink( s2, s10 )
+ self.addLink( s2, s11 )
+ self.addLink( s2, s12 )
+ self.addLink( s2, s13 )
+ self.addLink( s2, s14 )
+ self.addLink( s2, s15 )
+ self.addLink( s2, s16 )
+ self.addLink( s2, s17 )
+ self.addLink( s2, s18 )
+ self.addLink( s2, s19 )
+ self.addLink( s2, s20 )
+ self.addLink( s2, s21 )
+ self.addLink( s2, s22 )
+ self.addLink( s2, s23 )
+ self.addLink( s2, s24 )
+ self.addLink( s2, s25 )
+ self.addLink( s3, s4 )
+ self.addLink( s3, s5 )
+ self.addLink( s3, s6 )
+ self.addLink( s3, s7 )
+ self.addLink( s3, s8 )
+ self.addLink( s3, s9 )
+ self.addLink( s3, s10 )
+ self.addLink( s3, s11 )
+ self.addLink( s3, s12 )
+ self.addLink( s3, s13 )
+ self.addLink( s3, s14 )
+ self.addLink( s3, s15 )
+ self.addLink( s3, s16 )
+ self.addLink( s3, s17 )
+ self.addLink( s3, s18 )
+ self.addLink( s3, s19 )
+ self.addLink( s3, s20 )
+ self.addLink( s3, s21 )
+ self.addLink( s3, s22 )
+ self.addLink( s3, s23 )
+ self.addLink( s3, s24 )
+ self.addLink( s3, s25 )
+ self.addLink( s4, s5 )
+ self.addLink( s4, s6 )
+ self.addLink( s4, s7 )
+ self.addLink( s4, s8 )
+ self.addLink( s4, s9 )
+ self.addLink( s4, s10 )
+ self.addLink( s4, s11 )
+ self.addLink( s4, s12 )
+ self.addLink( s4, s13 )
+ self.addLink( s4, s14 )
+ self.addLink( s4, s15 )
+ self.addLink( s4, s16 )
+ self.addLink( s4, s17 )
+ self.addLink( s4, s18 )
+ self.addLink( s4, s19 )
+ self.addLink( s4, s20 )
+ self.addLink( s4, s21 )
+ self.addLink( s4, s22 )
+ self.addLink( s4, s23 )
+ self.addLink( s4, s24 )
+ self.addLink( s4, s25 )
+ self.addLink( s5, s6 )
+ self.addLink( s5, s7 )
+ self.addLink( s5, s8 )
+ self.addLink( s5, s9 )
+ self.addLink( s5, s10 )
+ self.addLink( s5, s11 )
+ self.addLink( s5, s12 )
+ self.addLink( s5, s13 )
+ self.addLink( s5, s14 )
+ self.addLink( s5, s15 )
+ self.addLink( s5, s16 )
+ self.addLink( s5, s17 )
+ self.addLink( s5, s18 )
+ self.addLink( s5, s19 )
+ self.addLink( s5, s20 )
+ self.addLink( s5, s21 )
+ self.addLink( s5, s22 )
+ self.addLink( s5, s23 )
+ self.addLink( s5, s24 )
+ self.addLink( s5, s25 )
+ self.addLink( s6, s7 )
+ self.addLink( s6, s8 )
+ self.addLink( s6, s9 )
+ self.addLink( s6, s10 )
+ self.addLink( s6, s11 )
+ self.addLink( s6, s12 )
+ self.addLink( s6, s13 )
+ self.addLink( s6, s14 )
+ self.addLink( s6, s15 )
+ self.addLink( s6, s16 )
+ self.addLink( s6, s17 )
+ self.addLink( s6, s18 )
+ self.addLink( s6, s19 )
+ self.addLink( s6, s20 )
+ self.addLink( s6, s21 )
+ self.addLink( s6, s22 )
+ self.addLink( s6, s23 )
+ self.addLink( s6, s24 )
+ self.addLink( s6, s25 )
+ self.addLink( s7, s8 )
+ self.addLink( s7, s9 )
+ self.addLink( s7, s10 )
+ self.addLink( s7, s11 )
+ self.addLink( s7, s12 )
+ self.addLink( s7, s13 )
+ self.addLink( s7, s14 )
+ self.addLink( s7, s15 )
+ self.addLink( s7, s16 )
+ self.addLink( s7, s17 )
+ self.addLink( s7, s18 )
+ self.addLink( s7, s19 )
+ self.addLink( s7, s20 )
+ self.addLink( s7, s21 )
+ self.addLink( s7, s22 )
+ self.addLink( s7, s23 )
+ self.addLink( s7, s24 )
+ self.addLink( s7, s25 )
+ self.addLink( s8, s9 )
+ self.addLink( s8, s10 )
+ self.addLink( s8, s11 )
+ self.addLink( s8, s12 )
+ self.addLink( s8, s13 )
+ self.addLink( s8, s14 )
+ self.addLink( s8, s15 )
+ self.addLink( s8, s16 )
+ self.addLink( s8, s17 )
+ self.addLink( s8, s18 )
+ self.addLink( s8, s19 )
+ self.addLink( s8, s20 )
+ self.addLink( s8, s21 )
+ self.addLink( s8, s22 )
+ self.addLink( s8, s23 )
+ self.addLink( s8, s24 )
+ self.addLink( s8, s25 )
+ self.addLink( s9, s10 )
+ self.addLink( s9, s11 )
+ self.addLink( s9, s12 )
+ self.addLink( s9, s13 )
+ self.addLink( s9, s14 )
+ self.addLink( s9, s15 )
+ self.addLink( s9, s16 )
+ self.addLink( s9, s17 )
+ self.addLink( s9, s18 )
+ self.addLink( s9, s19 )
+ self.addLink( s9, s20 )
+ self.addLink( s9, s21 )
+ self.addLink( s9, s22 )
+ self.addLink( s9, s23 )
+ self.addLink( s9, s24 )
+ self.addLink( s9, s25 )
+ self.addLink( s10, s11 )
+ self.addLink( s10, s12 )
+ self.addLink( s10, s13 )
+ self.addLink( s10, s14 )
+ self.addLink( s10, s15 )
+ self.addLink( s10, s16 )
+ self.addLink( s10, s17 )
+ self.addLink( s10, s18 )
+ self.addLink( s10, s19 )
+ self.addLink( s10, s20 )
+ self.addLink( s10, s21 )
+ self.addLink( s10, s22 )
+ self.addLink( s10, s23 )
+ self.addLink( s10, s24 )
+ self.addLink( s10, s25 )
+ self.addLink( s11, s12 )
+ self.addLink( s11, s13 )
+ self.addLink( s11, s14 )
+ self.addLink( s11, s15 )
+ self.addLink( s11, s16 )
+ self.addLink( s11, s17 )
+ self.addLink( s11, s18 )
+ self.addLink( s11, s19 )
+ self.addLink( s11, s20 )
+ self.addLink( s11, s21 )
+ self.addLink( s11, s22 )
+ self.addLink( s11, s23 )
+ self.addLink( s11, s24 )
+ self.addLink( s11, s25 )
+ self.addLink( s12, s13 )
+ self.addLink( s12, s14 )
+ self.addLink( s12, s15 )
+ self.addLink( s12, s16 )
+ self.addLink( s12, s17 )
+ self.addLink( s12, s18 )
+ self.addLink( s12, s19 )
+ self.addLink( s12, s20 )
+ self.addLink( s12, s21 )
+ self.addLink( s12, s22 )
+ self.addLink( s12, s23 )
+ self.addLink( s12, s24 )
+ self.addLink( s12, s25 )
+ self.addLink( s13, s14 )
+ self.addLink( s13, s15 )
+ self.addLink( s13, s16 )
+ self.addLink( s13, s17 )
+ self.addLink( s13, s18 )
+ self.addLink( s13, s19 )
+ self.addLink( s13, s20 )
+ self.addLink( s13, s21 )
+ self.addLink( s13, s22 )
+ self.addLink( s13, s23 )
+ self.addLink( s13, s24 )
+ self.addLink( s13, s25 )
+ self.addLink( s14, s15 )
+ self.addLink( s14, s16 )
+ self.addLink( s14, s17 )
+ self.addLink( s14, s18 )
+ self.addLink( s14, s19 )
+ self.addLink( s14, s20 )
+ self.addLink( s14, s21 )
+ self.addLink( s14, s22 )
+ self.addLink( s14, s23 )
+ self.addLink( s14, s24 )
+ self.addLink( s14, s25 )
+ self.addLink( s15, s16 )
+ self.addLink( s15, s17 )
+ self.addLink( s15, s18 )
+ self.addLink( s15, s19 )
+ self.addLink( s15, s20 )
+ self.addLink( s15, s21 )
+ self.addLink( s15, s22 )
+ self.addLink( s15, s23 )
+ self.addLink( s15, s24 )
+ self.addLink( s15, s25 )
+ self.addLink( s16, s17 )
+ self.addLink( s16, s18 )
+ self.addLink( s16, s19 )
+ self.addLink( s16, s20 )
+ self.addLink( s16, s21 )
+ self.addLink( s16, s22 )
+ self.addLink( s16, s23 )
+ self.addLink( s16, s24 )
+ self.addLink( s16, s25 )
+ self.addLink( s17, s18 )
+ self.addLink( s17, s19 )
+ self.addLink( s17, s20 )
+ self.addLink( s17, s21 )
+ self.addLink( s17, s22 )
+ self.addLink( s17, s23 )
+ self.addLink( s17, s24 )
+ self.addLink( s17, s25 )
+ self.addLink( s18, s19 )
+ self.addLink( s18, s20 )
+ self.addLink( s18, s21 )
+ self.addLink( s18, s22 )
+ self.addLink( s18, s23 )
+ self.addLink( s18, s24 )
+ self.addLink( s18, s25 )
+ self.addLink( s19, s20 )
+ self.addLink( s19, s21 )
+ self.addLink( s19, s22 )
+ self.addLink( s19, s23 )
+ self.addLink( s19, s24 )
+ self.addLink( s19, s25 )
+ self.addLink( s20, s21 )
+ self.addLink( s20, s22 )
+ self.addLink( s20, s23 )
+ self.addLink( s20, s24 )
+ self.addLink( s20, s25 )
+ self.addLink( s21, s22 )
+ self.addLink( s21, s23 )
+ self.addLink( s21, s24 )
+ self.addLink( s21, s25 )
+ self.addLink( s22, s23 )
+ self.addLink( s22, s24 )
+ self.addLink( s22, s25 )
+ self.addLink( s23, s24 )
+ self.addLink( s23, s25 )
+ self.addLink( s24, s25 )
topos = { 'chordal': ( lambda: chordalTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = chordalTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch,autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoRingIpv6.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoRingIpv6.py
old mode 100755
new mode 100644
index 982840e..09e0691
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoRingIpv6.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoRingIpv6.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import Host, RemoteController
@@ -32,13 +31,16 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class dualStackHost( Host ):
+
def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) )
return r
+
class ringTopo( Topo ):
def __init__( self, **opts ):
@@ -71,43 +73,44 @@
s10_host = self.addHost( 'h10', ip='10.1.0.10/24', cls=dualStackHost, v6Addr='1000::10/64' )
# add edges between switch and corresponding host
- self.addLink( s1 , s1_host )
- self.addLink( s2 , s2_host )
- self.addLink( s3 , s3_host )
- self.addLink( s4 , s4_host )
- self.addLink( s5 , s5_host )
- self.addLink( s6 , s6_host )
- self.addLink( s7 , s7_host )
- self.addLink( s8 , s8_host )
- self.addLink( s9 , s9_host )
- self.addLink( s10 , s10_host )
- self.addLink(s1, s2)
- self.addLink(s2, s3)
- self.addLink(s3, s4)
- self.addLink(s4, s5)
- self.addLink(s5, s6)
- self.addLink(s6, s7)
- self.addLink(s7, s8)
- self.addLink(s8, s9)
- self.addLink(s9, s10)
- self.addLink(s10, s1)
+ self.addLink( s1, s1_host )
+ self.addLink( s2, s2_host )
+ self.addLink( s3, s3_host )
+ self.addLink( s4, s4_host )
+ self.addLink( s5, s5_host )
+ self.addLink( s6, s6_host )
+ self.addLink( s7, s7_host )
+ self.addLink( s8, s8_host )
+ self.addLink( s9, s9_host )
+ self.addLink( s10, s10_host )
+ self.addLink( s1, s2 )
+ self.addLink( s2, s3 )
+ self.addLink( s3, s4 )
+ self.addLink( s4, s5 )
+ self.addLink( s5, s6 )
+ self.addLink( s6, s7 )
+ self.addLink( s7, s8 )
+ self.addLink( s8, s9 )
+ self.addLink( s9, s10 )
+ self.addLink( s10, s1 )
topos = { 'ring': ( lambda: ringTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = ringTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpine.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpine.py
old mode 100755
new mode 100644
index 8914e0b..48c4619
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpine.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpine.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import Controller, RemoteController, OVSController
@@ -32,6 +31,7 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class spineTopo( Topo ):
def __init__( self, **opts ):
@@ -123,16 +123,16 @@
s78 = self.addSwitch( 's78' )
# ... and now hosts
- #s1_host = self.addHost( 'h1' )
- #s2_host = self.addHost( 'h2' )
- #s3_host = self.addHost( 'h3' )
- #s4_host = self.addHost( 'h4' )
- #s5_host = self.addHost( 'h5' )
- #s6_host = self.addHost( 'h6' )
- #s7_host = self.addHost( 'h7' )
- #s8_host = self.addHost( 'h8' )
- #s9_host = self.addHost( 'h9' )
- #s10_host = self.addHost( 'h10' )
+ # s1_host = self.addHost( 'h1' )
+ # s2_host = self.addHost( 'h2' )
+ # s3_host = self.addHost( 'h3' )
+ # s4_host = self.addHost( 'h4' )
+ # s5_host = self.addHost( 'h5' )
+ # s6_host = self.addHost( 'h6' )
+ # s7_host = self.addHost( 'h7' )
+ # s8_host = self.addHost( 'h8' )
+ # s9_host = self.addHost( 'h9' )
+ # s10_host = self.addHost( 'h10' )
s11_host = self.addHost( 'h11' )
s12_host = self.addHost( 'h12' )
s13_host = self.addHost( 'h13' )
@@ -203,253 +203,254 @@
s78_host = self.addHost( 'h78' )
# add edges between switch and corresponding host
- #self.addLink( s1 , s1_host )
- #self.addLink( s2 , s2_host )
- #self.addLink( s3 , s3_host )
- #self.addLink( s4 , s4_host )
- #self.addLink( s5 , s5_host )
- #self.addLink( s6 , s6_host )
- #self.addLink( s7 , s7_host )
- #self.addLink( s8 , s8_host )
- #self.addLink( s9 , s9_host )
- #self.addLink( s10 , s10_host )
- self.addLink( s11 , s11_host )
- self.addLink( s12 , s12_host )
- self.addLink( s13 , s13_host )
- self.addLink( s14 , s14_host )
- self.addLink( s15 , s15_host )
- self.addLink( s16 , s16_host )
- self.addLink( s17 , s17_host )
- self.addLink( s18 , s18_host )
- self.addLink( s19 , s19_host )
- self.addLink( s20 , s20_host )
- self.addLink( s21 , s21_host )
- self.addLink( s22 , s22_host )
- self.addLink( s23 , s23_host )
- self.addLink( s24 , s24_host )
- self.addLink( s25 , s25_host )
- self.addLink( s26 , s26_host )
- self.addLink( s27 , s27_host )
- self.addLink( s28 , s28_host )
- self.addLink( s29 , s29_host )
- self.addLink( s30 , s30_host )
- self.addLink( s31 , s31_host )
- self.addLink( s32 , s32_host )
- self.addLink( s33 , s33_host )
- self.addLink( s34 , s34_host )
- self.addLink( s35 , s35_host )
- self.addLink( s36 , s36_host )
- self.addLink( s37 , s37_host )
- self.addLink( s38 , s38_host )
- self.addLink( s39 , s39_host )
- self.addLink( s40 , s40_host )
- self.addLink( s41 , s41_host )
- self.addLink( s42 , s42_host )
- self.addLink( s43 , s43_host )
- self.addLink( s44 , s44_host )
- self.addLink( s45 , s45_host )
- self.addLink( s46 , s46_host )
- self.addLink( s47 , s47_host )
- self.addLink( s48 , s48_host )
- self.addLink( s49 , s49_host )
- self.addLink( s50 , s50_host )
- self.addLink( s51 , s51_host )
- self.addLink( s52 , s52_host )
- self.addLink( s53 , s53_host )
- self.addLink( s54 , s54_host )
- self.addLink( s55 , s55_host )
- self.addLink( s56 , s56_host )
- self.addLink( s57 , s57_host )
- self.addLink( s58 , s58_host )
- self.addLink( s59 , s59_host )
- self.addLink( s60 , s60_host )
- self.addLink( s61 , s61_host )
- self.addLink( s62 , s62_host )
- self.addLink( s63 , s63_host )
- self.addLink( s64 , s64_host )
- self.addLink( s65 , s65_host )
- self.addLink( s66 , s66_host )
- self.addLink( s67 , s67_host )
- self.addLink( s68 , s68_host )
- self.addLink( s69 , s69_host )
- self.addLink( s70 , s70_host )
- self.addLink( s71 , s71_host )
- self.addLink( s72 , s72_host )
- self.addLink( s73 , s73_host )
- self.addLink( s74 , s74_host )
- self.addLink( s75 , s75_host )
- self.addLink( s76 , s76_host )
- self.addLink( s77 , s77_host )
- self.addLink( s78 , s78_host )
+ # self.addLink( s1 , s1_host )
+ # self.addLink( s2 , s2_host )
+ # self.addLink( s3 , s3_host )
+ # self.addLink( s4 , s4_host )
+ # self.addLink( s5 , s5_host )
+ # self.addLink( s6 , s6_host )
+ # self.addLink( s7 , s7_host )
+ # self.addLink( s8 , s8_host )
+ # self.addLink( s9 , s9_host )
+ # self.addLink( s10 , s10_host )
+ self.addLink( s11, s11_host )
+ self.addLink( s12, s12_host )
+ self.addLink( s13, s13_host )
+ self.addLink( s14, s14_host )
+ self.addLink( s15, s15_host )
+ self.addLink( s16, s16_host )
+ self.addLink( s17, s17_host )
+ self.addLink( s18, s18_host )
+ self.addLink( s19, s19_host )
+ self.addLink( s20, s20_host )
+ self.addLink( s21, s21_host )
+ self.addLink( s22, s22_host )
+ self.addLink( s23, s23_host )
+ self.addLink( s24, s24_host )
+ self.addLink( s25, s25_host )
+ self.addLink( s26, s26_host )
+ self.addLink( s27, s27_host )
+ self.addLink( s28, s28_host )
+ self.addLink( s29, s29_host )
+ self.addLink( s30, s30_host )
+ self.addLink( s31, s31_host )
+ self.addLink( s32, s32_host )
+ self.addLink( s33, s33_host )
+ self.addLink( s34, s34_host )
+ self.addLink( s35, s35_host )
+ self.addLink( s36, s36_host )
+ self.addLink( s37, s37_host )
+ self.addLink( s38, s38_host )
+ self.addLink( s39, s39_host )
+ self.addLink( s40, s40_host )
+ self.addLink( s41, s41_host )
+ self.addLink( s42, s42_host )
+ self.addLink( s43, s43_host )
+ self.addLink( s44, s44_host )
+ self.addLink( s45, s45_host )
+ self.addLink( s46, s46_host )
+ self.addLink( s47, s47_host )
+ self.addLink( s48, s48_host )
+ self.addLink( s49, s49_host )
+ self.addLink( s50, s50_host )
+ self.addLink( s51, s51_host )
+ self.addLink( s52, s52_host )
+ self.addLink( s53, s53_host )
+ self.addLink( s54, s54_host )
+ self.addLink( s55, s55_host )
+ self.addLink( s56, s56_host )
+ self.addLink( s57, s57_host )
+ self.addLink( s58, s58_host )
+ self.addLink( s59, s59_host )
+ self.addLink( s60, s60_host )
+ self.addLink( s61, s61_host )
+ self.addLink( s62, s62_host )
+ self.addLink( s63, s63_host )
+ self.addLink( s64, s64_host )
+ self.addLink( s65, s65_host )
+ self.addLink( s66, s66_host )
+ self.addLink( s67, s67_host )
+ self.addLink( s68, s68_host )
+ self.addLink( s69, s69_host )
+ self.addLink( s70, s70_host )
+ self.addLink( s71, s71_host )
+ self.addLink( s72, s72_host )
+ self.addLink( s73, s73_host )
+ self.addLink( s74, s74_host )
+ self.addLink( s75, s75_host )
+ self.addLink( s76, s76_host )
+ self.addLink( s77, s77_host )
+ self.addLink( s78, s78_host )
- #info( '*** Add Leaf links\n')
- self.addLink(s1, s9)
- self.addLink(s2, s10)
- self.addLink(s3, s9)
- self.addLink(s4, s10)
- self.addLink(s5, s9)
- self.addLink(s6, s10)
- self.addLink(s7, s9)
- self.addLink(s8, s10)
- self.addLink(s9, s11)
- self.addLink(s9, s12)
- self.addLink(s10, s13)
- self.addLink(s10, s14)
- self.addLink(s11, s12)
- self.addLink(s13, s14)
+ # info( '*** Add Leaf links\n' )
+ self.addLink( s1, s9 )
+ self.addLink( s2, s10 )
+ self.addLink( s3, s9 )
+ self.addLink( s4, s10 )
+ self.addLink( s5, s9 )
+ self.addLink( s6, s10 )
+ self.addLink( s7, s9 )
+ self.addLink( s8, s10 )
+ self.addLink( s9, s11 )
+ self.addLink( s9, s12 )
+ self.addLink( s10, s13 )
+ self.addLink( s10, s14 )
+ self.addLink( s11, s12 )
+ self.addLink( s13, s14 )
- #info( '*** Add Spine-1 links\n')
- self.addLink(s15, s1)
- self.addLink(s15, s2)
- self.addLink(s16, s1)
- self.addLink(s16, s2)
- self.addLink(s17, s1)
- self.addLink(s17, s2)
- self.addLink(s18, s1)
- self.addLink(s18, s2)
- self.addLink(s19, s1)
- self.addLink(s19, s2)
- self.addLink(s20, s1)
- self.addLink(s20, s2)
- self.addLink(s21, s1)
- self.addLink(s21, s2)
- self.addLink(s22, s1)
- self.addLink(s22, s2)
- self.addLink(s23, s1)
- self.addLink(s23, s2)
- self.addLink(s24, s1)
- self.addLink(s24, s2)
- self.addLink(s25, s1)
- self.addLink(s25, s2)
- self.addLink(s26, s1)
- self.addLink(s26, s2)
- self.addLink(s27, s1)
- self.addLink(s27, s2)
- self.addLink(s28, s1)
- self.addLink(s28, s2)
- self.addLink(s29, s1)
- self.addLink(s29, s2)
- self.addLink(s30, s1)
- self.addLink(s30, s2)
+ # info( '*** Add Spine-1 links\n' )
+ self.addLink( s15, s1 )
+ self.addLink( s15, s2 )
+ self.addLink( s16, s1 )
+ self.addLink( s16, s2 )
+ self.addLink( s17, s1 )
+ self.addLink( s17, s2 )
+ self.addLink( s18, s1 )
+ self.addLink( s18, s2 )
+ self.addLink( s19, s1 )
+ self.addLink( s19, s2 )
+ self.addLink( s20, s1 )
+ self.addLink( s20, s2 )
+ self.addLink( s21, s1 )
+ self.addLink( s21, s2 )
+ self.addLink( s22, s1 )
+ self.addLink( s22, s2 )
+ self.addLink( s23, s1 )
+ self.addLink( s23, s2 )
+ self.addLink( s24, s1 )
+ self.addLink( s24, s2 )
+ self.addLink( s25, s1 )
+ self.addLink( s25, s2 )
+ self.addLink( s26, s1 )
+ self.addLink( s26, s2 )
+ self.addLink( s27, s1 )
+ self.addLink( s27, s2 )
+ self.addLink( s28, s1 )
+ self.addLink( s28, s2 )
+ self.addLink( s29, s1 )
+ self.addLink( s29, s2 )
+ self.addLink( s30, s1 )
+ self.addLink( s30, s2 )
- #info( '*** Add Spine-2 links\n')
- self.addLink(s31, s3)
- self.addLink(s31, s4)
- self.addLink(s32, s3)
- self.addLink(s32, s4)
- self.addLink(s33, s3)
- self.addLink(s33, s4)
- self.addLink(s34, s3)
- self.addLink(s34, s4)
- self.addLink(s35, s3)
- self.addLink(s35, s4)
- self.addLink(s36, s3)
- self.addLink(s36, s4)
- self.addLink(s37, s3)
- self.addLink(s37, s4)
- self.addLink(s38, s3)
- self.addLink(s38, s4)
- self.addLink(s39, s3)
- self.addLink(s39, s4)
- self.addLink(s40, s3)
- self.addLink(s40, s4)
- self.addLink(s41, s3)
- self.addLink(s41, s4)
- self.addLink(s42, s3)
- self.addLink(s42, s4)
- self.addLink(s43, s3)
- self.addLink(s43, s4)
- self.addLink(s44, s3)
- self.addLink(s44, s4)
- self.addLink(s45, s3)
- self.addLink(s45, s4)
- self.addLink(s46, s3)
- self.addLink(s46, s4)
+ # info( '*** Add Spine-2 links\n' )
+ self.addLink( s31, s3 )
+ self.addLink( s31, s4 )
+ self.addLink( s32, s3 )
+ self.addLink( s32, s4 )
+ self.addLink( s33, s3 )
+ self.addLink( s33, s4 )
+ self.addLink( s34, s3 )
+ self.addLink( s34, s4 )
+ self.addLink( s35, s3 )
+ self.addLink( s35, s4 )
+ self.addLink( s36, s3 )
+ self.addLink( s36, s4 )
+ self.addLink( s37, s3 )
+ self.addLink( s37, s4 )
+ self.addLink( s38, s3 )
+ self.addLink( s38, s4 )
+ self.addLink( s39, s3 )
+ self.addLink( s39, s4 )
+ self.addLink( s40, s3 )
+ self.addLink( s40, s4 )
+ self.addLink( s41, s3 )
+ self.addLink( s41, s4 )
+ self.addLink( s42, s3 )
+ self.addLink( s42, s4 )
+ self.addLink( s43, s3 )
+ self.addLink( s43, s4 )
+ self.addLink( s44, s3 )
+ self.addLink( s44, s4 )
+ self.addLink( s45, s3 )
+ self.addLink( s45, s4 )
+ self.addLink( s46, s3 )
+ self.addLink( s46, s4 )
- #info( '*** Add Spine-3 links\n')
- self.addLink(s47, s5)
- self.addLink(s47, s6)
- self.addLink(s48, s5)
- self.addLink(s48, s6)
- self.addLink(s49, s5)
- self.addLink(s49, s6)
- self.addLink(s50, s5)
- self.addLink(s50, s6)
- self.addLink(s51, s5)
- self.addLink(s51, s6)
- self.addLink(s52, s5)
- self.addLink(s52, s6)
- self.addLink(s53, s5)
- self.addLink(s53, s6)
- self.addLink(s54, s5)
- self.addLink(s54, s6)
- self.addLink(s55, s5)
- self.addLink(s55, s6)
- self.addLink(s56, s5)
- self.addLink(s56, s6)
- self.addLink(s57, s5)
- self.addLink(s57, s6)
- self.addLink(s58, s5)
- self.addLink(s58, s6)
- self.addLink(s59, s5)
- self.addLink(s59, s6)
- self.addLink(s60, s5)
- self.addLink(s60, s6)
- self.addLink(s61, s5)
- self.addLink(s61, s6)
- self.addLink(s62, s5)
- self.addLink(s62, s6)
+ # info( '*** Add Spine-3 links\n' )
+ self.addLink( s47, s5 )
+ self.addLink( s47, s6 )
+ self.addLink( s48, s5 )
+ self.addLink( s48, s6 )
+ self.addLink( s49, s5 )
+ self.addLink( s49, s6 )
+ self.addLink( s50, s5 )
+ self.addLink( s50, s6 )
+ self.addLink( s51, s5 )
+ self.addLink( s51, s6 )
+ self.addLink( s52, s5 )
+ self.addLink( s52, s6 )
+ self.addLink( s53, s5 )
+ self.addLink( s53, s6 )
+ self.addLink( s54, s5 )
+ self.addLink( s54, s6 )
+ self.addLink( s55, s5 )
+ self.addLink( s55, s6 )
+ self.addLink( s56, s5 )
+ self.addLink( s56, s6 )
+ self.addLink( s57, s5 )
+ self.addLink( s57, s6 )
+ self.addLink( s58, s5 )
+ self.addLink( s58, s6 )
+ self.addLink( s59, s5 )
+ self.addLink( s59, s6 )
+ self.addLink( s60, s5 )
+ self.addLink( s60, s6 )
+ self.addLink( s61, s5 )
+ self.addLink( s61, s6 )
+ self.addLink( s62, s5 )
+ self.addLink( s62, s6 )
- #info( '*** Add Spine-4 links\n')
- self.addLink(s63, s7)
- self.addLink(s63, s8)
- self.addLink(s64, s7)
- self.addLink(s64, s8)
- self.addLink(s65, s7)
- self.addLink(s65, s8)
- self.addLink(s66, s7)
- self.addLink(s66, s8)
- self.addLink(s67, s7)
- self.addLink(s67, s8)
- self.addLink(s68, s7)
- self.addLink(s68, s8)
- self.addLink(s69, s7)
- self.addLink(s69, s8)
- self.addLink(s70, s7)
- self.addLink(s70, s8)
- self.addLink(s71, s7)
- self.addLink(s71, s8)
- self.addLink(s72, s7)
- self.addLink(s72, s8)
- self.addLink(s73, s7)
- self.addLink(s73, s8)
- self.addLink(s74, s7)
- self.addLink(s74, s8)
- self.addLink(s75, s7)
- self.addLink(s75, s8)
- self.addLink(s76, s7)
- self.addLink(s76, s8)
- self.addLink(s77, s7)
- self.addLink(s77, s8)
- self.addLink(s78, s7)
- self.addLink(s78, s8)
+ # info( '*** Add Spine-4 links\n' )
+ self.addLink( s63, s7 )
+ self.addLink( s63, s8 )
+ self.addLink( s64, s7 )
+ self.addLink( s64, s8 )
+ self.addLink( s65, s7 )
+ self.addLink( s65, s8 )
+ self.addLink( s66, s7 )
+ self.addLink( s66, s8 )
+ self.addLink( s67, s7 )
+ self.addLink( s67, s8 )
+ self.addLink( s68, s7 )
+ self.addLink( s68, s8 )
+ self.addLink( s69, s7 )
+ self.addLink( s69, s8 )
+ self.addLink( s70, s7 )
+ self.addLink( s70, s8 )
+ self.addLink( s71, s7 )
+ self.addLink( s71, s8 )
+ self.addLink( s72, s7 )
+ self.addLink( s72, s8 )
+ self.addLink( s73, s7 )
+ self.addLink( s73, s8 )
+ self.addLink( s74, s7 )
+ self.addLink( s74, s8 )
+ self.addLink( s75, s7 )
+ self.addLink( s75, s8 )
+ self.addLink( s76, s7 )
+ self.addLink( s76, s8 )
+ self.addLink( s77, s7 )
+ self.addLink( s77, s8 )
+ self.addLink( s78, s7 )
+ self.addLink( s78, s8 )
topos = { 'spine': ( lambda: spineTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = spineTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch, link=TCLink, autoSetMacs = True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, link=TCLink, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpineIpv6.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpineIpv6.py
old mode 100755
new mode 100644
index 5b99455..1b5163e
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpineIpv6.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoSpineIpv6.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import Host, RemoteController
@@ -32,13 +31,16 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class dualStackHost( Host ):
+
def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) )
return r
+
class spineTopo( Topo ):
def __init__( self, **opts ):
@@ -129,7 +131,6 @@
s77 = self.addSwitch( 's77' )
s78 = self.addSwitch( 's78' )
-
# ... and now hosts
# s1_host = self.addHost( 'h1', ip='10.1.0.1/24', cls=dualStackHost, v6Addr='1000::1/64' )
# s2_host = self.addHost( 'h2', ip='10.1.0.2/24', cls=dualStackHost, v6Addr='1000::2/64' )
@@ -211,253 +212,254 @@
s78_host = self.addHost( 'h78', ip='10.1.0.78/24', cls=dualStackHost, v6Addr='1000::78/64' )
# add edges between switch and corresponding host
- #self.addLink( s1 , s1_host )
- #self.addLink( s2 , s2_host )
- #self.addLink( s3 , s3_host )
- #self.addLink( s4 , s4_host )
- #self.addLink( s5 , s5_host )
- #self.addLink( s6 , s6_host )
- #self.addLink( s7 , s7_host )
- #self.addLink( s8 , s8_host )
- #self.addLink( s9 , s9_host )
- #self.addLink( s10 , s10_host )
- self.addLink( s11 , s11_host )
- self.addLink( s12 , s12_host )
- self.addLink( s13 , s13_host )
- self.addLink( s14 , s14_host )
- self.addLink( s15 , s15_host )
- self.addLink( s16 , s16_host )
- self.addLink( s17 , s17_host )
- self.addLink( s18 , s18_host )
- self.addLink( s19 , s19_host )
- self.addLink( s20 , s20_host )
- self.addLink( s21 , s21_host )
- self.addLink( s22 , s22_host )
- self.addLink( s23 , s23_host )
- self.addLink( s24 , s24_host )
- self.addLink( s25 , s25_host )
- self.addLink( s26 , s26_host )
- self.addLink( s27 , s27_host )
- self.addLink( s28 , s28_host )
- self.addLink( s29 , s29_host )
- self.addLink( s30 , s30_host )
- self.addLink( s31 , s31_host )
- self.addLink( s32 , s32_host )
- self.addLink( s33 , s33_host )
- self.addLink( s34 , s34_host )
- self.addLink( s35 , s35_host )
- self.addLink( s36 , s36_host )
- self.addLink( s37 , s37_host )
- self.addLink( s38 , s38_host )
- self.addLink( s39 , s39_host )
- self.addLink( s40 , s40_host )
- self.addLink( s41 , s41_host )
- self.addLink( s42 , s42_host )
- self.addLink( s43 , s43_host )
- self.addLink( s44 , s44_host )
- self.addLink( s45 , s45_host )
- self.addLink( s46 , s46_host )
- self.addLink( s47 , s47_host )
- self.addLink( s48 , s48_host )
- self.addLink( s49 , s49_host )
- self.addLink( s50 , s50_host )
- self.addLink( s51 , s51_host )
- self.addLink( s52 , s52_host )
- self.addLink( s53 , s53_host )
- self.addLink( s54 , s54_host )
- self.addLink( s55 , s55_host )
- self.addLink( s56 , s56_host )
- self.addLink( s57 , s57_host )
- self.addLink( s58 , s58_host )
- self.addLink( s59 , s59_host )
- self.addLink( s60 , s60_host )
- self.addLink( s61 , s61_host )
- self.addLink( s62 , s62_host )
- self.addLink( s63 , s63_host )
- self.addLink( s64 , s64_host )
- self.addLink( s65 , s65_host )
- self.addLink( s66 , s66_host )
- self.addLink( s67 , s67_host )
- self.addLink( s68 , s68_host )
- self.addLink( s69 , s69_host )
- self.addLink( s70 , s70_host )
- self.addLink( s71 , s71_host )
- self.addLink( s72 , s72_host )
- self.addLink( s73 , s73_host )
- self.addLink( s74 , s74_host )
- self.addLink( s75 , s75_host )
- self.addLink( s76 , s76_host )
- self.addLink( s77 , s77_host )
- self.addLink( s78 , s78_host )
+ # self.addLink( s1 , s1_host )
+ # self.addLink( s2 , s2_host )
+ # self.addLink( s3 , s3_host )
+ # self.addLink( s4 , s4_host )
+ # self.addLink( s5 , s5_host )
+ # self.addLink( s6 , s6_host )
+ # self.addLink( s7 , s7_host )
+ # self.addLink( s8 , s8_host )
+ # self.addLink( s9 , s9_host )
+ # self.addLink( s10 , s10_host )
+ self.addLink( s11, s11_host )
+ self.addLink( s12, s12_host )
+ self.addLink( s13, s13_host )
+ self.addLink( s14, s14_host )
+ self.addLink( s15, s15_host )
+ self.addLink( s16, s16_host )
+ self.addLink( s17, s17_host )
+ self.addLink( s18, s18_host )
+ self.addLink( s19, s19_host )
+ self.addLink( s20, s20_host )
+ self.addLink( s21, s21_host )
+ self.addLink( s22, s22_host )
+ self.addLink( s23, s23_host )
+ self.addLink( s24, s24_host )
+ self.addLink( s25, s25_host )
+ self.addLink( s26, s26_host )
+ self.addLink( s27, s27_host )
+ self.addLink( s28, s28_host )
+ self.addLink( s29, s29_host )
+ self.addLink( s30, s30_host )
+ self.addLink( s31, s31_host )
+ self.addLink( s32, s32_host )
+ self.addLink( s33, s33_host )
+ self.addLink( s34, s34_host )
+ self.addLink( s35, s35_host )
+ self.addLink( s36, s36_host )
+ self.addLink( s37, s37_host )
+ self.addLink( s38, s38_host )
+ self.addLink( s39, s39_host )
+ self.addLink( s40, s40_host )
+ self.addLink( s41, s41_host )
+ self.addLink( s42, s42_host )
+ self.addLink( s43, s43_host )
+ self.addLink( s44, s44_host )
+ self.addLink( s45, s45_host )
+ self.addLink( s46, s46_host )
+ self.addLink( s47, s47_host )
+ self.addLink( s48, s48_host )
+ self.addLink( s49, s49_host )
+ self.addLink( s50, s50_host )
+ self.addLink( s51, s51_host )
+ self.addLink( s52, s52_host )
+ self.addLink( s53, s53_host )
+ self.addLink( s54, s54_host )
+ self.addLink( s55, s55_host )
+ self.addLink( s56, s56_host )
+ self.addLink( s57, s57_host )
+ self.addLink( s58, s58_host )
+ self.addLink( s59, s59_host )
+ self.addLink( s60, s60_host )
+ self.addLink( s61, s61_host )
+ self.addLink( s62, s62_host )
+ self.addLink( s63, s63_host )
+ self.addLink( s64, s64_host )
+ self.addLink( s65, s65_host )
+ self.addLink( s66, s66_host )
+ self.addLink( s67, s67_host )
+ self.addLink( s68, s68_host )
+ self.addLink( s69, s69_host )
+ self.addLink( s70, s70_host )
+ self.addLink( s71, s71_host )
+ self.addLink( s72, s72_host )
+ self.addLink( s73, s73_host )
+ self.addLink( s74, s74_host )
+ self.addLink( s75, s75_host )
+ self.addLink( s76, s76_host )
+ self.addLink( s77, s77_host )
+ self.addLink( s78, s78_host )
- #info( '*** Add Leaf links\n')
- self.addLink(s1, s9)
- self.addLink(s2, s10)
- self.addLink(s3, s9)
- self.addLink(s4, s10)
- self.addLink(s5, s9)
- self.addLink(s6, s10)
- self.addLink(s7, s9)
- self.addLink(s8, s10)
- self.addLink(s9, s11)
- self.addLink(s9, s12)
- self.addLink(s10, s13)
- self.addLink(s10, s14)
- self.addLink(s11, s12)
- self.addLink(s13, s14)
+ # info( '*** Add Leaf links\n' )
+ self.addLink( s1, s9 )
+ self.addLink( s2, s10 )
+ self.addLink( s3, s9 )
+ self.addLink( s4, s10 )
+ self.addLink( s5, s9 )
+ self.addLink( s6, s10 )
+ self.addLink( s7, s9 )
+ self.addLink( s8, s10 )
+ self.addLink( s9, s11 )
+ self.addLink( s9, s12 )
+ self.addLink( s10, s13 )
+ self.addLink( s10, s14 )
+ self.addLink( s11, s12 )
+ self.addLink( s13, s14 )
- #info( '*** Add Spine-1 links\n')
- self.addLink(s15, s1)
- self.addLink(s15, s2)
- self.addLink(s16, s1)
- self.addLink(s16, s2)
- self.addLink(s17, s1)
- self.addLink(s17, s2)
- self.addLink(s18, s1)
- self.addLink(s18, s2)
- self.addLink(s19, s1)
- self.addLink(s19, s2)
- self.addLink(s20, s1)
- self.addLink(s20, s2)
- self.addLink(s21, s1)
- self.addLink(s21, s2)
- self.addLink(s22, s1)
- self.addLink(s22, s2)
- self.addLink(s23, s1)
- self.addLink(s23, s2)
- self.addLink(s24, s1)
- self.addLink(s24, s2)
- self.addLink(s25, s1)
- self.addLink(s25, s2)
- self.addLink(s26, s1)
- self.addLink(s26, s2)
- self.addLink(s27, s1)
- self.addLink(s27, s2)
- self.addLink(s28, s1)
- self.addLink(s28, s2)
- self.addLink(s29, s1)
- self.addLink(s29, s2)
- self.addLink(s30, s1)
- self.addLink(s30, s2)
+ # info( '*** Add Spine-1 links\n' )
+ self.addLink( s15, s1 )
+ self.addLink( s15, s2 )
+ self.addLink( s16, s1 )
+ self.addLink( s16, s2 )
+ self.addLink( s17, s1 )
+ self.addLink( s17, s2 )
+ self.addLink( s18, s1 )
+ self.addLink( s18, s2 )
+ self.addLink( s19, s1 )
+ self.addLink( s19, s2 )
+ self.addLink( s20, s1 )
+ self.addLink( s20, s2 )
+ self.addLink( s21, s1 )
+ self.addLink( s21, s2 )
+ self.addLink( s22, s1 )
+ self.addLink( s22, s2 )
+ self.addLink( s23, s1 )
+ self.addLink( s23, s2 )
+ self.addLink( s24, s1 )
+ self.addLink( s24, s2 )
+ self.addLink( s25, s1 )
+ self.addLink( s25, s2 )
+ self.addLink( s26, s1 )
+ self.addLink( s26, s2 )
+ self.addLink( s27, s1 )
+ self.addLink( s27, s2 )
+ self.addLink( s28, s1 )
+ self.addLink( s28, s2 )
+ self.addLink( s29, s1 )
+ self.addLink( s29, s2 )
+ self.addLink( s30, s1 )
+ self.addLink( s30, s2 )
- #info( '*** Add Spine-2 links\n')
- self.addLink(s31, s3)
- self.addLink(s31, s4)
- self.addLink(s32, s3)
- self.addLink(s32, s4)
- self.addLink(s33, s3)
- self.addLink(s33, s4)
- self.addLink(s34, s3)
- self.addLink(s34, s4)
- self.addLink(s35, s3)
- self.addLink(s35, s4)
- self.addLink(s36, s3)
- self.addLink(s36, s4)
- self.addLink(s37, s3)
- self.addLink(s37, s4)
- self.addLink(s38, s3)
- self.addLink(s38, s4)
- self.addLink(s39, s3)
- self.addLink(s39, s4)
- self.addLink(s40, s3)
- self.addLink(s40, s4)
- self.addLink(s41, s3)
- self.addLink(s41, s4)
- self.addLink(s42, s3)
- self.addLink(s42, s4)
- self.addLink(s43, s3)
- self.addLink(s43, s4)
- self.addLink(s44, s3)
- self.addLink(s44, s4)
- self.addLink(s45, s3)
- self.addLink(s45, s4)
- self.addLink(s46, s3)
- self.addLink(s46, s4)
+ # info( '*** Add Spine-2 links\n' )
+ self.addLink( s31, s3 )
+ self.addLink( s31, s4 )
+ self.addLink( s32, s3 )
+ self.addLink( s32, s4 )
+ self.addLink( s33, s3 )
+ self.addLink( s33, s4 )
+ self.addLink( s34, s3 )
+ self.addLink( s34, s4 )
+ self.addLink( s35, s3 )
+ self.addLink( s35, s4 )
+ self.addLink( s36, s3 )
+ self.addLink( s36, s4 )
+ self.addLink( s37, s3 )
+ self.addLink( s37, s4 )
+ self.addLink( s38, s3 )
+ self.addLink( s38, s4 )
+ self.addLink( s39, s3 )
+ self.addLink( s39, s4 )
+ self.addLink( s40, s3 )
+ self.addLink( s40, s4 )
+ self.addLink( s41, s3 )
+ self.addLink( s41, s4 )
+ self.addLink( s42, s3 )
+ self.addLink( s42, s4 )
+ self.addLink( s43, s3 )
+ self.addLink( s43, s4 )
+ self.addLink( s44, s3 )
+ self.addLink( s44, s4 )
+ self.addLink( s45, s3 )
+ self.addLink( s45, s4 )
+ self.addLink( s46, s3 )
+ self.addLink( s46, s4 )
- #info( '*** Add Spine-3 links\n')
- self.addLink(s47, s5)
- self.addLink(s47, s6)
- self.addLink(s48, s5)
- self.addLink(s48, s6)
- self.addLink(s49, s5)
- self.addLink(s49, s6)
- self.addLink(s50, s5)
- self.addLink(s50, s6)
- self.addLink(s51, s5)
- self.addLink(s51, s6)
- self.addLink(s52, s5)
- self.addLink(s52, s6)
- self.addLink(s53, s5)
- self.addLink(s53, s6)
- self.addLink(s54, s5)
- self.addLink(s54, s6)
- self.addLink(s55, s5)
- self.addLink(s55, s6)
- self.addLink(s56, s5)
- self.addLink(s56, s6)
- self.addLink(s57, s5)
- self.addLink(s57, s6)
- self.addLink(s58, s5)
- self.addLink(s58, s6)
- self.addLink(s59, s5)
- self.addLink(s59, s6)
- self.addLink(s60, s5)
- self.addLink(s60, s6)
- self.addLink(s61, s5)
- self.addLink(s61, s6)
- self.addLink(s62, s5)
- self.addLink(s62, s6)
+ # info( '*** Add Spine-3 links\n' )
+ self.addLink( s47, s5 )
+ self.addLink( s47, s6 )
+ self.addLink( s48, s5 )
+ self.addLink( s48, s6 )
+ self.addLink( s49, s5 )
+ self.addLink( s49, s6 )
+ self.addLink( s50, s5 )
+ self.addLink( s50, s6 )
+ self.addLink( s51, s5 )
+ self.addLink( s51, s6 )
+ self.addLink( s52, s5 )
+ self.addLink( s52, s6 )
+ self.addLink( s53, s5 )
+ self.addLink( s53, s6 )
+ self.addLink( s54, s5 )
+ self.addLink( s54, s6 )
+ self.addLink( s55, s5 )
+ self.addLink( s55, s6 )
+ self.addLink( s56, s5 )
+ self.addLink( s56, s6 )
+ self.addLink( s57, s5 )
+ self.addLink( s57, s6 )
+ self.addLink( s58, s5 )
+ self.addLink( s58, s6 )
+ self.addLink( s59, s5 )
+ self.addLink( s59, s6 )
+ self.addLink( s60, s5 )
+ self.addLink( s60, s6 )
+ self.addLink( s61, s5 )
+ self.addLink( s61, s6 )
+ self.addLink( s62, s5 )
+ self.addLink( s62, s6 )
- #info( '*** Add Spine-4 links\n')
- self.addLink(s63, s7)
- self.addLink(s63, s8)
- self.addLink(s64, s7)
- self.addLink(s64, s8)
- self.addLink(s65, s7)
- self.addLink(s65, s8)
- self.addLink(s66, s7)
- self.addLink(s66, s8)
- self.addLink(s67, s7)
- self.addLink(s67, s8)
- self.addLink(s68, s7)
- self.addLink(s68, s8)
- self.addLink(s69, s7)
- self.addLink(s69, s8)
- self.addLink(s70, s7)
- self.addLink(s70, s8)
- self.addLink(s71, s7)
- self.addLink(s71, s8)
- self.addLink(s72, s7)
- self.addLink(s72, s8)
- self.addLink(s73, s7)
- self.addLink(s73, s8)
- self.addLink(s74, s7)
- self.addLink(s74, s8)
- self.addLink(s75, s7)
- self.addLink(s75, s8)
- self.addLink(s76, s7)
- self.addLink(s76, s8)
- self.addLink(s77, s7)
- self.addLink(s77, s8)
- self.addLink(s78, s7)
- self.addLink(s78, s8)
+ # info( '*** Add Spine-4 links\n' )
+ self.addLink( s63, s7 )
+ self.addLink( s63, s8 )
+ self.addLink( s64, s7 )
+ self.addLink( s64, s8 )
+ self.addLink( s65, s7 )
+ self.addLink( s65, s8 )
+ self.addLink( s66, s7 )
+ self.addLink( s66, s8 )
+ self.addLink( s67, s7 )
+ self.addLink( s67, s8 )
+ self.addLink( s68, s7 )
+ self.addLink( s68, s8 )
+ self.addLink( s69, s7 )
+ self.addLink( s69, s8 )
+ self.addLink( s70, s7 )
+ self.addLink( s70, s8 )
+ self.addLink( s71, s7 )
+ self.addLink( s71, s8 )
+ self.addLink( s72, s7 )
+ self.addLink( s72, s8 )
+ self.addLink( s73, s7 )
+ self.addLink( s73, s8 )
+ self.addLink( s74, s7 )
+ self.addLink( s74, s8 )
+ self.addLink( s75, s7 )
+ self.addLink( s75, s8 )
+ self.addLink( s76, s7 )
+ self.addLink( s76, s8 )
+ self.addLink( s77, s7 )
+ self.addLink( s77, s8 )
+ self.addLink( s78, s7 )
+ self.addLink( s78, s8 )
topos = { 'spine': ( lambda: spineTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = spineTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch, link=TCLink, autoSetMacs = True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, link=TCLink, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()
diff --git a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoTripleIpv6.py b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoTripleIpv6.py
old mode 100755
new mode 100644
index 9b83391..d74d444
--- a/TestON/tests/CHOTestMonkey/dependencies/topologies/topoTripleIpv6.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/topologies/topoTripleIpv6.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -10,7 +10,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
from mininet.topo import Topo
from mininet.net import Mininet
from mininet.node import Host, RemoteController
@@ -32,13 +31,16 @@
from mininet.util import dumpNodeConnections
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
+
class dualStackHost( Host ):
+
def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) )
return r
+
class tripleTopo( Topo ):
def __init__( self, **opts ):
@@ -57,29 +59,30 @@
s3_host = self.addHost( 'h3', ip='10.1.0.3/24', cls=dualStackHost, v6Addr='1000::3/64' )
# add edges between switch and corresponding host
- self.addLink( s1 , s1_host )
- self.addLink( s2 , s2_host )
- self.addLink( s3 , s3_host )
- self.addLink(s1, s2)
- self.addLink(s1, s3)
- self.addLink(s2, s3)
+ self.addLink( s1, s1_host )
+ self.addLink( s2, s2_host )
+ self.addLink( s3, s3_host )
+ self.addLink( s1, s2 )
+ self.addLink( s1, s3 )
+ self.addLink( s2, s3 )
topos = { 'triple': ( lambda: tripleTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS
+
def setupNetwork():
"Create network"
topo = tripleTopo()
- #if controller_ip == '':
- #controller_ip = '10.0.2.2';
+ # if controller_ip == '':
+ # controller_ip = '10.0.2.2';
# controller_ip = '127.0.0.1';
- network = Mininet(topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None)
+ network = Mininet( topo=topo, switch=OVSSwitch, autoSetMacs=True, controller=None )
network.start()
CLI( network )
network.stop()
if __name__ == '__main__':
- setLogLevel('info')
- #setLogLevel('debug')
+ setLogLevel( 'info' )
+ # setLogLevel( 'debug' )
setupNetwork()