diff options
Diffstat (limited to 'framework/src/onos/tools/test')
7 files changed, 329 insertions, 10 deletions
diff --git a/framework/src/onos/tools/test/bin/ogroup-opts b/framework/src/onos/tools/test/bin/ogroup-opts index f02b7a8f..eec2f224 100644 --- a/framework/src/onos/tools/test/bin/ogroup-opts +++ b/framework/src/onos/tools/test/bin/ogroup-opts @@ -51,7 +51,7 @@ complete -F _cell-opts cell vicell function _ocapp-opts () { local cur=${COMP_WORDS[COMP_CWORD]} if [ $COMP_CWORD -eq 1 ]; then - COMPREPLY=( $( compgen -W "bundle ui cli" -- $cur ) ) + COMPREPLY=( $( compgen -W "app bundle ui uitable uitopo cli" -- $cur ) ) fi } diff --git a/framework/src/onos/tools/test/cells/andrea b/framework/src/onos/tools/test/cells/andrea index 1f9f22fe..0074f2d6 100644 --- a/framework/src/onos/tools/test/cells/andrea +++ b/framework/src/onos/tools/test/cells/andrea @@ -8,4 +8,4 @@ export OCN="10.128.12.4" export OCT=$OC1 export ONOS_USE_SSH=true -export ONOS_APPS=drivers,openflow,proxyarp,ovsdb +export ONOS_APPS=drivers,openflow,proxyarp,ovsdb,pathpainter diff --git a/framework/src/onos/tools/test/cells/tomx b/framework/src/onos/tools/test/cells/tomx index 91036e67..bc7f1e06 100644 --- a/framework/src/onos/tools/test/cells/tomx +++ b/framework/src/onos/tools/test/cells/tomx @@ -8,4 +8,4 @@ export OCN="10.128.11.4" export OCT=$OC1 export ONOS_USE_SSH=true -export ONOS_APPS=drivers,openflow,proxyarp,mobility
\ No newline at end of file +export ONOS_APPS=drivers,openflow,proxyarp,mobility,pathpainter
\ No newline at end of file diff --git a/framework/src/onos/tools/test/configs/network-cfg-2x2-leaf-spine.json b/framework/src/onos/tools/test/configs/network-cfg-2x2-leaf-spine.json new file mode 100644 index 00000000..828d2735 --- /dev/null +++ b/framework/src/onos/tools/test/configs/network-cfg-2x2-leaf-spine.json @@ -0,0 +1,108 @@ +{ + "ports" : { + "of:0000000000000001/3" : { + "interfaces" : [ + { + "ips" : [ "10.0.1.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000001/4" : { + "interfaces" : [ + { + "ips" : [ "10.0.1.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000002/3" : { + "interfaces" : [ + { + "ips" : [ "10.0.2.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000002/4" : { + "interfaces" : [ + { + "ips" : [ "10.0.2.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + } + }, + "devices" : { + "of:0000000000000001" : { + "segmentrouting" : { + "name" : "Leaf-R1", + "nodeSid" : 101, + "routerIp" : "10.0.1.254", + "routerMac" : "00:00:00:00:01:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000002" : { + "segmentrouting" : { + "name" : "Leaf-R2", + "nodeSid" : 102, + "routerIp" : "10.0.2.254", + "routerMac" : "00:00:00:00:02:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000191" : { + "segmentrouting" : { + "name" : "Spine-R1", + "nodeSid" : 103, + "routerIp" : "192.168.0.11", + "routerMac" : "00:00:01:00:11:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + }, + "of:0000000000000192" : { + "segmentrouting" : { + "name" : "Spine-R2", + "nodeSid" : 104, + "routerIp" : "192.168.0.22", + "routerMac" : "00:00:01:00:22:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + } + }, + "hosts" : { + "00:00:00:00:00:01/4093" : { + "basic": { + "ips": ["10.0.1.1"], + "location": "of:0000000000000001/3" + } + }, + "00:00:00:00:00:02/4093" : { + "basic": { + "ips": ["10.0.1.2"], + "location": "of:0000000000000001/4" + } + }, + "00:00:00:00:00:03/4093" : { + "basic": { + "ips": ["10.0.2.1"], + "location": "of:0000000000000002/3" + } + }, + "00:00:00:00:00:04/4093" : { + "basic": { + "ips": ["10.0.2.2"], + "location": "of:0000000000000002/4" + } + } + } +} diff --git a/framework/src/onos/tools/test/configs/network-cfg-4x4-leaf-spine.json b/framework/src/onos/tools/test/configs/network-cfg-4x4-leaf-spine.json new file mode 100644 index 00000000..4efcf97d --- /dev/null +++ b/framework/src/onos/tools/test/configs/network-cfg-4x4-leaf-spine.json @@ -0,0 +1,208 @@ +{ + "ports" : { + "of:0000000000000001/5" : { + "interfaces" : [ + { + "ips" : [ "10.0.1.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000001/6" : { + "interfaces" : [ + { + "ips" : [ "10.0.1.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000002/5" : { + "interfaces" : [ + { + "ips" : [ "10.0.2.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000002/6" : { + "interfaces" : [ + { + "ips" : [ "10.0.2.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000003/5" : { + "interfaces" : [ + { + "ips" : [ "10.0.3.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000003/6" : { + "interfaces" : [ + { + "ips" : [ "10.0.3.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000004/5" : { + "interfaces" : [ + { + "ips" : [ "10.0.4.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000004/6" : { + "interfaces" : [ + { + "ips" : [ "10.0.4.254/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + } + }, + "devices" : { + "of:0000000000000001" : { + "segmentrouting" : { + "name" : "Leaf-R1", + "nodeSid" : 101, + "routerIp" : "10.0.1.254", + "routerMac" : "00:00:00:00:01:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000002" : { + "segmentrouting" : { + "name" : "Leaf-R2", + "nodeSid" : 102, + "routerIp" : "10.0.2.254", + "routerMac" : "00:00:00:00:02:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000003" : { + "segmentrouting" : { + "name" : "Leaf-R3", + "nodeSid" : 103, + "routerIp" : "10.0.3.254", + "routerMac" : "00:00:00:00:03:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000004" : { + "segmentrouting" : { + "name" : "Leaf-R4", + "nodeSid" : 104, + "routerIp" : "10.0.4.254", + "routerMac" : "00:00:00:00:04:80", + "isEdgeRouter" : true, + "adjacencySids" : [] + } + }, + "of:0000000000000191" : { + "segmentrouting" : { + "name" : "Spine-R1", + "nodeSid" : 105, + "routerIp" : "192.168.0.11", + "routerMac" : "00:00:01:00:11:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + }, + "of:0000000000000192" : { + "segmentrouting" : { + "name" : "Spine-R2", + "nodeSid" : 106, + "routerIp" : "192.168.0.22", + "routerMac" : "00:00:01:00:22:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + }, + "of:0000000000000193" : { + "segmentrouting" : { + "name" : "Spine-R3", + "nodeSid" : 107, + "routerIp" : "192.168.0.33", + "routerMac" : "00:00:03:00:33:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + }, + "of:0000000000000194" : { + "segmentrouting" : { + "name" : "Spine-R4", + "nodeSid" : 108, + "routerIp" : "192.168.0.44", + "routerMac" : "00:00:04:00:44:80", + "isEdgeRouter" : false, + "adjacencySids" : [] + } + } + }, + "hosts" : { + "00:00:00:00:00:01/4093" : { + "basic": { + "ips": ["10.0.1.1"], + "location": "of:0000000000000001/5" + } + }, + "00:00:00:00:00:02/4093" : { + "basic": { + "ips": ["10.0.1.2"], + "location": "of:0000000000000001/6" + } + }, + "00:00:00:00:00:03/4093" : { + "basic": { + "ips": ["10.0.2.1"], + "location": "of:0000000000000002/5" + } + }, + "00:00:00:00:00:04/4093" : { + "basic": { + "ips": ["10.0.2.2"], + "location": "of:0000000000000002/6" + } + }, + "00:00:00:00:00:05/4093" : { + "basic": { + "ips": ["10.0.3.1"], + "location": "of:0000000000000003/5" + } + }, + "00:00:00:00:00:06/4093" : { + "basic": { + "ips": ["10.0.3.2"], + "location": "of:0000000000000003/6" + } + }, + "00:00:00:00:00:07/4093" : { + "basic": { + "ips": ["10.0.4.1"], + "location": "of:0000000000000004/5" + } + }, + "00:00:00:00:00:08/4093" : { + "basic": { + "ips": ["10.0.4.2"], + "location": "of:0000000000000004/6" + } + } + } +} diff --git a/framework/src/onos/tools/test/topos/attmplsfast.py b/framework/src/onos/tools/test/topos/attmplsfast.py index 7f904462..cc7479be 100644 --- a/framework/src/onos/tools/test/topos/attmplsfast.py +++ b/framework/src/onos/tools/test/topos/attmplsfast.py @@ -15,19 +15,23 @@ from mininet.util import dumpNodeConnections class AttMplsTopo( Topo ): "Internet Topology Zoo Specimen." - def build( self ): + 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' ) # 41.877461, -87.642892 + 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' ) # 38.626418, -90.198143 + 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 @@ -40,12 +44,12 @@ class AttMplsTopo( Topo ): 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' ) # 34.056346, -118.235951 + 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 - NY54 = self.addSwitch( 's25' ) # 40.728270, -73.994483 # ... and now hosts + NY54_host = self.addHost( 'h25' ) CMBR_host = self.addHost( 'h1' ) CHCG_host = self.addHost( 'h2' ) CLEV_host = self.addHost( 'h3' ) @@ -70,7 +74,6 @@ class AttMplsTopo( Topo ): LA03_host = self.addHost( 'h22' ) SNDG_host = self.addHost( 'h23' ) PHNX_host = self.addHost( 'h24' ) - NY54_host = self.addHost( 'h25' ) # add edges between switch and corresponding host self.addLink( NY54 , NY54_host ) diff --git a/framework/src/onos/tools/test/topos/metro.py b/framework/src/onos/tools/test/topos/metro.py index 1979b103..5a73cb6b 100755 --- a/framework/src/onos/tools/test/topos/metro.py +++ b/framework/src/onos/tools/test/topos/metro.py @@ -86,8 +86,8 @@ class Domain(object): class OpticalDomain(Domain): """ An emulated optical metro core. It is Domain 0. """ def build(self): - oean = { "optical.regens": 0 } 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" } |