mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-21 04:12:23 +02:00
Code Issues Projects Releases Wiki Activity

fix on VLAN intent encapsulation ONOS-3467

Browse Source 
Change-Id: Ia0a72d13a551fd4183531d35c04ca19d87b85280
This commit is contained in:
Michele Santuari 2016-01-15 10:00:32 +01:00 committed by Gerrit Code Review
parent 6b045587c9
commit 0ff59c27e4
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
View File

@ -172,12 +172,20 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> {
}
VlanId prevVlanId = vlanId;
//Tag the traffic with the new VLAN
TrafficTreatment treat = DefaultTrafficTreatment.builder()
.setVlanId(vlanId)
.build();
Optional<VlanIdCriterion> vlanCriterion = intent.selector().criteria()
.stream().filter(criterion -> criterion.type() == Criterion.Type.VLAN_VID)
.map(criterion -> (VlanIdCriterion) criterion)
.findAny();
rules.add(createFlowRule(intent.selector(), treat, srcLink.dst(), link.src(), intent.priority(), true));
//Push VLAN if selector does not include VLAN
TrafficTreatment.Builder treatBuilder = DefaultTrafficTreatment.builder();
if (!vlanCriterion.isPresent()) {
treatBuilder.pushVlan();
}
//Tag the traffic with the new encapsulation VLAN
treatBuilder.setVlanId(vlanId);
rules.add(createFlowRule(intent.selector(), treatBuilder.build(),
srcLink.dst(), link.src(), intent.priority(), true));
ConnectPoint prev = link.dst();
@ -211,15 +219,9 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> {
TrafficSelector egressSelector = DefaultTrafficSelector.builder()
.matchInPort(prev.port())
.matchVlanId(prevVlanId).build();
//TODO: think to other cases for egress packet restoration
Optional<VlanIdCriterion> vlanCriteria = intent.selector().criteria()
.stream().filter(criteria -> criteria.type() == Criterion.Type.VLAN_VID)
.map(criteria -> (VlanIdCriterion) criteria)
.findAny();
TrafficTreatment.Builder egressTreat = DefaultTrafficTreatment.builder(intent.treatment());
if (vlanCriteria.isPresent()) {
egressTreat.setVlanId(vlanCriteria.get().vlanId());
if (vlanCriterion.isPresent()) {
egressTreat.setVlanId(vlanCriterion.get().vlanId());
} else {
egressTreat.popVlan();
}