diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-07-03 12:44:55 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-07-04 10:57:08 +0000 |
| commit | b6ead1d5525b5b1500729959acbce905bbcbf04a (patch) | |
| tree | c951b431c5d2ddaf4f6965e54560645b3dd6d63d /v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java | |
| parent | 0461747b7d4e2c395a04501cddfa492c4f75ef7c (diff) | |
HC2VPP-275: use ip-address-no-zone in v3po YANG model
The inet:ip-address type was used in HC models
due to ODL bug:
https://bugs.opendaylight.org/show_bug.cgi?id=6413
which was fixed long time ago...
Change-Id: Icaa8ac1269c730243afba53bc663f39f7c90f36c
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java')
| -rw-r--r-- | v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java index 404f25e02..5e758c4d4 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizerTest.java @@ -39,8 +39,8 @@ import io.fd.vpp.jvpp.core.dto.VxlanAddDelTunnelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; @@ -66,8 +66,8 @@ public class VxlanCustomizerTest extends WriterCustomizerTest { private static Vxlan generateVxlan(long vni) { final VxlanBuilder builder = new VxlanBuilder(); - builder.setSrc(new IpAddress(new Ipv4Address("192.168.20.10"))); - builder.setDst(new IpAddress(new Ipv4Address("192.168.20.11"))); + builder.setSrc(new IpAddressNoZone(new Ipv4AddressNoZone("192.168.20.10"))); + builder.setDst(new IpAddressNoZone(new Ipv4AddressNoZone("192.168.20.11"))); builder.setEncapVrfId(new VniReference(123L)); builder.setVni(new VxlanVni(Long.valueOf(vni))); builder.setDecapNext(L2Input.class); @@ -105,9 +105,9 @@ public class VxlanCustomizerTest extends WriterCustomizerTest { final VxlanAddDelTunnel actual = argumentCaptor.getValue(); assertEquals(0, actual.isIpv6); assertEquals(1, actual.decapNextIndex); - assertArrayEquals(InetAddresses.forString(vxlan.getSrc().getIpv4Address().getValue()).getAddress(), + assertArrayEquals(InetAddresses.forString(vxlan.getSrc().getIpv4AddressNoZone().getValue()).getAddress(), actual.srcAddress); - assertArrayEquals(InetAddresses.forString(vxlan.getDst().getIpv4Address().getValue()).getAddress(), + assertArrayEquals(InetAddresses.forString(vxlan.getDst().getIpv4AddressNoZone().getValue()).getAddress(), actual.dstAddress); assertEquals(vxlan.getEncapVrfId().getValue().intValue(), actual.encapVrfId); assertEquals(vxlan.getVni().getValue().intValue(), actual.vni); |