Adding a cord-config appliation which hosts configuration
classes common to several cord applications.

Change-Id: Ie8fba7dbfacb50f627407a6c9d96bfaea43a6b61
diff --git a/api/pom.xml b/api/pom.xml
index b884942..570d55b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -52,6 +52,11 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-cord-config</artifactId>
+            <version>1.6.0-SNAPSHOT</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java b/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
deleted file mode 100644
index 5532e54..0000000
--- a/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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.
- */
-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.
-     *
-     * @return access device configuration
-     */
-    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, defaultVlan);
-    }
-}
diff --git a/api/src/main/java/org/onosproject/olt/AccessDeviceData.java b/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
deleted file mode 100644
index e292cef..0000000
--- a/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.olt;
-
-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;
-
-/**
- * Information about an access device.
- */
-public class AccessDeviceData {
-    private static final String DEVICE_ID_MISSING = "Device ID cannot be null";
-    private static final String UPLINK_MISSING = "Uplink cannot be null";
-    private static final String VLAN_MISSING = "VLAN ID cannot be null";
-
-    private final DeviceId deviceId;
-    private final PortNumber uplink;
-    private final VlanId vlan;
-    private final Optional<VlanId> defaultVlan;
-
-    /**
-     * Class constructor.
-     *
-     * @param deviceId access device ID
-     * @param uplink uplink port number
-     * @param vlan device VLAN ID
-     * @param defaultVlan default device VLAN ID
-     */
-    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);
-    }
-
-    /**
-     * Retrieves the access device ID.
-     *
-     * @return device ID
-     */
-    public DeviceId deviceId() {
-        return deviceId;
-    }
-
-    /**
-     * Retrieves the uplink port number.
-     *
-     * @return port number
-     */
-    public PortNumber uplink() {
-        return uplink;
-    }
-
-    /**
-     * Retrieves the VLAN ID assigned to the device.
-     *
-     * @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;
-    }
-}
diff --git a/api/src/main/java/org/onosproject/olt/AccessDeviceService.java b/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
index ab6cd68..aa90540 100644
--- a/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
+++ b/api/src/main/java/org/onosproject/olt/AccessDeviceService.java
@@ -17,6 +17,7 @@
 package org.onosproject.olt;
 
 import org.onlab.packet.VlanId;
+import org.onosproject.cordconfig.access.AccessDeviceData;
 import org.onosproject.event.ListenerService;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;