Added validation check for access agent config

Addressed comments in https://gerrit.onosproject.org/#/c/8959/

Change-Id: I3f730042ea31d7f4183985991fe5b4e630572521

+/*
+ * 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.cordconfig.access;
 package org.onosproject.cordconfig.access;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MacAddress;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
@@ -11,6 +30,9 @@ import org.onosproject.net.config.Config;
 import java.util.Map;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 
 
+import static org.onosproject.net.config.Config.FieldPresence.MANDATORY;
+import static org.onosproject.net.config.Config.FieldPresence.OPTIONAL;
+
 /**
 /**
  * Represents configuration for an OLT agent.
  * Represents configuration for an OLT agent.
  */
  */
@@ -22,6 +44,14 @@ public class AccessAgentConfig extends Config<DeviceId> {
     // TODO: Remove this, it is only useful as long as XOS doesn't manage this.
     // TODO: Remove this, it is only useful as long as XOS doesn't manage this.
     private static final String VTN_LOCATION = "vtn-location";
     private static final String VTN_LOCATION = "vtn-location";
 
 
+    @Override
+    public boolean isValid() {
+        return hasOnlyFields(OLTS, AGENT_MAC, VTN_LOCATION) &&
+                isMacAddress(AGENT_MAC, MANDATORY) &&
+                isConnectPoint(VTN_LOCATION, OPTIONAL) &&
+                isValidOlts();
+    }
+
     /**
     /**
      * Gets the access agent configuration for this device.
      * Gets the access agent configuration for this device.
      *
      *
@@ -29,9 +59,6 @@ public class AccessAgentConfig extends Config<DeviceId> {
      */
      */
     public AccessAgentData getAgent() {
     public AccessAgentData getAgent() {
         JsonNode olts = node.get(OLTS);
         JsonNode olts = node.get(OLTS);
-        if (!olts.isObject()) {
-            throw new IllegalArgumentException(OLTS + " should be an object");
-        }
         Map<ConnectPoint, MacAddress> oltMacInfo = Maps.newHashMap();
         Map<ConnectPoint, MacAddress> oltMacInfo = Maps.newHashMap();
         olts.fields().forEachRemaining(item -> oltMacInfo.put(
         olts.fields().forEachRemaining(item -> oltMacInfo.put(
                 new ConnectPoint(subject(), PortNumber.fromString(item.getKey())),
                 new ConnectPoint(subject(), PortNumber.fromString(item.getKey())),
@@ -50,4 +77,12 @@ public class AccessAgentConfig extends Config<DeviceId> {
         return new AccessAgentData(subject(), oltMacInfo, agentMac, vtnLocation);
         return new AccessAgentData(subject(), oltMacInfo, agentMac, vtnLocation);
     }
     }
 
 
+    private boolean isValidOlts() {
+        JsonNode olts = node.get(OLTS);
+        if (!olts.isObject()) {
+            return false;
+        }
+        return !Iterators.any(olts.fields(), item -> !StringUtils.isNumeric(item.getKey()) ||
+                        !isMacAddress((ObjectNode) olts, item.getKey(), MANDATORY));
+    }
 }
 }