HC2VPP-105: include NAT64 examples in postman collection

Also includes some minor refactoring.

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

1 files changed, 448 insertions, 242 deletions

diff --git a/nat/postman_rest_collection.json b/nat/nat_postman_collection.json
index 12bbaeb66..b7d918417 100644
--- a/nat/postman_rest_collection.json
+++ b/nat/nat_postman_collection.json
@@ -1,90 +1,92 @@
 {
-	"id": "f9258895-49e9-596f-d413-698cbcadfbde",
+	"id": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 	"name": "Honeycomb NAT RESTCONF calls",
 	"description": "Common management operations for Honeycomb + VPP + SNAT plugin",
 	"order": [
-		"d2961af7-47f7-8960-1b00-f5dcd2beafb9",
-		"c00f25d2-f194-2e90-30e5-ca31e8fbd630",
-		"1ffc71e4-9d1e-0c99-7901-605ac8e364b6",
-		"f3a7e1b5-c1d0-ab2f-3cef-3c902f8e72d5",
-		"ca3a075a-489a-5951-e013-00a0b1589704",
-		"d05da892-9e95-be1a-be8a-7cedad629d35",
-		"087269df-9897-03d3-36ea-a1f7b8d1018a",
-		"168d5e1d-ff49-4839-db83-520cb8c191ca",
-		"26f9e8f4-db90-f7f6-0c1b-d9d20790dbcd",
-		"e149e9d6-3bee-1499-c03b-c1043c9a5b46"
+		"70096d81-aeb7-01a9-2a10-b01872ff0b86",
+		"c4a57265-e848-274d-35d1-6b12f1f39e62",
+		"21c3c008-6053-8984-6f0b-a99093923f26",
+		"cdedb3f4-e4ab-1ea8-07b8-53639b44a257",
+		"2ac9831e-1fca-cbca-fb42-2b8b15e751b3"
 	],
 	"folders": [
 		{
-			"id": "ce93ade0-47c3-a82d-a768-058a2e18e2bb",
+			"id": "d256d898-3c36-7ce5-cf2a-74370463d78f",
 			"name": "1:1 static",
 			"description": "",
 			"order": [
-				"bca19675-d674-0cde-8639-df3d2ecbfd27",
-				"153f5720-fafc-22e6-6282-cf9e18226dbc",
-				"830c4ab3-2e48-5654-8aa5-2d2f9eed84b4",
-				"2c53651a-e31c-24da-122e-c0ce65544c8e",
-				"b54693d5-9226-1c27-77b2-8b1313da2e80"
+				"8cc85522-d230-fa19-dc00-e9ad4ef52b8e",
+				"a21bb084-d606-4a90-bd2d-60b866771f90"
 			],
-			"owner": "45557",
+			"owner": 0,
 			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde"
 		},
 		{
-			"id": "42903502-652c-8f7d-f18b-f333b45d30de",
+			"id": "d8c6ccdb-0df5-032d-6865-d2ea2a0782fc",
 			"name": "DYNAMIC",
 			"description": "",
 			"order": [
-				"8a37a16b-c400-6468-ca9c-d2a7657f9086",
-				"20a8172a-7908-37cf-b63e-51fee1474d10",
-				"70bc0207-e806-5722-fc71-7686d7076f9d",
-				"87de21e5-53c7-72d5-ac92-325381246350"
+				"9795bd6e-a1ec-dbaa-822c-328e3604e94e",
+				"58d78b6d-673f-ae1e-767f-fb970609b34a",
+				"7b92417d-e638-9e8c-23c7-a4aab3220a4f",
+				"afdc45a9-cf39-379b-5bb2-4a909512aee3"
 			],
-			"owner": "45557",
+			"owner": 0,
 			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde"
 		},
 		{
-			"id": "70e5612d-2e65-a822-975f-33134dcf16ff",
-			"name": "sub-interfaces",
+			"id": "a7c4171f-5d1c-0e1e-16cd-dc62f7377848",
+			"name": "Nat64",
 			"description": "",
 			"order": [
-				"df514a31-847e-768d-a309-a47b7bb48c98",
-				"6dbf92c2-398d-70f6-dd89-c5f130800d75",
-				"f87359f5-e9a0-3b7f-8ad8-c92e2bf65f0d",
-				"45a50c66-4afd-6a1f-27f3-b99c74056b36"
+				"c256b9c8-c530-acc2-f197-fd59e0d6843f",
+				"376fb011-96eb-fc09-4f87-0a16a9532ea9",
+				"cbad80e8-367a-6d8b-0a93-a81c717057aa",
+				"4a9a9b25-ea4e-7d4f-1fd0-b4d7d7f60ad3",
+				"501132a6-ac08-bc36-e5f4-0fb2dda82c4d",
+				"b7c9a0d0-394d-eeb3-1615-af7349ba229e",
+				"4f7bf0d9-f468-0041-e7e3-44386b74bb7e",
+				"84c2abaa-67f5-305e-e536-4bddcb8230cc"
 			],
-			"owner": "45557",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde"
+			"owner": 0
+		},
+		{
+			"id": "f01be22c-297e-e3e5-7859-bc8f40887321",
+			"name": "Sub-interface assignment",
+			"description": "",
+			"order": [
+				"de4621a3-0a50-bc14-36af-535aa4f9f6af",
+				"bb79f635-3d21-8f07-a2e9-fc2c1a7b7f4a",
+				"65149945-471e-cf86-dbe3-198584a32fe6",
+				"c47386c4-520b-78a5-9c52-a0f36e8aa6d0"
+			],
+			"owner": 0,
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154"
+		},
+		{
+			"id": "b22a3174-1314-bfbb-91f8-86c57b71b0cb",
+			"name": "interface assignment",
+			"description": "",
+			"order": [
+				"e37a052c-7d36-7db7-2657-3d97cc0beac2",
+				"7c21fede-28ce-28a6-44ec-dc91ef9a99f8",
+				"079316ae-dfb3-1160-6f60-35030528cda7",
+				"922bd899-44b1-eb14-49c7-7cb9e9984481",
+				"3a930fbc-f103-63e9-8d9d-3ecf496f1d24",
+				"bef09aa4-dcf2-1ec8-43e9-6991d8686100",
+				"b707bb28-9f4d-bedd-c690-549b68d6220c",
+				"d18c452e-0932-fa52-051d-8ad59cbaaede"
+			],
+			"owner": 0,
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154"
 		}
 	],
 	"timestamp": 1475147449190,
-	"owner": "45557",
+	"owner": 0,
 	"public": false,
-	"published": false,
 	"requests": [
 		{
-			"id": "153f5720-fafc-22e6-6282-cf9e18226dbc",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/naming-context:contexts",
-			"pathVariables": {},
-			"preRequestScript": "",
-			"method": "GET",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
-			"data": [],
-			"dataMode": "raw",
-			"name": "Get NAT context -context",
-			"description": "Read nat context ",
-			"descriptionFormat": "html",
-			"time": 1475678940763,
-			"version": 2,
-			"responses": [],
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"folder": "ce93ade0-47c3-a82d-a768-058a2e18e2bb",
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
-		},
-		{
-			"id": "1ffc71e4-9d1e-0c99-7901-605ac8e364b6",
+			"id": "079316ae-dfb3-1160-6f60-35030528cda7",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
 			"preRequestScript": "",
@@ -99,12 +101,13 @@
 			"time": 1475154424741,
 			"name": "Set NAT outbound for ifc - cfg",
 			"description": "Setting interface NAT outbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
 		},
 		{
-			"id": "2c53651a-e31c-24da-122e-c0ce65544c8e",
+			"id": "21c3c008-6053-8984-6f0b-a99093923f26",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config",
 			"preRequestScript": "",
@@ -117,60 +120,59 @@
 			"currentHelper": "normal",
 			"helperAttributes": {},
 			"time": 1475678997603,
-			"name": "Get NAT - config",
-			"description": "Read nat-state",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"name": "Get NAT config",
+			"description": "",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"isFromCollection": true,
+			"collectionRequestId": "21c3c008-6053-8984-6f0b-a99093923f26"
 		},
 		{
-			"id": "830c4ab3-2e48-5654-8aa5-2d2f9eed84b4",
+			"id": "2ac9831e-1fca-cbca-fb42-2b8b15e751b3",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/ietf-nat:nat-state",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/",
 			"pathVariables": {},
 			"preRequestScript": "",
 			"method": "GET",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Get NAT -state",
-			"description": "Read nat-state\n\nCLI: show snat [detail|verbose]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"name": "List ifcs - config",
+			"description": "",
 			"descriptionFormat": "html",
-			"time": 1475677867416,
+			"time": 1487678576123,
 			"version": 2,
 			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"folder": "ce93ade0-47c3-a82d-a768-058a2e18e2bb",
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"testInterface\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"ietf-ip:ipv4\": {\r\n                    \"enabled\": \"true\",\r\n                    \"mtu\": \"1500\",\r\n                    \"address\": [\r\n                        {\r\n                            \"ip\": \"1.2.3.0\",\r\n                            \"netmask\": \"255.255.255.0\"\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "b54693d5-9226-1c27-77b2-8b1313da2e80",
+			"id": "376fb011-96eb-fc09-4f87-0a16a9532ea9",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
-			"pathVariables": {},
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/1/",
 			"preRequestScript": "",
-			"method": "DELETE",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"pathVariables": {},
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Delete SNAT 1:1 static entry IPv4 -cfg",
-			"description": "",
-			"descriptionFormat": "html",
-			"time": 1475761660317,
 			"version": 2,
-			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"folder": "ce93ade0-47c3-a82d-a768-058a2e18e2bb",
-			"rawModeData": "{\r\n\t\"mapping-entry\" : {\r\n\t\t\"index\": 1,\r\n\t\t\"type\": \"static\",\r\n\t\t\"internal-src-address\": \"192.168.1.87\",\r\n\t\t\"external-src-address\": \"45.1.5.7\"\r\n\t}\r\n}"
+			"time": 1502799964039,
+			"name": "Add Nat64 address pool",
+			"description": "CLI: vppctl nat64 add pool address 172.16.2.0 - 172.16.2.4\n\nCan be verified with\nvppctl show nat64 pool\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.10/clicmd_src_plugins_snat.html#clicmd_nat64_add_pool_address",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "{\r\n\t\"external-ip-address-pool\" : {\r\n\t\t\"pool-id\": 1,\r\n\t\t\"external-ip-pool\": \"172.16.2.0/30\",\r\n        \"vpp-nat:pool-type\": \"nat64\"\r\n\t}\r\n}"
 		},
 		{
-			"id": "bca19675-d674-0cde-8639-df3d2ecbfd27",
+			"id": "3a930fbc-f103-63e9-8d9d-3ecf496f1d24",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -180,120 +182,157 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1475758450889,
-			"name": "Add SNAT 1:1 static entry IPv4 -cfg",
-			"description": "CLI: snat add static mapping local 10.0.0.3 external 4.4.4.4\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"time": 1501658658435,
+			"name": "Set NAT inbound for ifc (post routing) - cfg",
+			"description": "Setting interface NAT inbound output-feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n\t\"mapping-entry\" : {\r\n\t\t\"index\": 1,\r\n\t\t\"type\": \"static\",\r\n\t\t\"internal-src-address\": \"192.168.1.87\",\r\n\t\t\"external-src-address\": \"45.1.5.7\"\r\n\t}\r\n}"
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {\r\n        \t\"post-routing\" : true\r\n        }\r\n    \r\n}",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
 		},
 		{
-			"id": "c00f25d2-f194-2e90-30e5-ca31e8fbd630",
+			"id": "4a9a9b25-ea4e-7d4f-1fd0-b4d7d7f60ad3",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
-			"pathVariables": {},
 			"preRequestScript": "",
+			"pathVariables": {},
 			"method": "DELETE",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Disable NAT inbound for ifc - cfg",
-			"description": "Unsetting interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"descriptionFormat": "html",
-			"time": 1475835912474,
 			"version": 2,
-			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"time": 1502969752143,
+			"name": "Disable NAT64 inbound for ifc - cfg",
+			"description": "Disabling interface NAT64 inbound feature\n\nCLI: set interface nat64 in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": ""
 		},
 		{
-			"id": "d2961af7-47f7-8960-1b00-f5dcd2beafb9",
+			"id": "4f7bf0d9-f468-0041-e7e3-44386b74bb7e",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
-			"pathVariables": {},
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
 			"preRequestScript": "",
-			"method": "PUT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"pathVariables": {},
+			"method": "DELETE",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Set NAT inbound for ifc - cfg",
-			"description": "Setting interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"descriptionFormat": "html",
-			"time": 1475154374071,
 			"version": 2,
-			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"time": 1502969982987,
+			"name": "Delete NAT64 static BIB entry -cfg",
+			"description": "CLI: nat64 add static bib 2001:db8:85a3::8a2e:370:7334 1234 10.1.1.3 5678 tcp del\n\nMore information: https://wiki.fd.io/view/VPP/SNAT#Stateful_NAT64",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": ""
 		},
 		{
-			"id": "f3a7e1b5-c1d0-ab2f-3cef-3c902f8e72d5",
+			"id": "501132a6-ac08-bc36-e5f4-0fb2dda82c4d",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
+			"preRequestScript": "",
 			"pathVariables": {},
+			"method": "PUT",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1502969736196,
+			"name": "Set NAT64 outbound for ifc - cfg",
+			"description": "Setting interface NAT64 outbound feature\n\nCLI: set interface nat64 in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "{\r\n    \r\n        \"outbound\" : {\r\n        \t\"nat44-support\" : false,\r\n        \t\"nat64-support\" : true\r\n        }\r\n    \r\n}"
+		},
+		{
+			"id": "58d78b6d-673f-ae1e-767f-fb970609b34a",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/1/",
 			"preRequestScript": "",
+			"pathVariables": {},
 			"method": "DELETE",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Disable NAT outbound for ifc - cfg",
-			"description": "Unsetting interface NAT outbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"descriptionFormat": "html",
-			"time": 1475835941689,
 			"version": 2,
-			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}"
+			"time": 1487678255065,
+			"name": "Delete SNAT address pool",
+			"description": "CLI: vppctl snat del address 172.16.2.0 - 172.16.2.4\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "",
+			"folder": "d8c6ccdb-0df5-032d-6865-d2ea2a0782fc"
 		},
 		{
-			"id": "e149e9d6-3bee-1499-c03b-c1043c9a5b46",
+			"id": "65149945-471e-cf86-dbe3-198584a32fe6",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/",
-			"pathVariables": {},
+			"headerData": [
+				{
+					"key": "Authorization",
+					"value": "Basic YWRtaW46YWRtaW4=",
+					"description": "",
+					"enabled": true
+				},
+				{
+					"key": "Content-Type",
+					"value": "application/json",
+					"description": "",
+					"enabled": true
+				}
+			],
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/subinterface-nat:nat/outbound",
+			"queryParams": [],
 			"preRequestScript": "",
-			"method": "GET",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"pathVariables": {},
+			"pathVariableData": [],
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
-			"name": "List ifcs - cfg",
-			"description": "List ifcs - cfg",
-			"descriptionFormat": "html",
-			"time": 1487678576123,
 			"version": 2,
-			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"testInterface\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"ietf-ip:ipv4\": {\r\n                    \"enabled\": \"true\",\r\n                    \"mtu\": \"1500\",\r\n                    \"address\": [\r\n                        {\r\n                            \"ip\": \"1.2.3.0\",\r\n                            \"netmask\": \"255.255.255.0\"\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"time": 1498726954006,
+			"name": "Set NAT outbound for subifc - cfg",
+			"description": "Setting sub-interface NAT outbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}",
+			"folder": "f01be22c-297e-e3e5-7859-bc8f40887321"
 		},
 		{
-			"id": "26f9e8f4-db90-f7f6-0c1b-d9d20790dbcd",
+			"id": "70096d81-aeb7-01a9-2a10-b01872ff0b86",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/",
+			"url": "http://localhost:8183/restconf/operational/naming-context:contexts",
 			"pathVariables": {},
 			"preRequestScript": "",
 			"method": "GET",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"data": [],
 			"dataMode": "raw",
-			"name": "List ifcs - oper",
+			"name": "Get NAT context",
 			"description": "",
 			"descriptionFormat": "html",
-			"time": 1487678587771,
+			"time": 1475678940763,
 			"version": 2,
 			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"testInterface\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"ietf-ip:ipv4\": {\r\n                    \"enabled\": \"true\",\r\n                    \"mtu\": \"1500\",\r\n                    \"address\": [\r\n                        {\r\n                            \"ip\": \"1.2.3.0\",\r\n                            \"netmask\": \"255.255.255.0\"\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"isFromCollection": true,
+			"collectionRequestId": "70096d81-aeb7-01a9-2a10-b01872ff0b86"
 		},
 		{
-			"id": "70bc0207-e806-5722-fc71-7686d7076f9d",
+			"id": "7b92417d-e638-9e8c-23c7-a4aab3220a4f",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/2/",
 			"preRequestScript": "",
@@ -308,14 +347,37 @@
 			"time": 1487676902330,
 			"name": "Add single address to pool",
 			"description": "CLI: vppctl snat add address 172.16.2.123\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n\t\"external-ip-address-pool\" : {\r\n\t\t\"pool-id\": 2,\r\n\t\t\"external-ip-pool\": \"172.16.2.123/32\"\r\n\t}\r\n}"
+			"rawModeData": "{\r\n\t\"external-ip-address-pool\" : {\r\n\t\t\"pool-id\": 2,\r\n\t\t\"external-ip-pool\": \"172.16.2.123/32\"\r\n\t}\r\n}",
+			"folder": "d8c6ccdb-0df5-032d-6865-d2ea2a0782fc"
 		},
 		{
-			"id": "87de21e5-53c7-72d5-ac92-325381246350",
+			"id": "7c21fede-28ce-28a6-44ec-dc91ef9a99f8",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/2/",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "DELETE",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Disable NAT inbound for ifc - cfg",
+			"description": "Unsetting interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"descriptionFormat": "html",
+			"time": 1475835912474,
+			"version": 2,
+			"responses": [],
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
+		},
+		{
+			"id": "84c2abaa-67f5-305e-e536-4bddcb8230cc",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/1/",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "DELETE",
@@ -325,15 +387,58 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487678215755,
-			"name": "Delete single address",
-			"description": "CLI: vppctl snat del address 172.16.2.123\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"time": 1502970015631,
+			"name": "Delete Nat64 address pool",
+			"description": "CLI: vppctl nat64 add pool address 172.16.2.0 - 172.16.2.4 del\n\nCan be verified with\nvppctl show nat64 pool\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.10/clicmd_src_plugins_snat.html#clicmd_nat64_add_pool_address",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
 			"rawModeData": ""
 		},
 		{
-			"id": "8a37a16b-c400-6468-ca9c-d2a7657f9086",
+			"id": "8cc85522-d230-fa19-dc00-e9ad4ef52b8e",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
+			"preRequestScript": "",
+			"pathVariables": {},
+			"method": "PUT",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1475758450889,
+			"name": "Add SNAT 1:1 static entry IPv4 -cfg",
+			"description": "CLI: snat add static mapping local 10.0.0.3 external 4.4.4.4\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "{\r\n\t\"mapping-entry\" : {\r\n\t\t\"index\": 1,\r\n\t\t\"type\": \"static\",\r\n\t\t\"internal-src-address\": \"192.168.1.87\",\r\n\t\t\"external-src-address\": \"45.1.5.7\"\r\n\t}\r\n}",
+			"folder": "d256d898-3c36-7ce5-cf2a-74370463d78f"
+		},
+		{
+			"id": "922bd899-44b1-eb14-49c7-7cb9e9984481",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "DELETE",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Disable NAT outbound for ifc - cfg",
+			"description": "Unsetting interface NAT outbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"descriptionFormat": "html",
+			"time": 1475835941689,
+			"version": 2,
+			"responses": [],
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
+		},
+		{
+			"id": "9795bd6e-a1ec-dbaa-822c-328e3604e94e",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/1/",
 			"preRequestScript": "",
@@ -348,14 +453,37 @@
 			"time": 1487676498064,
 			"name": "Add SNAT address pool",
 			"description": "CLI: vppctl snat add address 172.16.2.0 - 172.16.2.4\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n\t\"external-ip-address-pool\" : {\r\n\t\t\"pool-id\": 1,\r\n\t\t\"external-ip-pool\": \"172.16.2.0/30\"\r\n\t}\r\n}"
+			"rawModeData": "{\r\n\t\"external-ip-address-pool\" : {\r\n\t\t\"pool-id\": 1,\r\n\t\t\"external-ip-pool\": \"172.16.2.0/30\"\r\n\t}\r\n}",
+			"folder": "d8c6ccdb-0df5-032d-6865-d2ea2a0782fc"
 		},
 		{
-			"id": "20a8172a-7908-37cf-b63e-51fee1474d10",
+			"id": "a21bb084-d606-4a90-bd2d-60b866771f90",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/1/",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "DELETE",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Delete SNAT 1:1 static entry IPv4 -cfg",
+			"description": "",
+			"descriptionFormat": "html",
+			"time": 1475761660317,
+			"version": 2,
+			"responses": [],
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"folder": "d256d898-3c36-7ce5-cf2a-74370463d78f",
+			"rawModeData": "{\r\n\t\"mapping-entry\" : {\r\n\t\t\"index\": 1,\r\n\t\t\"type\": \"static\",\r\n\t\t\"internal-src-address\": \"192.168.1.87\",\r\n\t\t\"external-src-address\": \"45.1.5.7\"\r\n\t}\r\n}"
+		},
+		{
+			"id": "afdc45a9-cf39-379b-5bb2-4a909512aee3",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/external-ip-address-pool/2/",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "DELETE",
@@ -365,55 +493,57 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1487678255065,
-			"name": "Delete SNAT address pool",
-			"description": "CLI: vppctl snat del address 172.16.2.0 - 172.16.2.4\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"time": 1487678215755,
+			"name": "Delete single address",
+			"description": "CLI: vppctl snat del address 172.16.2.123\n\nCan be verified with\nvat# snat_address_dump\n\nMore information:\nhttps://wiki.fd.io/view/VPP/SNAT\nhttps://docs.fd.io/vpp/17.07/clicmd_src_plugins_snat.html#clicmd_set_interface_snat",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": ""
+			"rawModeData": "",
+			"folder": "d8c6ccdb-0df5-032d-6865-d2ea2a0782fc"
 		},
 		{
-			"id": "df514a31-847e-768d-a309-a47b7bb48c98",
+			"id": "b707bb28-9f4d-bedd-c690-549b68d6220c",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"headerData": [
-				{
-					"key": "Authorization",
-					"value": "Basic YWRtaW46YWRtaW4=",
-					"description": "",
-					"enabled": true
-				},
-				{
-					"key": "Content-Type",
-					"value": "application/json",
-					"description": "",
-					"enabled": true
-				}
-			],
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/subinterface-nat:nat/inbound",
-			"queryParams": [],
-			"pathVariables": {},
-			"pathVariableData": [],
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
 			"preRequestScript": "",
+			"pathVariables": {},
 			"method": "PUT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
 			"data": [],
 			"dataMode": "raw",
-			"name": "Set NAT inbound for subifc - cfg",
-			"description": "Setting sub-interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"descriptionFormat": "html",
-			"time": 1498726706031,
 			"version": 2,
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1501658393667,
+			"name": "Set NAT outbound for ifc (post routing) - cfg",
+			"description": "Setting interface NAT outbound feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
+			"rawModeData": "{\r\n    \r\n        \"outbound\" : {\r\n        \t\"post-routing\" : true\r\n        }\r\n    \r\n}",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
+		},
+		{
+			"id": "b7c9a0d0-394d-eeb3-1615-af7349ba229e",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
+			"preRequestScript": "",
+			"pathVariables": {},
+			"method": "DELETE",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"isFromCollection": true,
-			"collectionRequestId": "df514a31-847e-768d-a309-a47b7bb48c98",
-			"folder": "70e5612d-2e65-a822-975f-33134dcf16ff",
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"time": 1502969748622,
+			"name": "Disable NAT64 outbound for ifc - cfg",
+			"description": "Disabling interface NAT64 outbound feature\n\nCLI: set interface nat64 in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": ""
 		},
 		{
-			"id": "6dbf92c2-398d-70f6-dd89-c5f130800d75",
+			"id": "bb79f635-3d21-8f07-a2e9-fc2c1a7b7f4a",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"headerData": [
 				{
@@ -444,32 +574,38 @@
 			"time": 1498726948962,
 			"name": "Disable NAT inbound for subifc - cfg",
 			"description": "Unsetting sub-interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"folder": "f01be22c-297e-e3e5-7859-bc8f40887321"
 		},
 		{
-			"id": "f87359f5-e9a0-3b7f-8ad8-c92e2bf65f0d",
+			"id": "bef09aa4-dcf2-1ec8-43e9-6991d8686100",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"headerData": [
-				{
-					"key": "Authorization",
-					"value": "Basic YWRtaW46YWRtaW4=",
-					"description": "",
-					"enabled": true
-				},
-				{
-					"key": "Content-Type",
-					"value": "application/json",
-					"description": "",
-					"enabled": true
-				}
-			],
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/subinterface-nat:nat/outbound",
-			"queryParams": [],
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
+			"preRequestScript": "",
+			"pathVariables": {},
+			"method": "DELETE",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1501658697686,
+			"name": "Disable NAT inbound for ifc (post routing) - cfg",
+			"description": "Unsetting interface NAT inbound output-feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"responses": [],
+			"rawModeData": "",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
+		},
+		{
+			"id": "c256b9c8-c530-acc2-f197-fd59e0d6843f",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-nat:nat-config/nat-instances/nat-instance/0/mapping-table/mapping-entry/1/",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"pathVariableData": [],
 			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
@@ -477,15 +613,15 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1498726954006,
-			"name": "Set NAT outbound for subifc - cfg",
-			"description": "Setting sub-interface NAT outbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"time": 1502272808631,
+			"name": "Add NAT64 static BIB entry -cfg",
+			"description": "CLI: nat64 add static bib 2001:db8:85a3::8a2e:370:7334 1234 10.1.1.3 5678 tcp\n\nMore information: https://wiki.fd.io/view/VPP/SNAT#Stateful_NAT64",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}"
+			"rawModeData": "{\n  \"mapping-entry\": {\n    \"index\": 1,\n    \"type\": \"static\",\n    \"transport-protocol\": 6,\n    \"internal-src-address\": \"2001:db8:85a3::8a2e:370:7334\",\n    \"external-src-address\": \"10.1.1.3\",\n    \"internal-src-port\": {\n      \"single-port-number\": 1234\n    },\n    \"external-src-port\": {\n      \"single-port-number\": 5678\n    }\n  }\n}"
 		},
 		{
-			"id": "45a50c66-4afd-6a1f-27f3-b99c74056b36",
+			"id": "c47386c4-520b-78a5-9c52-a0f36e8aa6d0",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"headerData": [
 				{
@@ -507,7 +643,7 @@
 			"pathVariableData": [],
 			"preRequestScript": "",
 			"method": "DELETE",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"data": [],
 			"dataMode": "raw",
 			"name": "Disable NAT outbound for subifc - cfg",
@@ -519,71 +655,75 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"folder": "70e5612d-2e65-a822-975f-33134dcf16ff",
+			"folder": "f01be22c-297e-e3e5-7859-bc8f40887321",
 			"rawModeData": "{\r\n    \r\n        \"outbound\" : {}\r\n    \r\n}"
 		},
 		{
-			"id": "ca3a075a-489a-5951-e013-00a0b1589704",
+			"id": "c4a57265-e848-274d-35d1-6b12f1f39e62",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
-			"preRequestScript": "",
+			"url": "http://localhost:8183/restconf/operational/ietf-nat:nat-state",
 			"pathVariables": {},
-			"method": "PUT",
+			"preRequestScript": "",
+			"method": "GET",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"data": [],
 			"dataMode": "raw",
+			"name": "Get NAT state",
+			"description": "Read nat-state\n\nCLI: show snat [detail|verbose]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"descriptionFormat": "html",
+			"time": 1475677867416,
 			"version": 2,
+			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1501658658435,
-			"name": "Set NAT inbound for ifc (post routing) - cfg",
-			"description": "Setting interface NAT inbound output-feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"inbound\" : {\r\n        \t\"post-routing\" : true\r\n        }\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"isFromCollection": true,
+			"collectionRequestId": "c4a57265-e848-274d-35d1-6b12f1f39e62"
 		},
 		{
-			"id": "d05da892-9e95-be1a-be8a-7cedad629d35",
+			"id": "cbad80e8-367a-6d8b-0a93-a81c717057aa",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "DELETE",
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1501658697686,
-			"name": "Disable NAT inbound for ifc (post routing) - cfg",
-			"description": "Unsetting interface NAT inbound output-feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"time": 1502969740040,
+			"name": "Set NAT64 inbound for ifc - cfg",
+			"description": "Setting interface NAT64 inbound feature\n\nCLI: set interface nat64 in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": ""
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {\r\n        \t\"nat44-support\" : false,\r\n        \t\"nat64-support\" : true\r\n        }\r\n    \r\n}"
 		},
 		{
-			"id": "087269df-9897-03d3-36ea-a1f7b8d1018a",
+			"id": "cdedb3f4-e4ab-1ea8-07b8-53639b44a257",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
-			"preRequestScript": "",
+			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/",
 			"pathVariables": {},
-			"method": "PUT",
+			"preRequestScript": "",
+			"method": "GET",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"data": [],
 			"dataMode": "raw",
+			"name": "List ifcs - state",
+			"description": "",
+			"descriptionFormat": "html",
+			"time": 1487678587771,
 			"version": 2,
+			"responses": [],
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1501658393667,
-			"name": "Set NAT outbound for ifc (post routing) - cfg",
-			"description": "Setting interface NAT outbound feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
-			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"outbound\" : {\r\n        \t\"post-routing\" : true\r\n        }\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"testInterface\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"ietf-ip:ipv4\": {\r\n                    \"enabled\": \"true\",\r\n                    \"mtu\": \"1500\",\r\n                    \"address\": [\r\n                        {\r\n                            \"ip\": \"1.2.3.0\",\r\n                            \"netmask\": \"255.255.255.0\"\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "168d5e1d-ff49-4839-db83-520cb8c191ca",
+			"id": "d18c452e-0932-fa52-051d-8ad59cbaaede",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/outbound",
 			"preRequestScript": "",
@@ -598,9 +738,75 @@
 			"time": 1501658438697,
 			"name": "Disable NAT outbound for ifc (post routing) - cfg",
 			"description": "Unsetting interface NAT outbound feature (post routing)\n\nCLI: set interface snat in <intfc> out <intfc> output-feature [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
-			"collectionId": "f9258895-49e9-596f-d413-698cbcadfbde",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
 			"responses": [],
-			"rawModeData": ""
+			"rawModeData": "",
+			"isFromCollection": true,
+			"collectionRequestId": "d18c452e-0932-fa52-051d-8ad59cbaaede",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
+		},
+		{
+			"id": "de4621a3-0a50-bc14-36af-535aa4f9f6af",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"headerData": [
+				{
+					"key": "Authorization",
+					"value": "Basic YWRtaW46YWRtaW4=",
+					"description": "",
+					"enabled": true
+				},
+				{
+					"key": "Content-Type",
+					"value": "application/json",
+					"description": "",
+					"enabled": true
+				}
+			],
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/subinterface-nat:nat/inbound",
+			"queryParams": [],
+			"pathVariables": {},
+			"pathVariableData": [],
+			"preRequestScript": "",
+			"method": "PUT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Set NAT inbound for subifc - cfg",
+			"description": "Setting sub-interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"descriptionFormat": "html",
+			"time": 1498726706031,
+			"version": 2,
+			"responses": [],
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"isFromCollection": true,
+			"folder": "f01be22c-297e-e3e5-7859-bc8f40887321",
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}"
+		},
+		{
+			"id": "e37a052c-7d36-7db7-2657-3d97cc0beac2",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/interface-nat:nat/inbound",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "PUT",
+			"collectionId": "87e0bcaa-5031-9a2b-8a6b-329758310154",
+			"data": [],
+			"dataMode": "raw",
+			"name": "Set NAT inbound for ifc - cfg",
+			"description": "Setting interface NAT inbound feature\n\nCLI: set interface snat in <intfc> out <intfc> [del]\n\nMore information: https://wiki.fd.io/view/VPP/SNAT",
+			"descriptionFormat": "html",
+			"time": 1475154374071,
+			"version": 2,
+			"responses": [],
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"rawModeData": "{\r\n    \r\n        \"inbound\" : {}\r\n    \r\n}",
+			"isFromCollection": true,
+			"collectionRequestId": "e37a052c-7d36-7db7-2657-3d97cc0beac2",
+			"folder": "b22a3174-1314-bfbb-91f8-86c57b71b0cb"
 		}
 	]
 }
\ No newline at end of file