홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
541413dc 1 parent c72271ff

Pruning deprecated test topo artifacts. 

Change-Id: I0627f1dae8d6af0eceedaf837bfc0e136c6b12df
Inline Side-by-side
Showing 6 changed files with 12 additions and 110 deletions
...@@ -29,12 +29,15 @@ ...@@ -29,12 +29,15 @@
29 29
30 <step name="Start-Mininet" 30 <step name="Start-Mininet"
31 requires="Install-Apps,Config-Topo,Push-Topos,Stop-Mininet-If-Needed" 31 requires="Install-Apps,Config-Topo,Push-Topos,Stop-Mininet-If-Needed"
32 - exec="onos-mininet start topos/topo att-onos.py ${ONOS_INSTANCES}"/> 32 + exec="onos-mininet start topos/topo attmplsfast.py ${ONOS_INSTANCES}"/>
33 33
34 <step name="Wait-For-Mininet" requires="Start-Mininet" 34 <step name="Wait-For-Mininet" requires="Start-Mininet"
35 exec="onos-mininet wait 10"/> 35 exec="onos-mininet wait 10"/>
36 36
37 - <step name="Check-Summary" requires="~Wait-For-Mininet" 37 + <step name="ARP-Hosts" requires="~Wait-For-Mininet"
38 + exec="onos-mininet sendAndExpect gratuitousArp --expect ."/>
39 +
40 + <step name="Check-Summary" requires="ARP-Hosts"
38 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/> 41 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
39 42
40 <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}" 43 <step name="Balance-Masters" requires="~Check-Summary" if="${OC2}"
......
1 -#!/bin/bash
2 -# -----------------------------------------------------------------------------
3 -# Starts ATT ONOS topology in mininet.
4 -# -----------------------------------------------------------------------------
5 -cd $(dirname $0)
6 -if [ -n "$1" ]; then
7 - sudo python att-onos.py "$@"
8 -else
9 - sudo python att-onos.py 10.128.11.1 10.128.11.2 10.128.11.3
10 -fi
1 -#!/usr/bin/python
2 -
3 -import sys
4 -
5 -from mininet.net import Mininet
6 -from mininet.cli import CLI
7 -from mininet.log import setLogLevel
8 -from mininet.node import RemoteController
9 -from mininet.link import TCLink
10 -
11 -from attmplsext import AttMplsTopoExt
12 -
13 -setLogLevel( 'info' )
14 -
15 -def run(controllers=[ '127.0.0.1' ]):
16 - net = Mininet( topo=AttMplsTopoExt(), link=TCLink, build=False, autoSetMacs=True )
17 - ctrl_count = 0
18 - for controllerIP in controllers:
19 - net.addController( 'c%d' % ctrl_count, RemoteController, ip=controllerIP )
20 - net.build()
21 - net.start()
22 - CLI( net )
23 - net.stop()
24 -
25 -if __name__ == '__main__':
26 - if len( sys.argv ) > 1:
27 - controllers = sys.argv[ 1: ]
28 - else:
29 - print 'Usage: att-onos-ext.py <c0 IP> <c1 IP> ...'
30 - exit( 1 )
31 - run( controllers )
1 -#!/usr/bin/python
2 -
3 -from onosnet import run
4 -from attmpls import AttMplsTopo
5 -
6 -run( AttMplsTopo() )
1 -{
2 - "devices": [
3 - { "alias": "s1", "uri": "of:0000000000000001", "mac": "000000000001", "annotations": { "name": "CMBR", "latitude": 42.373730, "longitude": -71.109734 }, "type": "SWITCH" },
4 - { "alias": "s2", "uri": "of:0000000000000002", "mac": "000000000002", "annotations": { "name": "CHCG", "latitude": 41.877461, "longitude": -87.642892 }, "type": "SWITCH" },
5 - { "alias": "s3", "uri": "of:0000000000000003", "mac": "000000000003", "annotations": { "name": "CLEV", "latitude": 41.498928, "longitude": -81.695217 }, "type": "SWITCH" },
6 - { "alias": "s4", "uri": "of:0000000000000004", "mac": "000000000004", "annotations": { "name": "RLGH", "latitude": 35.780150, "longitude": -78.644026 }, "type": "SWITCH" },
7 - { "alias": "s5", "uri": "of:0000000000000005", "mac": "000000000005", "annotations": { "name": "ATLN", "latitude": 33.749017, "longitude": -84.394168 }, "type": "SWITCH" },
8 - { "alias": "s6", "uri": "of:0000000000000006", "mac": "000000000006", "annotations": { "name": "PHLA", "latitude": 39.952906, "longitude": -75.172278 }, "type": "SWITCH" },
9 - { "alias": "s7", "uri": "of:0000000000000007", "mac": "000000000007", "annotations": { "name": "WASH", "latitude": 38.906696, "longitude": -77.035509 }, "type": "SWITCH" },
10 - { "alias": "s8", "uri": "of:0000000000000008", "mac": "000000000008", "annotations": { "name": "NSVL", "latitude": 36.166410, "longitude": -86.787305 }, "type": "SWITCH" },
11 - { "alias": "s9", "uri": "of:0000000000000009", "mac": "000000000009", "annotations": { "name": "STLS", "latitude": 38.626418, "longitude": -90.198143 }, "type": "SWITCH" },
12 - { "alias": "s10", "uri": "of:000000000000000a", "mac": "00000000000a", "annotations": { "name": "NWOR", "latitude": 29.951475, "longitude": -90.078434 }, "type": "SWITCH" },
13 - { "alias": "s11", "uri": "of:000000000000000b", "mac": "00000000000b", "annotations": { "name": "HSTN", "latitude": 29.763249, "longitude": -95.368332 }, "type": "SWITCH" },
14 - { "alias": "s12", "uri": "of:000000000000000c", "mac": "00000000000c", "annotations": { "name": "SNAN", "latitude": 29.424331, "longitude": -98.491745 }, "type": "SWITCH" },
15 - { "alias": "s13", "uri": "of:000000000000000d", "mac": "00000000000d", "annotations": { "name": "DLLS", "latitude": 32.777665, "longitude": -96.802064 }, "type": "SWITCH" },
16 - { "alias": "s14", "uri": "of:000000000000000e", "mac": "00000000000e", "annotations": { "name": "ORLD", "latitude": 28.538641, "longitude": -81.381110 }, "type": "SWITCH" },
17 - { "alias": "s15", "uri": "of:000000000000000f", "mac": "00000000000f", "annotations": { "name": "DNVR", "latitude": 39.736623, "longitude": -104.984887 }, "type": "SWITCH" },
18 - { "alias": "s16", "uri": "of:0000000000000010", "mac": "000000000010", "annotations": { "name": "KSCY", "latitude": 39.100725, "longitude": -94.581228 }, "type": "SWITCH" },
19 - { "alias": "s17", "uri": "of:0000000000000011", "mac": "000000000011", "annotations": { "name": "SNFN", "latitude": 37.779751, "longitude": -122.409791 }, "type": "SWITCH" },
20 - { "alias": "s18", "uri": "of:0000000000000012", "mac": "000000000012", "annotations": { "name": "SCRM", "latitude": 38.581001, "longitude": -121.497844 }, "type": "SWITCH" },
21 - { "alias": "s19", "uri": "of:0000000000000013", "mac": "000000000013", "annotations": { "name": "PTLD", "latitude": 45.523317, "longitude": -122.677768 }, "type": "SWITCH" },
22 - { "alias": "s20", "uri": "of:0000000000000014", "mac": "000000000014", "annotations": { "name": "STTL", "latitude": 47.607326, "longitude": -122.331786 }, "type": "SWITCH" },
23 - { "alias": "s21", "uri": "of:0000000000000015", "mac": "000000000015", "annotations": { "name": "SLKC", "latitude": 40.759577, "longitude": -111.895079 }, "type": "SWITCH" },
24 - { "alias": "s22", "uri": "of:0000000000000016", "mac": "000000000016", "annotations": { "name": "LA03", "latitude": 34.056346, "longitude": -118.235951 }, "type": "SWITCH" },
25 - { "alias": "s23", "uri": "of:0000000000000017", "mac": "000000000017", "annotations": { "name": "SNDG", "latitude": 32.714564, "longitude": -117.153528 }, "type": "SWITCH" },
26 - { "alias": "s24", "uri": "of:0000000000000018", "mac": "000000000018", "annotations": { "name": "PHNX", "latitude": 33.448289, "longitude": -112.076299 }, "type": "SWITCH" },
27 - { "alias": "s25", "uri": "of:0000000000000019", "mac": "000000000019", "annotations": { "name": "NY54", "latitude": 40.728270, "longitude": -73.994483 }, "type": "SWITCH" }
28 - ],
29 -
30 - "hosts": [
31 - { "alias": "h1", "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/1", "ip": "10.0.0.1", "annotations": { "name": "CMBR", "latitude": 43.355715, "longitude": -69.528243 } },
32 - { "alias": "h2", "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/1", "ip": "10.0.0.2", "annotations": { "name": "CHCG", "latitude": 43.632679, "longitude": -88.772526 } },
33 - { "alias": "h3", "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/1", "ip": "10.0.0.3", "annotations": { "name": "CLEV", "latitude": 42.756945, "longitude": -79.831317 } },
34 - { "alias": "h4", "mac": "00:00:00:00:00:04", "vlan": -1, "location": "of:0000000000000004/1", "ip": "10.0.0.4", "annotations": { "name": "RLGH", "latitude": 36.972249, "longitude": -76.667163 } },
35 - { "alias": "h5", "mac": "00:00:00:00:00:05", "vlan": -1, "location": "of:0000000000000005/1", "ip": "10.0.0.5", "annotations": { "name": "ATLN", "latitude": 35.427493, "longitude": -83.885831 } },
36 - { "alias": "h6", "mac": "00:00:00:00:00:06", "vlan": -1, "location": "of:0000000000000006/1", "ip": "10.0.0.6", "annotations": { "name": "PHLA", "latitude": 39.208113, "longitude": -73.421341 } },
37 - { "alias": "h7", "mac": "00:00:00:00:00:07", "vlan": -1, "location": "of:0000000000000007/1", "ip": "10.0.0.7", "annotations": { "name": "WASH", "latitude": 40.133860, "longitude": -79.238299 } },
38 - { "alias": "h8", "mac": "00:00:00:00:00:08", "vlan": -1, "location": "of:0000000000000008/1", "ip": "10.0.0.8", "annotations": { "name": "NSVL", "latitude": 37.407589, "longitude": -84.415068 } },
39 - { "alias": "h9", "mac": "00:00:00:00:00:09", "vlan": -1, "location": "of:0000000000000009/1", "ip": "10.0.0.9", "annotations": { "name": "STLS", "latitude": 40.066810, "longitude": -90.932405 } },
40 - { "alias": "h10", "mac": "00:00:00:00:00:0a", "vlan": -1, "location": "of:000000000000000a/1", "ip": "10.0.0.10", "annotations": { "name": "NWOR", "latitude": 31.470982, "longitude": -88.779353 } },
41 - { "alias": "h11", "mac": "00:00:00:00:00:0b", "vlan": -1, "location": "of:000000000000000b/1", "ip": "10.0.0.11", "annotations": { "name": "HSTN", "latitude": 31.136858, "longitude": -94.351656 } },
42 - { "alias": "h12", "mac": "00:00:00:00:00:0c", "vlan": -1, "location": "of:000000000000000c/1", "ip": "10.0.0.12", "annotations": { "name": "SNAN", "latitude": 28.040975, "longitude": -99.169527 } },
43 - { "alias": "h13", "mac": "00:00:00:00:00:0d", "vlan": -1, "location": "of:000000000000000d/1", "ip": "10.0.0.13", "annotations": { "name": "DLLS", "latitude": 31.899825, "longitude": -99.287263 } },
44 - { "alias": "h14", "mac": "00:00:00:00:00:0e", "vlan": -1, "location": "of:000000000000000e/1", "ip": "10.0.0.14", "annotations": { "name": "ORLD", "latitude": 26.670509, "longitude": -81.291920 } },
45 - { "alias": "h15", "mac": "00:00:00:00:00:0f", "vlan": -1, "location": "of:000000000000000f/1", "ip": "10.0.0.15", "annotations": { "name": "DNVR", "latitude": 40.888148, "longitude": -103.459878 } },
46 - { "alias": "h16", "mac": "00:00:00:00:00:10", "vlan": -1, "location": "of:0000000000000010/1", "ip": "10.0.0.16", "annotations": { "name": "KSCY", "latitude": 40.545088, "longitude": -93.734002 } },
47 - { "alias": "h17", "mac": "00:00:00:00:00:11", "vlan": -1, "location": "of:0000000000000011/1", "ip": "10.0.0.17", "annotations": { "name": "SNFN", "latitude": 39.081743, "longitude": -124.330172 } },
48 - { "alias": "h18", "mac": "00:00:00:00:00:12", "vlan": -1, "location": "of:0000000000000012/1", "ip": "10.0.0.18", "annotations": { "name": "SCRM", "latitude": 40.107468, "longitude": -120.424689 } },
49 - { "alias": "h19", "mac": "00:00:00:00:00:13", "vlan": -1, "location": "of:0000000000000013/1", "ip": "10.0.0.19", "annotations": { "name": "PTLD", "latitude": 44.383051, "longitude": -124.767594 } },
50 - { "alias": "h20", "mac": "00:00:00:00:00:14", "vlan": -1, "location": "of:0000000000000014/1", "ip": "10.0.0.20", "annotations": { "name": "STTL", "latitude": 48.832627, "longitude": -120.298441 } },
51 - { "alias": "h21", "mac": "00:00:00:00:00:15", "vlan": -1, "location": "of:0000000000000015/1", "ip": "10.0.0.21", "annotations": { "name": "SLKC", "latitude": 42.301734, "longitude": -111.217297 } },
52 - { "alias": "h22", "mac": "00:00:00:00:00:16", "vlan": -1, "location": "of:0000000000000016/1", "ip": "10.0.0.22", "annotations": { "name": "LA03", "latitude": 33.224634, "longitude": -121.532943 } },
53 - { "alias": "h23", "mac": "00:00:00:00:00:17", "vlan": -1, "location": "of:0000000000000017/1", "ip": "10.0.0.23", "annotations": { "name": "SNDG", "latitude": 31.834607, "longitude": -118.847982 } },
54 - { "alias": "h24", "mac": "00:00:00:00:00:18", "vlan": -1, "location": "of:0000000000000018/1", "ip": "10.0.0.24", "annotations": { "name": "PHNX", "latitude": 34.662290, "longitude": -110.946662 } },
55 - { "alias": "h25", "mac": "00:00:00:00:00:19", "vlan": -1, "location": "of:0000000000000019/1", "ip": "10.0.0.25", "annotations": { "name": "NY54", "latitude": 42.395459, "longitude": -75.293563 } }
56 - ]
57 -
58 -}
...@@ -24,14 +24,14 @@ class AttMplsTopo( Topo ): ...@@ -24,14 +24,14 @@ class AttMplsTopo( Topo ):
24 # add nodes, switches first... 24 # add nodes, switches first...
25 NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483 25 NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483
26 CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734 26 CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734
27 - CHCG = self.addSwitch( 's2', protocols='OpenFlow13' ) # 41.877461, -87.642892 27 + CHCG = self.addSwitch( 's2' ) # 41.877461, -87.642892
28 CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217 28 CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217
29 RLGH = self.addSwitch( 's4' ) # 35.780150, -78.644026 29 RLGH = self.addSwitch( 's4' ) # 35.780150, -78.644026
30 ATLN = self.addSwitch( 's5' ) # 33.749017, -84.394168 30 ATLN = self.addSwitch( 's5' ) # 33.749017, -84.394168
31 PHLA = self.addSwitch( 's6' ) # 39.952906, -75.172278 31 PHLA = self.addSwitch( 's6' ) # 39.952906, -75.172278
32 WASH = self.addSwitch( 's7' ) # 38.906696, -77.035509 32 WASH = self.addSwitch( 's7' ) # 38.906696, -77.035509
33 NSVL = self.addSwitch( 's8' ) # 36.166410, -86.787305 33 NSVL = self.addSwitch( 's8' ) # 36.166410, -86.787305
34 - STLS = self.addSwitch( 's9', protocols='OpenFlow13' ) # 38.626418, -90.198143 34 + STLS = self.addSwitch( 's9' ) # 38.626418, -90.198143
35 NWOR = self.addSwitch( 's10' ) # 29.951475, -90.078434 35 NWOR = self.addSwitch( 's10' ) # 29.951475, -90.078434
36 HSTN = self.addSwitch( 's11' ) # 29.763249, -95.368332 36 HSTN = self.addSwitch( 's11' ) # 29.763249, -95.368332
37 SNAN = self.addSwitch( 's12' ) # 29.424331, -98.491745 37 SNAN = self.addSwitch( 's12' ) # 29.424331, -98.491745
...@@ -44,7 +44,7 @@ class AttMplsTopo( Topo ): ...@@ -44,7 +44,7 @@ class AttMplsTopo( Topo ):
44 PTLD = self.addSwitch( 's19' ) # 45.523317, -122.677768 44 PTLD = self.addSwitch( 's19' ) # 45.523317, -122.677768
45 STTL = self.addSwitch( 's20' ) # 47.607326, -122.331786 45 STTL = self.addSwitch( 's20' ) # 47.607326, -122.331786
46 SLKC = self.addSwitch( 's21' ) # 40.759577, -111.895079 46 SLKC = self.addSwitch( 's21' ) # 40.759577, -111.895079
47 - LA03 = self.addSwitch( 's22', protocols='OpenFlow13' ) # 34.056346, -118.235951 47 + LA03 = self.addSwitch( 's22' ) # 34.056346, -118.235951
48 SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528 48 SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528
49 PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299 49 PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299
50 50
...@@ -175,3 +175,7 @@ class AttMplsTopo( Topo ): ...@@ -175,3 +175,7 @@ class AttMplsTopo( Topo ):
175 self.addLink( SNDG , PHNX) 175 self.addLink( SNDG , PHNX)
176 176
177 topos = { 'att': ( lambda: AttMplsTopo() ) } 177 topos = { 'att': ( lambda: AttMplsTopo() ) }
178 +
179 +if __name__ == '__main__':
180 + from onosnet import run
181 + run( AttMplsTopo() )
......