summaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-02-13 13:49:15 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-02-17 14:13:03 +0100
commita9e04a25e1f8636a53432095fce44a7087fb5f28 (patch)
tree7180a060424018bfcd184fa09ffbad315a7fafab /lisp
parent4b6dd0d15903bd96ad344a588b75b93fd0088f55 (diff)
Lisp model changes due to decrease version of ODL
Change-Id: I589b6480853ea4716f60301e2b53bdd82db3dde1 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp')
-rwxr-xr-xlisp/api/src/main/yang/lisp.yang6
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/BridgeDomainSubtableCustomizer.java4
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VrfSubtableCustomizer.java8
3 files changed, 14 insertions, 4 deletions
diff --git a/lisp/api/src/main/yang/lisp.yang b/lisp/api/src/main/yang/lisp.yang
index 933211c79..cf508c6c3 100755
--- a/lisp/api/src/main/yang/lisp.yang
+++ b/lisp/api/src/main/yang/lisp.yang
@@ -257,7 +257,8 @@ module lisp {
leaf table-id {
type uint32;
description "table-id";
- mandatory true;
+ // TODO - HC2VPP-73 - commented due to ODL Boron issues
+ //mandatory true;
}
uses dp-subtable-grouping;
@@ -268,7 +269,8 @@ module lisp {
leaf bridge-domain-ref {
type string;
description "Name reference to existing bridge domain";
- mandatory true;
+ // TODO - HC2VPP-73 - commented due to ODL Boron issues
+ // mandatory true;
}
uses dp-subtable-grouping;
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 {