Added support for RTP and UGS gate traffic profiles

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

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierContainerValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierContainerValidator.java
index 79d8d18f73a8af072791492a534c613e63885b75..1079e50ebfab44faa4e85ee2fb32d719ac6bc780 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierContainerValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierContainerValidator.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.classifier.attributes.classifiers.ClassifierContainer;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev170125.classifier.attributes.classifiers.ClassifierContainer;
 
 /**
  * @author rvail
@@ -23,9 +22,10 @@ public class ClassifierContainerValidator extends AbstractValidator<ClassifierCo
     private final ClassifierChoiceValidator classifierChoiceValidator = new ClassifierChoiceValidator();
 
     @Override
-    public void validate(final ClassifierContainer container, final Extent extent) throws ValidationException {
+    protected void doValidate(final ClassifierContainer container, final Extent extent) {
         if (container == null) {
-            throw new ValidationException("classifer-container must exist");
+            getErrorMessages().add("classifer-container must exist");
+            return;
         }
 
         mustExist(container.getClassifierChoice(), CLASSIFIER_CHOICE);
@@ -35,8 +35,6 @@ public class ClassifierContainerValidator extends AbstractValidator<ClassifierCo
         if (extent == Extent.NODE_AND_SUBTREE) {
             validateChild(classifierChoiceValidator, container.getClassifierChoice());
         }
-
-        throwErrorsIfNeeded();
     }
 
 }