Lisp model changes due to decrease version of ODL

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

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java
index 25c17f848..2d1be418a 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java
@@ -52,6 +52,8 @@ public class BridgeDomainSubtableCustomizer extends FutureJVppCustomizer
     public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomainSubtable> id,
                                        @Nonnull final BridgeDomainSubtable dataAfter,
                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        // TODO - HC2VPP-73 - remove after resolving ODL Boron issues
+        checkNotNull(dataAfter.getBridgeDomainRef(), "Bridge domain reference must be present");
         LOG.debug("Writing Id {} ", id);
 
         try {
@@ -76,6 +78,8 @@ public class BridgeDomainSubtableCustomizer extends FutureJVppCustomizer
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomainSubtable> id,
                                         @Nonnull final BridgeDomainSubtable dataBefore,
                                         @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        // TODO - HC2VPP-73 - remove after resolving ODL Boron issues
+        checkNotNull(dataBefore.getBridgeDomainRef(), "Bridge domain reference must be present");
         LOG.debug("Removing Id {}", id);
 
         try {
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java
index 49375f6f9..fc2379670 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java
@@ -30,6 +30,8 @@ import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class VrfSubtableCustomizer extends FutureJVppCustomizer
         implements WriterCustomizer<VrfSubtable>, SubtableWriter {
 
@@ -43,7 +45,8 @@ public class VrfSubtableCustomizer extends FutureJVppCustomizer
     public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<VrfSubtable> id,
                                        @Nonnull final VrfSubtable dataAfter, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-
+        // TODO - HC2VPP-73 - remove after resolving ODL Boron issues
+        checkNotNull(dataAfter.getTableId(), "Table id must be present");
         LOG.debug("Writing Id[{}]/Data[{}]", id, dataAfter);
 
         try {
@@ -66,7 +69,8 @@ public class VrfSubtableCustomizer extends FutureJVppCustomizer
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<VrfSubtable> id,
                                         @Nonnull final VrfSubtable dataBefore, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-
+        // TODO - HC2VPP-73 - remove after resolving ODL Boron issues
+        checkNotNull(dataBefore.getTableId(), "Table id must be present");
         LOG.debug("Removing Id[{}]/Data[{}]", id, dataBefore);
 
         try {