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>

4 files changed, 28 insertions, 18 deletions

diff --git a/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json b/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json
index 37e8e907f..8e309ef2f 100644
--- a/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json
+++ b/nat/nat2vpp/src/test/resources/nat44/external-ip-pool.json
@@ -1,12 +1,14 @@
 {
-  "nat-instances" : {
-    "nat-instance" : {
-      "id" : 0,
-      "external-ip-address-pool": {
-        "pool-id": 22,
-        "external-ip-pool": "192.168.1.1/24"
+  "instances": {
+    "instance": {
+      "id": 0,
+      "policy": {
+        "id": 0,
+        "external-ip-address-pool": {
+          "pool-id": 22,
+          "external-ip-pool": "192.168.1.1/24"
+        }
       }
     }
   }
 }
-
diff --git a/nat/nat2vpp/src/test/resources/nat64/external-ip-pool.json b/nat/nat2vpp/src/test/resources/nat64/external-ip-pool.json
index 3be25d299..724407b29 100644
--- a/nat/nat2vpp/src/test/resources/nat64/external-ip-pool.json
+++ b/nat/nat2vpp/src/test/resources/nat64/external-ip-pool.json
@@ -1,13 +1,15 @@
 {
-  "nat-instances" : {
-    "nat-instance" : {
-      "id" : 0,
-      "external-ip-address-pool": {
-        "pool-id": 22,
-        "external-ip-pool": "192.168.1.1/24",
-        "vpp-nat:pool-type": "nat64"
+  "instances": {
+    "instance": {
+      "id": 0,
+      "policy": {
+        "id": 0,
+        "external-ip-address-pool": {
+          "pool-id": 22,
+          "external-ip-pool": "192.168.1.1/24",
+          "vpp-nat:pool-type": "nat64"
+        }
       }
     }
   }
 }
-
diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json
index 73f2c0e55..2e836ce91 100644
--- a/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json
+++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json
@@ -7,10 +7,10 @@
       "internal-src-address": "2001:db8:85a3::8a2e:370:7334",
       "external-src-address": "10.1.1.4",
       "internal-src-port" : {
-        "single-port-number" : 1234
+        "start-port-number" : 1234
       },
       "external-src-port" : {
-        "single-port-number" : 5678
+        "start-port-number" : 5678
       }
     }
   }
diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json
index d3a1c40c4..9fff452a2 100644
--- a/nat/nat2vpp/src/test/resources/nat64/static-mapping.json
+++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json
@@ -5,7 +5,13 @@
       "type": "static",
       "transport-protocol": 58,
       "internal-src-address": "2001:db8:85a3::8a2e:370:7333",
-      "external-src-address": "10.1.1.3"
+      "internal-src-port": {
+        "start-port-number": 123
+      },
+      "external-src-address": "10.1.1.3",
+      "external-src-port": {
+        "start-port-number": 456
+      }
     }
   }
 }