diff options
author | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-14 09:53:10 -0800 |
---|---|---|
committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-14 09:53:10 -0800 |
commit | 5b2eaca070f4282ad32f620aaf479395fb6654de (patch) | |
tree | a45c0d7974fb6ea93270e56731ce1d6a5c81e204 /framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java | |
parent | 55d4a1b251e1b2e36b9036b3d0b033abc38acbec (diff) |
ONOS commit 4832784ed4032361f4c776b79a1de9c013c41226
Change-Id: I710a23a1485c08f006d3ead26f5281c2d1a986e4
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java')
-rw-r--r-- | framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java index 9aa8865a..d5d7d277 100644 --- a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java +++ b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java @@ -52,6 +52,7 @@ import org.slf4j.Logger; import java.util.Dictionary; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import static org.slf4j.LoggerFactory.getLogger; @@ -247,15 +248,17 @@ public class OLT implements AccessDeviceService { return; } - provisionVlans(olt.deviceId(), olt.uplink(), port.port(), vlan, olt.vlan()); + provisionVlans(olt.deviceId(), olt.uplink(), port.port(), vlan, olt.vlan(), + olt.defaultVlan()); } private void provisionVlans(DeviceId deviceId, PortNumber uplinkPort, PortNumber subscriberPort, - VlanId subscriberVlan, VlanId deviceVlan) { + VlanId subscriberVlan, VlanId deviceVlan, + Optional<VlanId> defaultVlan) { TrafficSelector upstream = DefaultTrafficSelector.builder() - .matchVlanId(DEFAULT_VLAN) + .matchVlanId((defaultVlan.isPresent()) ? defaultVlan.get() : DEFAULT_VLAN) .matchInPort(subscriberPort) .build(); @@ -273,7 +276,7 @@ public class OLT implements AccessDeviceService { TrafficTreatment downstreamTreatment = DefaultTrafficTreatment.builder() .popVlan() - .setVlanId(DEFAULT_VLAN) + .setVlanId((defaultVlan.isPresent()) ? defaultVlan.get() : DEFAULT_VLAN) .setOutput(subscriberPort) .build(); |