mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 18:32:28 +02:00
Code Issues Projects Releases Wiki Activity

Added support for dual-homed hosts (on "classic" topo).

Browse Source 
Change-Id: I47f4b3bf5756928452cbf99c4be2e3e1d6c8fa92
This commit is contained in:
Simon Hunt 2017-09-12 11:58:44 -07:00
parent 5bff7caf93
commit 12c79edc91
9 changed files with 125 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/test/topos/dual-onos.py Normal file
View File

@ -0,0 +1,6 @@
#!/usr/bin/python
from onosnet import run
from dual import DualTopo
run( DualTopo() )

21
tools/test/topos/dual.json Normal file
View File

@ -0,0 +1,21 @@
{
"devices": {
"of:0000000000000001": { "basic": { "name": "SW-A" }},
"of:0000000000000002": { "basic": { "name": "SW-B" }}
},
"hosts": {
"00:00:00:00:00:01/-1": {
"basic": {
"locations": [
"of:0000000000000001/1",
"of:0000000000000002/1"
],
"ips": [
"10.0.0.1"
],
"name": "Host-X"
}
}
}
}

35
tools/test/topos/dual.py Normal file
View File

@ -0,0 +1,35 @@
#!/usr/bin/env python
"""
"""
from mininet.topo import Topo
class DualTopo( Topo ):
"""Switches and Dual-homed host"""
def __init__( self ):
"""Create a topology."""
# Initialize Topology
Topo.__init__( self )
# add nodes, switches first...
LONDON = self.addSwitch( 's1' )
BRISTL = self.addSwitch( 's2' )
# ... and now hosts
LONDON_host = self.addHost( 'h1' )
# add edges between switch and corresponding host
self.addLink( LONDON, LONDON_host )
self.addLink( BRISTL, LONDON_host )
# add edges between switches
self.addLink( LONDON, BRISTL, bw=10, delay='1.0ms')
topos = { 'dual': ( lambda: DualTopo() ) }
if __name__ == '__main__':
from onosnet import run
run( DualTopo() )

4
tools/test/topos/dual.recipe Normal file
View File

@ -0,0 +1,4 @@
# Simple Dual topology recipe
export OTD=2
export OTL=1
export OTH=1

15
web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
View File

