diff --git a/tools/test/topos/vpls.json b/tools/test/topos/vpls.json index 26829fe1cb..ea3654acd1 100644 --- a/tools/test/topos/vpls.json +++ b/tools/test/topos/vpls.json @@ -1,100 +1,80 @@ { "devices": { - "of:0000000000000001": { "basic": { "name": "s1", "latitude": 37.7576793, "longitude": -122.5076405 }}, - "of:0000000000000002": { "basic": { "name": "s2", "latitude": 34.0502337, "longitude": -118.3263353 }}, - "of:0000000000000003": { "basic": { "name": "s3", "latitude": 38.9082909, "longitude": -77.0886051 }}, - "of:0000000000000004": { "basic": { "name": "s4", "latitude": 30.2787717, "longitude": -82.3069047 }}, - "of:0000000000000005": { "basic": { "name": "s5", "latitude": 32.1932468, "longitude": -96.6318932 }} + "of:0000000000000001": { "basic": { "name": "s1", "latitude": 39.736623, "longitude": -104.984887 }}, + "of:0000000000000002": { "basic": { "name": "s2", "latitude": 41.498928, "longitude": -81.695217 }}, + "of:0000000000000003": { "basic": { "name": "s3", "latitude": 33.749017, "longitude": -84.394168 }}, + "of:0000000000000004": { "basic": { "name": "s4", "latitude": 33.448289, "longitude": -112.076299 }}, + "of:0000000000000005": { "basic": { "name": "s5", "latitude": 34.056346, "longitude": -118.235951 }}, + "of:0000000000000006": { "basic": { "name": "s6", "latitude": 40.728270, "longitude": -73.994483 }} }, "hosts": { - "00:00:00:00:00:01/10": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "vpls1h1", "latitude": 37.7576793, "longitude": -125.0076405 }}, - "00:00:00:00:00:02/10": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.2" ], "name": "vpls1h2", "latitude": 30.2787717, "longitude": -79.8069047 }}, - "00:00:00:00:00:03/20": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "vpls1h3", "latitude": 38.9082909, "longitude": -74.5886051 }}, - "00:00:00:00:00:04/30": { "basic": { "location": "of:0000000000000004/2", "ips": [ "10.0.0.4" ], "name": "vpls2h1", "latitude": 30.2787717, "longitude": -79.8069047 }}, - "00:00:00:00:00:05/40": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.5" ], "name": "vpls2h2", "latitude": 34.0502337, "longitude": -120.8263353 }}, - "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000004/3", "ips": [ "10.0.0.6" ], "name": "vpls2h3", "latitude": 30.2787717, "longitude": -79.8069047 }}, - "00:00:00:00:00:07/-1": { "basic": { "location": "of:0000000000000003/2", "ips": [ "10.0.0.7" ], "name": "vpls3h1", "latitude": 38.9082909, "longitude": -74.5886051 }}, - "00:00:00:00:00:08/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.8" ], "name": "vpls3h2", "latitude": 32.1932468, "longitude": -96.6318932 }} + "00:00:00:00:00:01/100": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "h1", "latitude": 40.888148, "longitude": -103.459878 }}, + "00:00:00:00:00:02/200": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ], "name": "h2", "latitude": 42.756945, "longitude": -79.831317 }}, + "00:00:00:00:00:03/300": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "h3", "latitude": 35.427493, "longitude": -83.885831 }}, + "00:00:00:00:00:04/400": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ], "name": "h4", "latitude": 34.662290, "longitude": -110.946662 }}, + "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ], "name": "h5", "latitude": 33.224634, "longitude": -121.532943 }}, + "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ], "name": "h6", "latitude": 42.395459, "longitude": -75.293563 }} }, "ports": { "of:0000000000000001/1": { "interfaces": [ { - "name": "vpls1h1", - "vlan": "10" + "name": "h1", + "vlan": "100" } ] }, "of:0000000000000002/1": { "interfaces": [ { - "name": "vpls2h2", - "vlan": "40" + "name": "h2", + "vlan": "200" } ] }, "of:0000000000000003/1": { "interfaces": [ { - "name": "vpls1h3", - "vlan": "20" - } - ] - }, - "of:0000000000000003/2": { - "interfaces": [ - { - "name": "vpls3h1" + "name": "h3", + "vlan": "300" } ] }, "of:0000000000000004/1": { "interfaces": [ { - "name": "vpls1h2", - "vlan": "10" - } - ] - }, - "of:0000000000000004/2": { - "interfaces": [ - { - "name": "vpls2h1", - "vlan": "30" - } - ] - }, - "of:0000000000000004/3": { - "interfaces": [ - { - "name": "vpls2h3" + "name": "h4", + "vlan": "400" } ] }, "of:0000000000000005/1": { "interfaces": [ { - "name": "vpls3h2" + "name": "h5" + } + ] + }, + "of:0000000000000006/1": { + "interfaces": [ + { + "name": "h6" } ] } }, "apps" : { "org.onosproject.vpls" : { - "vpls": { + "vpls" : { "vplsList" : [ { "name" : "VPLS1", - "encapsulation" : "VLAN", - "interfaces" : ["vpls1h1", "vpls1h2", "vpls1h3"] + "interfaces" : ["h1", "h2", "h5", "h6"] }, { "name" : "VPLS2", - "interfaces" : ["vpls2h1", "vpls2h2", "vpls2h3"] - }, - { - "name" : "VPLS3", - "interfaces" : ["vpls3h1", "vpls3h2"] + "interfaces" : ["h3", "h4"], + "encapsulation" : "vlan" } ] } diff --git a/tools/test/topos/vpls.py b/tools/test/topos/vpls.py index 35e593ba44..0be2e6802e 100755 --- a/tools/test/topos/vpls.py +++ b/tools/test/topos/vpls.py @@ -44,31 +44,31 @@ class VplsTopo(Topo): s3 = self.addSwitch('s3') s4 = self.addSwitch('s4') s5 = self.addSwitch('s5') + s6 = self.addSwitch('s6') - vpls1h1 = self.addHost('vpls1h1', cls=VLANHost, vlan=10, mac='00:00:00:00:00:01') - vpls1h2 = self.addHost('vpls1h2', cls=VLANHost, vlan=10, mac='00:00:00:00:00:02') - vpls1h3 = self.addHost('vpls1h3', cls=VLANHost, vlan=20, mac='00:00:00:00:00:03') - vpls2h1 = self.addHost('vpls2h1', cls=VLANHost, vlan=30, mac='00:00:00:00:00:04') - vpls2h2 = self.addHost('vpls2h2', cls=VLANHost, vlan=40, mac='00:00:00:00:00:05') - vpls2h3 = self.addHost('vpls2h3', mac='00:00:00:00:00:06') - vpls3h1 = self.addHost('vpls3h1', mac='00:00:00:00:00:07') - vpls3h2 = self.addHost('vpls3h2', mac='00:00:00:00:00:08') + h1 = self.addHost('h1', cls=VLANHost, vlan=100, mac='00:00:00:00:00:01') + h2 = self.addHost('h2', cls=VLANHost, vlan=200, mac='00:00:00:00:00:02') + h3 = self.addHost('h3', cls=VLANHost, vlan=300, mac='00:00:00:00:00:03') + h4 = self.addHost('h4', cls=VLANHost, vlan=400, mac='00:00:00:00:00:04') + h5 = self.addHost('h5', mac='00:00:00:00:00:05') + h6 = self.addHost('h6', mac='00:00:00:00:00:06') - self.addLink(s1, vpls1h1, port1=1, port2=0) - self.addLink(s2, vpls2h2, port1=1, port2=0) - self.addLink(s3, vpls1h3, port1=1, port2=0) - self.addLink(s3, vpls3h1, port1=2, port2=0) - self.addLink(s4, vpls1h2, port1=1, port2=0) - self.addLink(s4, vpls2h1, port1=2, port2=0) - self.addLink(s4, vpls2h3, port1=3, port2=0) - self.addLink(s5, vpls3h2, port1=1, port2=0) + self.addLink(s1, h1, port1=1, port2=0) + self.addLink(s2, h2, port1=1, port2=0) + self.addLink(s3, h3, port1=1, port2=0) + self.addLink(s4, h4, port1=1, port2=0) + self.addLink(s5, h5, port1=1, port2=0) + self.addLink(s6, h6, port1=1, port2=0) - self.addLink(s1, s4) self.addLink(s1, s2) - self.addLink(s2, s4) self.addLink(s2, s3) self.addLink(s3, s4) - self.addLink(s3, s5) + self.addLink(s4, s1) + self.addLink(s4, s2) + self.addLink(s1, s5) + self.addLink(s4, s5) + self.addLink(s2, s6) + self.addLink(s3, s6) topos = { 'vpls': ( lambda: VplsTopo() ) } diff --git a/tools/test/topos/vpls.recipe b/tools/test/topos/vpls.recipe index 468ce99ccf..d725c558a1 100644 --- a/tools/test/topos/vpls.recipe +++ b/tools/test/topos/vpls.recipe @@ -1,4 +1,4 @@ # Default VPLS topology recipe -export OTD=4 # ONOS Topology Devices -export OTL=10 # ONOS Topology Links -export OTH=4 # ONOS Topology Hosts +export OTD=6 # ONOS Topology Devices +export OTL=18 # ONOS Topology Links +export OTH=6 # ONOS Topology Hosts