mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 11:51:43 +02:00
Code Issues Projects Releases Wiki Activity

Avoid programming TMAC entries for BSOD vlans

Browse Source 
When an interfaces is defined with tagged VLAN(s) and no IP addresses, do not install TMAC entries for that VLAN(s).

Change-Id: I5beeb38c0b21cdd69a0da90943f768c3aeddb720
This commit is contained in:
Daniel Ginsburg 2018-04-30 19:27:19 -04:00 committed by Charles Chan
parent d980c6db30
commit c1d47e9bfa
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
View File

@ -998,7 +998,23 @@ public class RoutingRulePopulator {
private boolean processSinglePortFiltersInternal(DeviceId deviceId, PortNumber portnum,
boolean pushVlan, VlanId vlanId, boolean install) {
FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId);
boolean doTMAC = true;
if (!pushVlan) {
// Skip the tagged vlans belonging to an interface without an IP address
Set<Interface> ifaces = srManager.interfaceService
.getInterfacesByPort(new ConnectPoint(deviceId, portnum))
.stream()
.filter(intf -> intf.vlanTagged().contains(vlanId) && intf.ipAddressesList().isEmpty())
.collect(Collectors.toSet());
if (!ifaces.isEmpty()) {
log.debug("processSinglePortFiltersInternal: skipping TMAC for vlan {} at {}/{} - no IP",
vlanId, deviceId, portnum);
doTMAC = false;
}
}
FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId, doTMAC);
if (fob == null) {
// error encountered during build
return false;
@ -1019,7 +1035,7 @@ public class RoutingRulePopulator {
}
private FilteringObjective.Builder buildFilteringObjective(DeviceId deviceId, PortNumber portnum,
boolean pushVlan, VlanId vlanId) {
boolean pushVlan, VlanId vlanId, boolean doTMAC) {
MacAddress deviceMac;
try {
deviceMac = config.getDeviceMac(deviceId);
@ -1028,9 +1044,15 @@ public class RoutingRulePopulator {
return null;
}
FilteringObjective.Builder fob = DefaultFilteringObjective.builder();
fob.withKey(Criteria.matchInPort(portnum))
.addCondition(Criteria.matchEthDst(deviceMac))
.withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
if (doTMAC) {
fob.withKey(Criteria.matchInPort(portnum))
.addCondition(Criteria.matchEthDst(deviceMac))
.withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
} else {
fob.withKey(Criteria.matchInPort(portnum))
.withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
}
TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();

2
drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java
View File

@ -511,7 +511,7 @@ public class Ofdpa2Pipeline extends AbstractHandlerBehaviour implements Pipeline
if (ethCriterion == null || ethCriterion.mac().equals(NONE)) {
// NOTE: it is possible that a filtering objective only has vidCriterion
log.warn("filtering objective missing dstMac, cannot program TMAC table");
log.debug("filtering objective missing dstMac, won't program TMAC table");
} else {
MacAddress unicastMac = readEthDstFromTreatment(filt.meta());
List<List<FlowRule>> allStages = processEthDstFilter(portCriterion, ethCriterion,