summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Srnicek <jan.srnicek@pantheon.tech>2016-07-07 13:21:26 +0200
committerJan Srnicek <jan.srnicek@pantheon.tech>2016-07-07 13:22:49 +0200
commit7cd13f2d7919f617395c2504f3633cb12b57bf52 (patch)
treed37be833c65e71db83aff8362a30e1c4aae208ec
parent582bc3d05c36fcb2d8c92727a41f581b248da74a (diff)
HONEYCOMB-113 - refactoring based on jvpp type-conversion changes
Change-Id: I5792e8cbcaf4e214386083850594119e6f6ed445 Signed-off-by: Jan Srnicek <jan.srnicek@pantheon.tech>
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/SubInterfaceCustomizer.java4
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/SubInterfaceCustomizer.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/SubInterfaceCustomizer.java
index c6d19475a..7eb568530 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/SubInterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/SubInterfaceCustomizer.java
@@ -154,7 +154,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer
checkState(SVlan.class == outerTag.getDot1qTag().getTagType(), "Service Tag expected at index 0");
final Dot1qTag.VlanId vlanId = outerTag.getDot1qTag().getVlanId();
- request.outerVlanId = dot1qVlanIdToChar(vlanId.getDot1qVlanId());
+ request.outerVlanId = vlanId.getDot1qVlanId().getValue().shortValue();
request.outerVlanIdAny = booleanToByte(Dot1qTag.VlanId.Enumeration.Any.equals(vlanId.getEnumeration()));
}
@@ -162,7 +162,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer
checkState(CVlan.class == innerTag.getDot1qTag().getTagType(), "Customer Tag expected at index 1");
final Dot1qTag.VlanId vlanId = innerTag.getDot1qTag().getVlanId();
- request.innerVlanId = dot1qVlanIdToChar(vlanId.getDot1qVlanId());
+ request.innerVlanId = vlanId.getDot1qVlanId().getValue().shortValue();
request.innerVlanIdAny = booleanToByte(Dot1qTag.VlanId.Enumeration.Any.equals(vlanId.getEnumeration()));
}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/SubInterfaceCustomizer.java
index 911937c31..99c701ab2 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/SubInterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/SubInterfaceCustomizer.java
@@ -219,7 +219,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer
return tag.build();
}
- private static Dot1qTag.VlanId buildVlanId(final char vlanId) {
+ private static Dot1qTag.VlanId buildVlanId(final short vlanId) {
return new Dot1qTag.VlanId(new Dot1qVlanId((int) vlanId));
}