From b731e2f1dd0972409b136aebc7b463dd72c9cfad Mon Sep 17 00:00:00 2001 From: CNlucius Date: Tue, 13 Sep 2016 11:40:12 +0800 Subject: ONOSFW-171 O/S-SFC-ONOS scenario documentation Change-Id: I51ae1cf736ea24ab6680f8edca1b2bf5dd598365 Signed-off-by: CNlucius --- framework/src/onos/tools/test/topos/att-onos | 10 - .../src/onos/tools/test/topos/att-onos-ext.py | 31 - framework/src/onos/tools/test/topos/att-onos.py | 41 - framework/src/onos/tools/test/topos/attcli.py | 138 ---- .../src/onos/tools/test/topos/attmpls-intents | 8 - framework/src/onos/tools/test/topos/attmpls.json | 58 -- framework/src/onos/tools/test/topos/attmpls.py | 177 ----- framework/src/onos/tools/test/topos/attmplsfast.py | 177 ----- framework/src/onos/tools/test/topos/chordal.py | 402 ---------- framework/src/onos/tools/test/topos/cord.json | 24 - framework/src/onos/tools/test/topos/fractal.py | 56 -- framework/src/onos/tools/test/topos/linear-2.json | 6 - framework/src/onos/tools/test/topos/metro.py | 217 ------ framework/src/onos/tools/test/topos/newFuncTopo.py | 148 ---- framework/src/onos/tools/test/topos/obelisk.py | 70 -- .../src/onos/tools/test/topos/obeliskHostCheck.py | 91 --- .../src/onos/tools/test/topos/oe-linear-3.json | 48 -- .../src/onos/tools/test/topos/oe-nonlinear-10.json | 149 ---- .../src/onos/tools/test/topos/oe-nonlinear-4.json | 52 -- framework/src/onos/tools/test/topos/onos.py | 225 ------ framework/src/onos/tools/test/topos/optical.py | 79 -- framework/src/onos/tools/test/topos/optical2.py | 84 -- framework/src/onos/tools/test/topos/opticalTest.py | 98 --- .../src/onos/tools/test/topos/opticalTestBig.py | 391 ---------- .../src/onos/tools/test/topos/opticalUtils.py | 846 --------------------- framework/src/onos/tools/test/topos/rftest.py | 40 - framework/src/onos/tools/test/topos/rftesttopo.py | 59 -- framework/src/onos/tools/test/topos/sdn-ip.json | 26 - framework/src/onos/tools/test/topos/sol.py | 4 - framework/src/onos/tools/test/topos/solar.py | 97 --- .../onos/tools/test/topos/sys-nonlinear-10.config | 183 ----- .../onos/tools/test/topos/sys-nonlinear-4.config | 79 -- framework/src/onos/tools/test/topos/sys.config | 183 ----- framework/src/onos/tools/test/topos/topo | 10 - .../onos/tools/test/topos/topo-200sw-linkalarm.py | 20 - framework/src/onos/tools/test/topos/tower | 2 - framework/src/onos/tools/test/topos/tower.py | 55 -- 37 files changed, 4384 deletions(-) delete mode 100755 framework/src/onos/tools/test/topos/att-onos delete mode 100644 framework/src/onos/tools/test/topos/att-onos-ext.py delete mode 100644 framework/src/onos/tools/test/topos/att-onos.py delete mode 100644 framework/src/onos/tools/test/topos/attcli.py delete mode 100755 framework/src/onos/tools/test/topos/attmpls-intents delete mode 100644 framework/src/onos/tools/test/topos/attmpls.json delete mode 100644 framework/src/onos/tools/test/topos/attmpls.py delete mode 100644 framework/src/onos/tools/test/topos/attmplsfast.py delete mode 100644 framework/src/onos/tools/test/topos/chordal.py delete mode 100644 framework/src/onos/tools/test/topos/cord.json delete mode 100755 framework/src/onos/tools/test/topos/fractal.py delete mode 100644 framework/src/onos/tools/test/topos/linear-2.json delete mode 100755 framework/src/onos/tools/test/topos/metro.py delete mode 100644 framework/src/onos/tools/test/topos/newFuncTopo.py delete mode 100755 framework/src/onos/tools/test/topos/obelisk.py delete mode 100755 framework/src/onos/tools/test/topos/obeliskHostCheck.py delete mode 100644 framework/src/onos/tools/test/topos/oe-linear-3.json delete mode 100644 framework/src/onos/tools/test/topos/oe-nonlinear-10.json delete mode 100644 framework/src/onos/tools/test/topos/oe-nonlinear-4.json delete mode 100755 framework/src/onos/tools/test/topos/onos.py delete mode 100755 framework/src/onos/tools/test/topos/optical.py delete mode 100644 framework/src/onos/tools/test/topos/optical2.py delete mode 100644 framework/src/onos/tools/test/topos/opticalTest.py delete mode 100644 framework/src/onos/tools/test/topos/opticalTestBig.py delete mode 100644 framework/src/onos/tools/test/topos/opticalUtils.py delete mode 100644 framework/src/onos/tools/test/topos/rftest.py delete mode 100644 framework/src/onos/tools/test/topos/rftesttopo.py delete mode 100644 framework/src/onos/tools/test/topos/sdn-ip.json delete mode 100755 framework/src/onos/tools/test/topos/sol.py delete mode 100644 framework/src/onos/tools/test/topos/solar.py delete mode 100644 framework/src/onos/tools/test/topos/sys-nonlinear-10.config delete mode 100644 framework/src/onos/tools/test/topos/sys-nonlinear-4.config delete mode 100644 framework/src/onos/tools/test/topos/sys.config delete mode 100755 framework/src/onos/tools/test/topos/topo delete mode 100644 framework/src/onos/tools/test/topos/topo-200sw-linkalarm.py delete mode 100755 framework/src/onos/tools/test/topos/tower delete mode 100755 framework/src/onos/tools/test/topos/tower.py (limited to 'framework/src/onos/tools/test/topos') diff --git a/framework/src/onos/tools/test/topos/att-onos b/framework/src/onos/tools/test/topos/att-onos deleted file mode 100755 index 9ad918a9..00000000 --- a/framework/src/onos/tools/test/topos/att-onos +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# Starts ATT ONOS topology in mininet. -# ----------------------------------------------------------------------------- -cd $(dirname $0) -if [ -n "$1" ]; then - sudo python att-onos.py "$@" -else - sudo python att-onos.py 10.128.11.1 10.128.11.2 10.128.11.3 -fi diff --git a/framework/src/onos/tools/test/topos/att-onos-ext.py b/framework/src/onos/tools/test/topos/att-onos-ext.py deleted file mode 100644 index a058b648..00000000 --- a/framework/src/onos/tools/test/topos/att-onos-ext.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/python - -import sys - -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.node import RemoteController -from mininet.link import TCLink - -from attmplsext import AttMplsTopoExt - -setLogLevel( 'info' ) - -def run(controllers=[ '127.0.0.1' ]): - net = Mininet( topo=AttMplsTopoExt(), link=TCLink, build=False, autoSetMacs=True ) - ctrl_count = 0 - for controllerIP in controllers: - net.addController( 'c%d' % ctrl_count, RemoteController, ip=controllerIP ) - net.build() - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - if len( sys.argv ) > 1: - controllers = sys.argv[ 1: ] - else: - print 'Usage: att-onos-ext.py ...' - exit( 1 ) - run( controllers ) diff --git a/framework/src/onos/tools/test/topos/att-onos.py b/framework/src/onos/tools/test/topos/att-onos.py deleted file mode 100644 index 109d335d..00000000 --- a/framework/src/onos/tools/test/topos/att-onos.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python - -import sys - -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.node import RemoteController -from mininet.link import TCLink - -from attmpls import AttMplsTopo - -setLogLevel( 'info' ) - -def pingloop( net ): - setLogLevel( 'error' ) - try: - while True: - net.ping() - finally: - setLogLevel( 'info' ) - -def run(controllers=[ '127.0.0.1' ]): - Mininet.pingloop = pingloop - net = Mininet( topo=AttMplsTopo(), link=TCLink, build=False, autoSetMacs=True ) - ctrl_count = 0 - for controllerIP in controllers: - net.addController( 'c%d' % ctrl_count, RemoteController, ip=controllerIP ) - ctrl_count = ctrl_count + 1 - net.build() - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - if len( sys.argv ) > 1: - controllers = sys.argv[ 1: ] - else: - print 'Usage: att-onos.py ...' - exit( 1 ) - run( controllers ) diff --git a/framework/src/onos/tools/test/topos/attcli.py b/framework/src/onos/tools/test/topos/attcli.py deleted file mode 100644 index 19453204..00000000 --- a/framework/src/onos/tools/test/topos/attcli.py +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/python - -""" -CLI for test with AttMplsTopo -""" - -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.util import quietRun -from mininet.log import setLogLevel, info, output, error -from mininet.node import RemoteController - -from attmplsfast import AttMplsTopo - -from subprocess import PIPE, STDOUT -from time import time -import random - -class IperfCLI( CLI ): - "CLI with iperf UDP traffic generation" - - def __init__( self, net, *args, **kwargs ): - self.iperfs = {} - self.bw = '12k' - self.mn = net - self.lastbw = {} # last bandwidth reports - self.start() - quietRun( 'rm /tmp/*.iperf /tmp/*.client' ) - CLI.__init__( self, net, *args, **kwargs ) - - def __del__( self ): - "Destructor: kill *all* iperf servers and clients!" - quietRun( 'pkill -9 iperf' ) - - def start( self ): - "Start iperf servers" - for h in sorted( self.mn.hosts ): - with open( '/tmp/%s.iperf' % h, 'w' ) as f: - cmd = 'iperf -f k -i 1 -s -u' - popen = h.popen( cmd, stdin=PIPE, stdout=f, stderr=STDOUT ) - self.iperfs[ h ] = popen - - def udpstart( self, h1, h2, bw): - "Start up a udp iperf from h1 to h2 with bandwidth bw" - # For udp we don't have to wait for startup - self.udpstop( h1 ) - h1.cmdPrint( 'iperf -c', h2.IP(), - '-t 36000 -u -b', bw, - '1>/tmp/%s.client 2>&1 &' % h1 ) - - def udpstop( self, h ): - "udpstop h: Stop udp client on host h" - h.cmdPrint( 'kill %iperf && wait %iperf' ) - h.cmdPrint( 'rm /tmp/%s.client' % h ) - - def do_udp( self, line ): - """udp h1 h2 [rate]: start a udp iperf session from h1 to h2 - rate: udp transmit rate [12k]""" - args = line.split() - if len( args ) not in ( 2, 3 ): - error( 'usage: udp h1 h2 [rate]\n' ) - return - h1, h2 = self.mn.get( *args[ :2 ] ) - bw = self.bw if len( args ) == 2 else args[ 2 ] - self.udpstart( h1, h2, bw ) - - def do_stop( self, line ): - "stop [host | all]: Stop iperf client on host" - if not line or line == 'all': - hosts = self.mn.hosts - else: - hosts = [ self.mn.get( line ) ] - for h in hosts: - self.udpstop( h ) - - def do_bw( self, line ): - "bw: show last reported iperf server ingress bandwidth" - output( "Last reported iperf UDP server input bandwidth:\n" ) - for h in self.mn.hosts: - lastout, lasttime = self.lastbw.get( h, ( '', 0 ) ) - out = h.cmd( 'tail -1 /tmp/%s.iperf' % h ) - if '---' in out or ( out == lastout and - time() - lasttime > 1.5 ): - # Stale update - don't display - out = '\n' - else: - self.lastbw[ h ] = ( out, time() ) - output( '%s:' % h, out ) - - def do_rand( self, line ): - """rand [N [bw]]: Start N random flows (default: 10) - at the given bandwidth (default: 12k) - Note: this may replace existing flows""" - args = line.split() - N = 10 - if args: - try: - N = int( args[ 0 ] ) - except: - error( 'please specify an integer' ) - return - output( 'Starting/restarting', N, 'random flows...\n' ) - bw = self.bw if len( args ) < 2 else args[ 1 ] - servers = random.sample( self.mn.hosts, N ) - clients = [] - for server in servers: - allclients = [ h for h in self.mn.hosts - if h not in clients ] - client = random.choice( allclients ) - clients.append( client ) - self.udpstart( client, server, bw ) - - def do_jobs( self, line ): - "jobs: List iperf jobs" - output( "Currently running jobs:\n" ) - for h in self.mn.hosts: - output( '%s:' % h, h.cmd( 'jobs' ).strip(), '\n' ) - - -def run( Topo=AttMplsTopo ): - "Create network and run CLI" - topo = Topo() - net = Mininet( topo=topo, controller=RemoteController ) - net.start() - info( '\n### Welcome to the custom iperf udp CLI!\n' - '###\n' - '### udp h1 h2 [bw] start iperf udp from h1 to h2\n' - '### stop h1 h2 stop iperf udp from h1 to h2\n' - '### rand [N] start/restart N random udp iperfs\n' - '### bw show last reported udp ingress bandwidth\n' - '### jobs list iperf jobs\n\n' ) - IperfCLI( net ) - net.stop() - - -if __name__ == '__main__': - setLogLevel( 'info' ) - run() diff --git a/framework/src/onos/tools/test/topos/attmpls-intents b/framework/src/onos/tools/test/topos/attmpls-intents deleted file mode 100755 index f4624595..00000000 --- a/framework/src/onos/tools/test/topos/attmpls-intents +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Creates some sample intents -onos $OCI add-host-intent 00:00:00:00:00:15/-1 00:00:00:00:00:0b/-1 -onos $OCI add-host-intent 00:00:00:00:00:15/-1 00:00:00:00:00:0e/-1 -onos $OCI add-host-intent 00:00:00:00:00:10/-1 00:00:00:00:00:0a/-1 -onos $OCI add-host-intent 00:00:00:00:00:09/-1 00:00:00:00:00:0c/-1 -onos $OCI add-host-intent 00:00:00:00:00:02/-1 00:00:00:00:00:0e/-1 -onos $OCI add-host-intent 00:00:00:00:00:11/-1 00:00:00:00:00:05/-1 diff --git a/framework/src/onos/tools/test/topos/attmpls.json b/framework/src/onos/tools/test/topos/attmpls.json deleted file mode 100644 index 096a78fa..00000000 --- a/framework/src/onos/tools/test/topos/attmpls.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "devices": [ - { "alias": "s1", "uri": "of:0000000000000001", "mac": "000000000001", "annotations": { "name": "CMBR", "latitude": 42.373730, "longitude": -71.109734 }, "type": "SWITCH" }, - { "alias": "s2", "uri": "of:0000000000000002", "mac": "000000000002", "annotations": { "name": "CHCG", "latitude": 41.877461, "longitude": -87.642892 }, "type": "SWITCH" }, - { "alias": "s3", "uri": "of:0000000000000003", "mac": "000000000003", "annotations": { "name": "CLEV", "latitude": 41.498928, "longitude": -81.695217 }, "type": "SWITCH" }, - { "alias": "s4", "uri": "of:0000000000000004", "mac": "000000000004", "annotations": { "name": "RLGH", "latitude": 35.780150, "longitude": -78.644026 }, "type": "SWITCH" }, - { "alias": "s5", "uri": "of:0000000000000005", "mac": "000000000005", "annotations": { "name": "ATLN", "latitude": 33.749017, "longitude": -84.394168 }, "type": "SWITCH" }, - { "alias": "s6", "uri": "of:0000000000000006", "mac": "000000000006", "annotations": { "name": "PHLA", "latitude": 39.952906, "longitude": -75.172278 }, "type": "SWITCH" }, - { "alias": "s7", "uri": "of:0000000000000007", "mac": "000000000007", "annotations": { "name": "WASH", "latitude": 38.906696, "longitude": -77.035509 }, "type": "SWITCH" }, - { "alias": "s8", "uri": "of:0000000000000008", "mac": "000000000008", "annotations": { "name": "NSVL", "latitude": 36.166410, "longitude": -86.787305 }, "type": "SWITCH" }, - { "alias": "s9", "uri": "of:0000000000000009", "mac": "000000000009", "annotations": { "name": "STLS", "latitude": 38.626418, "longitude": -90.198143 }, "type": "SWITCH" }, - { "alias": "s10", "uri": "of:000000000000000a", "mac": "00000000000a", "annotations": { "name": "NWOR", "latitude": 29.951475, "longitude": -90.078434 }, "type": "SWITCH" }, - { "alias": "s11", "uri": "of:000000000000000b", "mac": "00000000000b", "annotations": { "name": "HSTN", "latitude": 29.763249, "longitude": -95.368332 }, "type": "SWITCH" }, - { "alias": "s12", "uri": "of:000000000000000c", "mac": "00000000000c", "annotations": { "name": "SNAN", "latitude": 29.424331, "longitude": -98.491745 }, "type": "SWITCH" }, - { "alias": "s13", "uri": "of:000000000000000d", "mac": "00000000000d", "annotations": { "name": "DLLS", "latitude": 32.777665, "longitude": -96.802064 }, "type": "SWITCH" }, - { "alias": "s14", "uri": "of:000000000000000e", "mac": "00000000000e", "annotations": { "name": "ORLD", "latitude": 28.538641, "longitude": -81.381110 }, "type": "SWITCH" }, - { "alias": "s15", "uri": "of:000000000000000f", "mac": "00000000000f", "annotations": { "name": "DNVR", "latitude": 39.736623, "longitude": -104.984887 }, "type": "SWITCH" }, - { "alias": "s16", "uri": "of:0000000000000010", "mac": "000000000010", "annotations": { "name": "KSCY", "latitude": 39.100725, "longitude": -94.581228 }, "type": "SWITCH" }, - { "alias": "s17", "uri": "of:0000000000000011", "mac": "000000000011", "annotations": { "name": "SNFN", "latitude": 37.779751, "longitude": -122.409791 }, "type": "SWITCH" }, - { "alias": "s18", "uri": "of:0000000000000012", "mac": "000000000012", "annotations": { "name": "SCRM", "latitude": 38.581001, "longitude": -121.497844 }, "type": "SWITCH" }, - { "alias": "s19", "uri": "of:0000000000000013", "mac": "000000000013", "annotations": { "name": "PTLD", "latitude": 45.523317, "longitude": -122.677768 }, "type": "SWITCH" }, - { "alias": "s20", "uri": "of:0000000000000014", "mac": "000000000014", "annotations": { "name": "STTL", "latitude": 47.607326, "longitude": -122.331786 }, "type": "SWITCH" }, - { "alias": "s21", "uri": "of:0000000000000015", "mac": "000000000015", "annotations": { "name": "SLKC", "latitude": 40.759577, "longitude": -111.895079 }, "type": "SWITCH" }, - { "alias": "s22", "uri": "of:0000000000000016", "mac": "000000000016", "annotations": { "name": "LA03", "latitude": 34.056346, "longitude": -118.235951 }, "type": "SWITCH" }, - { "alias": "s23", "uri": "of:0000000000000017", "mac": "000000000017", "annotations": { "name": "SNDG", "latitude": 32.714564, "longitude": -117.153528 }, "type": "SWITCH" }, - { "alias": "s24", "uri": "of:0000000000000018", "mac": "000000000018", "annotations": { "name": "PHNX", "latitude": 33.448289, "longitude": -112.076299 }, "type": "SWITCH" }, - { "alias": "s25", "uri": "of:0000000000000019", "mac": "000000000019", "annotations": { "name": "NY54", "latitude": 40.728270, "longitude": -73.994483 }, "type": "SWITCH" } - ], - - "hosts": [ - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } }, - { "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 } } - ] - -} diff --git a/framework/src/onos/tools/test/topos/attmpls.py b/framework/src/onos/tools/test/topos/attmpls.py deleted file mode 100644 index 4fe71154..00000000 --- a/framework/src/onos/tools/test/topos/attmpls.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env python - -""" -""" -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.node import RemoteController -from mininet.node import Node -from mininet.node import CPULimitedHost -from mininet.link import TCLink -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.util import dumpNodeConnections - -class AttMplsTopo( Topo ): - "Internet Topology Zoo Specimen." - - def __init__( self ): - "Create a topology." - - # Initialize Topology - Topo.__init__( self ) - - # add nodes, switches first... - NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483 - CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734 - CHCG = self.addSwitch( 's2', protocols='OpenFlow13' ) # 41.877461, -87.642892 - CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217 - RLGH = self.addSwitch( 's4' ) # 35.780150, -78.644026 - ATLN = self.addSwitch( 's5' ) # 33.749017, -84.394168 - PHLA = self.addSwitch( 's6' ) # 39.952906, -75.172278 - WASH = self.addSwitch( 's7' ) # 38.906696, -77.035509 - NSVL = self.addSwitch( 's8' ) # 36.166410, -86.787305 - STLS = self.addSwitch( 's9', protocols='OpenFlow13' ) # 38.626418, -90.198143 - NWOR = self.addSwitch( 's10' ) # 29.951475, -90.078434 - HSTN = self.addSwitch( 's11' ) # 29.763249, -95.368332 - SNAN = self.addSwitch( 's12' ) # 29.424331, -98.491745 - DLLS = self.addSwitch( 's13' ) # 32.777665, -96.802064 - ORLD = self.addSwitch( 's14' ) # 28.538641, -81.381110 - DNVR = self.addSwitch( 's15' ) # 39.736623, -104.984887 - KSCY = self.addSwitch( 's16' ) # 39.100725, -94.581228 - SNFN = self.addSwitch( 's17' ) # 37.779751, -122.409791 - SCRM = self.addSwitch( 's18' ) # 38.581001, -121.497844 - PTLD = self.addSwitch( 's19' ) # 45.523317, -122.677768 - STTL = self.addSwitch( 's20' ) # 47.607326, -122.331786 - SLKC = self.addSwitch( 's21' ) # 40.759577, -111.895079 - LA03 = self.addSwitch( 's22', protocols='OpenFlow13' ) # 34.056346, -118.235951 - SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528 - PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299 - - # ... and now hosts - NY54_host = self.addHost( 'h25' ) - CMBR_host = self.addHost( 'h1' ) - CHCG_host = self.addHost( 'h2' ) - CLEV_host = self.addHost( 'h3' ) - RLGH_host = self.addHost( 'h4' ) - ATLN_host = self.addHost( 'h5' ) - PHLA_host = self.addHost( 'h6' ) - WASH_host = self.addHost( 'h7' ) - NSVL_host = self.addHost( 'h8' ) - STLS_host = self.addHost( 'h9' ) - NWOR_host = self.addHost( 'h10' ) - HSTN_host = self.addHost( 'h11' ) - SNAN_host = self.addHost( 'h12' ) - DLLS_host = self.addHost( 'h13' ) - ORLD_host = self.addHost( 'h14' ) - DNVR_host = self.addHost( 'h15' ) - KSCY_host = self.addHost( 'h16' ) - SNFN_host = self.addHost( 'h17' ) - SCRM_host = self.addHost( 'h18' ) - PTLD_host = self.addHost( 'h19' ) - STTL_host = self.addHost( 'h20' ) - SLKC_host = self.addHost( 'h21' ) - LA03_host = self.addHost( 'h22' ) - SNDG_host = self.addHost( 'h23' ) - PHNX_host = self.addHost( 'h24' ) - - # 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 ) - - # add edges between switches - self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') - self.addLink( NY54 , CMBR, bw=10, delay='0.979030824185ms') - 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 , 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 , 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 , DLLS, bw=10, delay='0.544782086448ms') - 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 , DNVR, bw=10, delay='0.251471593235ms') - self.addLink( DLLS , KSCY, bw=10, delay='0.18026026737ms') - 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( 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 , 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( SNFN , LA03, bw=10, delay='0.602936230151ms') - 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 , SNDG, bw=10, delay='0.681264950821ms') - self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') - self.addLink( LA03 , PHNX, bw=10, delay='0.343709457969ms') - self.addLink( SNDG , PHNX, bw=10, delay='0.345064487693ms') - -topos = { 'att': ( lambda: AttMplsTopo() ) } diff --git a/framework/src/onos/tools/test/topos/attmplsfast.py b/framework/src/onos/tools/test/topos/attmplsfast.py deleted file mode 100644 index cc7479be..00000000 --- a/framework/src/onos/tools/test/topos/attmplsfast.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env python - -""" -""" -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.node import RemoteController -from mininet.node import Node -from mininet.node import CPULimitedHost -from mininet.link import TCLink -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.util import dumpNodeConnections - -class AttMplsTopo( Topo ): - "Internet Topology Zoo Specimen." - - def __init__( self ): - "Create a topology." - - # Initialize Topology - Topo.__init__( self ) - - # add nodes, switches first... - NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483 - CMBR = self.addSwitch( 's1' ) # 42.373730, -71.109734 - CHCG = self.addSwitch( 's2', protocols='OpenFlow13' ) # 41.877461, -87.642892 - CLEV = self.addSwitch( 's3' ) # 41.498928, -81.695217 - RLGH = self.addSwitch( 's4' ) # 35.780150, -78.644026 - ATLN = self.addSwitch( 's5' ) # 33.749017, -84.394168 - PHLA = self.addSwitch( 's6' ) # 39.952906, -75.172278 - WASH = self.addSwitch( 's7' ) # 38.906696, -77.035509 - NSVL = self.addSwitch( 's8' ) # 36.166410, -86.787305 - STLS = self.addSwitch( 's9', protocols='OpenFlow13' ) # 38.626418, -90.198143 - NWOR = self.addSwitch( 's10' ) # 29.951475, -90.078434 - HSTN = self.addSwitch( 's11' ) # 29.763249, -95.368332 - SNAN = self.addSwitch( 's12' ) # 29.424331, -98.491745 - DLLS = self.addSwitch( 's13' ) # 32.777665, -96.802064 - ORLD = self.addSwitch( 's14' ) # 28.538641, -81.381110 - DNVR = self.addSwitch( 's15' ) # 39.736623, -104.984887 - KSCY = self.addSwitch( 's16' ) # 39.100725, -94.581228 - SNFN = self.addSwitch( 's17' ) # 37.779751, -122.409791 - SCRM = self.addSwitch( 's18' ) # 38.581001, -121.497844 - PTLD = self.addSwitch( 's19' ) # 45.523317, -122.677768 - STTL = self.addSwitch( 's20' ) # 47.607326, -122.331786 - SLKC = self.addSwitch( 's21' ) # 40.759577, -111.895079 - LA03 = self.addSwitch( 's22', protocols='OpenFlow13' ) # 34.056346, -118.235951 - SNDG = self.addSwitch( 's23' ) # 32.714564, -117.153528 - PHNX = self.addSwitch( 's24' ) # 33.448289, -112.076299 - - # ... and now hosts - NY54_host = self.addHost( 'h25' ) - CMBR_host = self.addHost( 'h1' ) - CHCG_host = self.addHost( 'h2' ) - CLEV_host = self.addHost( 'h3' ) - RLGH_host = self.addHost( 'h4' ) - ATLN_host = self.addHost( 'h5' ) - PHLA_host = self.addHost( 'h6' ) - WASH_host = self.addHost( 'h7' ) - NSVL_host = self.addHost( 'h8' ) - STLS_host = self.addHost( 'h9' ) - NWOR_host = self.addHost( 'h10' ) - HSTN_host = self.addHost( 'h11' ) - SNAN_host = self.addHost( 'h12' ) - DLLS_host = self.addHost( 'h13' ) - ORLD_host = self.addHost( 'h14' ) - DNVR_host = self.addHost( 'h15' ) - KSCY_host = self.addHost( 'h16' ) - SNFN_host = self.addHost( 'h17' ) - SCRM_host = self.addHost( 'h18' ) - PTLD_host = self.addHost( 'h19' ) - STTL_host = self.addHost( 'h20' ) - SLKC_host = self.addHost( 'h21' ) - LA03_host = self.addHost( 'h22' ) - SNDG_host = self.addHost( 'h23' ) - PHNX_host = self.addHost( 'h24' ) - - # 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 ) - - # add edges between switches - self.addLink( NY54 , CMBR) - self.addLink( NY54 , CMBR) - self.addLink( NY54 , CMBR) - self.addLink( NY54 , CHCG) - self.addLink( NY54 , PHLA) - self.addLink( NY54 , PHLA) - self.addLink( NY54 , WASH) - self.addLink( CMBR , PHLA) - self.addLink( CHCG , CLEV) - self.addLink( CHCG , PHLA) - self.addLink( CHCG , STLS) - self.addLink( CHCG , DNVR) - self.addLink( CHCG , KSCY) - self.addLink( CHCG , KSCY) - self.addLink( CHCG , SNFN) - self.addLink( CHCG , STTL) - self.addLink( CHCG , SLKC) - self.addLink( CLEV , NSVL) - self.addLink( CLEV , STLS) - self.addLink( CLEV , PHLA) - self.addLink( RLGH , ATLN) - self.addLink( RLGH , WASH) - self.addLink( ATLN , WASH) - self.addLink( ATLN , NSVL) - self.addLink( ATLN , STLS) - self.addLink( ATLN , DLLS) - self.addLink( ATLN , DLLS) - self.addLink( ATLN , DLLS) - self.addLink( ATLN , ORLD) - self.addLink( PHLA , WASH) - self.addLink( NSVL , STLS) - self.addLink( NSVL , DLLS) - self.addLink( STLS , DLLS) - self.addLink( STLS , KSCY) - self.addLink( STLS , LA03) - self.addLink( NWOR , HSTN) - self.addLink( NWOR , DLLS) - self.addLink( NWOR , ORLD) - self.addLink( HSTN , SNAN) - self.addLink( HSTN , DLLS) - self.addLink( HSTN , ORLD) - self.addLink( SNAN , PHNX) - self.addLink( SNAN , DLLS) - self.addLink( DLLS , DNVR) - self.addLink( DLLS , DNVR) - self.addLink( DLLS , KSCY) - self.addLink( DLLS , KSCY) - self.addLink( DLLS , SNFN) - self.addLink( DLLS , LA03) - self.addLink( DLLS , LA03) - self.addLink( DNVR , KSCY) - self.addLink( DNVR , SNFN) - self.addLink( DNVR , SNFN) - self.addLink( DNVR , SLKC) - self.addLink( KSCY , SNFN) - self.addLink( SNFN , SCRM) - self.addLink( SNFN , PTLD) - self.addLink( SNFN , STTL) - self.addLink( SNFN , SLKC) - self.addLink( SNFN , LA03) - self.addLink( SNFN , LA03) - self.addLink( SNFN , LA03) - self.addLink( SCRM , SLKC) - self.addLink( PTLD , STTL) - self.addLink( SLKC , LA03) - self.addLink( LA03 , SNDG) - self.addLink( LA03 , SNDG) - self.addLink( LA03 , PHNX) - self.addLink( LA03 , PHNX) - self.addLink( SNDG , PHNX) - -topos = { 'att': ( lambda: AttMplsTopo() ) } diff --git a/framework/src/onos/tools/test/topos/chordal.py b/framework/src/onos/tools/test/topos/chordal.py deleted file mode 100644 index 22f9ca19..00000000 --- a/framework/src/onos/tools/test/topos/chordal.py +++ /dev/null @@ -1,402 +0,0 @@ -""" -""" -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.node import RemoteController -from mininet.node import Node -from mininet.node import CPULimitedHost -from mininet.link import TCLink -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.util import dumpNodeConnections - -class chordalTopo( Topo ): - - def __init__( self, **opts ): - "Create a topology." - - # Initialize Topology - Topo.__init__( self, **opts ) - - # add nodes, switches first... - s1 = self.addSwitch( 's1' ) - s2 = self.addSwitch( 's2' ) - s3 = self.addSwitch( 's3' ) - s4 = self.addSwitch( 's4' ) - s5 = self.addSwitch( 's5' ) - s6 = self.addSwitch( 's6' ) - s7 = self.addSwitch( 's7' ) - s8 = self.addSwitch( 's8' ) - s9 = self.addSwitch( 's9' ) - s10 = self.addSwitch( 's10' ) - s11 = self.addSwitch( 's11' ) - s12 = self.addSwitch( 's12' ) - s13 = self.addSwitch( 's13' ) - s14 = self.addSwitch( 's14' ) - s15 = self.addSwitch( 's15' ) - s16 = self.addSwitch( 's16' ) - s17 = self.addSwitch( 's17' ) - s18 = self.addSwitch( 's18' ) - s19 = self.addSwitch( 's19' ) - s20 = self.addSwitch( 's20' ) - s21 = self.addSwitch( 's21' ) - s22 = self.addSwitch( 's22' ) - s23 = self.addSwitch( 's23' ) - s24 = self.addSwitch( 's24' ) - s25 = self.addSwitch( 's25' ) - - # ... 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' ) - s11_host = self.addHost( 'h11' ) - s12_host = self.addHost( 'h12' ) - s13_host = self.addHost( 'h13' ) - s14_host = self.addHost( 'h14' ) - s15_host = self.addHost( 'h15' ) - s16_host = self.addHost( 'h16' ) - s17_host = self.addHost( 'h17' ) - s18_host = self.addHost( 'h18' ) - s19_host = self.addHost( 'h19' ) - s20_host = self.addHost( 'h20' ) - s21_host = self.addHost( 'h21' ) - s22_host = self.addHost( 'h22' ) - s23_host = self.addHost( 'h23' ) - s24_host = self.addHost( 'h24' ) - 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) - -topos = { 'chordal': ( lambda: chordalTopo() ) } diff --git a/framework/src/onos/tools/test/topos/cord.json b/framework/src/onos/tools/test/topos/cord.json deleted file mode 100644 index 418a6b4b..00000000 --- a/framework/src/onos/tools/test/topos/cord.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "devices": [ - { "uri": "of:00010001e88b9368", "mac": "0001e88b9368", "annotations": { "name": "s101", "latitude": 37.710742, "longitude": -103.975010 }}, - { "uri": "of:00010001e88b939b", "mac": "0001e88b939b", "annotations": { "name": "s102", "latitude": 37.756072, "longitude": -97.547678 }}, - { "uri": "of:00010001e88b938c", "mac": "0001e88b938c", "annotations": { "name": "s103", "latitude": 37.657851, "longitude": -90.778101 }}, - { "uri": "of:00010001e88b93ad", "mac": "0001e88b93ad", "annotations": { "name": "s104", "latitude": 37.634692, "longitude": -84.215821 }}, - { "uri": "of:00010001e88b93bc", "mac": "0001e88b93bc", "annotations": { "name": "s105", "latitude": 41.951018, "longitude": -103.853350 }}, - { "uri": "of:00010001e88b93c2", "mac": "0001e88b93c2", "annotations": { "name": "s106", "latitude": 41.945684, "longitude": -97.526174 }}, - { "uri": "of:00010001e88b9398", "mac": "0001e88b9398", "annotations": { "name": "s107", "latitude": 41.952876, "longitude": -90.696484 }}, - { "uri": "of:00010001e88b27e3", "mac": "0001e88b27e3", "annotations": { "name": "s108", "latitude": 41.996877, "longitude": -84.169273 }} - ], - "hosts": [ - { "id": "00:1f:29:e1:2c:36/-1", "mac": "00:1f:29:e1:2c:36", "vlan": -1, "location": "of:00010001e88b9368/46", "ip": "10.200.1.11", "annotations": { "name": "h11", "latitude": 34.384830, "longitude": -104.019262 }}, - { "id": "00:1e:0b:cb:9d:64/-1", "mac": "00:1e:0b:cb:9d:64", "vlan": -1, "location": "of:00010001e88b9368/45", "ip": "10.200.1.12", "annotations": { "name": "h12", "latitude": 34.384830, "longitude": -104.019262 }}, - { "id": "00:1c:c4:6b:d8:12/-1", "mac": "00:1c:c4:6b:d8:12", "vlan": -1, "location": "of:00010001e88b939b/46", "ip": "10.200.2.21", "annotations": { "name": "h21", "latitude": 34.133376, "longitude": -89.442032 }}, - { "id": "00:1e:0b:ca:90:44/-1", "mac": "00:1e:0b:ca:90:44", "vlan": -1, "location": "of:00010001e88b939b/45", "ip": "10.200.2.22", "annotations": { "name": "h22", "latitude": 34.133376, "longitude": -89.442032 }}, - { "id": "00:1e:0b:ca:e5:1a/-1", "mac": "00:1e:0b:ca:e5:1a", "vlan": -1, "location": "of:00010001e88b938c/46", "ip": "10.200.3.31", "annotations": { "name": "h31", "latitude": 34.166625, "longitude": -91.983293 }}, - { "id": "2c:44:fd:e0:90:40/-1", "mac": "2c:44:fd:e0:90:40", "vlan": -1, "location": "of:00010001e88b938c/45", "ip": "10.200.3.32", "annotations": { "name": "h32", "latitude": 34.166625, "longitude": -91.983293 }}, - { "id": "2c:44:fd:e0:90:44/-1", "mac": "2c:44:fd:e0:90:44", "vlan": -1, "location": "of:00010001e88b938c/47", "ip": "10.200.3.33", "annotations": { "name": "h33", "latitude": 34.166625, "longitude": -91.983293 }}, - { "id": "00:1e:0b:cb:3f:ac/-1", "mac": "00:1e:0b:cb:3f:ac", "vlan": -1, "location": "of:00010001e88b93ad/46", "ip": "10.200.4.41", "annotations": { "name": "h41", "latitude": 34.225065, "longitude": -97.492882 }}, - { "id": "c8:1f:66:e2:9b:d0/-1", "mac": "c8:1f:66:e2:9b:d0", "vlan": -1, "location": "of:00010001e88b93ad/45", "ip": "10.200.4.42", "annotations": { "name": "h42", "latitude": 34.249236, "longitude": -84.253025 }}, - { "id": "c8:1f:66:e2:9b:d2/-1", "mac": "c8:1f:66:e2:9b:d2", "vlan": -1, "location": "of:00010001e88b93ad/47", "ip": "10.200.4.43", "annotations": { "name": "h43", "latitude": 34.249236, "longitude": -84.253025 }} - ] -} diff --git a/framework/src/onos/tools/test/topos/fractal.py b/framework/src/onos/tools/test/topos/fractal.py deleted file mode 100755 index bc5c6899..00000000 --- a/framework/src/onos/tools/test/topos/fractal.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python - -from mininet.topo import Topo - -class FractalTopo( Topo ): - def build( self, n=3, h=2 ): - - clusters = [] - for i in range( 1, n+1 ): - clusterSws = [] - # create switches in cluster - for j in range( 1, n+1 ): - id = i * 1000 + j - sw = self.addSwitch('s%d' % id, dpid=str(id).zfill(16)) - [ self.addLink(s, sw) for s in clusterSws ] - clusterSws.append(sw) - clusters.append(clusterSws) - - for i in range( 1, n+1 ): - # create the edge switch - id = i * 10000 - sw = self.addSwitch('s%d' % id, dpid=str(id).zfill(16)) - self.addLink(clusters[i-1].pop(0), sw) - for j in range( 1, h+1 ): - id = i * 1000 + j - host = self.addHost( 'h%d' % id ) - self.addLink( host, sw ) - - for i in range( 1, n+1 ): - # connect the clusters - if i == n: - id = n * 1000000 + 10000 - sw = self.addSwitch('s%d' % id, dpid=str(id).zfill(16)) - self.addLink(clusters[i-1].pop(0), sw) - self.addLink(clusters[0].pop(0), sw) - - else: - id = (i+1) * 1000000 + i * 10000 - sw = self.addSwitch('s%d' % id, dpid=str(id).zfill(16)) - self.addLink(clusters[i-1].pop(0), sw) - self.addLink(clusters[i].pop(0), sw) - - -topos = { 'fractal': FractalTopo } - -def run(): - topo = FractalTopo() - net = Mininet( topo=topo, controller=RemoteController, autoSetMacs=True ) - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - setLogLevel( 'info' ) - run() - diff --git a/framework/src/onos/tools/test/topos/linear-2.json b/framework/src/onos/tools/test/topos/linear-2.json deleted file mode 100644 index c248a236..00000000 --- a/framework/src/onos/tools/test/topos/linear-2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "devices": [ - { "alias": "s1", "uri": "of:0000000000000001", "annotations": { "driver": "ovs-corsa" } }, - { "alias": "s2", "uri": "of:0000000000000002", "annotations": { "driver": "ovs-corsa" } } - ] -} diff --git a/framework/src/onos/tools/test/topos/metro.py b/framework/src/onos/tools/test/topos/metro.py deleted file mode 100755 index 5a73cb6b..00000000 --- a/framework/src/onos/tools/test/topos/metro.py +++ /dev/null @@ -1,217 +0,0 @@ -#!/usr/bin/env python - -from mininet.net import Mininet -from mininet.node import UserSwitch, DefaultController, RemoteController, Host -from mininet.topo import Topo -from mininet.log import setLogLevel, info -from mininet.cli import CLI -from mininet.link import OVSIntf - -from opticalUtils import LINCSwitch, LINCLink - -class Domain(object): - """ - A container for switch, host, link, and controller information to be dumped - into the Mininet mid-level API. - """ - - def __init__ (self, did=0): - # each Domain has a numeric ID for sanity/convenience - self.__dId = did - - # information about network elements - for calling the "mid-level" APIs - self.__ctrls = {} - self.__switches = {} - self.__hosts = {} - self.__links = {} - # maps of devices, hosts, and controller names to actual objects - self.__smap = {} - self.__hmap = {} - self.__cmap = {} - - def addController(self, name, **args): - self.__ctrls[name] = args if args else {} - return name - - def addSwitch(self, name, **args): - self.__switches[name] = args if args else {} - return name - - def addHost(self, name, **args): - self.__hosts[name] = args if args else {} - return name - - def addLink(self, src, dst, **args): - self.__links[(src, dst)] = args if args else {} - return (src, dst) - - def getId( self): - return self.__dId - - def getControllers(self, name=None): - return self.__cmap.values() if not name else self.__cmap.get(name) - - def getSwitches(self, name=None): - return self.__smap.values() if not name else self.__smap.get(name) - - def getHosts(self, name=None): - return self.__hmap.values() if not name else self.__hmap.get(name) - - def injectInto(self, net): - """ Adds available topology info to a supplied Mininet object. """ - # add switches, hosts, then links to mininet object - for sw, args in self.__switches.iteritems(): - self.__smap[sw] = net.addSwitch(sw, **args) - for h, args in self.__hosts.iteritems(): - self.__hmap[h] = net.addHost(h, **args) - for l, args in self.__links.iteritems(): - src = self.__smap.get(l[0]) - dst = self.__smap.get(l[1]) - net.addLink(src if src else self.__hmap.get(l[0]), - dst if dst else self.__hmap.get(l[1]), **args) - # then controllers - for c, args in self.__ctrls.iteritems(): - self.__cmap[c] = net.addController(c, **args) - - def start(self): - """ starts the switches with the correct controller. """ - map(lambda c: c.start(), self.__cmap.values()) - map(lambda s: s.start(self.__cmap.values()), self.__smap.values()) - - def build(self, *args): - """ override for custom topology, similar to Topo """ - pass - - -class OpticalDomain(Domain): - """ An emulated optical metro core. It is Domain 0. """ - def build(self): - for i in range (1,4): - oean = { "optical.regens": 0 } - self.addSwitch('OE%s' % i, dpid='0000ffffffffff0%s' % i, annotations=oean, cls=LINCSwitch) - - an = { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" } - self.addLink('OE1', 'OE2', port1=50, port2=30, annotations=an, cls=LINCLink) - self.addLink('OE2', 'OE3', port1=50, port2=30, annotations=an, cls=LINCLink) - self.addLink('OE3', 'OE1', port1=50, port2=30, annotations=an, cls=LINCLink) - -class FabricDomain(Domain): - """ - An emulated CO fabric, which is basically a K(n,m) bipartite graph. - - Each FabricDomain should be given a unique Domain ID (did) to ensure unique - names and addressing. - """ - def __init__(self, did): - Domain.__init__(self, did) - - def build(self, n=2, m=3, f=2): - # K(n,m) in bipartite graph - l_nsw=[] - l_msw=[] - - # create n spine switches - for sw in range(n): - l_nsw.append(self.addSwitch('swn%s%s' % (self.getId(), sw+1), cls=UserSwitch)) - - # create connection point to optical core (a leaf switch) - tsw = self.addSwitch('swm%s01' % self.getId(), cls=UserSwitch) - self.addTether(tsw, 'sw000%s' % self.getId(), '0000ffffffff000%s' % self.getId()) - l_msw.append(tsw) - - # attach f hosts to last m-1 leaves - for sw in range(1, m): - msw = self.addSwitch('swm%s0%s' % (self.getId(), sw+1), cls=UserSwitch) - l_msw.append(msw) - for h in range(f): - host = self.addHost('h%s%s' % (self.getId(), sw * f+h+1), cls=IpHost, - ip='10.0.%s.%s/24' % ((self.getId()+sw+1), (f+1)), - gateway='10.0.%s.254' % (self.getId()+sw+1)) - self.addLink(host, msw) - # link up spines and leaves - for nsw in l_nsw: - for msw in l_msw: - self.addLink(nsw, msw) - - def addTether(self, name, tname, tdpid): - """ - add an OVS with name 'tname' and dpid 'tdpid' for connecting fabric - domains to the core. name: the UserSwitch to connect the OVS to. - """ - self.__tether = self.addSwitch(tname, dpid=tdpid) - self.addLink(tname, name, port1=1) - - def getTether(self): - """ get connection point of this fabric to the core """ - return self.__tether - - -class IpHost(Host): - def __init__(self, name, gateway, *args, **kwargs): - super(IpHost, self).__init__(name, *args, **kwargs) - self.gateway = gateway - - def config(self, **kwargs): - Host.config(self, **kwargs) - mtu = "ifconfig "+self.name+"-eth0 mtu 1490" - self.cmd(mtu) - self.cmd('ip route add default via %s' % self.gateway) - -# fixed port numbers for attachment points (APs) between CORD and metro domains -OVS_AP=2 -OE_AP=10 - -def setup(argv): - domains = [] - ctlsets = sys.argv[1:] - - # the controllers for the optical domain - d0 = OpticalDomain() - domains.append(d0) - ctls = ctlsets[0].split(',') - for i in range (len(ctls)): - d0.addController('c0%s' % i, controller=RemoteController, ip=ctls[i]) - - # the fabric domains - position 1 for domain 1, 2 for 2 ... - for i in range (1,len(ctlsets)): - f = FabricDomain(i) - domains.append(f) - ctls = ctlsets[i].split(',') - for j in range (len(ctls)): - f.addController('c%s%s' % (i,j), controller=RemoteController, ip=ctls[j]) - - # make/setup Mininet object - net = Mininet() - for d in domains: - d.build() - d.injectInto(net) - - # connect COs to core - sort of hard-wired at this moment - for i in range(1,len(domains)): - an = { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } - net.addLink(domains[i].getTether(), d0.getSwitches('OE%s' % i), - port1=OVS_AP, port2=OE_AP, speed=10000, annotations=an, cls=LINCLink) - - # fire everything up - net.build() - map(lambda x: x.start(), domains) - - # create a minimal copy of the network for configuring LINC. - cfgnet = Mininet() - cfgnet.switches = net.switches - cfgnet.links = net.links - cfgnet.controllers = d0.getControllers() - LINCSwitch.bootOE(cfgnet, d0.getSwitches()) - - CLI(net) - net.stop() - LINCSwitch.shutdownOE() - -if __name__ == '__main__': - setLogLevel('info') - import sys - if len(sys.argv) < 5: - print ("Usage: sudo -E ./metro.py ctl-set1 ... ctl-set4\n\n", - "Where ctl-set are comma-separated controller IP's") - else: - setup(sys.argv) diff --git a/framework/src/onos/tools/test/topos/newFuncTopo.py b/framework/src/onos/tools/test/topos/newFuncTopo.py deleted file mode 100644 index 5edf7f78..00000000 --- a/framework/src/onos/tools/test/topos/newFuncTopo.py +++ /dev/null @@ -1,148 +0,0 @@ -#!/usr/bin/python - -""" -Custom topology for Mininet -""" -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.node import Host, RemoteController -from mininet.node import Node -from mininet.node import CPULimitedHost -from mininet.link import TCLink -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.util import dumpNodeConnections -from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch ) - -class VLANHost( Host ): - def config( self, vlan=100, **params ): - r = super( Host, self ).config( **params ) - intf = self.defaultIntf() - self.cmd( 'ifconfig %s inet 0' % intf ) - self.cmd( 'vconfig add %s %d' % ( intf, vlan ) ) - self.cmd( 'ifconfig %s.%d inet %s' % ( intf, vlan, params['ip'] ) ) - newName = '%s.%d' % ( intf, vlan ) - intf.name = newName - self.nameToIntf[ newName ] = intf - return r - -class IPv6Host( Host ): - def config( self, v6Addr='1000:1/64', **params ): - r = super( Host, self ).config( **params ) - intf = self.defaultIntf() - self.cmd( 'ifconfig %s inet 0' % intf ) - self.cmd( 'ip -6 addr add %s dev %s' % ( v6Addr, intf ) ) - return r - -class dualStackHost( Host ): - def config( self, v6Addr='2000: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 MyTopo( Topo ): - - def __init__( self ): - # Initialize topology - Topo.__init__( self ) - # Switch S5 Hosts - host1=self.addHost( 'h1', ip='10.1.0.2/24' ) - host2=self.addHost( 'h2', cls=IPv6Host, v6Addr='1000::2/64' ) - host3=self.addHost( 'h3', ip='10.1.0.3/24', cls=dualStackHost, v6Addr='2000::2/64' ) - #VLAN hosts - host4=self.addHost( 'h4', ip='100.1.0.2/24', cls=VLANHost, vlan=100 ) - host5=self.addHost( 'h5', ip='200.1.0.2/24', cls=VLANHost, vlan=200 ) - #VPN-1 and VPN-2 Hosts - host6=self.addHost( 'h6', ip='11.1.0.2/24' ) - host7=self.addHost( 'h7', ip='12.1.0.2/24' ) - #Multicast Sender - host8=self.addHost( 'h8', ip='10.1.0.4/24' ) - - # Switch S6 Hosts - host9=self.addHost( 'h9', ip='10.1.0.5/24' ) - host10=self.addHost( 'h10', cls=IPv6Host, v6Addr='1000::3/64' ) - host11=self.addHost( 'h11', ip='10.1.0.6/24', cls=dualStackHost, v6Addr='2000::3/64' ) - #VLAN hosts - host12=self.addHost( 'h12', ip='100.1.0.3/24', cls=VLANHost, vlan=100 ) - host13=self.addHost( 'h13', ip='200.1.0.3/24', cls=VLANHost, vlan=200 ) - #VPN-1 and VPN-2 Hosts - host14=self.addHost( 'h14', ip='11.1.0.3/24' ) - host15=self.addHost( 'h15', ip='12.1.0.3/24' ) - #Multicast Receiver - host16=self.addHost( 'h16', ip='10.1.0.7/24' ) - - # Switch S7 Hosts - host17=self.addHost( 'h17', ip='10.1.0.8/24' ) - host18=self.addHost( 'h18', cls=IPv6Host, v6Addr='1000::4/64' ) - host19=self.addHost( 'h19', ip='10.1.0.9/24', cls=dualStackHost, v6Addr='2000::4/64' ) - #VLAN hosts - host20=self.addHost( 'h20', ip='100.1.0.4/24', cls=VLANHost, vlan=100 ) - host21=self.addHost( 'h21', ip='200.1.0.4/24', cls=VLANHost, vlan=200 ) - #VPN-1 and VPN-2 Hosts - host22=self.addHost( 'h22', ip='11.1.0.4/24' ) - host23=self.addHost( 'h23', ip='12.1.0.4/24' ) - #Multicast Receiver - host24=self.addHost( 'h24', ip='10.1.0.10/24' ) - - s1 = self.addSwitch( 's1' ) - s2 = self.addSwitch( 's2' ) - s3 = self.addSwitch( 's3' ) - s4 = self.addSwitch( 's4' ) - s5 = self.addSwitch( 's5' ) - s6 = self.addSwitch( 's6' ) - s7 = self.addSwitch( 's7' ) - - self.addLink(s5,host1) - self.addLink(s5,host2) - self.addLink(s5,host3) - self.addLink(s5,host4) - self.addLink(s5,host5) - self.addLink(s5,host6) - self.addLink(s5,host7) - self.addLink(s5,host8) - - self.addLink(s6,host9) - self.addLink(s6,host10) - self.addLink(s6,host11) - self.addLink(s6,host12) - self.addLink(s6,host13) - self.addLink(s6,host14) - self.addLink(s6,host15) - self.addLink(s6,host16) - - self.addLink(s7,host17) - self.addLink(s7,host18) - self.addLink(s7,host19) - self.addLink(s7,host20) - self.addLink(s7,host21) - self.addLink(s7,host22) - self.addLink(s7,host23) - self.addLink(s7,host24) - - self.addLink(s1,s2) - self.addLink(s1,s3) - self.addLink(s1,s4) - self.addLink(s1,s5) - self.addLink(s2,s3) - self.addLink(s2,s5) - self.addLink(s2,s6) - self.addLink(s3,s4) - self.addLink(s3,s6) - self.addLink(s4,s7) - topos = { 'mytopo': ( lambda: MyTopo() ) } - -# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS - -def setupNetwork(): - "Create network" - topo = MyTopo() - network = Mininet(topo=topo, autoSetMacs=True, controller=None) - network.start() - CLI( network ) - network.stop() - -if __name__ == '__main__': - setLogLevel('info') - #setLogLevel('debug') - setupNetwork() diff --git a/framework/src/onos/tools/test/topos/obelisk.py b/framework/src/onos/tools/test/topos/obelisk.py deleted file mode 100755 index fb6ccdbe..00000000 --- a/framework/src/onos/tools/test/topos/obelisk.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python - -from mininet.topo import Topo - -class ObeliskTopo( Topo ): - def __init__( self ): - Topo.__init__( self ) - topSwitch = self.addSwitch('s1',dpid='1000'.zfill(16)) - leftTopSwitch = self.addSwitch('s2',dpid='2000'.zfill(16)) - rightTopSwitch = self.addSwitch('s5',dpid='5000'.zfill(16)) - leftBotSwitch = self.addSwitch('s3',dpid='3000'.zfill(16)) - rightBotSwitch = self.addSwitch('s6',dpid='6000'.zfill(16)) - midBotSwitch = self.addSwitch('s28',dpid='2800'.zfill(16)) - - topHost = self.addHost( 'h1' ) - leftTopHost = self.addHost('h2') - rightTopHost = self.addHost('h5') - leftBotHost = self.addHost('h3') - rightBotHost = self.addHost('h6') - midBotHost = self.addHost('h28') - self.addLink(topSwitch,topHost) - self.addLink(leftTopSwitch,leftTopHost) - self.addLink(rightTopSwitch,rightTopHost) - self.addLink(leftBotSwitch,leftBotHost) - self.addLink(rightBotSwitch,rightBotHost) - self.addLink(midBotSwitch,midBotHost) - self.addLink(leftTopSwitch,rightTopSwitch) - self.addLink(topSwitch,leftTopSwitch) - self.addLink(topSwitch,rightTopSwitch) - self.addLink(leftTopSwitch,leftBotSwitch) - self.addLink(rightTopSwitch,rightBotSwitch) - self.addLink(leftBotSwitch,midBotSwitch) - self.addLink(midBotSwitch,rightBotSwitch) - - agg1Switch = self.addSwitch('s4',dpid = '3004'.zfill(16)) - agg2Switch = self.addSwitch('s7',dpid = '6007'.zfill(16)) - agg1Host = self.addHost('h4') - agg2Host = self.addHost('h7') - self.addLink(agg1Switch,agg1Host) - self.addLink(agg2Switch,agg2Host) - self.addLink(agg1Switch, leftBotSwitch) - self.addLink(agg2Switch, rightBotSwitch) - - for i in range(10): - num = str(i+8) - switch = self.addSwitch('s'+num,dpid = ('30'+num.zfill(2)).zfill(16)) - host = self.addHost('h'+num) - self.addLink(switch, host) - self.addLink(switch, agg1Switch) - - for i in range(10): - num = str(i+18) - switch = self.addSwitch('s'+num,dpid = ('60'+num.zfill(2)).zfill(16)) - host = self.addHost('h'+num) - self.addLink(switch, host) - self.addLink(switch, agg2Switch) - -topos = { 'obelisk': (lambda: ObeliskTopo() ) } - -def run(): - topo = ObeliskTopo() - net = Mininet( topo=topo, controller=RemoteController, autoSetMacs=True ) - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - setLogLevel( 'info' ) - run() - diff --git a/framework/src/onos/tools/test/topos/obeliskHostCheck.py b/framework/src/onos/tools/test/topos/obeliskHostCheck.py deleted file mode 100755 index e928f89f..00000000 --- a/framework/src/onos/tools/test/topos/obeliskHostCheck.py +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/python - -import sys -import os -import json - -# TODO: if none given, use OCI -try: - onosIp = sys.argv[1] - print "Reading hosts view from ONOS node " + onosIp + ":" -except Exception as e: - print "Error reading ONOS IP arguement" - print e -# Grab the json objects from ONOS -output = os.popen("onos " + onosIp + " \"hosts -j\"" ) -hosts = json.loads( output.read() ) -#hosts = json.loads( output.split( 'Logging in as karaf\n' )[1] ) - -hostAttachment = True -# FIXME: topo-HA/obelisk specific mappings: -# key is mac and value is dpid -mappings = {} -for i in range( 1, 29 ): # hosts 1 through 28 - # set up correct variables: - macId = "00:" * 5 + hex( i ).split( "0x" )[1].upper().zfill(2) - if i == 1: - deviceId = "1000".zfill(16) - elif i == 2: - deviceId = "2000".zfill(16) - elif i == 3: - deviceId = "3000".zfill(16) - elif i == 4: - deviceId = "3004".zfill(16) - elif i == 5: - deviceId = "5000".zfill(16) - elif i == 6: - deviceId = "6000".zfill(16) - elif i == 7: - deviceId = "6007".zfill(16) - elif i >= 8 and i <= 17: - dpid = '3' + str( i ).zfill( 3 ) - deviceId = dpid.zfill(16) - elif i >= 18 and i <= 27: - dpid = '6' + str( i ).zfill( 3 ) - deviceId = dpid.zfill(16) - elif i == 28: - deviceId = "2800".zfill(16) - mappings[ macId ] = deviceId - -if hosts or "Error" not in hosts: - if hosts == []: - print "WARNING: There are no hosts discovered" - else: - for host in hosts: - mac = None - location = None - device = None - port = None - try: - mac = host.get( 'mac' ) - assert mac, "mac field could not be found for this host object" - - location = host.get( 'location' ) - assert location, "location field could not be found for this host object" - - # Trim the protocol identifier off deviceId - device = str( location.get( 'elementId' ) ).split(':')[1] - assert device, "elementId field could not be found for this host location object" - - port = location.get( 'port' ) - assert port, "port field could not be found for this host location object" - - # Now check if this matches where they should be - if mac and device and port: - if device != mappings[ str( mac ) ]: - print "The attachment device is incorrect for host " + str( mac ) +\ - ". Expected: " + mappings[ str( mac ) ] + "; Actual: " + device - hostAttachment = False - if str( port ) != "1": - print "The attachment port is incorrect for host " + str( mac ) +\ - ". Expected: 1; Actual: " + str( port) - hostAttachment = False - else: - hostAttachment = False - except AssertionError as e: - print "ERROR: Json object not as expected:" - print e - print "host object: " + repr( host ) - hostAttachment = False -else: - print "No hosts json output or \"Error\" in output. hosts = " + repr( hosts ) diff --git a/framework/src/onos/tools/test/topos/oe-linear-3.json b/framework/src/onos/tools/test/topos/oe-linear-3.json deleted file mode 100644 index 44fccd99..00000000 --- a/framework/src/onos/tools/test/topos/oe-linear-3.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "devices" : [ - { - "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, - "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, - "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 }, - "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] - }, - - { - "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - } - ], - - "links" : [ - { "src": "of:0000ffffffffff01/20", "dst": "of:0000ffffffffff03/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffffff02/21", "dst": "of:0000ffffffffff03/31", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - - { "src": "of:0000ffffffff0001/2", "dst": "of:0000ffffffffff01/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true", "inactive": "true" } } - ], - - "hosts" : [ - { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000ffffffff0001/1", "ip": "10.0.0.1" }, - { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000ffffffff0002/1", "ip": "10.0.0.2" } - ] -} \ No newline at end of file diff --git a/framework/src/onos/tools/test/topos/oe-nonlinear-10.json b/framework/src/onos/tools/test/topos/oe-nonlinear-10.json deleted file mode 100644 index 9bf291e8..00000000 --- a/framework/src/onos/tools/test/topos/oe-nonlinear-10.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "devices" : [ - { - "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "SFO-W10", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, - "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed":100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "SJC-W10", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, - "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" }, - { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "LAX-W10", "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 }, - "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "SDG-W10", "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 }, - "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, - { "port":50, "speed": 0, "type": "FIBER" }, - { "port":20, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "MSP-M10", "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 }, - "ports": [ { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 40, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "DFW-M10", "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 }, - "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 40, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "CHG-N10", "latitude": 41.8, "longitude": -87.6, "optical.regens": 3 }, - "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "IAD-M10", "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 }, - "ports": [ { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 30, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "JFK-M10", "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 }, - "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ATL-S10", "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 }, - "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, - { "port": 20, "speed": 0, "type": "FIBER" }, - { "port": 50, "speed": 0, "type": "FIBER" }] - }, - { - "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "SFO-R10", "latitude": 37.6, "longitude": -122.3 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0002", "mac": "ffffffffff0003", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "LAX-R10", "latitude": 33.9, "longitude": -118.4 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0003", "mac": "ffffffffff0004", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "SDG-R10", "latitude": 32.8, "longitude": -117.1 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0004", "mac": "ffffffffff0007", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "CHG-R10", "latitude": 41.8, "longitude": -87.6 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0005", "mac": "ffffffffff0009", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "JFK-R10", "latitude": 40.8, "longitude": -73.1 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0006", "mac": "ffffffffff000A", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "ATL-R10", "latitude": 33.8, "longitude": -84.1 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - } - - ], - - "links" : [ - { "src": "of:0000ffffffffff01/50", "dst": "of:0000ffffffffff02/30","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 48, "durable": "true" } }, - { "src": "of:0000ffffffffff02/50", "dst": "of:0000ffffffffff03/30","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 493, "durable": "true" } }, - { "src": "of:0000ffffffffff03/50", "dst": "of:0000ffffffffff04/50","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 171, "durable": "true" } }, - { "src": "of:0000ffffffffff01/20", "dst": "of:0000ffffffffff05/50","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 2555, "durable": "true" } }, - { "src": "of:0000ffffffffff02/20", "dst": "of:0000ffffffffff05/20","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 2539, "durable": "true" } }, - { "src": "of:0000ffffffffff03/20", "dst": "of:0000ffffffffff06/50","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1979, "durable": "true" } }, - { "src": "of:0000ffffffffff04/20", "dst": "of:0000ffffffffff06/20","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1867, "durable": "true" } }, - { "src": "of:0000ffffffffff05/30", "dst": "of:0000ffffffffff06/40","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1378, "durable": "true" } }, - { "src": "of:0000ffffffffff05/40", "dst": "of:0000ffffffffff07/50", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 2200, "durable": "true" } }, - { "src": "of:0000ffffffffff06/30", "dst": "of:0000ffffffffff08/50", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1918, "durable": "true" } }, - { "src": "of:0000ffffffffff07/20", "dst": "of:0000ffffffffff08/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 3625, "durable": "true" } }, - { "src": "of:0000ffffffffff07/30", "dst": "of:0000ffffffffff09/50", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 3880, "durable": "true" } }, - { "src": "of:0000ffffffffff08/20", "dst": "of:0000ffffffffff0A/50", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 838, "durable": "true" } }, - { "src": "of:0000ffffffffff09/20", "dst": "of:0000ffffffffff0A/20","type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1245, "durable": "true" } }, - - { "src": "of:0000ffffffff0001/2", "dst": "of:0000ffffffffff01/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, - { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff04/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, - { "src": "of:0000ffffffff0003/2", "dst": "of:0000ffffffffff06/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, - { "src": "of:0000ffffffff0004/2", "dst": "of:0000ffffffffff07/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, - { "src": "of:0000ffffffff0005/2", "dst": "of:0000ffffffffff09/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, - { "src": "of:0000ffffffff0006/2", "dst": "of:0000ffffffffff0A/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } } - ] -} diff --git a/framework/src/onos/tools/test/topos/oe-nonlinear-4.json b/framework/src/onos/tools/test/topos/oe-nonlinear-4.json deleted file mode 100644 index 47782a86..00000000 --- a/framework/src/onos/tools/test/topos/oe-nonlinear-4.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "devices" : [ - { - "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, - "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, - "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 }, - "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type":"ROADM", - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", - "annotations": { "name": "ROADM4", "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 }, - "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - }, - { - "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH", - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", - "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 }, - "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] - } - ], - - "links" : [ - { "src": "of:0000ffffffffff01/20", "dst": "of:0000ffffffffff03/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffffff02/21", "dst": "of:0000ffffffffff03/31", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffffff01/22", "dst": "of:0000ffffffffff04/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffffff04/31", "dst": "of:0000ffffffffff02/22", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM", "durable": "true", "inactive": "true" } }, - - { "src": "of:0000ffffffff0001/2", "dst": "of:0000ffffffffff01/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true", "inactive": "true" } }, - { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true", "inactive": "true" } } - ] - -} - diff --git a/framework/src/onos/tools/test/topos/onos.py b/framework/src/onos/tools/test/topos/onos.py deleted file mode 100755 index b77a4975..00000000 --- a/framework/src/onos/tools/test/topos/onos.py +++ /dev/null @@ -1,225 +0,0 @@ -#!/usr/bin/env python - -# TODO add onos-app-fwd to features -# TODO check if service is running... i think this might already be done by mn - -from mininet.node import Controller, OVSSwitch, CPULimitedHost, RemoteController -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.topo import LinearTopo, Topo -from mininet.log import setLogLevel, info, warn -from mininet.util import quietRun, numCores - -from shutil import copyfile -from os import environ, path -from functools import partial -import time -from sys import argv -from time import sleep -from sets import Set - -class ONOS( Controller ): - "TODO" - - onosDir = '/opt/onos/' - - def __init__( self, name, onosDir=onosDir, - reactive=True, features=[ 'onos-app-tvue' ], - **kwargs ): - '''TODO''' - - Controller.__init__( self, name, **kwargs ) - # the following have been done for us: - #self.ip = ip ('127.0.0.1') - #self.port = port (6653) - #self.protocol = protocol ('tcp') - #self.checkListening() - - self.onosDir = onosDir - self.karafDir = onosDir + 'apache-karaf-3.0.3/' - self.instanceDir = self.karafDir - - # add default modules - # TODO: consider an ordered set - self.features = Set([ 'webconsole', - 'onos-rest', - 'onos-api', - 'onos-cli', - 'onos-openflow' ]) - self.features.update( features ) - # add reactive forwarding modules - if reactive: - self.features.update( ['onos-app-fwd', - 'onos-app-proxyarp', - 'onos-app-mobility' ] ) - # add the distributed core if we are in a namespace with no trivial core - if self.inNamespace and 'onos-core-trivial' not in self.features: - self.features.add( 'onos-core' ) - # if there is no core, add the trivial one - if 'onos-core' not in self.features: - self.features.add( 'onos-core-trivial' ) - print self.features - - def start( self ): - if self.inNamespace: - instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.4.0-rc1/xml/features ' - '-s 8101' ) - if self.ip is not None: - instanceOpts += (' -a %s' % self.IP() ) - self.userCmd( self.karafDir + 'bin/instance create %s %s' % ( instanceOpts, self.name ) ) - self.instanceDir = self.karafDir + 'instances/%s/' % self.name - else: - # we are running in the root namespace, so let's use the root instance - # clean up the data directory - #self.userCmd( 'rm -rf '+ self.karafDir + 'data/' ) - pass - - self.userCmd( 'rm -rf '+ self.instanceDir + 'data/' ) - - # Update etc/org.apache.karaf.features.cfg - self.updateFeatures() - - # TODO 2. Update etc/hazelcast.xml : interface lines - #cp etc/hazelcast.xml instances/c1/etc/ - self.updateHazelcast() - - # TODO 3. Update etc/system.properties : onos.ip - # TODO 4. Update config/cluster.json : with all nodes - - # start onos - self.userCmd( '%sbin/instance start -d %s' % ( self.karafDir, self.name ) ) - #TODO we should wait for startup... - - def stop( self ): - self.userCmd( self.instanceDir + 'bin/stop' ) - #if self.inNamespace: - # self.userCmd( self.karafDir + 'bin/instance destroy %s' % self.name ) - self.terminate() - - def updateHazelcast( self ): - hz = '192.168.123.*' - if self.ip is not None: - hz = '.'.join(self.ip.split('.')[:-1]) + '.*' - - readfile = self.karafDir + 'etc/hazelcast.xml' - writefile = self.instanceDir + 'etc/hazelcast.xml' - with open( readfile, 'r' ) as r: - with open( writefile, 'w' ) as w: - for line in r.readlines(): - if '' in line: - line = '' + hz + '\n' - w.write( line ) - - def updateFeatures( self ): - filename = self.instanceDir + 'etc/org.apache.karaf.features.cfg' - with open( filename, 'r+' ) as f: - lines = f.readlines() - f.seek(0) - f.truncate() - for line in lines: - #print '?', line, - if 'featuresBoot=' in line: - # parse the features from the line - features = line.rstrip().split('=')[1].split(',') - # add the features to our features set - self.features.update( features ) - # generate the new features line - line = 'featuresBoot=' + ','.join( self.features ) + '\n' - #print '!', line, - f.write( line ) - - - @classmethod - def isAvailable( self ): - return quietRun( 'ls %s' % self.onosDir ) - - def userCmd( self, cmd ): - # switch to the non-root user because karaf gets upset otherwise - # because the .m2repo is not stored with root - cmd = 'sudo -u %s %s' % ( self.findUser(), cmd ) - return self.cmd( cmd ) - - @staticmethod - def findUser(): - "Try to return logged-in (usually non-root) user" - try: - # If we're running sudo - return os.environ[ 'SUDO_USER' ] - except: - try: - # Logged-in user (if we have a tty) - return quietRun( 'who am i' ).split()[ 0 ] - except: - # Give up and return effective user - return quietRun( 'whoami' ) - - -class ControlNetwork( Topo ): - "Control Network Topology" - def __init__( self, n, dataController=ONOS, **kwargs ): - """n: number of data network controller nodes - dataController: class for data network controllers""" - Topo.__init__( self, **kwargs ) - # Connect everything to a single switch - cs0 = self.addSwitch( 'cs0' ) - # Add hosts which will serve as data network controllers - for i in range( 1, n+1 ): - c = self.addHost( 'c%s' % i, cls=dataController, - inNamespace=True ) - self.addLink( c, cs0 ) - # Connect switch to root namespace so that data network - # switches will be able to talk to us - root = self.addHost( 'root', inNamespace=False ) - self.addLink( root, cs0 ) - -class ONOSCluster( Controller ): - # TODO - n = 3 - - def start( self ): - ctopo = ControlNetwork( n=self.n, dataController=ONOS ) - self.cnet = Mininet( topo=ctopo, ipBase='192.168.123.0/24', controller=None ) - self.cnet.addController( 'cc0', controller=Controller ) - self.cnet.start() - - self.ctrls = [] - for host in self.cnet.hosts: - if isinstance( host, Controller ): - self.ctrls.append( host ) - host.start() - - def stop( self ): - for host in self.cnet.hosts: - if isinstance( host, Controller ): - host.stop() - self.cnet.stop() - - def clist( self ): - "Return list of Controller proxies for this ONOS cluster" - print 'controllers:', self.ctrls - return self.ctrls - -class OVSSwitchONOS( OVSSwitch ): - "OVS switch which connects to multiple controllers" - def start( self, controllers ): - assert len( controllers ) == 1 - c0 = controllers[ 0 ] - assert type( c0 ) == ONOSCluster - controllers = c0.clist() - OVSSwitch.start( self, controllers ) - -controllers = { 'onos': ONOS } -switches = { 'ovso': OVSSwitchONOS } - -if __name__ == '__main__': - # Simple test for ONOS() controller class - setLogLevel( 'info' ) #TODO info - size = 2 if len( argv ) != 2 else int( argv[ 1 ] ) - net = Mininet( topo=LinearTopo( size ), - #controller=ONOS, - controller=partial( ONOSCluster, n=3 ), #TODO - switch=OVSSwitchONOS ) - net.start() - #waitConnected( net.switches ) - CLI( net ) - net.stop() diff --git a/framework/src/onos/tools/test/topos/optical.py b/framework/src/onos/tools/test/topos/optical.py deleted file mode 100755 index 300332aa..00000000 --- a/framework/src/onos/tools/test/topos/optical.py +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python - -''' file: optical.py ''' - -from mininet.topo import Topo -from mininet.node import RemoteController -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.log import setLogLevel, info -from mininet.link import Intf, Link -from mininet.util import irange - -class NullIntf( Intf ): - "A dummy interface with a blank name that doesn't do any configuration" - def __init__( self, name, **params ): - self.name = '' - -class NullLink( Link ): - "A dummy link that doesn't touch either interface" - def makeIntfPair( cls, intf1, intf2, addr1=None, addr2=None ): - pass - def delete( self ): - pass - -class OpticalTopo( Topo ): - - def addIntf( self, switch, intfName ): - "Add intf intfName to switch" - self.addLink( switch, switch, cls=NullLink, - intfName1=intfName, cls2=NullIntf, intfName2=intfName ) - - def build( self, n=2, tapStart=3 ): - - # Add hosts and switches - hosts = [] - switches = [] - for i in irange( 1, n ): - h = self.addHost( 'h%d' % i ) - s = self.addSwitch( 's%d' % i, dpid="0000ffffffff%04d" % i ) - self.addLink( h, s ) - hosts.append( h ) - switches.append( s ) - - # Add optical tap interfaces - tapNum = tapStart - for sw in switches: - self.addIntf( sw, 'tap%d' % tapNum ) - tapNum += 1 - -# if you use, sudo mn --custom custom/optical.py, then register the topo: -#sudo mn --custom optical.py --topo optical,5 -topos = { 'optical': OpticalTopo } - -def installStaticFlows( net ): - for sw in net.switches: - info( 'Adding flows to %s...' % sw.name ) - sw.dpctl( 'add-flow', 'in_port=1,actions=output=2' ) - sw.dpctl( 'add-flow', 'in_port=2,actions=output=1' ) - info( sw.dpctl( 'dump-flows' ) ) - -def run( n ): - topo = OpticalTopo( n ) - net = Mininet( topo=topo, controller=RemoteController, autoSetMacs=True ) - net.start() - #installStaticFlows( net ) - CLI( net ) - net.stop() - -# if the script is run directly (sudo custom/optical.py): -if __name__ == '__main__': - import sys - try: - n = int( sys.argv[1] ) - except: - print ( 'Usage: ./optical.py n # n is number of switches\n' - 'Starting with default of 2 switches...\n' ) - n = 2 - setLogLevel( 'info' ) - run( n ) diff --git a/framework/src/onos/tools/test/topos/optical2.py b/framework/src/onos/tools/test/topos/optical2.py deleted file mode 100644 index b778592c..00000000 --- a/framework/src/onos/tools/test/topos/optical2.py +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python - -''' file: custom/optical.py ''' - -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.log import setLogLevel, info -from mininet.link import Intf, Link -from mininet.node import RemoteController - -class NullIntf( Intf ): - "A dummy interface with a blank name that doesn't do any configuration" - def __init__( self, name, **params ): - self.name = '' - -class NullLink( Link ): - "A dummy link that doesn't touch either interface" - def makeIntfPair( cls, intf1, intf2, *args, **kwargs ): - pass - def delete( self ): - pass - -class OpticalTopo(Topo): - def addIntf( self, switch, intfName ): - "Add intf intfName to switch" - self.addLink( switch, switch, cls=NullLink, - intfName1=intfName, cls2=NullIntf ) - def __init__(self): - - # Initialize topology - Topo.__init__(self) - - # Add hosts and switches - h1 = self.addHost('h1') - h2 = self.addHost('h2') - h3 = self.addHost('h3') - h4 = self.addHost('h4') - h5 = self.addHost('h5') - h6 = self.addHost('h6') - - s1 = self.addSwitch('s1', dpid="0000ffffffff0001") - s2 = self.addSwitch('s2', dpid="0000ffffffff0002") - s3 = self.addSwitch('s3', dpid="0000ffffffff0003") - s4 = self.addSwitch('s4', dpid="0000ffffffff0004") - s5 = self.addSwitch('s5', dpid="0000ffffffff0005") - s6 = self.addSwitch('s6', dpid="0000ffffffff0006") - - - # Add links from hosts to OVS - self.addLink(s1, h1) - self.addLink(s2, h2) - self.addLink(s3, h3) - self.addLink(s4, h4) - self.addLink(s5, h5) - self.addLink(s6, h6) - - # add links from ovs to linc-oe - # sorry about the syntax :( - self.addIntf(s1,'tap29') - self.addIntf(s2,'tap30') - self.addIntf(s3,'tap31') - self.addIntf(s4,'tap32') - self.addIntf(s5,'tap33') - self.addIntf(s6,'tap34') - - # if you use, sudo mn --custom custom/optical.py, then register the topo: -topos = {'optical': ( lambda: OpticalTopo() )} - - -def run(): - c = RemoteController('c','127.0.0.1',6653) - net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True) - net.addController(c) - net.start() - - #installStaticFlows( net ) - CLI( net ) - net.stop() - -# if the script is run directly (sudo custom/optical.py): -if __name__ == '__main__': - setLogLevel('info') - run() diff --git a/framework/src/onos/tools/test/topos/opticalTest.py b/framework/src/onos/tools/test/topos/opticalTest.py deleted file mode 100644 index b34f08da..00000000 --- a/framework/src/onos/tools/test/topos/opticalTest.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/python - -from opticalUtils import MininetOE, LINCSwitch, LINCLink -from mininet.topo import Topo -from mininet.log import setLogLevel -from mininet.node import RemoteController -from mininet.cli import CLI - -class SmallOpticalTopo( Topo ): - - def build( self ): - o1ann = { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 } - O1 = self.addSwitch( 'SFO-W10', dpid='0000ffffffffff01', annotations=o1ann, cls=LINCSwitch ) - o2ann = { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 } - O2 = self.addSwitch( 'SJC-W10', dpid='0000ffffffffff02', annotations=o2ann, cls=LINCSwitch ) - o3ann = { "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 } - O3 = self.addSwitch( 'LAX-W10', dpid='0000ffffffffff03', annotations=o3ann, cls=LINCSwitch ) - o4ann = { "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 } - O4 = self.addSwitch( 'SDG-W10', dpid='0000ffffffffff04', annotations=o4ann, cls=LINCSwitch ) - o5ann = { "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 } - O5 = self.addSwitch( 'MSP-M10', dpid='0000ffffffffff05', annotations=o5ann, cls=LINCSwitch ) - o6ann = { "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 } - O6 = self.addSwitch( 'DFW-M10', dpid='0000ffffffffff06', annotations=o6ann, cls=LINCSwitch ) - o7ann = { "latitude": 41.8, "longitude": -87.6, "optical.regens": 3 } - O7 = self.addSwitch( 'CHG-N10', dpid='0000ffffffffff07', annotations=o7ann, cls=LINCSwitch ) - o8ann = { "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 } - O8 = self.addSwitch( 'IAD-M10', dpid='0000ffffffffff08', annotations=o8ann, cls=LINCSwitch ) - o9ann = { "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 } - O9 = self.addSwitch( 'JFK-M10', dpid='0000ffffffffff09', annotations=o9ann, cls=LINCSwitch ) - o10ann = { "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 } - O10 = self.addSwitch( 'ATL-S10', dpid='0000ffffffffff0a', annotations=o10ann, cls=LINCSwitch ) - - - SFOR10 = self.addSwitch( 'SFO-R10', dpid='0000ffffffff0001', annotations={"latitude": 37.6, "longitude": -122.3} ) - LAXR10 = self.addSwitch( 'LAX-R10', dpid='0000ffffffff0002', annotations={ "latitude": 33.9, "longitude": -118.4 } ) - SDGR10 = self.addSwitch( 'SDG-R10', dpid='0000ffffffff0003', annotations={ "latitude": 32.8, "longitude": -117.1 } ) - CHGR10 = self.addSwitch( 'CHG-R10', dpid='0000ffffffff0004', annotations={ "latitude": 41.8, "longitude": -87.6 } ) - JFKR10 = self.addSwitch( 'JFK-R10', dpid='0000ffffffff0005', annotations={ "latitude": 40.8, "longitude": -73.1 } ) - ATLR10 = self.addSwitch( 'ATL-R10', dpid='0000ffffffff0006', annotations={ "latitude": 33.8, "longitude": -84.1 } ) - - self.addLink( O1, O2, port1=50, port2=30, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O2, O3, port1=50, port2=30, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O3, O4, port1=50, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O1, O5, port1=20, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O2, O5, port1=20, port2=20, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O3, O6, port1=20, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O4, O6, port1=20, port2=20, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O5, O6, port1=30, port2=40, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O5, O7, port1=40, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O6, O8, port1=30, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O7, O8, port1=20, port2=30, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O7, O9, port1=30, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O8, O10, port1=20, port2=50, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - self.addLink( O9, O10, port1=20, port2=20, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }, cls=LINCLink ) - - self.addLink( SFOR10, O1, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SFOR10, O1, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - - self.addLink( LAXR10, O3, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - # added second tap - self.addLink( LAXR10, O3, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SDGR10, O4, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( CHGR10, O7, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - - self.addLink( JFKR10, O9, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( JFKR10, O9, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - - self.addLink( ATLR10, O10, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - - h1 = self.addHost( 'h1' ) - h2 = self.addHost( 'h2' ) - h3 = self.addHost( 'h3' ) - h4 = self.addHost( 'h4' ) - h5 = self.addHost( 'h5' ) - h6 = self.addHost( 'h6' ) - - self.addLink( SFOR10, h1, port1=1 ) - self.addLink( LAXR10, h2, port1=1 ) - self.addLink( SDGR10, h3, port1=1 ) - self.addLink( CHGR10, h4, port1=1 ) - self.addLink( JFKR10, h5, port1=1 ) - self.addLink( ATLR10, h6, port1=1 ) - -if __name__ == '__main__': - import sys - if len( sys.argv ) >= 2: - controllers = sys.argv[1:] - else: - print 'Usage:sudo -E python opticalTest.py ()+' - print 'Using localhost...\n' - controllers = [ '127.0.0.1' ] - - setLogLevel( 'info' ) - net = MininetOE( topo=SmallOpticalTopo(), controller=None, autoSetMacs=True ) - net.addControllers( controllers ) - net.start() - CLI( net ) - net.stop() diff --git a/framework/src/onos/tools/test/topos/opticalTestBig.py b/framework/src/onos/tools/test/topos/opticalTestBig.py deleted file mode 100644 index 943699b0..00000000 --- a/framework/src/onos/tools/test/topos/opticalTestBig.py +++ /dev/null @@ -1,391 +0,0 @@ -#!/usr/bin/python - -from opticalUtils import MininetOE, LINCSwitch, LINCLink -from mininet.topo import Topo -from mininet.log import setLogLevel -from mininet.node import RemoteController -from mininet.cli import CLI - -class BigOpticalTopo( Topo ): - - def build( self ): - # Optical layer ROADMs - o1ann = { "latitude": 32.508086, "longitude": -99.741564, "optical.regens": 0 } - O1 = self.addSwitch( 'ABLNTXRO', dpid='0000ffffffffff01', annotations=o1ann, cls=LINCSwitch ) - o2ann = { "latitude": 35.084446, "longitude": -106.649719, "optical.regens": 0 } - O2 = self.addSwitch( 'ALBQNMMA', dpid='0000ffffffffff02', annotations=o2ann, cls=LINCSwitch ) - o3ann = { "latitude": 42.652222, "longitude": -73.758333, "optical.regens": 0 } - O3 = self.addSwitch( 'ALBYNYSS', dpid='0000ffffffffff03', annotations=o3ann, cls=LINCSwitch ) - o4ann = { "latitude": 33.755833, "longitude": -97.743057, "optical.regens": 5 } - O4 = self.addSwitch( 'ATLNGATL', dpid='0000ffffffffff04', annotations=o4ann, cls=LINCSwitch ) # ATLNGATL Connected to packet node - o5ann = { "latitude": 42.882778, "longitude": -78.877778, "optical.regens": 0 } - O5 = self.addSwitch( 'BFLONYFR', dpid='0000ffffffffff05', annotations=o5ann, cls=LINCSwitch ) - o6ann = { "latitude": 45.781667, "longitude": -108.509167, "optical.regens": 0 } - O6 = self.addSwitch( 'BLNGMTMA', dpid='0000ffffffffff06', annotations=o6ann, cls=LINCSwitch ) - o7ann = { "latitude": 39.293781, "longitude": -76.614127, "optical.regens": 0 } - O7 = self.addSwitch( 'BLTMMDCH', dpid='0000ffffffffff07', annotations=o7ann, cls=LINCSwitch ) - o8ann = { "latitude": 33.517223, "longitude": -86.812225, "optical.regens": 0 } - O8 = self.addSwitch( 'BRHMALMT', dpid='0000ffffffffff08', annotations=o8ann, cls=LINCSwitch ) - o9ann = { "latitude": 46.836379, "longitude": -100.796917, "optical.regens": 0 } - O9 = self.addSwitch( 'BSMRNDJC', dpid='0000ffffffffff09', annotations=o9ann, cls=LINCSwitch ) - o10ann = { "latitude": 30.449722, "longitude": -91.184167, "optical.regens": 0 } - O10 = self.addSwitch( 'BTRGLAMA', dpid='0000ffffffffff0a', annotations=o10ann, cls=LINCSwitch ) - o11ann = { "latitude": 41.881484, "longitude": -87.640432, "optical.regens": 4 } - O11 = self.addSwitch( 'CHCGILCL', dpid='0000ffffffffff0b', annotations=o11ann, cls=LINCSwitch ) - o12ann = { "latitude": 35.224924, "longitude": -80.837502, "optical.regens": 0 } - O12 = self.addSwitch( 'CHRLNCCA', dpid='0000ffffffffff0c', annotations=o12ann, cls=LINCSwitch ) - o13ann = { "latitude": 32.785278, "longitude": -79.938056, "optical.regens": 0 } - O13 = self.addSwitch( 'CHTNSCDT', dpid='0000ffffffffff0d', annotations=o13ann, cls=LINCSwitch ) - o14ann = { "latitude": 41.498333, "longitude": -81.686943, "optical.regens": 0 } - O14 = self.addSwitch( 'CLEVOH02', dpid='0000ffffffffff0e', annotations=o14ann, cls=LINCSwitch ) - o15ann = { "latitude": 39.965279, "longitude": -82.996666, "optical.regens": 0 } - O15 = self.addSwitch( 'CLMBOH11', dpid='0000ffffffffff0f', annotations=o15ann, cls=LINCSwitch ) - o16ann = { "latitude": 42.36745, "longitude": -71.084918, "optical.regens": 0 } - O16 = self.addSwitch( 'CMBRMA01', dpid='0000ffffffffff10', annotations=o16ann, cls=LINCSwitch ) - o17ann = { "latitude": 39.102778, "longitude": -84.516944, "optical.regens": 0 } - O17 = self.addSwitch( 'CNCNOHWS', dpid='0000ffffffffff11', annotations=o17ann, cls=LINCSwitch ) - o18ann = { "latitude": 32.797524, "longitude": -96.780431, "optical.regens": 0 } - O18 = self.addSwitch( 'DLLSTXTL', dpid='0000ffffffffff12', annotations=o18ann, cls=LINCSwitch ) # DLLSTXTL Connected to packet node - o19ann = { "latitude": 39.744999, "longitude": -104.996391, "optical.regens": 0 } - O19 = self.addSwitch( 'DNVRCOMA', dpid='0000ffffffffff13', annotations=o19ann, cls=LINCSwitch ) - o20ann = { "latitude": 42.332779, "longitude": -83.054169, "optical.regens": 5 } - O20 = self.addSwitch( 'DTRTMIBA', dpid='0000ffffffffff14', annotations=o20ann, cls=LINCSwitch ) - o21ann = { "latitude": 31.756389, "longitude": -106.483611, "optical.regens": 0 } - O21 = self.addSwitch( 'ELPSTXMA', dpid='0000ffffffffff15', annotations=o21ann, cls=LINCSwitch ) - o22ann = { "latitude": 36.73923, "longitude": -119.79423, "optical.regens": 0 } - O22 = self.addSwitch( 'FRSNCA01', dpid='0000ffffffffff16', annotations=o22ann, cls=LINCSwitch ) - o23ann = { "latitude": 36.072222, "longitude": -79.793889, "optical.regens": 0 } - O23 = self.addSwitch( 'GNBONCEU', dpid='0000ffffffffff17', annotations=o23ann, cls=LINCSwitch ) - o24ann = { "latitude": 41.765833, "longitude": -72.676389, "optical.regens": 0 } - O24 = self.addSwitch( 'HRFRCT03', dpid='0000ffffffffff18', annotations=o24ann, cls=LINCSwitch ) - o25ann = { "latitude": 29.748333, "longitude": -95.36528, "optical.regens": 0 } - O25 = self.addSwitch( 'HSTNTX01', dpid='0000ffffffffff19', annotations=o25ann, cls=LINCSwitch ) - o26ann = { "latitude": 30.33071, "longitude": -81.43, "optical.regens": 0 } - O26 = self.addSwitch( 'JCVLFLCL', dpid='0000ffffffffff1a', annotations=o26ann, cls=LINCSwitch ) - o27ann = { "latitude": 39.096649, "longitude": -94.578716, "optical.regens": 0 } - O27 = self.addSwitch( 'KSCYMO09', dpid='0000ffffffffff1b', annotations=o27ann, cls=LINCSwitch ) - o28ann = { "latitude": 40.5899999,"longitude": -73.6699993, "optical.regens": 0 } - O28 = self.addSwitch( 'LGISLAND', dpid='0000ffffffffff1c', annotations=o28ann, cls=LINCSwitch ) - o29ann = { "latitude": 34.051227, "longitude": -118.252958, "optical.regens": 0 } - O29 = self.addSwitch( 'LSANCA03', dpid='0000ffffffffff1d', annotations=o29ann, cls=LINCSwitch ) # LSANCA03 Connected to packet node - o30ann = { "latitude": 36.168056, "longitude": -115.138889, "optical.regens": 0 } - O30 = self.addSwitch( 'LSVGNV02', dpid='0000ffffffffff1e', annotations=o30ann, cls=LINCSwitch ) - o31ann = { "latitude":38.249167, "longitude": -85.760833, "optical.regens": 0 } - O31 = self.addSwitch( 'LSVLKYCS', dpid='0000ffffffffff1f', annotations=o31ann, cls=LINCSwitch ) - o32ann = { "latitude": 34.740833, "longitude": -92.271942, "optical.regens": 2 } - O32 = self.addSwitch( 'LTRKARFR', dpid='0000ffffffffff20', annotations=o32ann, cls=LINCSwitch ) - o33ann = { "latitude": 25.779167, "longitude": -80.195, "optical.regens": 0 } - O33 = self.addSwitch( 'MIAMFLAC', dpid='0000ffffffffff21', annotations=o33ann, cls=LINCSwitch ) - o34ann = { "latitude": 43.037224, "longitude": -87.922501, "optical.regens": 0 } - O34 = self.addSwitch( 'MILWWIHE', dpid='0000ffffffffff22', annotations=o34ann, cls=LINCSwitch ) - o35ann = { "latitude": 35.145158, "longitude": -90.048058, "optical.regens": 0 } - O35 = self.addSwitch( 'MMPHTNMA', dpid='0000ffffffffff23', annotations=o35ann, cls=LINCSwitch ) - o36ann = { "latitude": 44.977365, "longitude": -93.26718, "optical.regens": 0 } - O36 = self.addSwitch( 'MPLSMNDT', dpid='0000ffffffffff24', annotations=o36ann, cls=LINCSwitch ) # MPLSMNDT Connected to packet node - o37ann = { "latitude": 36.853333, "longitude": -76.29, "optical.regens": 0 } - O37 = self.addSwitch( 'NRFLVABS', dpid='0000ffffffffff25', annotations=o37ann, cls=LINCSwitch ) - o38ann = { "latitude": 36.163955, "longitude": -86.775558, "optical.regens": 0 } - O38 = self.addSwitch( 'NSVLTNMT', dpid='0000ffffffffff26', annotations=o38ann, cls=LINCSwitch ) - o39ann = { "latitude": 29.949806, "longitude": -90.07222, "optical.regens": 0 } - O39 = self.addSwitch( 'NWORLAMA', dpid='0000ffffffffff27', annotations=o39ann, cls=LINCSwitch ) - o40ann = { "latitude": 40.734408, "longitude": -74.177978, "optical.regens": 0 } - O40 = self.addSwitch( 'NWRKNJ02', dpid='0000ffffffffff28', annotations=o40ann, cls=LINCSwitch ) # NWRKNJ02 Connected to packet node - o41ann = { "latitude": 40.767497, "longitude": -73.989713, "optical.regens": 0 } - O41 = self.addSwitch( 'NYCMNY54', dpid='0000ffffffffff29', annotations=o41ann, cls=LINCSwitch ) - o42ann = { "latitude": 35.470833, "longitude": -97.515274, "optical.regens": 0 } - O42 = self.addSwitch( 'OKCYOKCE', dpid='0000ffffffffff2a', annotations=o42ann, cls=LINCSwitch ) - o43ann = { "latitude": 37.805556, "longitude": -122.268889, "optical.regens": 2 } - O43 = self.addSwitch( 'OKLDCA03', dpid='0000ffffffffff2b', annotations=o43ann, cls=LINCSwitch ) - o44ann = { "latitude": 41.259167, "longitude":-95.940277, "optical.regens": 0 } - O44 = self.addSwitch( 'OMAHNENW', dpid='0000ffffffffff2c', annotations=o44ann, cls=LINCSwitch ) - o45ann = { "latitude": 28.543279, "longitude": -81.377502, "optical.regens": 0 } - O45 = self.addSwitch( 'ORLDFLMA', dpid='0000ffffffffff2d', annotations=o45ann, cls=LINCSwitch ) # ORLDFLMA Connected to packet node - o46ann = { "latitude": 39.946446, "longitude": -75.184139, "optical.regens": 0 } - O46 = self.addSwitch( 'PHLAPASL', dpid='0000ffffffffff2e', annotations=o46ann, cls=LINCSwitch ) - o47ann = { "latitude": 33.450361, "longitude": -112.07709, "optical.regens": 0 } - O47 = self.addSwitch( 'PHNXAZMA', dpid='0000ffffffffff2f', annotations=o47ann, cls=LINCSwitch ) # PHNXAZMA Connected to packet node - o48ann = { "latitude":40.441387, "longitude": -79.995552, "optical.regens": 0 } - O48 = self.addSwitch( 'PITBPADG', dpid='0000ffffffffff30', annotations=o48ann, cls=LINCSwitch ) - o49ann = { "latitude":41.818889, "longitude": -71.415278, "optical.regens": 0 } - O49 = self.addSwitch( 'PRVDRIGR', dpid='0000ffffffffff31', annotations=o49ann, cls=LINCSwitch ) - o50ann = { "latitude": 45.522499, "longitude": -122.678055, "optical.regens": 2 } - O50 = self.addSwitch( 'PTLDOR62', dpid='0000ffffffffff32', annotations=o50ann, cls=LINCSwitch ) - o51ann = { "latitude": 37.540752, "longitude": -77.436096, "optical.regens": 0 } - O51 = self.addSwitch( 'RCMDVAGR', dpid='0000ffffffffff33', annotations=o51ann, cls=LINCSwitch ) - o52ann = { "latitude": 35.779656, "longitude": -78.640831, "optical.regens": 0 } - O52 = self.addSwitch( 'RLGHNCMO', dpid='0000ffffffffff34', annotations=o52ann, cls=LINCSwitch ) - o53ann = { "latitude": 43.157222, "longitude": -77.616389, "optical.regens": 0 } - O53 = self.addSwitch( 'ROCHNYXA', dpid='0000ffffffffff35', annotations=o53ann, cls=LINCSwitch ) # ROCHNYXA Connected to packet node - o54ann = { "latitude": 38.578609, "longitude": -121.487221, "optical.regens": 0 } - O54 = self.addSwitch( 'SCRMCA01', dpid='0000ffffffffff36', annotations=o54ann, cls=LINCSwitch ) - o55ann = { "latitude": 41.415278, "longitude": -75.649167, "optical.regens": 0 } - O55 = self.addSwitch( 'SCTNPA01', dpid='0000ffffffffff37', annotations=o55ann, cls=LINCSwitch ) - o56ann = { "latitude": 40.767776, "longitude": -111.888336, "optical.regens": 0 } - O56 = self.addSwitch( 'SLKCUTMA', dpid='0000ffffffffff38', annotations=o56ann, cls=LINCSwitch ) - o57ann = { "latitude": 29.429445, "longitude": -98.488892, "optical.regens": 0 } - O57 = self.addSwitch( 'SNANTXCA', dpid='0000ffffffffff39', annotations=o57ann, cls=LINCSwitch ) # SNANTXCA Connected to packet node - o58ann = { "latitude": 34.418889, "longitude": -119.7, "optical.regens": 0 } - O58 = self.addSwitch( 'SNBBCA01', dpid='0000ffffffffff3a', annotations=o58ann, cls=LINCSwitch ) - o59ann = { "latitude":32.746944, "longitude": -117.158611, "optical.regens": 0 } - O59 = self.addSwitch( 'SNDGCA02', dpid='0000ffffffffff3b', annotations=o59ann, cls=LINCSwitch ) - o60ann = { "latitude":37.785143, "longitude": -122.397263, "optical.regens": 0 } - O60 = self.addSwitch( 'SNFCCA21', dpid='0000ffffffffff3c', annotations=o60ann, cls=LINCSwitch ) - o61ann = { "latitude": 37.333333, "longitude": -121.892778, "optical.regens": 0 } - O61 = self.addSwitch( 'SNJSCA02', dpid='0000ffffffffff3d', annotations=o61ann, cls=LINCSwitch ) # SNJSCA02 Connected to packet node - o62ann = { "latitude": 39.795278, "longitude": -89.649444, "optical.regens": 0 } - O62 = self.addSwitch( 'SPFDILSD', dpid='0000ffffffffff3e', annotations=o62ann, cls=LINCSwitch ) - o63ann = { "latitude": 47.654724, "longitude": -117.419167, "optical.regens": 0 } - O63 = self.addSwitch( 'SPKNWA01', dpid='0000ffffffffff3f', annotations=o63ann, cls=LINCSwitch ) - o64ann = { "latitude": 38.633335, "longitude": -90.215279, "optical.regens": 0 } - O64 = self.addSwitch( 'STLSMO09', dpid='0000ffffffffff40', annotations=o64ann, cls=LINCSwitch ) - o65ann = { "latitude": 47.606945, "longitude": -122.333336, "optical.regens": 0 } - O65 = self.addSwitch( 'STTLWA06', dpid='0000ffffffffff41', annotations=o65ann, cls=LINCSwitch ) - o66ann = { "latitude": 43.049444, "longitude": -76.1475, "optical.regens": 3 } - O66 = self.addSwitch( 'SYRCNYSU', dpid='0000ffffffffff42', annotations=o66ann, cls=LINCSwitch ) - o67ann = { "latitude": 28.0225, "longitude": -82.522778, "optical.regens": 0 } - O67 = self.addSwitch( 'TAMQFLFN', dpid='0000ffffffffff43', annotations=o67ann, cls=LINCSwitch ) - o68ann = { "latitude": 32.224444, "longitude": -110.968333, "optical.regens": 0 } - O68 = self.addSwitch( 'TCSNAZMA', dpid='0000ffffffffff44', annotations=o68ann, cls=LINCSwitch ) - o69ann = { "latitude": 30.456389, "longitude": -84.290833, "optical.regens": 0 } - O69 = self.addSwitch( 'TLHSFLAT', dpid='0000ffffffffff45', annotations=o69ann, cls=LINCSwitch ) - o70ann = { "latitude": 41.65, "longitude": -83.538056, "optical.regens": 2 } - O70 = self.addSwitch( 'TOLDOH21', dpid='0000ffffffffff46', annotations=o70ann, cls=LINCSwitch ) - o71ann = { "latitude": 36.151669, "longitude": -95.985832, "optical.regens": 0 } - O71 = self.addSwitch( 'TULSOKTB', dpid='0000ffffffffff47', annotations=o71ann, cls=LINCSwitch ) - o72ann = { "latitude": 38.88306 , "longitude": -77.01028, "optical.regens": 0 } - O72 = self.addSwitch( 'WASHDCSW', dpid='0000ffffffffff48', annotations=o72ann, cls=LINCSwitch ) # WASHDCSW Connected to packet node - o73ann = { "latitude": 39.739167, "longitude": -75.553889, "optical.regens": 0 } - O73 = self.addSwitch( 'WLMGDE01', dpid='0000ffffffffff49', annotations=o73ann, cls=LINCSwitch ) - o74ann = { "latitude": 26.709391, "longitude": -80.05278, "optical.regens": 0 } - O74 = self.addSwitch( 'WPBHFLAN', dpid='0000ffffffffff4a', annotations=o74ann, cls=LINCSwitch ) - o75ann = { "latitude": 29.57, "longitude": -96.7, "optical.regens": 0 } - O75 = self.addSwitch( 'AUSTTXGR', dpid='0000ffffffffff4b', annotations=o75ann, cls=LINCSwitch ) - #o25ann = { "latitude": 29.748333, "longitude": -95.36528, "optical.regens": 0 } - #o57ann = { "latitude": 29.429445, "longitude": -98.488892, "optical.regens": 0 } - - - # Packet Layer switches - ''' # from opticalTest.py - SFOR10 = self.addSwitch( 'SFO-R10', dpid='0000ffffffff0001', annotations={"latitude": 37.6, "longitude": -122.3} ) - LAXR10 = self.addSwitch( 'LAX-R10', dpid='0000ffffffff0002', annotations={ "latitude": 33.9, "longitude": -118.4 } ) - SDGR10 = self.addSwitch( 'SDG-R10', dpid='0000ffffffff0003', annotations={ "latitude": 32.8, "longitude": -117.1 } ) - CHGR10 = self.addSwitch( 'CHG-R10', dpid='0000ffffffff0004', annotations={ "latitude": 41.8, "longitude": -87.6 } ) - JFKR10 = self.addSwitch( 'JFK-R10', dpid='0000ffffffff0005', annotations={ "latitude": 40.8, "longitude": -73.1 } ) - ATLR10 = self.addSwitch( 'ATL-R10', dpid='0000ffffffff0006', annotations={ "latitude": 33.8, "longitude": -84.1 } ) - ''' - WASHDCSWR = self.addSwitch( 'WASHDCSW-R', dpid='0000ffffff000001', annotations={ "latitude": 38.8, "longitude": -77.0 } ) # this switch is O72 - SNJSCA02R = self.addSwitch( 'SNJSCA02-R', dpid='0000ffffff000002', annotations={ "latitude": 37.3, "longitude": -121.8 } ) # O61 - SNANTXCAR = self.addSwitch( 'SNANTXCA-R', dpid='0000ffffff000003', annotations={ "latitude": 29.4, "longitude": -98.4 } ) # O57 - ROCHNYXAR = self.addSwitch( 'ROCHNYXA-R', dpid='0000ffffff000004', annotations={ "latitude": 43.1, "longitude": -77.6 } ) # O53 - PHNXAZMAR = self.addSwitch( 'PHNXAZMA-R', dpid='0000ffffff000005', annotations={ "latitude": 33.4, "longitude": -112.0 } ) # O47 - ORLDFLMAR = self.addSwitch( 'ORLDFLMA-R', dpid='0000ffffff000006', annotations={ "latitude": 28.5, "longitude": -81.3 } ) # O45 - NWRKNJ02R = self.addSwitch( 'NWRKNJ02-R', dpid='0000ffffff000007', annotations={ "latitude": 40.7, "longitude": -74.1 } ) # O40 - MPLSMNDTR = self.addSwitch( 'MPLSMNDT-R', dpid='0000ffffff000008', annotations={ "latitude": 44.9, "longitude": -93.2 } ) # O36 - LSANCA03R = self.addSwitch( 'LSANCA03-R', dpid='0000ffffff000009', annotations={ "latitude": 34.1, "longitude": -118.3 } ) # O29 - DLLSTXTLR = self.addSwitch( 'DLLSTXTL-R', dpid='0000ffffff00000a', annotations={ "latitude": 32.7, "longitude": -96.7 } ) # O18 - ATLNGATLR = self.addSwitch( 'ATLNGATL-R', dpid='0000ffffff00000b', annotations={ "latitude": 33.7, "longitude": -97.7 } ) # O4 - - - - # Optical Links between the ROADMs (although Distance is not used; we should keep these for future reference) - self.addLink( O1, O18, port1=100, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 334, "durable": "true" }, cls=LINCLink ) # ABLNTXRO DLLSTXTL - self.addLink( O1, O21, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 768, "durable": "true" }, cls=LINCLink ) # ABLNTXRO ELPSTXMA - self.addLink( O3, O16, port1=100, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 265, "durable": "true" }, cls=LINCLink ) # ALBYNYSS CMBRMA01 - self.addLink( O3, O66, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 239, "durable": "true" }, cls=LINCLink ) # ALBYNYSS SYRCNYSU - self.addLink( O2, O18, port1=100, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1134, "durable": "true" }, cls=LINCLink ) # ALBQNMMA DLLSTXTL - self.addLink( O2, O19, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 646, "durable": "true" }, cls=LINCLink ) # ALBQNMMA DNVRCOMA - self.addLink( O2, O21, port1=102, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 444, "durable": "true" }, cls=LINCLink ) # ALBQNMMA ELPSTXMA - self.addLink( O2, O30, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 931, "durable": "true" }, cls=LINCLink ) # ALBQNMMA LSVGNV02 - self.addLink( O4, O8, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 271, "durable": "true" }, cls=LINCLink ) # ATLNGATL BRHMALMT - self.addLink( O4, O12, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 436, "durable": "true" }, cls=LINCLink ) # ATLNGATL CHRLNCCA - self.addLink( O4, O26, port1=103, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 566, "durable": "true" }, cls=LINCLink ) # ATLNGATL JCVLFLCL - self.addLink( O75, O25, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 283, "durable": "true" }, cls=LINCLink ) # AUSTTXGR HSTNTX01 - self.addLink( O75, O57, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 141, "durable": "true" }, cls=LINCLink ) # AUSTTXGR SNANTXCA - self.addLink( O7, O46, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 170, "durable": "true" }, cls=LINCLink ) # BLTMMDCH PHLAPASL - self.addLink( O7, O48, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 378, "durable": "true" }, cls=LINCLink ) # BLTMMDCH PITBPADG - self.addLink( O7, O70, port1=103, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 68, "durable": "true" }, cls=LINCLink ) # BLTMMDCH WASHDCSW - self.addLink( O10, O25, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 491, "durable": "true" }, cls=LINCLink ) # BTRGLAMA HSTNTX01 - self.addLink( O10, O39, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 144, "durable": "true" }, cls=LINCLink ) # BTRGLAMA NWORLAMA - self.addLink( O6, O9, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 724, "durable": "true" }, cls=LINCLink ) # BLNGMTMA BSMRNDJC - self.addLink( O6, O19, port1=102, port2=107, annotations={ "optical.wves": 80, "optical.type": "WDM", "optical.kms": 875, "durable": "true" }, cls=LINCLink ) # BLNGMTMA DNVRCOMA - self.addLink( O6, O63, port1=103, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 852, "durable": "true" }, cls=LINCLink ) # BLNGMTMA SPKNWA01 - self.addLink( O8, O38, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 353, "durable": "true" }, cls=LINCLink ) # BRHMALMT NSVLTNMT - self.addLink( O8, O39, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 602, "durable": "true" }, cls=LINCLink ) # BRHMALMT NWORLAMA - self.addLink( O9, O36, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 741, "durable": "true" }, cls=LINCLink ) # BSMRNDJC MPLSMNDT - self.addLink( O16, O49, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 80, "durable": "true" }, cls=LINCLink ) # CMBRMA01 PRVDRIGR - self.addLink( O5, O14, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 333, "durable": "true" }, cls=LINCLink ) # BFLONYFR CLEVOH02 - self.addLink( O5, O53, port1=104, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 128, "durable": "true" }, cls=LINCLink ) # BFLONYFR ROCHNYXA - self.addLink( O13, O26, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 368, "durable": "true" }, cls=LINCLink ) # CHTNSCDT JCVLFLCL - self.addLink( O13, O52, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 424, "durable": "true" }, cls=LINCLink ) # CHTNSCDT RLGHNCMO - self.addLink( O12, O23, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 160, "durable": "true" }, cls=LINCLink ) # CHRLNCCA GNBONCEU - self.addLink( O11, O20, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 458, "durable": "true" }, cls=LINCLink ) # CHCGILCL DTRTMIBA - self.addLink( O11, O34, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 156, "durable": "true" }, cls=LINCLink ) # CHCGILCL MILWWIHE - self.addLink( O11, O62, port1=103, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 344, "durable": "true" }, cls=LINCLink ) # CHCGILCL SPFDILSD - self.addLink( O17, O15, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 194, "durable": "true" }, cls=LINCLink ) # CNCNOHWS CLMBOH11 - self.addLink( O17, O31, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 172, "durable": "true" }, cls=LINCLink ) # CNCNOHWS LSVLKYCS - self.addLink( O17, O72, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 779, "durable": "true" }, cls=LINCLink ) # CNCNOHWS WASHDCSW - self.addLink( O14, O15, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 243, "durable": "true" }, cls=LINCLink ) # CLEVOH02 CLMBOH11 - self.addLink( O14, O70, port1=102, port2=101, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 185, "durable": "true" }, cls=LINCLink ) # CLEVOH02 TOLDOH21 - self.addLink( O15, O48, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 312, "durable": "true" }, cls=LINCLink ) # CLMBOH11 PITBPADG - self.addLink( O18, O25, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 437, "durable": "true" }, cls=LINCLink ) # DLLSTXTL HSTNTX01 - self.addLink( O18, O32, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 563, "durable": "true" }, cls=LINCLink ) # DLLSTXTL LTRKARFR - self.addLink( O18, O42, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 365, "durable": "true" }, cls=LINCLink ) # DLLSTXTL OKCYOKCE - self.addLink( O19, O44, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 940, "durable": "true" }, cls=LINCLink ) # DNVRCOMA OMAHNENW - self.addLink( O19, O56, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 714, "durable": "true" }, cls=LINCLink ) # DNVRCOMA SLKCUTMA - self.addLink( O20, O70, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 103, "durable": "true" }, cls=LINCLink ) # DTRTMIBA TOLDOH21 - self.addLink( O21, O57, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 969, "durable": "true" }, cls=LINCLink ) # ELPSTXMA SNANTXCA - self.addLink( O21, O68, port1=102, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 511, "durable": "true" }, cls=LINCLink ) # ELPSTXMA TCSNAZMA - self.addLink( O22, O31, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 505, "durable": "true" }, cls=LINCLink ) # FRSNCA01 LSVGNV02 - self.addLink( O22, O29, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 396, "durable": "true" }, cls=LINCLink ) # FRSNCA01 LSANCA03 - self.addLink( O22, O42, port1=103, port2=108, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 298, "durable": "true" }, cls=LINCLink ) # FRSNCA01 OKLDCA03 - self.addLink( O23, O31, port1=101, port2=108, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 697, "durable": "true" }, cls=LINCLink ) # GNBONCEU LSVLKYCS - self.addLink( O23, O52, port1=102, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 130, "durable": "true" }, cls=LINCLink ) # GNBONCEU RLGHNCMO - self.addLink( O23, O51, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 319, "durable": "true" }, cls=LINCLink ) # GNBONCEU RCMDVAGR - self.addLink( O24, O28, port1=101, port2=108, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 185, "durable": "true" }, cls=LINCLink ) # HRFRCT03 L_Island - self.addLink( O24, O49, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 125, "durable": "true" }, cls=LINCLink ) # HRFRCT03 PRVDRIGR - self.addLink( O26, O45, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 238, "durable": "true" }, cls=LINCLink ) # JCVLFLCL ORLDFLMA - self.addLink( O27, O44, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 320, "durable": "true" }, cls=LINCLink ) # KSCYMO09 OMAHNENW - self.addLink( O27, O64, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 457, "durable": "true" }, cls=LINCLink ) # KSCYMO09 STLSMO09 - self.addLink( O27, O71, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 420, "durable": "true" }, cls=LINCLink ) # KSCYMO09 TULSOKTB - self.addLink( O30, O47, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 494, "durable": "true" }, cls=LINCLink ) # LSVGNV02 PHNXAZMA - self.addLink( O30, O56, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 701, "durable": "true" }, cls=LINCLink ) # LSVGNV02 SLKCUTMA - self.addLink( O32, O35, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 249, "durable": "true" }, cls=LINCLink ) # LTRKARFR MMPHTNMA - self.addLink( O28, O41, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 40, "durable": "true" }, cls=LINCLink ) # L_Island NYCMNY54 - self.addLink( O29, O59, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 212, "durable": "true" }, cls=LINCLink ) # LSANCA03 SNDGCA02 - self.addLink( O29, O58, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 167, "durable": "true" }, cls=LINCLink ) # LSANCA03 SNBBCA01 - self.addLink( O31, O38, port1=104, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 298, "durable": "true" }, cls=LINCLink ) # LSVLKYCS NSVLTNMT - self.addLink( O31, O64, port1=102, port2=108, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 468, "durable": "true" }, cls=LINCLink ) # LSVLKYCS STLSMO09 - self.addLink( O35, O38, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 380, "durable": "true" }, cls=LINCLink ) # MMPHTNMA NSVLTNMT - self.addLink( O33, O67, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 407, "durable": "true" }, cls=LINCLink ) # MIAMFLAC TAMQFLFN - self.addLink( O33, O74, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 125, "durable": "true" }, cls=LINCLink ) # MIAMFLAC WPBHFLAN - self.addLink( O34, O36, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 574, "durable": "true" }, cls=LINCLink ) # MILWWIHE MPLSMNDT - self.addLink( O36, O44, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 560, "durable": "true" }, cls=LINCLink ) # MPLSMNDT OMAHNENW - self.addLink( O39, O69, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 670, "durable": "true" }, cls=LINCLink ) # NWORLAMA TLHSFLAT - self.addLink( O41, O40, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 19, "durable": "true" }, cls=LINCLink ) # NYCMNY54 NWRKNJ02 - self.addLink( O41, O55, port1=102, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 187, "durable": "true" }, cls=LINCLink ) # NYCMNY54 SCTNPA01 - self.addLink( O41, O73, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 210, "durable": "true" }, cls=LINCLink ) # NYCMNY54 WLMGDE01 - self.addLink( O40, O46, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 146, "durable": "true" }, cls=LINCLink ) # NWRKNJ02 PHLAPASL - self.addLink( O37, O52, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 290, "durable": "true" }, cls=LINCLink ) # NRFLVABS RLGHNCMO - self.addLink( O37, O73, port1=102, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 392, "durable": "true" }, cls=LINCLink ) # NRFLVABS WLMGDE01 - self.addLink( O43, O54, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 131, "durable": "true" }, cls=LINCLink ) # OKLDCA03 SCRMCA01 - self.addLink( O43, O56, port1=102, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1142, "durable": "true" }, cls=LINCLink ) # OKLDCA03 SLKCUTMA - self.addLink( O43, O60, port1=103, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 13, "durable": "true" }, cls=LINCLink ) # OKLDCA03 SNFCCA21 - self.addLink( O42, O71, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 188, "durable": "true" }, cls=LINCLink ) # OKCYOKCE TULSOKTB - self.addLink( O45, O74, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 290, "durable": "true" }, cls=LINCLink ) # ORLDFLMA WPBHFLAN - self.addLink( O46, O55, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 201, "durable": "true" }, cls=LINCLink ) # PHLAPASL SCTNPA01 - self.addLink( O47, O59, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 575, "durable": "true" }, cls=LINCLink ) # PHNXAZMA SNDGCA02 - self.addLink( O47, O68, port1=102, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 205, "durable": "true" }, cls=LINCLink ) # PHNXAZMA TCSNAZMA - self.addLink( O48, O55, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 457, "durable": "true" }, cls=LINCLink ) # PITBPADG SCTNPA01 - self.addLink( O50, O54, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 934, "durable": "true" }, cls=LINCLink ) # PTLDOR62 SCRMCA01 - self.addLink( O50, O56, port1=102, port2=108, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1225, "durable": "true" }, cls=LINCLink ) # PTLDOR62 SLKCUTMA - self.addLink( O50, O65, port1=103, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 280, "durable": "true" }, cls=LINCLink ) # PTLDOR62 STTLWA06 - self.addLink( O51, O72, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 184, "durable": "true" }, cls=LINCLink ) # RCMDVAGR WASHDCSW - self.addLink( O53, O66, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 143, "durable": "true" }, cls=LINCLink ) # ROCHNYXA SYRCNYSU - self.addLink( O60, O61, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 80., "durable": "true" }, cls=LINCLink ) # SNFCCA21 SNJSCA02 - self.addLink( O61, O58, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 455, "durable": "true" }, cls=LINCLink ) # SNJSCA02 SNBBCA01 - self.addLink( O55, O66, port1=101, port2=105, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 223, "durable": "true" }, cls=LINCLink ) # SCTNPA01 SYRCNYSU - self.addLink( O65, O63, port1=101, port2=107, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 442, "durable": "true" }, cls=LINCLink ) # STTLWA06 SPKNWA01 - self.addLink( O62, O64, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 165, "durable": "true" }, cls=LINCLink ) # SPFDILSD STLSMO09 - self.addLink( O69, O67, port1=101, port2=106, annotations={ "optical.waves": 80, "optical.type": "WDM", "optical.kms": 384, "durable": "true" }, cls=LINCLink ) # TLHSFLAT TAMQFLFN - - # Packet/Optical cross connect links (this will be the tap interfaces) - self.addLink( WASHDCSWR, O72, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( WASHDCSWR, O72, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( WASHDCSWR, O72, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( WASHDCSWR, O72, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( WASHDCSWR, O72, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNJSCA02R, O61, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNJSCA02R, O61, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNJSCA02R, O61, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNJSCA02R, O61, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNJSCA02R, O61, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNANTXCAR, O57, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNANTXCAR, O57, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNANTXCAR, O57, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNANTXCAR, O57, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( SNANTXCAR, O57, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ROCHNYXAR, O53, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ROCHNYXAR, O53, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ROCHNYXAR, O53, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ROCHNYXAR, O53, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ROCHNYXAR, O53, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( PHNXAZMAR, O47, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( PHNXAZMAR, O47, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( PHNXAZMAR, O47, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( PHNXAZMAR, O47, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( PHNXAZMAR, O47, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ORLDFLMAR, O45, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ORLDFLMAR, O45, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ORLDFLMAR, O45, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ORLDFLMAR, O45, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ORLDFLMAR, O45, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( NWRKNJ02R, O40, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( NWRKNJ02R, O40, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( NWRKNJ02R, O40, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( NWRKNJ02R, O40, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( NWRKNJ02R, O40, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( MPLSMNDTR, O36, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( MPLSMNDTR, O36, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( MPLSMNDTR, O36, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( MPLSMNDTR, O36, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( MPLSMNDTR, O36, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( LSANCA03R, O29, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( LSANCA03R, O29, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( LSANCA03R, O29, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( LSANCA03R, O29, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( LSANCA03R, O29, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( DLLSTXTLR, O18, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( DLLSTXTLR, O18, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( DLLSTXTLR, O18, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( DLLSTXTLR, O18, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( DLLSTXTLR, O18, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ATLNGATLR, O4, port1=2, port2=10, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ATLNGATLR, O4, port1=3, port2=11, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ATLNGATLR, O4, port1=4, port2=12, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ATLNGATLR, O4, port1=5, port2=13, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - self.addLink( ATLNGATLR, O4, port1=6, port2=14, speed1=10000, annotations={ "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }, cls=LINCLink ) - - - # Attach hosts to the packet layer switches - for i in range( 1, 4 ): #don't make this more than 4!!!!! - # Create Hosts 1..11 - h1 = self.addHost( 'h1d%d' % i, ip='10.0.1.%d/16' % i ) - h2 = self.addHost( 'h2d%d' % i, ip='10.0.2.%d/16' % i ) - h3 = self.addHost( 'h3d%d' % i, ip='10.0.3.%d/16' % i ) - h4 = self.addHost( 'h4d%d' % i, ip='10.0.4.%d/16' % i ) - h5 = self.addHost( 'h5d%d' % i, ip='10.0.5.%d/16' % i ) - h6 = self.addHost( 'h6d%d' % i, ip='10.0.6.%d/16' % i ) - h7 = self.addHost( 'h7d%d' % i, ip='10.0.7.%d/16' % i ) - h8 = self.addHost( 'h8d%d' % i, ip='10.0.8.%d/16' % i ) - h9 = self.addHost( 'h9d%d' % i, ip='10.0.9.%d/16' % i ) - h10 = self.addHost( 'h10d%d' % i, ip='10.0.10.%d/16' % i ) - h11 = self.addHost( 'h11d%d' % i, ip='10.0.11.%d/16' % i ) - - port = i + 6 - self.addLink( SNJSCA02R, h1, port1=port ) - self.addLink( SNANTXCAR, h2, port1=port ) - self.addLink( ROCHNYXAR, h3, port1=port ) - self.addLink( PHNXAZMAR, h4, port1=port ) - self.addLink( ORLDFLMAR, h5, port1=port ) - self.addLink( NWRKNJ02R, h6, port1=port ) - self.addLink( MPLSMNDTR, h7, port1=port ) - self.addLink( LSANCA03R, h8, port1=port ) - self.addLink( DLLSTXTLR, h9, port1=port ) - self.addLink( ATLNGATLR, h10, port1=port ) - self.addLink( WASHDCSWR, h11, port1=port ) - -if __name__ == '__main__': - import sys - if len( sys.argv ) >= 2: - controllers = sys.argv[1:] - else: - print 'Usage: sudo -E python opticalTestBig.py ()+' - print 'Using localhost...\n' - controllers = [ '127.0.0.1' ] - - setLogLevel( 'info' ) - net = MininetOE( topo=BigOpticalTopo(), controller=None, autoSetMacs=True ) - net.addControllers( controllers ) - net.start() - CLI( net ) - net.stop() diff --git a/framework/src/onos/tools/test/topos/opticalUtils.py b/framework/src/onos/tools/test/topos/opticalUtils.py deleted file mode 100644 index 87903cc5..00000000 --- a/framework/src/onos/tools/test/topos/opticalUtils.py +++ /dev/null @@ -1,846 +0,0 @@ -#!/usr/bin/python - -''' -Notes: - -This file contains classes and methods useful for integrating LincOE with Mininet, -such as startOE, stopOE, LINCLink, and OpticalSwitch - -- $ONOS_ROOT ust be set -- Need to run with sudo -E to preserve ONOS_ROOT env var -- We assume LINC-Config-Generator is named LINC-Config-Generator -- We also assume linc-oe is named linc-oe -- LINC-config-generator and linc-oe must be subdirectories of the user's - home directory - - TODO - ----------- - - clean up files after runtime - - maybe save the old files in a separate directory? - - modify script to allow startOE to run before net.start() - - add ONOS as a controller in script - - Usage: - ------------ - - import LINCLink and OpticalSwitch from this module - - import startOE and stopOE from this module - - create topology as you would a normal topology. when - to an optical switch with topo.addLink, always specify cls=LINCLink - - when creating an optical switch, use cls=OpticalSwitch in topo.addSwitch - - for annotations on links and switches, a dictionary must be passed in as - the annotations argument - - startOE must be run AFTER net.start() with net as an argument. - - stopOE can be run at any time - -I created a separate function to start lincOE to avoid subclassing Mininet. -In case anyone wants to write something that DOES subclass Mininet, I -thought I would outline how: - -If we want an object that starts lincOE within the mininet class itself, -we need to add another object to Mininet that contains all of the json object -information for each switch. We would still subclass switch and link, but these -classes would basically be dummy classes that store their own json information -in the Mininet class object. We may also change the default switch class to add -it's tap interfaces from lincOE during startup. The start() method for mininet would -grab all of the information from these switches and links, write configuration files -for lincOE using the json module, start lincOE, then run the start methodfor each -switch. The new start() method for each switch would parse through the sys.config -file that was created and find the tap interface it needs to connect to, similar -to the findTap function that I currently use. After all of the controllers and -switches have been started, the new Mininet start() method should also push the -Topology configuration file to ONOS. - -''' -import sys -import re -import json -import os -from time import sleep -import urllib2 - -from mininet.node import Switch, OVSSwitch, RemoteController -from mininet.topo import Topo -from mininet.util import quietRun -from mininet.net import Mininet -from mininet.log import setLogLevel, info, error, warn -from mininet.link import Link, Intf -from mininet.cli import CLI - -# Sleep time and timeout values in seconds -SLEEP_TIME = 2 -TIMEOUT = 60 - -class OpticalSwitch(Switch): - """ - For now, same as Switch class. - """ - pass - -class OpticalIntf(Intf): - """ - For now,same as Intf class. - """ - pass - -class OpticalLink(Link): - """ - For now, same as Link. - """ - pass - -class LINCSwitch(OpticalSwitch): - """ - LINCSwitch class - """ - # FIXME:Sometimes LINC doesn't remove pipes and on restart increase the pipe - # number from erlang.pipe.1.* to erlang.pipe.2.*, so should read and write - # from latest pipe files. For now we are removing all the pipes before - # starting LINC. - ### User Name ### - user = os.getlogin() - ### pipes ### - readPipe = "/tmp/home/{}/linc-oe/rel/linc/erlang.pipe.1.r".format(user) - writePipe = "/tmp/home/{}/linc-oe/rel/linc/erlang.pipe.1.w".format(user) - ### sys.config path ### - sysConfig = "/home/{}/linc-oe/rel/linc/releases/1.0/sys.config".format(user) - ### method, mapping dpid to LINC switchId ### - @staticmethod - def dpids_to_ids(sysConfig): - ''' - return the dict containing switch dpids as key and LINC switch id as values - ''' - dpids_to_ids = {} - fd = None - try: - with open(sysConfig, 'r', 0) as fd: - switch_id = 1 - for line in fd: - dpid = re.search(r'([0-9A-Fa-f]{2}[:-]){7}([0-9A-Fa-f]{2})+', line, re.I) - if dpid: - dpids_to_ids[dpid.group().replace(':', '')] = switch_id - switch_id += 1 - return dpids_to_ids - except: - print "Error working with {}\nError: {}\n".format(sysConfig, sys.exc_info()) - fd.close() - return None - ### dict of containing dpids as key and corresponding LINC switchId as values ### - dpidsToLINCSwitchId = dpids_to_ids.__func__(sysConfig) - @staticmethod - def findDir(directory, userName): - "finds and returns the path of any directory in the user's home directory" - homeDir = '/home/' + userName - Dir = quietRun('find %s -maxdepth 1 -name %s -type d' % (homeDir, directory)).strip('\n') - DirList = Dir.split('\n') - if not Dir: - return None - elif len(DirList) > 1 : - warn('***WARNING: Found multiple instances of %s; using %s\n' - % (directory, DirList[ 0 ])) - return DirList[ 0 ] - else: - return Dir - ### ONOS Directory ### - try: - onosDir = os.environ[ 'ONOS_ROOT' ] - except: - onosDir = findDir('onos', user) - if not onosDir: - error('Please set ONOS_ROOT environment variable!\n') - else: - os.environ[ 'ONOS_ROOT' ] = onosDir - ### REST USER/PASS ### - try: - restUser = os.environ[ 'ONOS_WEB_USER' ] - restPass = os.environ[ 'ONOS_WEB_PASS' ] - except: - error('***WARNING: $ONOS_WEB_USER and $ONOS_WEB_PASS aren\'t set!\n') - error('***WARNING: Setting (probably) sane WEB user/pass values\n') - restUser = 'onos' - restPass = 'rocks' - os.environ[ 'ONOS_WEB_USER' ] = restUser - os.environ[ 'ONOS_WEB_PASS' ] = restPass - ### LINC-directory - lincDir = findDir.__func__('linc-oe', user) - if not lincDir: - error("***ERROR: Could not find linc-oe in user's home directory\n") - ### LINC config generator directory### - configGen = findDir.__func__('LINC-config-generator', user) - if not configGen: - error("***ERROR: Could not find LINC-config-generator in user's home directory\n") - # list of all the controllers - controllers = None - def __init__(self, name, dpid=None, allowed=True, - switchType='ROADM', topo=None, annotations={}, controller=None, **params): - params[ 'inNamespace' ] = False - Switch.__init__(self, name, dpid=dpid, **params) - self.name = name - self.annotations = annotations - self.allowed = allowed - self.switchType = switchType - self.configDict = {} # dictionary that holds all of the JSON configuration data - self.crossConnects = [] - self.deletedCrossConnects = [] - self.controller = controller - self.lincId = self._get_linc_id() # use to communicate with LINC - self.lincStarted = False - - def start(self, *opts, **params): - '''Instead of starting a virtual switch, we build the JSON - dictionary for the emulated optical switch''' - # TODO:Once LINC has the ability to spawn network element dynamically - # we need to use this method to spawn new logical LINC switch rather then - # bulding JSON. - # if LINC is started then we can start and stop logical switches else create JSON - if self.lincStarted: - return self.start_oe() - self.configDict[ 'uri' ] = 'of:' + self.dpid - self.configDict[ 'annotations' ] = self.annotations - self.configDict[ 'annotations' ].setdefault('name', self.name) - self.configDict[ 'hw' ] = 'LINC-OE' - self.configDict[ 'mfr' ] = 'Linc' - self.configDict[ 'mac' ] = 'ffffffffffff' + self.dpid[-2] + self.dpid[-1] - self.configDict[ 'type' ] = self.switchType - self.configDict[ 'ports' ] = [] - for port, intf in self.intfs.items(): - if intf.name == 'lo': - continue - else: - self.configDict[ 'ports' ].append(intf.json()) - self.lincStarted = True - - def stop(self, deleteIntfs=False): - ''' - stop the existing switch - ''' - # TODO:Add support for deleteIntf - self.stop_oe() - - def dpctl( self, *args ): - "Run dpctl command: ignore for now" - pass - - def write_to_cli(self, command): - ''' - send command to LINC - ''' - fd = None - try: - fd = open(self.writePipe, 'w', 0) - fd.write(command) - fd.close() - except: - print "Error working with {}\nError: {}\n".format(self.writePipe, sys.exc_info()) - if fd: - fd.close() - - def read_from_cli(self): - ''' - read the output from the LINC CLI - ''' - response = None - fd = None - try: - fd = open(self.readPipe, 'r', 0) - fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK) # for non-blocking read - # FIXME:Due to non-blocking read most for the time we read nothing - response = fd.read() - fd.close() - except : - # print "Error working with {}\nError: {}\n".format(self.readPipe, sys.exc_info()) - if fd: - fd.close() - return response - - def _get_linc_id(self): - ''' - return the corresponding LINC switchId. - ''' - return LINCSwitch.dpidsToLINCSwitchId.get(self.dpid) - #-------------------------------------------------------------------------- - # LINC CLI commands - #-------------------------------------------------------------------------- - def start_oe(self): - ''' - existing LINC switch - ''' - #starting Switch - cmd = "linc:start_switch({}).\r\n".format(self.lincId) - self.write_to_cli(cmd) - #hanlding taps interfaces related to the switch - crossConnectJSON = {} - linkConfig = [] - for i in range(0,len(self.deletedCrossConnects)): - crossConnect = self.deletedCrossConnects.pop() - tap = None - if isinstance(crossConnect.intf1.node, LINCSwitch): - intf = crossConnect.intf2 - tapPort = crossConnect.intf1.port - else: - intf = crossConnect.intf1 - tapPort = crossConnect.intf2.port - tap = LINCSwitch.findTap(self, tapPort) - if tap: - LINCSwitch.setupInts([tap]) - intf.node.attach(tap) - self.crossConnects.append(crossConnect) - linkConfig.append(crossConnect.json()) - #Sending crossConnect info to the ONOS. - crossConnectJSON['links'] = linkConfig - with open("crossConnect.json", 'w') as fd: - json.dump(crossConnectJSON, fd, indent=4, separators=(',', ': ')) - info('*** Pushing crossConnect.json to ONOS\n') - output = quietRun('%s/tools/test/bin/onos-topo-cfg %s\ - Topology.json network/configuration/' % (self.onosDir, self.controllers[ 0 ].ip), shell=True) - - def stop_oe(self): - ''' - stop the existing LINC switch - ''' - cmd = "linc:stop_switch({}).\r\n".format(self.lincId) - self.write_to_cli(cmd) - #handling taps if any - for i in range(0, len(self.crossConnects)): - crossConnect = self.crossConnects.pop() - if isinstance(crossConnect.intf1.node, LINCSwitch): - intf = crossConnect.intf2 - tapPort = crossConnect.intf1.port - else: - intf = crossConnect.intf1 - tapPort = crossConnect.intf2.port - intf.node.detach(LINCSwitch.findTap(self, tapPort)) - self.deletedCrossConnects.append(crossConnect) - - def w_port_up(self, port): - ''' - port_up - ''' - cmd = "linc:port_up({},{}).\r\n".format(self.lincId, port) - self.write_to_cli(cmd) - - def w_port_down(self, port): - ''' - port_down - ''' - cmd = "linc:port_down({},{}).\r\n".format(self.lincId, port) - self.write_to_cli(cmd) - - # helper functions - @staticmethod - def switchJSON(switch): - "Returns the json configuration for a packet switch" - configDict = {} - configDict[ 'uri' ] = 'of:' + switch.dpid - configDict[ 'mac' ] = quietRun('cat /sys/class/net/%s/address' % switch.name).strip('\n').translate(None, ':') - configDict[ 'hw' ] = 'PK' # FIXME what about OVS? - configDict[ 'mfr' ] = 'Linc' # FIXME what about OVS? - configDict[ 'type' ] = 'SWITCH' # FIXME what about OVS? - annotations = switch.params.get('annotations', {}) - annotations.setdefault('name', switch.name) - configDict[ 'annotations' ] = annotations - ports = [] - for port, intf in switch.intfs.items(): - if intf.name == 'lo': - continue - portDict = {} - portDict[ 'port' ] = port - portType = 'COPPER' - if isinstance(intf.link, LINCLink): - portType = 'OCH' if intf.link.isCrossConnect else 'OMS' - portDict[ 'type' ] = portType - intfList = [ intf.link.intf1, intf.link.intf2 ] - intfList.remove(intf) - portDict[ 'speed' ] = intfList[ 0 ].speed if isinstance(intf.link, LINCLink) else 0 - ports.append(portDict) - configDict[ 'ports' ] = ports - return configDict - - @staticmethod - def bootOE(net, domain=None): - """ - Start the LINC optical emulator within a mininet instance - - This involves 1. converting the information stored in Linc* to configs - for both LINC and the network config system, 2. starting Linc, 3. connecting - cross-connects, and finally pushing the network configs to ONOS. - - Inevitably, there are times when we have OVS switches that should not be - under the control of the controller in charge of the Linc switches. We - hint at these by passing domain information. - """ - LINCSwitch.opticalJSON = {} - linkConfig = [] - devices = [] - #setting up the controllers for LINCSwitch class - LINCSwitch.controllers = net.controllers - - for switch in net.switches: - if domain and switch not in domain: - continue - if isinstance(switch, OpticalSwitch): - devices.append(switch.json()) - elif isinstance(switch, OVSSwitch): - devices.append(LINCSwitch.switchJSON(switch)) - LINCSwitch.opticalJSON[ 'devices' ] = devices - - for link in net.links: - if isinstance(link, LINCLink) : - linkConfig.append(link.json()) - LINCSwitch.opticalJSON[ 'links' ] = linkConfig - - info('*** Writing Topology.json file\n') - topoJSON = LINCSwitch.makeTopoJSON() - with open('Topology.json', 'w') as outfile: - json.dump(topoJSON, outfile, indent=4, separators=(',', ': ')) - - info('*** Converting Topology.json to linc-oe format (TopoConfig.json) file (no oecfg) \n') - - topoConfigJson = {} - dpIdToName = {} - - topoConfigJson["switchConfig"] = LINCSwitch.getSwitchConfig(dpIdToName) - topoConfigJson["linkConfig"] = LINCSwitch.getLinkConfig(dpIdToName) - - #Writing to TopoConfig.json - with open( 'TopoConfig.json', 'w' ) as outfile: - json.dump( topoConfigJson, outfile, indent=4, separators=(',', ': ') ) - - info('*** Creating sys.config...\n') - output = quietRun('%s/config_generator TopoConfig.json %s/sys.config.template %s %s' - % (LINCSwitch.configGen, LINCSwitch.configGen, LINCSwitch.controllers[ 0 ].ip, LINCSwitch.controllers[ 0 ].port), shell=True) - if output: - error('***ERROR: Error creating sys.config file: %s\n' % output) - return False - - info ('*** Setting multiple controllers in sys.config...\n') - searchStr = '\[{"Switch.*$' - ctrlStr = '' - for index in range(len(LINCSwitch.controllers)): - ctrlStr += '{"Switch%d-Controller","%s",%d,tcp},' % (index, net.controllers[index].ip, net.controllers[index].port) - replaceStr = '[%s]},' % ctrlStr[:-1] # Cut off last comma - sedCmd = 'sed -i \'s/%s/%s/\' sys.config' % (searchStr, replaceStr) - output = quietRun(sedCmd, shell=True) - - info('*** Copying sys.config to linc-oe directory: ', output + '\n') - output = quietRun('cp -v sys.config %s/rel/linc/releases/1.0/' % LINCSwitch.lincDir, shell=True).strip('\n') - info(output + '\n') - - info('*** Adding taps and bringing them up...\n') - LINCSwitch.setupInts(LINCSwitch.getTaps()) - - info('*** removing pipes if any \n') - quietRun('rm /tmp/home/%s/linc-oe/rel/linc/*' % LINCSwitch.user, shell=True) - - info('*** Starting linc OE...\n') - output = quietRun('%s/rel/linc/bin/linc start' % LINCSwitch.lincDir, shell=True) - if output: - error('***ERROR: LINC-OE: %s' % output + '\n') - quietRun('%s/rel/linc/bin/linc stop' % LINCSwitch.lincDir, shell=True) - return False - - info('*** Waiting for linc-oe to start...\n') - LINCSwitch.waitStarted(net) - - info('*** Adding cross-connect (tap) interfaces to packet switches...\n') - for link in net.links: - if isinstance(link, LINCLink): - if link.annotations[ 'optical.type' ] == 'cross-connect': - for intf in [ link.intf1, link.intf2 ]: - if not isinstance(intf, LINCIntf): - intfList = [ intf.link.intf1, intf.link.intf2 ] - intfList.remove(intf) - intf2 = intfList[ 0 ] - intf.node.attach(LINCSwitch.findTap(intf2.node, intf2.node.ports[ intf2 ])) - - info('*** Waiting for all devices to be available in ONOS...\n') - url = 'http://%s:8181/onos/v1/devices' % LINCSwitch.controllers[0].ip - time = 0 - # Set up password authentication - pw_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm() - pw_mgr.add_password(None, url, LINCSwitch.restUser, LINCSwitch.restPass) - handler = urllib2.HTTPBasicAuthHandler(pw_mgr) - opener = urllib2.build_opener(handler) - opener.open(url) - urllib2.install_opener(opener) - # focus on just checking the state of devices we're interested in - devlist = map( lambda x: x['uri'], devices ) - while True: - response = json.load(urllib2.urlopen(url)) - devs = response.get('devices') - - # Wait for all devices to be registered. There is a chance that this is only a subgraph. - if (len(devices) > len(devs)): - continue - - # Wait for all devices to available - available = True - for d in devs: - if d['id'] in devlist: - available &= d['available'] - if available: - break - - if (time >= TIMEOUT): - error('***ERROR: ONOS did not register devices within %s seconds\n' % TIMEOUT) - break - - time += SLEEP_TIME - sleep(SLEEP_TIME) - - info('*** Pushing Topology.json to ONOS\n') - for index in range(len(LINCSwitch.controllers)): - output = quietRun('%s/tools/test/bin/onos-topo-cfg %s Topology.json network/configuration/ &'\ - % (LINCSwitch.onosDir, LINCSwitch.controllers[ index ].ip), shell=True) - # successful output contains the two characters '{}' - # if there is more output than this, there is an issue - if output.strip('{}'): - warn('***WARNING: Could not push topology file to ONOS: %s\n' % output) - - #converts node ids to linc-oe format, with colons every two chars - @staticmethod - def dpId(id): - nodeDpid = "" - id = id.split("/", 1)[0] - for i in range(3, len(id) - 1, 2): - nodeDpid += (id[i:(i + 2):]) + ":" - return nodeDpid[0:-1]; - - @staticmethod - def makeTopoJSON(): - """ - Builds ONOS network conifg system compatible dicts to be written as Topology.json file. - """ - topology = {} - links = {} - devices = {} - ports = {} - - for switch in LINCSwitch.opticalJSON[ 'devices' ]: - # build device entries - keyed on uri (DPID) and config key 'basic' - devDict = {} - devDict[ 'driver' ] = switch[ 'hw' ] - devDict[ 'mfr' ] = switch[ 'mfr' ] - devDict[ 'mac' ] = switch[ 'mac' ] - devDict[ 'type' ] = switch[ 'type' ] - devDict.update(switch[ 'annotations' ]) - - devSubj = switch[ 'uri' ] - devices[ devSubj ] = { 'basic': devDict } - - # build port entries - keyed on "uri/port" and config key 'optical' - for port in switch[ 'ports' ]: - portSubj = devSubj + '/' + str(port[ 'port' ]) - ports[ portSubj ] = { 'optical': port } - - # build link entries - keyed on "uri/port-uri/port" and config key 'basic' - for link in LINCSwitch.opticalJSON[ 'links' ]: - linkDict = {} - linkDict[ 'type' ] = link[ 'type' ] - linkDict.update(link[ 'annotations' ]) - - linkSubj = link[ 'src' ] + '-' + link[ 'dst' ] - links[ linkSubj ] = { 'basic': linkDict } - - topology[ 'links' ] = links - topology[ 'devices' ] = devices - topology[ 'ports' ] = ports - - return topology - - @staticmethod - def getSwitchConfig (dpIdToName): - switchConfig = []; - #Iterate through all switches and convert the ROADM switches to linc-oe format - for switch in LINCSwitch.opticalJSON["devices"]: - if switch.get("type", "none") == "ROADM": - builtSwitch = {} - - #set basic switch params based on annotations - builtSwitch["allowed"] = True; - builtSwitch["latitude"] = switch["annotations"].get("latitude", 0.0); - builtSwitch["longitude"] = switch["annotations"].get("longitude", 0.0); - - #assumed that all switches have this entry - nodeId = switch["uri"] - - #convert the nodeId to linc-oe format - nodeDpid = LINCSwitch.dpId(nodeId); - - builtSwitch["name"] = switch.get("name", "none"); - - #keep track of the name corresponding to each switch dpid - dpIdToName[nodeDpid] = builtSwitch["name"]; - - builtSwitch["nodeDpid"] = nodeDpid - - #set switch params and type - builtSwitch["params"] = {}; - builtSwitch["params"]["numregens"] = switch["annotations"].get("optical.regens", 0); - builtSwitch["type"] = "Roadm" - - #append to list of switches - switchConfig.append(builtSwitch); - return switchConfig - - @staticmethod - def getLinkConfig (dpIdToName): - newLinkConfig = []; - #Iterate through all optical links and convert them to linc-oe format - for link in LINCSwitch.opticalJSON["links"]: - if link.get("type", "none") == "OPTICAL": - builtLink = {} - - #set basic link params for src and dst - builtLink["allowed"] = True; - builtLink["nodeDpid1"] = LINCSwitch.dpId(link["src"]) - builtLink["nodeDpid2"] = LINCSwitch.dpId(link["dst"]) - - #set more params such as name/bandwidth/port/waves if they exist - params = {} - params["nodeName1"] = dpIdToName.get(builtLink["nodeDpid1"], "none") - params["nodeName2"] = dpIdToName.get(builtLink["nodeDpid2"], "none") - - params["port1"] = int(link["src"].split("/")[1]) - params["port2"] = int(link["dst"].split("/")[1]) - - if "bandwidth" in link["annotations"]: - params["bandwidth"] = link["annotations"]["bandwidth"] - - if "optical.waves" in link["annotations"]: - params["numWaves"] = link["annotations"]["optical.waves"] - - builtLink["params"] = params - - #set type of link (WDM or pktOpt) - if link["annotations"].get("optical.type", "cross-connect") == "WDM": - builtLink["type"] = "wdmLink" - else: - builtLink["type"] = "pktOptLink" - - newLinkConfig.append(builtLink); - return newLinkConfig - - - @staticmethod - def waitStarted(net, timeout=TIMEOUT): - "wait until all tap interfaces are available" - tapCount = 0 - time = 0 - for link in net.links: - if isinstance(link, LINCLink): - if link.annotations[ 'optical.type' ] == 'cross-connect': - tapCount += 1 - while True: - # tapCount can be less than the actual number of taps if the optical network - # is a subgraph of a larger multidomain network. - tapNum = int(quietRun('ip addr | grep tap | wc -l', shell=True).strip('\n')) - if tapCount <= tapNum: - return True - if timeout: - if time >= TIMEOUT: - error('***ERROR: LINC OE did not start within %s seconds\n' % TIMEOUT) - return False - time += SLEEP_TIME - sleep(SLEEP_TIME) - - @staticmethod - def shutdownOE(): - "stop the optical emulator" - info('*** Stopping linc OE...\n') - quietRun('%s/rel/linc/bin/linc stop' % LINCSwitch.lincDir, shell=True) - - @staticmethod - def setupInts(intfs): - ''' - add taps and bring them up. - ''' - for i in intfs: - quietRun('ip tuntap add dev %s mode tap' % i) - quietRun('ip link set dev %s up' % i) - info('*** Intf %s set\n' % i) - - @staticmethod - def getTaps(path=None): - ''' - return list of all the tops in sys.config - ''' - if path is None: - path = '%s/rel/linc/releases/1.0/sys.config' % LINCSwitch.lincDir - fd = open(path, 'r', 0) - sys_data = fd.read() - taps = re.findall('tap\d+', sys_data) - fd.close() - return taps - - @staticmethod - def findUser(): - "Try to return logged-in (usually non-root) user" - try: - # If we're running sudo - return os.environ[ 'SUDO_USER' ] - except: - try: - # Logged-in user (if we have a tty) - return quietRun('who am i').split()[ 0 ] - except: - # Give up and return effective user - return quietRun('whoami') - - - @staticmethod - def findTap(node, port, path=None): - '''utility function to parse through a sys.config - file to find tap interfaces for a switch''' - switch = False - portLine = '' - intfLines = [] - - if path is None: - path = '%s/rel/linc/releases/1.0/sys.config' % LINCSwitch.lincDir - - with open(path) as f: - for line in f: - if 'tap' in line: - intfLines.append(line) - if node.dpid in line.translate(None, ':'): - switch = True - continue - if switch: - if 'switch' in line: - switch = False - if 'port_no,%s}' % port in line: - portLine = line - break - - if portLine: - m = re.search('port,\d+', portLine) - port = m.group(0).split(',')[ 1 ] - else: - error('***ERROR: Could not find any ports in sys.config\n') - return - - for intfLine in intfLines: - if 'port,%s' % port in intfLine: - return re.findall('tap\d+', intfLine)[ 0 ] - - def json(self): - "return json configuration dictionary for switch" - return self.configDict - - def terminate(self): - pass - - - -class LINCLink(Link): - """ - LINC link class - """ - def __init__(self, node1, node2, port1=None, port2=None, allowed=True, - intfName1=None, intfName2=None, linkType='OPTICAL', - annotations={}, speed1=0, speed2=0, **params): - "Creates a dummy link without a virtual ethernet pair." - self.allowed = allowed - self.annotations = annotations - self.linkType = linkType - self.port1 = port1 - self.port2 = port2 - params1 = { 'speed': speed1 } - params2 = { 'speed': speed2 } - # self.isCrossConnect = True if self.annotations.get('optical.type') == 'cross-connect' else False - if isinstance(node1, LINCSwitch) and isinstance(node2, LINCSwitch): - self.isCrossConnect = False - else: - self.isCrossConnect = True - if isinstance(node1, LINCSwitch): - cls1 = LINCIntf - if self.isCrossConnect: - node1.crossConnects.append(self) - else: - cls1 = Intf - # bad hack to stop error message from appearing when we try to set up intf in a packet switch, - # and there is no interface there( because we do not run makeIntfPair ). This way, we just set lo up - intfName1 = 'lo' - if isinstance(node2, LINCSwitch): - cls2 = LINCIntf - if self.isCrossConnect: - node2.crossConnects.append(self) - else: - cls2 = Intf - intfName2 = 'lo' - Link.__init__(self, node1, node2, port1=port1, port2=port2, - intfName1=intfName1, intfName2=intfName2, cls1=cls1, - cls2=cls2, params1=params1, params2=params2) - - @classmethod - def makeIntfPair(_cls, intfName1, intfName2, *args, **kwargs): - pass - - def json(self): - "build and return the json configuration dictionary for this link" - configData = {} - configData[ 'src' ] = ('of:' + self.intf1.node.dpid + - '/%s' % self.intf1.node.ports[ self.intf1 ]) - configData[ 'dst' ] = ('of:' + self.intf2.node.dpid + - '/%s' % self.intf2.node.ports[ self.intf2 ]) - configData[ 'type' ] = self.linkType - configData[ 'annotations' ] = self.annotations - return configData - -class LINCIntf(OpticalIntf): - """ - LINC interface class - """ - def __init__(self, name=None, node=None, speed=0, - port=None, link=None, **params): - self.node = node - self.speed = speed - self.port = port - self.link = link - self.name = name - node.addIntf(self, port=port) - self.params = params - self.ip = None - - def json(self): - "build and return the JSON information for this interface( not used right now )" - configDict = {} - configDict[ 'port' ] = self.port - configDict[ 'speed' ] = self.speed - portType = 'COPPER' - if isinstance(self.link, LINCLink): - portType = 'OCH' if self.link.isCrossConnect else 'OMS' - configDict[ 'type' ] = portType - return configDict - - def config(self, *args, **kwargs): - "dont configure a dummy interface" - pass - - def ifconfig(self, status): - "configure the status" - if status == "up": - return self.node.w_port_up(self.port) - elif status == "down": - return self.node.w_port_down(self.port) - - -class MininetOE(Mininet): - "Mininet with Linc-OE support (starts and stops linc-oe)" - - def start(self): - Mininet.start(self) - LINCSwitch.bootOE(self) - - def stop(self): - Mininet.stop(self) - LINCSwitch.shutdownOE() - - def addControllers(self, controllers): - i = 0 - for ctrl in controllers: - self.addController(RemoteController('c%d' % i, ip=ctrl)) - i += 1 - -if __name__ == '__main__': - pass diff --git a/framework/src/onos/tools/test/topos/rftest.py b/framework/src/onos/tools/test/topos/rftest.py deleted file mode 100644 index 7aba54f9..00000000 --- a/framework/src/onos/tools/test/topos/rftest.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python - -import sys - -from mininet.net import Mininet -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.node import RemoteController - -from rftesttopo import ReactiveForwardingTestTopo - -setLogLevel( 'info' ) - -def pingloop( net ): - setLogLevel( 'error' ) - try: - while True: - net.ping() - finally: - setLogLevel( 'info' ) - -def run(controllers=[ '127.0.0.1' ]): - Mininet.pingloop = pingloop - net = Mininet( topo=ReactiveForwardingTestTopo(), build=False, autoSetMacs=True ) - ctrl_count = 0 - for controllerIP in controllers: - net.addController( 'c%d' % ctrl_count, RemoteController, ip=controllerIP ) - ctrl_count = ctrl_count + 1 - net.build() - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - if len( sys.argv ) > 1: - controllers = sys.argv[ 1: ] - else: - print 'Usage: rf-test.py ...' - exit( 1 ) - run( controllers ) diff --git a/framework/src/onos/tools/test/topos/rftesttopo.py b/framework/src/onos/tools/test/topos/rftesttopo.py deleted file mode 100644 index 9b975785..00000000 --- a/framework/src/onos/tools/test/topos/rftesttopo.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python - -""" -""" -from mininet.topo import Topo -from mininet.net import Mininet -from mininet.node import RemoteController -from mininet.node import Node -from mininet.node import CPULimitedHost -from mininet.link import TCLink -from mininet.cli import CLI -from mininet.log import setLogLevel -from mininet.util import dumpNodeConnections - -class ReactiveForwardingTestTopo( Topo ): - "Internet Topology Zoo Specimen." - - def __init__( self ): - "Create a topology." - - # Initialize Topology - Topo.__init__( self ) - - # add nodes, switches first... - s1 = self.addSwitch( 's1' ) - s2 = self.addSwitch( 's2' ) - s3 = self.addSwitch( 's3' ) - s4 = self.addSwitch( 's4' ) - s5 = self.addSwitch( 's5' ) - s6 = self.addSwitch( 's6' ) - s7 = self.addSwitch( 's7' ) - s8 = self.addSwitch( 's8' ) - s9 = self.addSwitch( 's9' ) - - # ... and now hosts - h1 = self.addHost( 'h1' ) - h2 = self.addHost( 'h2' ) - h3 = self.addHost( 'h3' ) - h4 = self.addHost( 'h4' ) - - # add edges between switch and corresponding host - self.addLink( s1 , h1 ) - self.addLink( s2 , h2 ) - self.addLink( s3 , h3 ) - self.addLink( s4 , h4 ) - - # add edges between switches - self.addLink( s1 , s5 ) - self.addLink( s2 , s5 ) - self.addLink( s2 , s8 ) - self.addLink( s3 , s4 ) - self.addLink( s3 , s7 ) - self.addLink( s4 , s5 ) - self.addLink( s6 , s8 ) - self.addLink( s6 , s7 ) - self.addLink( s5 , s9 ) - self.addLink( s6 , s9 ) - -topos = { 'att': ( lambda: ReactiveForwardingTestTopo() ) } diff --git a/framework/src/onos/tools/test/topos/sdn-ip.json b/framework/src/onos/tools/test/topos/sdn-ip.json deleted file mode 100644 index 153d9959..00000000 --- a/framework/src/onos/tools/test/topos/sdn-ip.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "devices": [ - { "alias": "s1", "uri": "of:0000000000000001", "mac": "000000000001", "annotations": { "name": "DEN", "latitude": 39.739317, "longitude": -104.983791 }, "type": "SWITCH" }, - { "alias": "s2", "uri": "of:0000000000000002", "mac": "000000000002", "annotations": { "name": "IND", "latitude": 39.769089, "longitude": -86.158039 }, "type": "SWITCH" }, - { "alias": "s3", "uri": "of:0000000000000003", "mac": "000000000003", "annotations": { "name": "ABQ", "latitude": 35.116541, "longitude": -106.604146 }, "type": "SWITCH" }, - { "alias": "s4", "uri": "of:0000000000000004", "mac": "000000000004", "annotations": { "name": "DFW", "latitude": 32.779501, "longitude": -96.801104 }, "type": "SWITCH" }, - { "alias": "s5", "uri": "of:0000000000000005", "mac": "000000000005", "annotations": { "name": "PDX", "latitude": 45.522585, "longitude": -122.677890 }, "type": "SWITCH" }, - { "alias": "s6", "uri": "of:0000000000000006", "mac": "000000000006", "annotations": { "name": "SFO", "latitude": 37.785286, "longitude": -122.406509 }, "type": "SWITCH" }, - { "alias": "s7", "uri": "of:0000000000000007", "mac": "000000000007", "annotations": { "name": "LAX", "latitude": 34.055604, "longitude": -118.248567 }, "type": "SWITCH" }, - { "alias": "s8", "uri": "of:0000000000000008", "mac": "000000000008", "annotations": { "name": "JFK", "latitude": 40.769487, "longitude": -73.972520 }, "type": "SWITCH" }, - { "alias": "s9", "uri": "of:0000000000000009", "mac": "000000000009", "annotations": { "name": "IAD", "latitude": 38.897676, "longitude": -77.036525 }, "type": "SWITCH" }, - { "alias": "s10", "uri": "of:0000000000000010", "mac": "000000000010", "annotations": { "name": "ATL", "latitude": 33.756298, "longitude": -84.388507 }, "type": "SWITCH" } - ], - - "hosts" : [ - { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/10", "ip": "10.0.1.2, 10.0.2.2", "annotations": { "type": "bgpSpeaker", "latitude": 42.292306, "longitude": -104.084378 } }, - { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/10", "ip": "10.0.11.2, 10.0.22.2, 10.0.3.2, 10.0.4.2", "annotations": { "type": "bgpSpeaker", "latitude": 41.019068, "longitude": -91.079570 } }, - { "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/10", "ip": "10.0.33.2, 10.0.44.2", "annotations": { "type": "bgpSpeaker", "latitude": 32.043892, "longitude": -105.644437 } }, - { "mac": "00:00:00:00:01:01", "vlan": -1, "location": "of:0000000000000005/10", "ip": "10.0.1.1", "annotations": { "type": "router", "latitude": 42.985256, "longitude": -127.074018 } }, - { "mac": "00:00:00:00:01:02", "vlan": -1, "location": "of:0000000000000006/10", "ip": "10.0.11.1", "annotations": { "type": "router", "latitude": 40.593824, "longitude": -127.074018 } }, - { "mac": "00:00:00:00:02:01", "vlan": -1, "location": "of:0000000000000007/10", "ip": "10.0.2.1, 10.0.22.1", "annotations": { "type": "router", "latitude": 31.277098, "longitude": -121.35488 } }, - { "mac": "00:00:00:00:03:01", "vlan": -1, "location": "of:0000000000000008/10", "ip": "10.0.3.1, 10.0.33.1", "annotations": { "type": "router", "latitude": 39.368502, "longitude": -69.976271 } }, - { "mac": "00:00:00:00:04:01", "vlan": -1, "location": "of:0000000000000009/10", "ip": "10.0.4.1", "annotations": { "type": "router", "latitude": 34.936264, "longitude": -75.526168 } }, - { "mac": "00:00:00:00:44:01", "vlan": -1, "location": "of:0000000000000010/10", "ip": "10.0.44.1", "annotations": { "type": "router", "latitude": 32.863420, "longitude": -77.505795 } } - ] -} diff --git a/framework/src/onos/tools/test/topos/sol.py b/framework/src/onos/tools/test/topos/sol.py deleted file mode 100755 index 68f2d406..00000000 --- a/framework/src/onos/tools/test/topos/sol.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/python -import sys, solar -topo = solar.Solar(cips=sys.argv[1:]) -topo.run() diff --git a/framework/src/onos/tools/test/topos/solar.py b/framework/src/onos/tools/test/topos/solar.py deleted file mode 100644 index f316162a..00000000 --- a/framework/src/onos/tools/test/topos/solar.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env python -from mininet.cli import CLI -from mininet.net import Mininet -from mininet.node import RemoteController, OVSKernelSwitch - -MAC = 12 -DPID = 16 - -class CustomCLI(CLI): - """Custom CLI to allow us to add our own commands.""" - - def __init__ (self, net): - """Init method for our custom CLI.""" - self.net = net - CLI.__init__(self, net) - -class Solar(object): - """ Create a tiered topology from semi-scratch in Mininet """ - - def __init__(self, cname='onos', cips=['192.168.56.1'], islands=3, edges=2, hosts=2): - """Create tower topology for mininet""" - - # We are creating the controller with local-loopback on purpose to avoid - # having the switches connect immediately. Instead, we'll set controller - # explicitly for each switch after configuring it as we want. - self.ctrls = [ RemoteController(cname, cip, 6653) for cip in cips ] - self.net = Mininet(controller=RemoteController, switch = OVSKernelSwitch, - build=False) - - self.cips = cips - self.spines = [] - self.leaves = [] - self.hosts = [] - for ctrl in self.ctrls: - self.net.addController(ctrl) - - # Create the two core switches and links between them - c1 = self.net.addSwitch('c1',dpid='1111000000000000') - c2 = self.net.addSwitch('c2',dpid='2222000000000000') - self.spines.append(c1) - self.spines.append(c2) - - self.net.addLink(c1, c2) - self.net.addLink(c2, c1) - - for i in range(1, islands + 1): - sc = self.createSpineClump(i, edges, hosts) - self.net.addLink(c1, sc[0]) - self.net.addLink(c2, sc[0]) - self.net.addLink(c1, sc[1]) - self.net.addLink(c2, sc[1]) - - def createSpineClump(self, island, edges, hosts): - """ Creates a clump of spine and edge switches with hosts""" - s1 = self.net.addSwitch('s%1d1' % island,dpid='00000%1d0100000000' % island) - s2 = self.net.addSwitch('s%1d2' % island,dpid='00000%1d0200000000' % island) - self.net.addLink(s1, s2) - self.net.addLink(s2, s1) - - for i in range(1, edges + 1): - es = self.createEdgeSwitch(island, i, hosts) - self.net.addLink(es, s1) - self.net.addLink(es, s2) - - self.spines.append(s1) - self.spines.append(s2) - - clump = [] - clump.append(s1) - clump.append(s2) - return clump - - def createEdgeSwitch(self, island, index, hosts): - """ Creates an edge switch in an island and ads hosts to it""" - sw = self.net.addSwitch('e%1d%1d' % (island, index),dpid='0000000%1d0000000%1d' % (island, index)) - self.leaves.append(sw) - - for j in range(1, hosts + 1): - host = self.net.addHost('h%d%d%d' % (island, index, j),ip='10.%d.%d.%d' % (island, index, j)) - self.net.addLink(host, sw) - self.hosts.append(host) - return sw - - def run(self): - """ Runs the created network topology and launches mininet cli""" - self.net.build() - self.net.start() - CustomCLI(self.net) - self.net.stop() - - def pingAll(self): - """ PingAll to create flows - for unit testing """ - self.net.pingAll() - - def stop(self): - "Stops the topology. You should call this after run_silent" - self.net.stop() diff --git a/framework/src/onos/tools/test/topos/sys-nonlinear-10.config b/framework/src/onos/tools/test/topos/sys-nonlinear-10.config deleted file mode 100644 index b3a718dd..00000000 --- a/framework/src/onos/tools/test/topos/sys-nonlinear-10.config +++ /dev/null @@ -1,183 +0,0 @@ -[{linc, - [{of_config,disabled}, - {software_desc,<<"LINC-OE OpenFlow Software Switch 1.1">>}, - {capable_switch_ports, - [{port,1,[{interface,"dummy"},{type,optical}]}, - {port,2,[{interface,"dummy"},{type,optical}]}, - {port,3,[{interface,"dummy"},{type,optical}]}, - {port,4,[{interface,"dummy"},{type,optical}]}, - {port,5,[{interface,"dummy"},{type,optical}]}, - {port,6,[{interface,"dummy"},{type,optical}]}, - {port,7,[{interface,"dummy"},{type,optical}]}, - {port,8,[{interface,"dummy"},{type,optical}]}, - {port,9,[{interface,"dummy"},{type,optical}]}, - {port,10,[{interface,"dummy"},{type,optical}]}, - {port,11,[{interface,"dummy"},{type,optical}]}, - {port,12,[{interface,"dummy"},{type,optical}]}, - {port,13,[{interface,"dummy"},{type,optical}]}, - {port,14,[{interface,"dummy"},{type,optical}]}, - {port,15,[{interface,"dummy"},{type,optical}]}, - {port,16,[{interface,"dummy"},{type,optical}]}, - {port,17,[{interface,"dummy"},{type,optical}]}, - {port,18,[{interface,"dummy"},{type,optical}]}, - {port,19,[{interface,"dummy"},{type,optical}]}, - {port,20,[{interface,"dummy"},{type,optical}]}, - {port,21,[{interface,"dummy"},{type,optical}]}, - {port,22,[{interface,"dummy"},{type,optical}]}, - {port,23,[{interface,"dummy"},{type,optical}]}, - {port,24,[{interface,"dummy"},{type,optical}]}, - {port,25,[{interface,"dummy"},{type,optical}]}, - {port,26,[{interface,"dummy"},{type,optical}]}, - {port,27,[{interface,"dummy"},{type,optical}]}, - {port,28,[{interface,"dummy"},{type,optical}]}, - {port,29,[{interface,"tap29"}]}, - {port,30,[{interface,"tap30"}]}, - {port,31,[{interface,"tap31"}]}, - {port,32,[{interface,"tap32"}]}, - {port,33,[{interface,"tap33"}]}, - {port,34,[{interface,"tap34"}]}]}, - {capable_switch_queues,[]}, - {optical_links, - [{{1,50},{2,30}}, - {{2,50},{3,30}}, - {{3,50},{4,50}}, - {{1,20},{5,50}}, - {{2,20},{5,20}}, - {{3,20},{6,50}}, - {{4,20},{6,20}}, - {{5,30},{6,40}}, - {{5,40},{7,50}}, - {{6,30},{8,50}}, - {{7,20},{8,30}}, - {{7,30},{9,50}}, - {{8,20},{10,50}}, - {{9,20},{10,20}}]}, - {logical_switches, - [{switch,1, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:01"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,1,[{queues,[]},{port_no,50}]}, - {port,7,[{queues,[]},{port_no,20}]}, - {port,29,[{queues,[]},{port_no,10}]}]}]}, - {switch,2, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:02"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,2,[{queues,[]},{port_no,30}]}, - {port,3,[{queues,[]},{port_no,50}]}, - {port,9,[{queues,[]},{port_no,20}]}]}]}, - {switch,3, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:03"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,4,[{queues,[]},{port_no,30}]}, - {port,5,[{queues,[]},{port_no,50}]}, - {port,11,[{queues,[]},{port_no,20}]}]}]}, - {switch,4, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:04"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,6,[{queues,[]},{port_no,50}]}, - {port,13,[{queues,[]},{port_no,20}]}, - {port,30,[{queues,[]},{port_no,10}]}]}]}, - {switch,5, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:05"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,8,[{queues,[]},{port_no,50}]}, - {port,10,[{queues,[]},{port_no,20}]}, - {port,15,[{queues,[]},{port_no,30}]}, - {port,17,[{queues,[]},{port_no,40}]}]}]}, - {switch,7, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:07"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,18,[{queues,[]},{port_no,50}]}, - {port,21,[{queues,[]},{port_no,20}]}, - {port,23,[{queues,[]},{port_no,30}]}, - {port,32,[{queues,[]},{port_no,10}]}]}]}, - {switch,8, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:08"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,20,[{queues,[]},{port_no,50}]}, - {port,22,[{queues,[]},{port_no,30}]}, - {port,25,[{queues,[]},{port_no,20}]}]}]}, - {switch,9, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:09"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,24,[{queues,[]},{port_no,50}]}, - {port,27,[{queues,[]},{port_no,20}]}, - {port,33,[{queues,[]},{port_no,10}]}]}]}, - {switch,10, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,26,[{queues,[]},{port_no,50}]}, - {port,28,[{queues,[]},{port_no,20}]}, - {port,34,[{queues,[]},{port_no,10}]}]}]}, - {switch,6, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:06"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,12,[{queues,[]},{port_no,50}]}, - {port,14,[{queues,[]},{port_no,20}]}, - {port,16,[{queues,[]},{port_no,40}]}, - {port,19,[{queues,[]},{port_no,30}]}, - {port,31,[{queues,[]},{port_no,10}]}]}]}]}]}, - {epcap,[{verbose,false},{stats_interval,10}]}, - {enetconf, - [{capabilities, - [{base,{1,0}}, - {base,{1,1}}, - {startup,{1,0}}, - {'writable-running',{1,0}}]}, - {callback_module,linc_ofconfig}, - {sshd_ip,any}, - {sshd_port,1830}, - {sshd_user_passwords,[{"linc","linc"}]}]}, - {lager, - [{handlers, - [{lager_console_backend,info}, - {lager_file_backend, - [{"log/error.log",error,10485760,"$D0",5}, - {"log/console.log",info,10485760,"$D0",5}]}]}]}, - {sasl, - [{sasl_error_logger,{file,"log/sasl-error.log"}}, - {errlog_type,error}, - {error_logger_mf_dir,"log/sasl"}, - {error_logger_mf_maxbytes,10485760}, - {error_logger_mf_maxfiles,5}]}, - {sync,[{excluded_modules,[procket]}]}]. diff --git a/framework/src/onos/tools/test/topos/sys-nonlinear-4.config b/framework/src/onos/tools/test/topos/sys-nonlinear-4.config deleted file mode 100644 index b1451bee..00000000 --- a/framework/src/onos/tools/test/topos/sys-nonlinear-4.config +++ /dev/null @@ -1,79 +0,0 @@ -[{linc, - [{of_config,disabled}, - {software_desc,<<"LINC-OE OpenFlow Software Switch 1.1">>}, - {capable_switch_ports, - [{port,1,[{interface,"dummy"},{type,optical}]}, - {port,2,[{interface,"dummy"},{type,optical}]}, - {port,5,[{interface,"dummy"},{type,optical}]}, - {port,6,[{interface,"dummy"},{type,optical}]}, - {port,7,[{interface,"dummy"},{type,optical}]}, - {port,8,[{interface,"dummy"},{type,optical}]}, - {port,9,[{interface,"dummy"},{type,optical}]}, - {port,10,[{interface,"dummy"},{type,optical}]}, - {port,3,[{interface,"tap3"}]}, - {port,4,[{interface,"tap4"}]}]}, - {capable_switch_queues,[]}, - {optical_links,[{{1,20},{3,30}},{{3,31},{2,21}},{{1,22},{4,30}},{{4,31},{2,22}}]}, - {logical_switches, - [{switch,1, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:01"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,1,[{queues,[]},{port_no,20}]}, - {port,7,[{queues,[]},{port_no,22}]}, - {port,3,[{queues,[]},{port_no,10}]}]}]}, - {switch,3, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:03"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,5,[{queues,[]},{port_no,30}]}, - {port,6,[{queues,[]},{port_no,31}]}]}]}, - {switch,2, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:02"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,2,[{queues,[]},{port_no,21}]}, - {port,8,[{queues,[]},{port_no,22}]}, - {port,4,[{queues,[]},{port_no,11}]}]}]}, - {switch,4, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:04"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,9,[{queues,[]},{port_no,30}]}, - {port,10,[{queues,[]},{port_no,31}]}]}]}]}]}, - {epcap,[{verbose,false},{stats_interval,10}]}, - {enetconf, - [{capabilities, - [{base,{1,0}}, - {base,{1,1}}, - {startup,{1,0}}, - {'writable-running',{1,0}}]}, - {callback_module,linc_ofconfig}, - {sshd_ip,any}, - {sshd_port,1830}, - {sshd_user_passwords,[{"linc","linc"}]}]}, - {lager, - [{handlers, - [{lager_console_backend,debug}, - {lager_file_backend, - [{"log/error.log",error,10485760,"$D0",5}, - {"log/console.log",info,10485760,"$D0",5}]}]}]}, - {sasl, - [{sasl_error_logger,{file,"log/sasl-error.log"}}, - {errlog_type,error}, - {error_logger_mf_dir,"log/sasl"}, - {error_logger_mf_maxbytes,10485760}, - {error_logger_mf_maxfiles,5}]}, - {sync,[{excluded_modules,[procket]}]}]. diff --git a/framework/src/onos/tools/test/topos/sys.config b/framework/src/onos/tools/test/topos/sys.config deleted file mode 100644 index b3a718dd..00000000 --- a/framework/src/onos/tools/test/topos/sys.config +++ /dev/null @@ -1,183 +0,0 @@ -[{linc, - [{of_config,disabled}, - {software_desc,<<"LINC-OE OpenFlow Software Switch 1.1">>}, - {capable_switch_ports, - [{port,1,[{interface,"dummy"},{type,optical}]}, - {port,2,[{interface,"dummy"},{type,optical}]}, - {port,3,[{interface,"dummy"},{type,optical}]}, - {port,4,[{interface,"dummy"},{type,optical}]}, - {port,5,[{interface,"dummy"},{type,optical}]}, - {port,6,[{interface,"dummy"},{type,optical}]}, - {port,7,[{interface,"dummy"},{type,optical}]}, - {port,8,[{interface,"dummy"},{type,optical}]}, - {port,9,[{interface,"dummy"},{type,optical}]}, - {port,10,[{interface,"dummy"},{type,optical}]}, - {port,11,[{interface,"dummy"},{type,optical}]}, - {port,12,[{interface,"dummy"},{type,optical}]}, - {port,13,[{interface,"dummy"},{type,optical}]}, - {port,14,[{interface,"dummy"},{type,optical}]}, - {port,15,[{interface,"dummy"},{type,optical}]}, - {port,16,[{interface,"dummy"},{type,optical}]}, - {port,17,[{interface,"dummy"},{type,optical}]}, - {port,18,[{interface,"dummy"},{type,optical}]}, - {port,19,[{interface,"dummy"},{type,optical}]}, - {port,20,[{interface,"dummy"},{type,optical}]}, - {port,21,[{interface,"dummy"},{type,optical}]}, - {port,22,[{interface,"dummy"},{type,optical}]}, - {port,23,[{interface,"dummy"},{type,optical}]}, - {port,24,[{interface,"dummy"},{type,optical}]}, - {port,25,[{interface,"dummy"},{type,optical}]}, - {port,26,[{interface,"dummy"},{type,optical}]}, - {port,27,[{interface,"dummy"},{type,optical}]}, - {port,28,[{interface,"dummy"},{type,optical}]}, - {port,29,[{interface,"tap29"}]}, - {port,30,[{interface,"tap30"}]}, - {port,31,[{interface,"tap31"}]}, - {port,32,[{interface,"tap32"}]}, - {port,33,[{interface,"tap33"}]}, - {port,34,[{interface,"tap34"}]}]}, - {capable_switch_queues,[]}, - {optical_links, - [{{1,50},{2,30}}, - {{2,50},{3,30}}, - {{3,50},{4,50}}, - {{1,20},{5,50}}, - {{2,20},{5,20}}, - {{3,20},{6,50}}, - {{4,20},{6,20}}, - {{5,30},{6,40}}, - {{5,40},{7,50}}, - {{6,30},{8,50}}, - {{7,20},{8,30}}, - {{7,30},{9,50}}, - {{8,20},{10,50}}, - {{9,20},{10,20}}]}, - {logical_switches, - [{switch,1, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:01"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,1,[{queues,[]},{port_no,50}]}, - {port,7,[{queues,[]},{port_no,20}]}, - {port,29,[{queues,[]},{port_no,10}]}]}]}, - {switch,2, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:02"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,2,[{queues,[]},{port_no,30}]}, - {port,3,[{queues,[]},{port_no,50}]}, - {port,9,[{queues,[]},{port_no,20}]}]}]}, - {switch,3, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:03"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,4,[{queues,[]},{port_no,30}]}, - {port,5,[{queues,[]},{port_no,50}]}, - {port,11,[{queues,[]},{port_no,20}]}]}]}, - {switch,4, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:04"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,6,[{queues,[]},{port_no,50}]}, - {port,13,[{queues,[]},{port_no,20}]}, - {port,30,[{queues,[]},{port_no,10}]}]}]}, - {switch,5, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:05"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,8,[{queues,[]},{port_no,50}]}, - {port,10,[{queues,[]},{port_no,20}]}, - {port,15,[{queues,[]},{port_no,30}]}, - {port,17,[{queues,[]},{port_no,40}]}]}]}, - {switch,7, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:07"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,18,[{queues,[]},{port_no,50}]}, - {port,21,[{queues,[]},{port_no,20}]}, - {port,23,[{queues,[]},{port_no,30}]}, - {port,32,[{queues,[]},{port_no,10}]}]}]}, - {switch,8, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:08"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,20,[{queues,[]},{port_no,50}]}, - {port,22,[{queues,[]},{port_no,30}]}, - {port,25,[{queues,[]},{port_no,20}]}]}]}, - {switch,9, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:09"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,24,[{queues,[]},{port_no,50}]}, - {port,27,[{queues,[]},{port_no,20}]}, - {port,33,[{queues,[]},{port_no,10}]}]}]}, - {switch,10, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,26,[{queues,[]},{port_no,50}]}, - {port,28,[{queues,[]},{port_no,20}]}, - {port,34,[{queues,[]},{port_no,10}]}]}]}, - {switch,6, - [{backend,linc_us4_oe}, - {datapath_id,"00:00:ff:ff:ff:ff:ff:06"}, - {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]}, - {controllers_listener,disabled}, - {queues_status,disabled}, - {ports, - [{port,12,[{queues,[]},{port_no,50}]}, - {port,14,[{queues,[]},{port_no,20}]}, - {port,16,[{queues,[]},{port_no,40}]}, - {port,19,[{queues,[]},{port_no,30}]}, - {port,31,[{queues,[]},{port_no,10}]}]}]}]}]}, - {epcap,[{verbose,false},{stats_interval,10}]}, - {enetconf, - [{capabilities, - [{base,{1,0}}, - {base,{1,1}}, - {startup,{1,0}}, - {'writable-running',{1,0}}]}, - {callback_module,linc_ofconfig}, - {sshd_ip,any}, - {sshd_port,1830}, - {sshd_user_passwords,[{"linc","linc"}]}]}, - {lager, - [{handlers, - [{lager_console_backend,info}, - {lager_file_backend, - [{"log/error.log",error,10485760,"$D0",5}, - {"log/console.log",info,10485760,"$D0",5}]}]}]}, - {sasl, - [{sasl_error_logger,{file,"log/sasl-error.log"}}, - {errlog_type,error}, - {error_logger_mf_dir,"log/sasl"}, - {error_logger_mf_maxbytes,10485760}, - {error_logger_mf_maxfiles,5}]}, - {sync,[{excluded_modules,[procket]}]}]. diff --git a/framework/src/onos/tools/test/topos/topo b/framework/src/onos/tools/test/topos/topo deleted file mode 100755 index 854de504..00000000 --- a/framework/src/onos/tools/test/topos/topo +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# Starts the specified mininet topology. -# ----------------------------------------------------------------------------- -cd $(dirname $0) - -topo=${1:-att-onos.py} - -[ -n "$1" ] && shift -sudo python $topo "$@" diff --git a/framework/src/onos/tools/test/topos/topo-200sw-linkalarm.py b/framework/src/onos/tools/test/topos/topo-200sw-linkalarm.py deleted file mode 100644 index bb964e2b..00000000 --- a/framework/src/onos/tools/test/topos/topo-200sw-linkalarm.py +++ /dev/null @@ -1,20 +0,0 @@ - -from mininet.topo import Topo - -class MyTopo( Topo ): - "10 'floating' switch topology" - - def __init__( self ): - # Initialize topology - Topo.__init__( self ) - - sw_list = [] - swC = self.addSwitch('sc', dpid = 'ffffffff00000001') - - for i in range(1, 201): - switch=self.addSwitch('s'+str(i), dpid = str(i).zfill(16)) - self.addLink(switch,swC) - - sw_list.append(switch) - -topos = { 'mytopo': ( lambda: MyTopo() ) } diff --git a/framework/src/onos/tools/test/topos/tower b/framework/src/onos/tools/test/topos/tower deleted file mode 100755 index 8244bae9..00000000 --- a/framework/src/onos/tools/test/topos/tower +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -cd ~/topos && sudo mn --custom tower.py --topo tower --controller remote,${1:-192.168.56.101} --mac diff --git a/framework/src/onos/tools/test/topos/tower.py b/framework/src/onos/tools/test/topos/tower.py deleted file mode 100755 index b75bfe40..00000000 --- a/framework/src/onos/tools/test/topos/tower.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python - -from mininet.topo import Topo -from mininet.cli import CLI -from mininet.net import Mininet -from mininet.node import RemoteController, OVSKernelSwitch -from mininet.log import setLogLevel - - -class TowerTopo( Topo ): - """Create a tower topology""" - - def build( self, k=4, h=6 ): - spines = [] - leaves = [] - hosts = [] - - # Create the two spine switches - spines.append(self.addSwitch('s1')) - spines.append(self.addSwitch('s2')) - - # Create two links between the spine switches - self.addLink(spines[0], spines[1]) - #TODO add second link between spines when multi-link topos are supported - #self.addLink(spines[0], spines[1]) - - # Now create the leaf switches, their hosts and connect them together - i = 1 - c = 0 - while i <= k: - leaves.append(self.addSwitch('s1%d' % i)) - for spine in spines: - self.addLink(leaves[i-1], spine) - - j = 1 - while j <= h: - hosts.append(self.addHost('h%d%d' % (i, j))) - self.addLink(hosts[c], leaves[i-1]) - j+=1 - c+=1 - - i+=1 - -topos = { 'tower': TowerTopo } - -def run(): - topo = TowerTopo() - net = Mininet( topo=topo, controller=RemoteController, autoSetMacs=True ) - net.start() - CLI( net ) - net.stop() - -if __name__ == '__main__': - setLogLevel( 'info' ) - run() -- cgit 1.2.3-korg