diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-12-22 14:25:45 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2016-12-22 14:28:55 +0100 |
| commit | 0f4d4af63ad5d0705f781a6e67090a60c48e6afa (patch) | |
| tree | ce07ebb4febe12ca2a0c3e3554e5b3b2f20ee86e /v3po/v3po2vpp/src | |
| parent | d5e1e3a563807561caa0b64c414332d85a31f216 (diff) | |
Fix b-vlan-tag-vlan-id translation
Change-Id: I32ba794673c3caaf8f07c1d2460a16d3c3a34202
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src')
2 files changed, 8 insertions, 8 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java index 3e8d82399..c2f703e69 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizer.java @@ -112,8 +112,8 @@ public class PbbRewriteCustomizer extends FutureJVppCustomizer return checkNotNull(data.getSourceAddress(), "Destination address cannot be null").getValue(); } - private byte verifiedBVlanId(final PbbRewrite data) { - return (byte) checkNotNull(data.getBVlanTagVlanId(), "BVlan id cannot be null").shortValue(); + private short verifiedBVlanId(final PbbRewrite data) { + return checkNotNull(data.getBVlanTagVlanId(), "BVlan id cannot be null").shortValue(); } private int verifiedISid(final PbbRewrite data) { diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java index 214f760d1..8303064a2 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/pbb/PbbRewriteCustomizerTest.java @@ -223,7 +223,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { desiredResult.vtrOp = Operation.Pop2.getIntValue(); desiredResult.bDmac = new byte[]{-69, -69, -69, -69, -69, -69}; desiredResult.bSmac = new byte[]{-86, -86, -86, -86, -86, -86}; - desiredResult.bVlanid = 1; + desiredResult.bVlanid = 1234; desiredResult.iSid = 2; return desiredResult; @@ -235,7 +235,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { desiredResult.vtrOp = 0; desiredResult.bDmac = new byte[]{-69, -69, -69, -69, -69, -69}; desiredResult.bSmac = new byte[]{-86, -86, -86, -86, -86, -86}; - desiredResult.bVlanid = 1; + desiredResult.bVlanid = 1234; desiredResult.iSid = 2; return desiredResult; @@ -257,7 +257,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { private PbbRewrite invalidDataNoDestination() { return new PbbRewriteBuilder() - .setBVlanTagVlanId(1) + .setBVlanTagVlanId(1234) .setITagIsid(2L) .setSourceAddress(new MacAddress("aa:aa:aa:aa:aa:aa")) .setInterfaceOperation(Operation.Pop2) @@ -266,7 +266,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { private PbbRewrite invalidDataNoSource() { return new PbbRewriteBuilder() - .setBVlanTagVlanId(1) + .setBVlanTagVlanId(1234) .setITagIsid(2L) .setDestinationAddress(new MacAddress("bb:bb:bb:bb:bb:bb")) .setInterfaceOperation(Operation.Pop2) @@ -275,7 +275,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { private PbbRewrite invalidDataNoItag() { return new PbbRewriteBuilder() - .setBVlanTagVlanId(1) + .setBVlanTagVlanId(1234) .setSourceAddress(new MacAddress("aa:aa:aa:aa:aa:aa")) .setDestinationAddress(new MacAddress("bb:bb:bb:bb:bb:bb")) .setInterfaceOperation(Operation.Pop2) @@ -302,7 +302,7 @@ public class PbbRewriteCustomizerTest extends WriterCustomizerTest { private PbbRewrite validData() { return new PbbRewriteBuilder() - .setBVlanTagVlanId(1) + .setBVlanTagVlanId(1234) .setITagIsid(2L) .setSourceAddress(new MacAddress("aa:aa:aa:aa:aa:aa")) .setDestinationAddress(new MacAddress("bb:bb:bb:bb:bb:bb")) |