@ -341,14 +341,17 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
ObjectNode payload = objectNode()
.put("id", host.id().toString())
.put("type", isNullOrEmpty(hostType) ? "endstation" : hostType)
.put("ingress", compactLinkString(edgeLink(host, true)))
.put("egress", compactLinkString(edgeLink(host, false)));
.put("type", isNullOrEmpty(hostType) ? "endstation" : hostType);
// set most recent connect point (and previous if we know it)
payload.set("cp", hostConnect(host.location()));
if (prevHost != null && prevHost.location() != null) {
payload.set("prevCp", hostConnect(prevHost.location()));
}
// set ALL connect points
addAllCps(host.locations(), payload);
payload.set("labels", labels(nameForHost(host), ip, host.mac().toString()));
payload.set("props", props(host.annotations()));
addGeoLocation(host, payload);
@ -358,6 +361,12 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
return JsonUtils.envelope(type, payload);
}
private void addAllCps(Set<HostLocation> locations, ObjectNode payload) {
ArrayNode cps = arrayNode();
locations.forEach(loc -> cps.add(hostConnect(loc)));
payload.set("allCps", cps);
}
// Encodes the specified host location into a JSON object.
private ObjectNode hostConnect(HostLocation location) {
return objectNode()

45
web/gui/src/main/webapp/app/view/topo/topoForce.js
View File

@ -160,7 +160,7 @@
function addHost(data) {
var id = data.id,
d, lnk;
d;
// although this is an add host event, if we already have the
// host, treat it as an update instead..
@ -174,12 +174,28 @@
lu[id] = d;
updateNodes();
lnk = tms.createHostLink(data);
if (lnk) {
d.linkData = lnk; // cache ref on its host
network.links.push(lnk);
lu[d.ingress] = lnk;
lu[d.egress] = lnk;
function mkLinkKey(devId, devPort) {
return id + '/0-' + devId + '/' + devPort;
}
// need to handle possible multiple links (multi-homed host)
d.links = [];
data.allCps.forEach(function (cp) {
var linkData = {
key: mkLinkKey(cp.device, cp.port),
dst: cp.device,
dstPort: cp.port,
};
d.links.push(linkData);
var lnk = tms.createHostLink(id, cp.device, cp.port);
if (lnk) {
network.links.push(lnk);
lu[linkData.key] = lnk;
}
});
if (d.links.length) {
updateLinks();
}
fStart();
@ -201,8 +217,10 @@
var id = data.id,
d = lu[id],
lnk;
if (d) {
// first remove the old host link
// FIXME: what if the host has multiple links??????
removeLinkElement(d.linkData);
// merge new data
@ -212,12 +230,17 @@
}
// now create a new host link
lnk = tms.createHostLink(data);
// TODO: verify this is the APPROPRIATE host link
lnk = tms.createHostLink(id, data.cp.device, data.cp.port);
if (lnk) {
d.linkData = lnk;
network.links.push(lnk);
lu[d.ingress] = lnk;
lu[d.egress] = lnk;
lu[lnk.key] = lnk;
d.links.push({
key: id + '/0-' + cp.device + '/' + cp.port,
dst: data.cp.device,
dstPort: data.cp.port,
});
}
updateNodes();

12
web/gui/src/main/webapp/app/view/topo/topoModel.js
View File

@ -158,11 +158,9 @@
return node;
}
function createHostLink(host) {
var src = host.id,
dst = host.cp.device,
id = host.ingress,
lnk = linkEndPoints(src, dst);
function createHostLink(hostId, devId, devPort) {
var linkKey = hostId + '/0-' + devId + '/' + devPort,
lnk = linkEndPoints(hostId, devId);
if (!lnk) {
return null;
@ -170,10 +168,10 @@
// Synthesize link ...
angular.extend(lnk, {
key: id,
key: linkKey,
class: 'link',
// NOTE: srcPort left undefined (host end of the link)
tgtPort: host.cp.port,
tgtPort: devPort,
type: function () { return 'hostLink'; },
expected: function () { return true; },

10
web/gui/src/main/webapp/app/view/topo/topoSelect.js
View File

@ -197,17 +197,15 @@
// special handling for links...
if (itemClass === 'link') {
payload.key = data.key;
payload.sourceId = data.source.id;
payload.targetId = data.target.id;
payload.targetPort = data.tgtPort;
if (data.source.class === 'host') {
payload.isEdgeLink = true;
payload.sourceId = data.source.id;
payload.targetId = data.source.cp.device;
payload.targetPort = data.source.cp.port;
} else {
payload.isEdgeLink = false;
payload.sourceId = data.source.id;
payload.sourcePort = data.srcPort;
payload.targetId = data.target.id;
payload.targetPort = data.tgtPort;
}
}

6
web/gui/src/main/webapp/tests/app/view/topo/topoModel-spec.js
View File

@ -358,7 +358,8 @@ describe('factory: view/topo/topoModel.js', function() {
// === unit tests for createHostLink()
it('should create a basic host link', function () {
// TODO: fix this test to use new createHostLink(...) API
xit('should create a basic host link', function () {
var link = tms.createHostLink(host1);
expect(link.source).toEqual(host1);
expect(link.target).toEqual(dev1);
@ -370,7 +371,8 @@ describe('factory: view/topo/topoModel.js', function() {
expect(link.online()).toEqual(true);
});
it('should return null for failed endpoint lookup', function () {
// TODO: fix this test to use new createHostLink(...) API
xit('should return null for failed endpoint lookup', function () {
spyOn($log, 'error');
var link = tms.createHostLink(host2);
expect(link).toBeNull();