Updates to support new TrafficProfiles that require a user-specified Direction in...

[packetcable.git] / packetcable-policy-server / src / main / java / org / opendaylight / controller / packetcable / provider / validation / impl / validators / qos / classifier / ExtClassifierValidator.java

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ExtClassifierValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ExtClassifierValidator.java
index fe9cdb522fdc0a3be3c000f6bca9b5b4c0b99b93..1e3bce8b10ff4870d4ebcdb9a937a944fdf3ea5d 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ExtClassifierValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ExtClassifierValidator.java
@@ -8,9 +8,8 @@
 
 package org.opendaylight.controller.packetcable.provider.validation.impl.validators.qos.classifier;
 
-import org.opendaylight.controller.packetcable.provider.validation.ValidationException;
 import org.opendaylight.controller.packetcable.provider.validation.impl.validators.AbstractValidator;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.pcmm.qos.ext.classifier.ExtClassifier;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161017.pcmm.qos.ext.classifier.ExtClassifier;
 
 /**
  * @author rvail
@@ -35,25 +34,13 @@ public class ExtClassifierValidator extends AbstractValidator<ExtClassifier> {
     private static final String DST_PORT_END = "ext-classifer.dstPort-end";
 
     @Override
-    public void validate(final ExtClassifier extClassifier, final Extent extent) throws ValidationException {
+    protected void doValidate(final ExtClassifier extClassifier, final Extent extent) {
+        if (extClassifier == null) {
+            getErrorMessages().add("ext-classifier must exist");
+            return;
+        }
 
-        mustExist(extClassifier.getSrcIp(), SRC_IP);
-        mustExist(extClassifier.getSrcIpMask(), SRC_MASK);
+        // all values are optional and have defaults
 
-        mustExist(extClassifier.getDstIp(), DST_IP);
-        mustExist(extClassifier.getDstIpMask(), DST_MASK);
-
-        mustExist(extClassifier.getTosByte(), TOS_BYTE);
-        mustExist(extClassifier.getTosMask(), TOS_MASK);
-
-        mustExist(extClassifier.getProtocol(), PROTOCOL);
-
-        mustExist(extClassifier.getSrcPortStart(), SRC_PORT_START);
-        mustExist(extClassifier.getSrcPortEnd(), SRC_PORT_END);
-
-        mustExist(extClassifier.getDstPortStart(), DST_PORT_START);
-        mustExist(extClassifier.getDstPortEnd(), DST_PORT_END);
-
-        throwErrorsIfNeeded();
     }
 }