ONOS commit 4832784ed4032361f4c776b79a1de9c013c41226

Change-Id: I710a23a1485c08f006d3ead26f5281c2d1a986e4
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceConfig.java b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
index 90ed7403..07b73c84 100644
--- a/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
+++ b/framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
@@ -16,11 +16,14 @@
 
 package org.onosproject.olt;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.onlab.packet.VlanId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.config.Config;
 
+import java.util.Optional;
+
 /**
  * Config object for access device data.
  */
@@ -28,6 +31,7 @@ public class AccessDeviceConfig extends Config<DeviceId> {
 
     private static final String UPLINK = "uplink";
     private static final String VLAN = "vlan";
+    private static final String DEFAULT_VLAN = "defaultVlan";
 
     /**
      * Gets the access device configuration for this device.
@@ -37,7 +41,15 @@ public class AccessDeviceConfig extends Config<DeviceId> {
     public AccessDeviceData getOlt() {
         PortNumber uplink = PortNumber.portNumber(node.path(UPLINK).asText());
         VlanId vlan = VlanId.vlanId(Short.parseShort(node.path(VLAN).asText()));
+        JsonNode defaultVlanNode = node.path(DEFAULT_VLAN);
+
+        Optional<VlanId> defaultVlan;
+        if (defaultVlanNode.isMissingNode()) {
+            defaultVlan = Optional.empty();
+        } else {
+            defaultVlan = Optional.of(VlanId.vlanId(Short.parseShort(defaultVlanNode.asText())));
+        }
 
-        return new AccessDeviceData(subject(), uplink, vlan);
+        return new AccessDeviceData(subject(), uplink, vlan, defaultVlan);
     }
 }