Added FlowSpec Traffic Profile feature

[packetcable.git] / packetcable-policy-server / src / main / java / org / opendaylight / controller / packetcable / provider / validation / impl / validators / ccaps / CcapsValidator.java

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidator.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidator.java
index 6a49dc70cbe6eb356ab1e3f1af7334e83e0d48ba..8670f0ad63397d5cbcc2203713e38fee48890c8a 100644 (file)
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidator.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidator.java
@@ -8,10 +8,9 @@
 
 package org.opendaylight.controller.packetcable.provider.validation.impl.validators.ccaps;
 
-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.Ccaps;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.ccaps.Ccap;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161219.Ccaps;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161219.ccaps.Ccap;
 
 /**
  * @author rvail
@@ -21,14 +20,17 @@ public class CcapsValidator extends AbstractValidator<Ccaps> {
     private final CcapValidator ccapValidator = new CcapValidator();
 
     @Override
-    public void validate(final Ccaps ccaps, Extent extent) throws ValidationException {
+    public void doValidate(final Ccaps ccaps, Extent extent) {
         if (ccaps == null) {
-            throw new ValidationException("ccaps must exist");
+            getErrorMessages().add("ccaps must exist");
+            return;
         }
 
         if (extent == Extent.NODE_AND_SUBTREE) {
-            for (Ccap ccap : ccaps.getCcap()) {
-                validateChild(ccapValidator, ccap);
+            if (ccaps.getCcap() != null) {
+                for (Ccap ccap : ccaps.getCcap()) {
+                    validateChild(ccapValidator, ccap);
+                }
             }
         }
     }