Skip to content
Snippets Groups Projects
Commit 76816576 authored by Srinivasan Ramasubramanian's avatar Srinivasan Ramasubramanian
Browse files

Identifying broadcast domains in the network.

parent 930d8da7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/main/java/net/floodlightcontroller/topology/BroadcastDomain.java 0 → 100644
+ 91
− 0
View file @ 76816576
package net.floodlightcontroller.topology;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.openflow.util.HexString;
import net.floodlightcontroller.core.IOFSwitch;
/**
*
* @author Srinivasan Ramasubramanian, Big Switch Networks
*
*/
public class BroadcastDomain {
private Set<Long> clusterIds;
private Map<Long, Set<Long>> clusterSwitchMap;
private Map<Long, Set<Short>> switchPortMap;
public BroadcastDomain() {
clusterIds = new HashSet<Long>();
clusterSwitchMap = new HashMap<Long,Set<Long>>();
switchPortMap = new HashMap<Long, Set<Short>>();
}
public Set<Long> getClustersIds() {
return clusterIds;
}
public Map<Long, Set<Long>> getClusterSwitchMap() {
return clusterSwitchMap;
}
public Set<Short> getPorts(IOFSwitch sw) {
return switchPortMap.get(sw.getId());
}
public void add(SwitchPortTuple spt) {
// Add the switch to the set
Long cid = spt.getSw().getSwitchClusterId();
clusterIds.add(cid);
Set<Long> switchIds = clusterSwitchMap.get(cid);
if (switchIds == null) {
switchIds = new HashSet<Long>();
clusterSwitchMap.put(cid, switchIds);
}
long sid = spt.getSw().getId();
switchIds.add(sid);
Set<Short> ports = switchPortMap.get(sid);
// If ports don't exist for that switch, create one
if (ports == null){
ports = new HashSet<Short>();
switchPortMap.put(spt.getSw().getId(), ports);
}
// Add the port to the group
ports.add(spt.getPort());
}
public boolean contains(SwitchPortTuple swt) {
// no ports of that switch is this domain
if (switchPortMap.get(swt.getSw()) == null)
return false;
return (switchPortMap.get(swt.getSw().getId()).contains(swt.getPort()));
}
public String toString() {
StringBuffer sb = new StringBuffer("[BroadcastDomain:");;
for(Long c: clusterIds) {
for(Long s: clusterSwitchMap.get(c)) {
String str = HexString.toHexString(s);
for(Short p: switchPortMap.get(s)) {
sb.append("[");
sb.append(c);
sb.append(",");
sb.append(str);
sb.append(",");
sb.append(p);
sb.append("]");
}
}
}
sb.append("]");
return sb.toString();
}
}
src/main/java/net/floodlightcontroller/topology/LinkInfo.java
+ 45
− 17
View file @ 76816576
/**
* Copyright 2011, Big Switch Networks, Inc.
* Originally created by David Erickson, Stanford University
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* Copyright 2011, Big Switch Networks, Inc.* Originally created by David Erickson, Stanford University
** Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License. You may obtain
* a copy of the License at
*
......@@ -25,7 +23,16 @@ public class LinkInfo {
PBS_FORWARD,
};
protected Long validTime;
/**
* The term unicastValidTime may be slightly misleading here.
* The standard LLDP destination MAC address that is currently
* used is also a multicast address, however since this address
* is specified in the standard, we expect all switches to
* absorb this packet, thus making the standard LLDP packet
* traverse only one link.
*/
protected Long unicastValidTime;
protected Long multicastValidTime;
/** The port states stored here are topology's last knowledge of
* the state of the port. This mostly mirrors the state
......@@ -46,8 +53,12 @@ public class LinkInfo {
*/
protected PortBroadcastState bcState;
public LinkInfo(Long validTime, Integer srcPortState, Integer dstPortState) {
this.validTime = validTime;
public LinkInfo(Long unicastValidTime,
Long broadcastValidTime,
Integer srcPortState,
Integer dstPortState) {
this.unicastValidTime = unicastValidTime;
this.multicastValidTime = broadcastValidTime;
this.srcPortState = srcPortState;
this.dstPortState = dstPortState;
if (linkStpBlocked()) {
......@@ -73,12 +84,20 @@ public class LinkInfo {
this.bcState = bcState;
}
public Long getValidTime() {
return validTime;
public Long getUnicastValidTime() {
return unicastValidTime;
}
public void setUnicastValidTime(Long unicastValidTime) {
this.unicastValidTime = unicastValidTime;
}
public Long getMulticastValidTime() {
return multicastValidTime;
}
public void setValidTime(Long validTime) {
this.validTime = validTime;
public void setMulticastValidTime(Long multicastValidTime) {
this.multicastValidTime = multicastValidTime;
}
public Integer getSrcPortState() {
......@@ -104,8 +123,9 @@ public class LinkInfo {
public int hashCode() {
final int prime = 5557;
int result = 1;
result = prime * result + ((validTime == null) ? 0 : validTime.hashCode());
result = prime * result + ((srcPortState == null) ? 0 : validTime.hashCode());
result = prime * result + ((unicastValidTime == null) ? 0 : unicastValidTime.hashCode());
result = prime * result + ((multicastValidTime == null) ? 0 : multicastValidTime.hashCode());
result = prime * result + ((srcPortState == null) ? 0 : unicastValidTime.hashCode());
result = prime * result + ((dstPortState == null) ? 0 : dstPortState.hashCode());
result = prime * result + ((bcState == null) ? 0 : bcState.hashCode());
return result;
......@@ -123,10 +143,17 @@ public class LinkInfo {
if (!(obj instanceof LinkInfo))
return false;
LinkInfo other = (LinkInfo) obj;
if (validTime == null) {
if (other.validTime != null)
if (unicastValidTime == null) {
if (other.unicastValidTime != null)
return false;
} else if (!unicastValidTime.equals(other.unicastValidTime))
return false;
if (multicastValidTime == null) {
if (other.multicastValidTime != null)
return false;
} else if (!validTime.equals(other.validTime))
} else if (!multicastValidTime.equals(other.multicastValidTime))
return false;
if (srcPortState == null) {
......@@ -155,7 +182,8 @@ public class LinkInfo {
*/
@Override
public String toString() {
return "LinkInfo [validTime=" + ((validTime == null) ? "null" : validTime)
return "LinkInfo [unicastValidTime=" + ((unicastValidTime == null) ? "null" : unicastValidTime)
+ "multicastValidTime=" + ((multicastValidTime == null) ? "null" : multicastValidTime)
+ ", srcPortState=" + ((srcPortState == null) ? "null" : srcPortState)
+ ", dstPortState=" + ((dstPortState == null) ? "null" : srcPortState)
+ ", bcState=" + ((bcState == null) ? "null" : bcState) + "]";
......
src/test/java/net/floodlightcontroller/topology/internal/TopologyImplTest.java
+ 154
− 11
View file @ 76816576
......@@ -80,7 +80,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
LinkTuple lt = new LinkTuple(sw1, 2, sw2, 1);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
// check invariants hold
assertNotNull(topology.switchLinks.get(lt.getSrc().getSw()));
......@@ -99,7 +101,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
LinkTuple lt = new LinkTuple(sw1, 2, sw2, 1);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
topology.deleteLinks(Collections.singletonList(lt), "Test");
// check invariants hold
......@@ -117,7 +121,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
LinkTuple lt = new LinkTuple(sw1, 2, sw1, 3);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
// check invariants hold
assertNotNull(topology.switchLinks.get(lt.getSrc().getSw()));
......@@ -135,7 +141,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw1 = createMockSwitch(1L);
replay(sw1);
LinkTuple lt = new LinkTuple(sw1, 2, sw1, 3);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
topology.deleteLinks(Collections.singletonList(lt), "Test to self");
// check invariants hold
......@@ -153,7 +161,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
LinkTuple lt = new LinkTuple(sw1, 2, sw2, 1);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
// Mock up our expected behavior
topology.removedSwitch(sw1);
......@@ -173,7 +183,9 @@ public class TopologyImplTest extends FloodlightTestCase {
IOFSwitch sw1 = createMockSwitch(1L);
replay(sw1);
LinkTuple lt = new LinkTuple(sw1, 2, sw1, 3);
topology.addOrUpdateLink(lt, 0, 0);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
0, 0);
topology.addOrUpdateLink(lt, info);
// Mock up our expected behavior
topology.removedSwitch(sw1);
......@@ -190,7 +202,9 @@ public class TopologyImplTest extends FloodlightTestCase {
for (int i = 0; i < linkInfoArray.length; i++) {
int[] linkInfo = linkInfoArray[i];
LinkTuple lt = new LinkTuple(switches[linkInfo[0]-1], linkInfo[1], switches[linkInfo[3]-1], linkInfo[4]);
topology.addOrUpdateLink(lt, linkInfo[2], linkInfo[5]);
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
linkInfo[2], linkInfo[5]);
topology.addOrUpdateLink(lt, info);
}
}
......@@ -434,10 +448,11 @@ public class TopologyImplTest extends FloodlightTestCase {
for (int i = 0; i < linkInfoArray.length; i++) {
int[] linkInfo = linkInfoArray[i];
LinkTuple lt = new LinkTuple(switches[linkInfo[0]-1], linkInfo[1], switches[linkInfo[3]-1], linkInfo[4]);
LinkInfo lkInfo = new LinkInfo(System.currentTimeMillis(), linkInfo[2], linkInfo[5]);
lkInfo.setBroadcastState(linkInfo[6]==0 ? LinkInfo.PortBroadcastState.PBS_FORWARD :
LinkInfo info = new LinkInfo(System.currentTimeMillis(), null,
linkInfo[2], linkInfo[5]);
info.setBroadcastState(linkInfo[6]==0 ? LinkInfo.PortBroadcastState.PBS_FORWARD :
LinkInfo.PortBroadcastState.PBS_BLOCK);
thisLinkInfos.put(lt, lkInfo);
thisLinkInfos.put(lt, info);
}
for (Map.Entry<LinkTuple, LinkInfo> entry : topology.getLinks().entrySet()) {
......@@ -446,7 +461,7 @@ public class TopologyImplTest extends FloodlightTestCase {
LinkInfo l2 = entry.getValue();
assertNotNull(l1);
assertNotNull(l2);
l1.setValidTime(l2.getValidTime());
l1.setUnicastValidTime(l2.getUnicastValidTime());
boolean value = l1.equals(l2);
assertTrue(value);
}
......@@ -775,4 +790,132 @@ public class TopologyImplTest extends FloodlightTestCase {
verifyClusters(topology, switches, expectedClusters1);
assertTrue(topology.getSwitchCluster(switches[2]).getId() == 1);
}
@Test
public void testAddUpdateLinks() throws Exception {
TopologyImpl topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
expect(sw1.getSwitchClusterId()).andReturn(1L).anyTimes();
expect(sw2.getSwitchClusterId()).andReturn(1L).anyTimes();
replay(sw1, sw2);
LinkTuple lt = new LinkTuple(sw1, 1, sw2, 1);
LinkInfo info;
info = new LinkInfo(System.currentTimeMillis() - 40000, null,
0, 0);
topology.addOrUpdateLink(lt, info);
// check invariants hold
assertNotNull(topology.switchLinks.get(lt.getSrc().getSw()));
assertTrue(topology.switchLinks.get(lt.getSrc().getSw()).contains(lt));
assertNotNull(topology.portLinks.get(lt.getSrc()));
assertTrue(topology.portLinks.get(lt.getSrc()).contains(lt));
assertNotNull(topology.portLinks.get(lt.getDst()));
assertTrue(topology.portLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.links.containsKey(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()) == null ||
topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt) == false);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()) == null ||
topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt) == false);
assertTrue(topology.broadcastDomains.isEmpty());
topology.timeoutLinks();
info = new LinkInfo(null, System.currentTimeMillis(), 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.links.get(lt).getUnicastValidTime() == null);
assertTrue(topology.links.get(lt).getMulticastValidTime() != null);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.isEmpty() == false);
assertTrue(topology.broadcastDomains.size() == 1);
// Add a link info based on info that woudld be obtained from unicast LLDP
// Setting the unicast LLDP reception time to be 40 seconds old, so we can use
// this to test timeout after this test. Although the info is initialized
// with LT_OPENFLOW_LINK, the link property should be changed to LT_NON_OPENFLOW
// by the addOrUpdateLink method.
info = new LinkInfo(System.currentTimeMillis() - 40000, null, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()) == null ||
topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt) == false);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()) == null ||
topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt) == false);
assertTrue(topology.broadcastDomains.size() == 0);
// Expect to timeout the unicast Valid Time, but not the multicast Valid time
// So the link type should go back to non-openflow link.
topology.timeoutLinks();
assertTrue(topology.links.get(lt).getUnicastValidTime() == null);
assertTrue(topology.links.get(lt).getMulticastValidTime() != null);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 1);
// Set the multicastValidTime to be old and see if that also times out.
topology.links.get(lt).setMulticastValidTime(System.currentTimeMillis() - 40000);
topology.timeoutLinks();
assertTrue(topology.links.get(lt) == null);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()) == null ||
topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt) == false);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()) == null ||
topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt) == false);
assertTrue(topology.broadcastDomains.size() == 0);
// Test again only with multicast LLDP
info = new LinkInfo(null, System.currentTimeMillis() - 40000, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.links.get(lt).getUnicastValidTime() == null);
assertTrue(topology.links.get(lt).getMulticastValidTime() != null);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 1);
// Call timeout and check if link is no longer present.
topology.timeoutLinks();
assertTrue(topology.links.get(lt) == null);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()) == null ||
topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt) == false);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()) == null ||
topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt) == false);
assertTrue(topology.broadcastDomains.size() == 0);
// Start clean and see if loops are also added.
lt = new LinkTuple(sw1, 1, sw1, 2);
info = new LinkInfo(null, System.currentTimeMillis() - 40000, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 1);
// Start clean and see if loops are also added.
lt = new LinkTuple(sw1, 1, sw1, 3);
info = new LinkInfo(null, System.currentTimeMillis() - 40000, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 1);
// Start clean and see if loops are also added.
lt = new LinkTuple(sw1, 4, sw1, 5);
info = new LinkInfo(null, System.currentTimeMillis() - 40000, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 2);
// Start clean and see if loops are also added.
lt = new LinkTuple(sw1, 3, sw1, 5);
info = new LinkInfo(null, System.currentTimeMillis() - 40000, 0, 0);
topology.addOrUpdateLink(lt, info);
assertTrue(topology.portBroadcastDomainLinks.get(lt.getSrc()).contains(lt));
assertTrue(topology.portBroadcastDomainLinks.get(lt.getDst()).contains(lt));
assertTrue(topology.broadcastDomains.size() == 1);
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment