diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-01-03 08:37:30 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-01-03 08:39:47 +0100 |
| commit | c127a6e1f1f7c37864bf9e11887cb7b84dfad826 (patch) | |
| tree | a5d43033dbb78c4992f1cea4885f74e9ba4dd48c /dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java | |
| parent | 730a7ee0267663fdc525ad7b0c50318ef73e520f (diff) | |
HC2VPP-274(dhcp.yang): use inet:ip-address-no-zone instead of inet:ip-address
The zone index is not needed in case of dhcp.yang.
It was introduced due to ODL bug:
https://bugs.opendaylight.org/show_bug.cgi?id=6413
Change-Id: Ia32a2e6cc0c4ec31bd9b30392a3a558b28568fb2
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java')
| -rw-r--r-- | dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java index cb9939228..a506f72f1 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/write/DhcpRelayCustomizer.java @@ -30,11 +30,11 @@ import io.fd.vpp.jvpp.core.dto.DhcpProxyConfig; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.List; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev170315.Ipv6; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev170315.dhcp.attributes.relays.Relay; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev170315.dhcp.attributes.relays.RelayKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev170315.relay.attributes.Server; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev180103.Ipv6; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev180103.dhcp.attributes.relays.Relay; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev180103.dhcp.attributes.relays.RelayKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.dhcp.rev180103.relay.attributes.Server; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,11 +109,11 @@ final class DhcpRelayCustomizer extends FutureJVppCustomizer implements ListWrit getReplyForWrite(getFutureJVpp().dhcpProxyConfig(request).toCompletableFuture(), id); } - private byte[] parseAddress(@Nonnull final IpAddress address, final boolean isIpv6) { + private byte[] parseAddress(@Nonnull final IpAddressNoZone address, final boolean isIpv6) { if (isIpv6) { - return ipv6AddressNoZoneToArray(address.getIpv6Address()); + return ipv6AddressNoZoneToArray(address.getIpv6AddressNoZone()); } else { - return ipv4AddressNoZoneToArray(address.getIpv4Address().getValue()); + return ipv4AddressNoZoneToArray(address.getIpv4AddressNoZone()); } } } |