Updated node/host locations for "dual" topo.

Change-Id: I8ce1e3ca8b2a21f36521af9820bbc80cc9eb5d2b
This commit is contained in:
Simon Hunt 2017-09-12 13:11:11 -07:00
parent 12c79edc91
commit ac8f11f01b
2 changed files with 23 additions and 9 deletions

View File

@ -1,7 +1,19 @@
{
"devices": {
"of:0000000000000001": { "basic": { "name": "SW-A" }},
"of:0000000000000002": { "basic": { "name": "SW-B" }}
"of:0000000000000001": {
"basic": {
"name": "SW-A",
"latitude": 43.3700,
"longitude": -104.6572
}
},
"of:0000000000000002": {
"basic": {
"name": "SW-B",
"latitude": 38.5189,
"longitude": -109.2781
}
}
},
"hosts": {
@ -14,7 +26,9 @@
"ips": [
"10.0.0.1"
],
"name": "Host-X"
"name": "Host-X",
"latitude": 39.9444,
"longitude": -91.7822
}
}
}

View File

@ -14,18 +14,18 @@ class DualTopo( Topo ):
Topo.__init__( self )
# add nodes, switches first...
LONDON = self.addSwitch( 's1' )
BRISTL = self.addSwitch( 's2' )
SWA = self.addSwitch( 's1' )
SWB = self.addSwitch( 's2' )
# ... and now hosts
LONDON_host = self.addHost( 'h1' )
HOSTX = self.addHost( 'h1' )
# add edges between switch and corresponding host
self.addLink( LONDON, LONDON_host )
self.addLink( BRISTL, LONDON_host )
self.addLink( SWA, HOSTX )
self.addLink( SWB, HOSTX )
# add edges between switches
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
self.addLink( SWA, SWB, bw=10, delay='1.0ms' )
topos = { 'dual': ( lambda: DualTopo() ) }