Fixed reading of operational state of lisp

Rejecting of empty locator-sets
Added revert of searched key to match vpp address 
order
Ignoring helper data returned by dumps

Change-Id: I35fff11d6dbbceb28a526c6603317948a5a9e179
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
index c2db3b845..fdb9cf3ab 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
@@ -17,6 +17,7 @@
 package io.fd.honeycomb.lisp.translate.write;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
 import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.getReply;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -35,10 +36,12 @@ import io.fd.honeycomb.translate.v3po.util.cache.exceptions.execution.DumpExecut
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import java.io.UnsupportedEncodingException;
+import java.util.List;
 import java.util.concurrent.TimeoutException;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.locator.sets.grouping.locator.sets.LocatorSet;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.locator.sets.grouping.locator.sets.LocatorSetKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.locator.sets.grouping.locator.sets.locator.set.Interface;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.openvpp.jvpp.VppBaseCallException;
 import org.openvpp.jvpp.core.dto.LispAddDelLocatorSet;
@@ -76,8 +79,9 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer
 
         final String locatorSetName = dataAfter.getName();
         checkNotNull(locatorSetName, "LocatorSet name is null");
-
-        //TODO check and fill mapping when api returns index of created locator set
+        checkState(isNonEmptyLocatorSet(writeContext.readAfter(id).get()),
+                "Creating empty locator-sets is not allowed");
+        // TODO VPP-323 check and fill mapping when api returns index of created locator set
         // checkState(!locatorSetContext.containsIndex(locatorSetName, writeContext.getMappingContext()),
         //         "Locator set with name %s allready defined", locatorSetName);
 
@@ -98,6 +102,11 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer
         }
     }
 
+    private boolean isNonEmptyLocatorSet(final LocatorSet locatorSet) {
+        final List<Interface> locators = locatorSet.getInterface();
+        return locators != null && !locators.isEmpty();
+    }
+
     @Override
     public void updateCurrentAttributes(@Nonnull InstanceIdentifier<LocatorSet> id,
                                         @Nonnull LocatorSet dataBefore,