HC2VPP-321: bump nat model to ietf-nat@2018-02-23.yang

Uses ietf-nat module as defined in
https://tools.ietf.org/html/draft-ietf-opsawg-nat-yang-14

Modifications to original model:
- ip-address is used instead of ip-prefix
 (draft is not clear, see HC2VPP-325).

API changes relevant to HC/VPP:
- nat-config and nat-state merged into nat container
- nat-instances and nat-instace renamed
  to instances and instance respectively
- external-ip-address-pool has new parent - policy list
- port-type choice was removed, port is now defined using
  start-port-number and end-port-number leaves.
  Missing end is equivalent to single-port-number case from
  the older version.

TODOs:
- HC2VPP-322: single nat64Prefix per NAT instance
- HC2VPP-323: update postman collection
- HC2VPP-324: update CSIT tests.

Out of the scope of NAT model update:
- HC2VPP-326: support for nat-type handling
  (vpp-nat model might become obsolete)
- HC2VPP-327: support external-realm container
  (requires adding augmentations
  that are alredy present in the interface-nat model).

Change-Id: Ie229a55b0a3f6ee3f8c97f4fd13c54a797a62438
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
index 8e5673003..22641437f 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
@@ -20,31 +20,31 @@ import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstance;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.Instance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.InstanceKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class NatInstaceCustomizer implements ListWriterCustomizer<NatInstance, NatInstanceKey> {
+final class NatInstaceCustomizer implements ListWriterCustomizer<Instance, InstanceKey> {
 
     private static final Logger LOG = LoggerFactory.getLogger(NatInstaceCustomizer.class);
 
     @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<NatInstance> id,
-                                       @Nonnull final NatInstance dataAfter, @Nonnull final WriteContext writeContext)
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Instance> id,
+                                       @Nonnull final Instance dataAfter, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-        LOG.trace("Writing nat-instance: {}", id);
+        LOG.trace("Writing NAT instance: {}", id);
     }
 
     @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NatInstance> id,
-                                        @Nonnull final NatInstance dataBefore, @Nonnull final WriteContext writeContext)
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Instance> id,
+                                        @Nonnull final Instance dataBefore, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-        LOG.trace("Deleting nat-instance: {}", id);
+        LOG.trace("Deleting NAT instance: {}", id);
 
         // For consistency with reader, forbid removing default NAT instance:
-        final Long vrfId = id.firstKeyOf(NatInstance.class).getId();
+        final Long vrfId = id.firstKeyOf(Instance.class).getId();
         if (vrfId == 0) {
             throw new WriteFailedException.DeleteFailedException(id,
                 new UnsupportedOperationException("Removing default NAT instance (vrf=0) is not supported."));