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/l2/ArpTerminationTableEntryCustomizerTest.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/l2/ArpTerminationTableEntryCustomizerTest.java')
-rw-r--r-- | v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java index 091b2422c..b785142b0 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java @@ -34,7 +34,7 @@ import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel; import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply; import org.junit.Test; import org.mockito.ArgumentCaptor; -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.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.inet.types.rev130715.Ipv6AddressNoZone; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress; @@ -60,13 +60,13 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest private byte[] ip6AddressRaw; private byte[] physAddressRaw; private PhysAddress physAddress; - private IpAddress ipAddress; - private IpAddress ip6Address; + private IpAddressNoZone ipAddress; + private IpAddressNoZone ip6Address; private ArpTerminationTableEntry entry; private ArpTerminationTableEntry ip6entry; private InstanceIdentifier<ArpTerminationTableEntry> id; - private static InstanceIdentifier<ArpTerminationTableEntry> getArpEntryId(final IpAddress ipAddress, + private static InstanceIdentifier<ArpTerminationTableEntry> getArpEntryId(final IpAddressNoZone ipAddress, final PhysAddress physAddress) { return InstanceIdentifier.create(BridgeDomains.class).child(BridgeDomain.class, new BridgeDomainKey(BD_NAME)) .child(ArpTerminationTable.class) @@ -82,8 +82,8 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest physAddressRaw = new byte[]{1, 2, 3, 4, 5, 6}; physAddress = new PhysAddress("01:02:03:04:05:06"); - ipAddress = new IpAddress(Ipv4AddressNoZone.getDefaultInstance("1.2.3.4")); - ip6Address = new IpAddress(Ipv6AddressNoZone.getDefaultInstance("2001:0db8:0a0b:12f0:0000:0000:0000:0001")); + ipAddress = new IpAddressNoZone(Ipv4AddressNoZone.getDefaultInstance("1.2.3.4")); + ip6Address = new IpAddressNoZone(Ipv6AddressNoZone.getDefaultInstance("2001:0db8:0a0b:12f0:0000:0000:0000:0001")); entry = generateArpEntry(ipAddress, physAddress); ip6entry = generateArpEntry(ip6Address, physAddress); id = getArpEntryId(ipAddress, physAddress); @@ -110,7 +110,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest return request; } - private ArpTerminationTableEntry generateArpEntry(final IpAddress ipAddress, final PhysAddress physAddress) { + private ArpTerminationTableEntry generateArpEntry(final IpAddressNoZone ipAddress, final PhysAddress physAddress) { final ArpTerminationTableEntryBuilder entry = new ArpTerminationTableEntryBuilder(); entry.setKey(new ArpTerminationTableEntryKey(ipAddress, physAddress)); entry.setPhysAddress(physAddress); |