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/AccessDeviceData.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/AccessDeviceData.java')
-rw-r--r-- | framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java index f7e40e30..18b5e99f 100644 --- a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java +++ b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java @@ -20,6 +20,8 @@ import org.onlab.packet.VlanId; import org.onosproject.net.DeviceId; import org.onosproject.net.PortNumber; +import java.util.Optional; + import static com.google.common.base.Preconditions.checkNotNull; /** @@ -33,6 +35,7 @@ public class AccessDeviceData { private final DeviceId deviceId; private final PortNumber uplink; private final VlanId vlan; + private final Optional<VlanId> defaultVlan; /** * Class constructor. @@ -41,10 +44,12 @@ public class AccessDeviceData { * @param uplink uplink port number * @param vlan device VLAN ID */ - public AccessDeviceData(DeviceId deviceId, PortNumber uplink, VlanId vlan) { + public AccessDeviceData(DeviceId deviceId, PortNumber uplink, VlanId vlan, + Optional<VlanId> defaultVlan) { this.deviceId = checkNotNull(deviceId, DEVICE_ID_MISSING); this.uplink = checkNotNull(uplink, UPLINK_MISSING); this.vlan = checkNotNull(vlan, VLAN_MISSING); + this.defaultVlan = checkNotNull(defaultVlan); } /** @@ -68,9 +73,18 @@ public class AccessDeviceData { /** * Retrieves the VLAN ID assigned to the device. * - * @return vlan ID + * @return VLAN ID */ public VlanId vlan() { return vlan; } + + /** + * Retrieves the default VLAN ID that will be used for this device. + * + * @return default VLAN ID + */ + public Optional<VlanId> defaultVlan() { + return defaultVlan; + } } |