X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packetcable-policy-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fpacketcable%2Fprovider%2Fvalidation%2Fimpl%2Fvalidators%2Fqos%2Fclassifier%2FIpv6ClassifierValidator.java;h=9150618ee5192e290da71247457e43d24c9916d6;hb=8ae63b25741f11c30c9095f0071e0ba7c563cd2c;hp=87d4495e0dcb413d1eec65bb7608bf7644ab70dc;hpb=d42d25f6c01dfc742f4410cf809a306e59242c86;p=packetcable.git

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidator.java
index 87d4495..9150618 100644
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidator.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.rev151026.pcmm.qos.ipv6.classifier.Ipv6Classifier;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev170125.pcmm.qos.ipv6.classifier.Ipv6Classifier;
 
 /**
  * @author rvail
@@ -36,28 +35,12 @@ public class Ipv6ClassifierValidator extends AbstractValidator<Ipv6Classifier> {
     private static final String DST_PORT_END = "ipv6-classifer.dstPort-end";
 
     @Override
-    public void validate(final Ipv6Classifier ipv6Classifier, final Extent extent) throws ValidationException {
+    protected void doValidate(final Ipv6Classifier ipv6Classifier, final Extent extent) {
         if (ipv6Classifier == null) {
-            throw new ValidationException("ipv6-classifer must exist");
+            getErrorMessages().add("ipv6-classifer must exist");
+            return;
         }
 
-        mustExist(ipv6Classifier.getSrcIp6(), SRC_IP6);
-        mustExist(ipv6Classifier.getDstIp6(), DST_IP6);
-
-        mustExist(ipv6Classifier.getTcLow(), TC_LOW);
-        mustExist(ipv6Classifier.getTcHigh(), TC_HIGH);
-        mustExist(ipv6Classifier.getTcMask(), TC_MASK);
-
-        mustExist(ipv6Classifier.getNextHdr(), NEXT_HEADER);
-
-        mustExist(ipv6Classifier.getFlowLabel(), FLOW_LABEL);
-
-        mustExist(ipv6Classifier.getSrcPortStart(), SRC_PORT_START);
-        mustExist(ipv6Classifier.getSrcPortEnd(), SRC_PORT_END);
-
-        mustExist(ipv6Classifier.getDstPortStart(), DST_PORT_START);
-        mustExist(ipv6Classifier.getDstPortEnd(), DST_PORT_END);
-
-        throwErrorsIfNeeded();
+        // all values are optional
     }
 }