Augment postman json with nsh_action

Change-Id: I2940b98397f1bdb140b042e78551971b868180f2
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>

2 files changed, 125 insertions, 118 deletions

diff --git a/nsh/api/src/main/yang/vpp-nsh.yang b/nsh/api/src/main/yang/vpp-nsh.yang
index a3313bad4..d4914f4fd 100644
--- a/nsh/api/src/main/yang/vpp-nsh.yang
+++ b/nsh/api/src/main/yang/vpp-nsh.yang
@@ -210,6 +210,7 @@ module vpp-nsh {
     }
     leaf nsh-action {
       type nsh-action-type;
+      default "swap";
     }
     leaf encap-type {
       type nsh-encap-type;
diff --git a/nsh/nsh_postman_collection.json b/nsh/nsh_postman_collection.json
index a0d2d3a6b..a3f3641b6 100644
--- a/nsh/nsh_postman_collection.json
+++ b/nsh/nsh_postman_collection.json
@@ -1,46 +1,46 @@
 {
-	"id": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+	"id": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 	"name": "Honeycomb RESTCONF calls for NSH_SFC",
 	"description": "Common mgmt operations on VPP using Honeycomb REST interface",
 	"order": [],
 	"folders": [
 		{
-			"id": "2502c4f1-af98-c534-4b91-1406aed3311d",
+			"id": "c98829cd-4993-4e1d-58f1-97523ecb6e4f",
 			"name": "NSH_SFC",
 			"description": "",
 			"order": [
-				"4ff752a7-8ae3-d104-030b-d95f58355ccc",
-				"81185d8f-4160-807f-fc76-f59e69b7d29e",
-				"5f96cf69-8c56-4010-e018-30ac0a6f0b1a",
-				"2e0edbd7-cf82-747b-d2fb-223b57c9b834",
-				"793a461b-f7f4-715d-80a4-a6587a08605d",
-				"57deb7dc-0592-8243-513b-eba8b0b518d8",
-				"62c21c12-56fa-4f1c-b02b-b396d135f8f3",
-				"0a9cca39-208f-0767-f711-d1da97fda8d1"
+				"2b4aaeb0-c7c1-57a9-c2a3-e07bc83dcde3",
+				"3c13298c-3619-391b-c808-5206d17a84d5",
+				"553e04ce-23d8-81de-b414-0a21b108d93d",
+				"4d8de77e-5342-3144-e904-d067eaa6a5cc",
+				"911beeb5-61c1-bdb5-a850-96171a6686ae",
+				"df2ec9ba-6a30-fc30-45db-365b666487c8",
+				"d19976f1-abc6-7c28-c69f-3bcfe8877658",
+				"23796c20-8543-9f46-8e51-413e86dfb54e"
 			],
 			"owner": "652751",
 			"collectionId": "b6a0ef73-644b-01fc-93c4-a4b260b9acff"
 		},
 		{
-			"id": "5c285e56-bd8e-5862-b57e-64aa50d1c194",
+			"id": "c957a93e-c4f6-53d1-0606-207eefd79ac2",
 			"name": "VXLAN-GPE-TUNNEL",
 			"description": "",
 			"order": [
-				"58394713-b868-91f7-fe33-f05cc3ae7fb0",
-				"30628971-9262-08cd-04b8-fff021814df3",
-				"e23aa3c9-5ce7-0d03-3d42-87936d4ef1e1",
-				"fd829953-dd1e-47b5-07c3-3cbd14a9c118"
+				"0a0c7d8e-6acf-96dc-81a0-6b93a65e9402",
+				"1bb24338-457a-b9ba-6834-9402e60c8c6f",
+				"ee2676f9-ce96-cae1-2d47-8515fc58dd78",
+				"477b81e3-7735-c371-967b-91cbc0cdf991"
 			],
 			"owner": "652751",
 			"collectionId": "b6a0ef73-644b-01fc-93c4-a4b260b9acff"
 		},
 		{
-			"id": "edf5527f-df76-3e65-5b0c-6420b6cc1b42",
+			"id": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b",
 			"name": "VXLAN-TUNNEL",
 			"description": "",
 			"order": [
-				"43d50e69-df5e-e193-0a0f-1dea35670204",
-				"4325e122-094c-b52d-d81c-acbee3ba4691"
+				"b18d5cc2-7c42-0aee-152b-27b822a7bc66",
+				"db501b30-8ac3-f889-8892-c8c8245a05fa"
 			],
 			"owner": "652751"
 		}
@@ -48,50 +48,30 @@
 	"timestamp": 1473313581383,
 	"owner": "652751",
 	"public": false,
-	"published": false,
+	"hasRequests": true,
 	"requests": [
 		{
-			"id": "0a9cca39-208f-0767-f711-d1da97fda8d1",
+			"id": "0a0c7d8e-6acf-96dc-81a0-6b93a65e9402",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1473679734916,
-			"name": "Delete nsh-map - cfg",
-			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
-			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\"             \r\n        }\r\n    ]\r\n}"
-		},
-		{
-			"id": "2e0edbd7-cf82-747b-d2fb-223b57c9b834",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "DELETE",
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473313722940,
-			"name": "Delete nsh-entry - cfg",
+			"time": 1477449333942,
+			"name": "Add vxlan-gpe - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\"             \r\n        }\r\n    ]\r\n}"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "30628971-9262-08cd-04b8-fff021814df3",
+			"id": "1bb24338-457a-b9ba-6834-9402e60c8c6f",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
 			"preRequestScript": "",
@@ -106,14 +86,15 @@
 			"time": 1473679728872,
 			"name": "Get vxlan-gpe - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
+			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
 		},
 		{
-			"id": "4325e122-094c-b52d-d81c-acbee3ba4691",
+			"id": "23796c20-8543-9f46-8e51-413e86dfb54e",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
+			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "DELETE",
@@ -123,19 +104,17 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1462892071867,
-			"name": "Delete virtual ifc - cfg",
+			"time": 1477449352823,
+			"name": "Delete nsh-map - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"timestamp": null,
-			"rawModeData": "",
-			"folder": "edf5527f-df76-3e65-5b0c-6420b6cc1b42"
+			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\"             \r\n        }\r\n    ]\r\n}"
 		},
 		{
-			"id": "43d50e69-df5e-e193-0a0f-1dea35670204",
+			"id": "2b4aaeb0-c7c1-57a9-c2a3-e07bc83dcde3",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "https://localhost:8443/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
+			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -145,75 +124,78 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679767979,
-			"name": "Add virtual ifc - cfg",
+			"time": 1477448840459,
+			"name": "Add nsh-entry - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanTun1\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan\" : {\r\n                    \"src\" : \"192.168.1.6\",\r\n                    \"dst\" : \"192.168.1.9\",\r\n                    \"vni\" : \"88\",\r\n                    \"encap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"c1\": \"1\",\r\n            \"c2\": \"2\",\r\n            \"c3\": \"3\",\r\n            \"c4\": \"4\"\r\n        }\r\n    ]\r\n}"
 		},
 		{
-			"id": "4ff752a7-8ae3-d104-030b-d95f58355ccc",
+			"id": "3c13298c-3619-391b-c808-5206d17a84d5",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "PUT",
+			"method": "GET",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679751885,
-			"name": "Add nsh-entry - cfg",
+			"time": 1473313729119,
+			"name": "Get nsh-entry - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"c1\": \"1\",\r\n            \"c2\": \"2\",\r\n            \"c3\": \"3\",\r\n            \"c4\": \"4\"\r\n        }\r\n    ]\r\n}"
+			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}",
+			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
 		},
 		{
-			"id": "57deb7dc-0592-8243-513b-eba8b0b518d8",
+			"id": "477b81e3-7735-c371-967b-91cbc0cdf991",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "GET",
+			"method": "DELETE",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679742877,
-			"name": "Get nsh-map - cfg",
+			"time": 1464764638498,
+			"name": "Delete vxlan-gpe - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "",
+			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
 		},
 		{
-			"id": "58394713-b868-91f7-fe33-f05cc3ae7fb0",
+			"id": "4d8de77e-5342-3144-e904-d067eaa6a5cc",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
+			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "PUT",
+			"method": "DELETE",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679731521,
-			"name": "Add vxlan-gpe - cfg",
+			"time": 1473313722940,
+			"name": "Delete nsh-entry - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \"nsh-entry\": [\r\n        {\r\n            \"name\": \"nshEntry3\",\r\n            \"version\": \"0\",\r\n            \"length\": \"6\",\r\n            \"md-type\": \"md-type1\",\r\n            \"next-protocol\": \"ethernet\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\"             \r\n        }\r\n    ]\r\n}",
+			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
 		},
 		{
-			"id": "5f96cf69-8c56-4010-e018-30ac0a6f0b1a",
+			"id": "553e04ce-23d8-81de-b414-0a21b108d93d",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/operational/vpp-nsh:vpp-nsh-state/nsh-entries/",
 			"preRequestScript": "",
@@ -228,34 +210,35 @@
 			"time": 1473313726281,
 			"name": "Get nsh-entry - oper",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}",
+			"folder": "c98829cd-4993-4e1d-58f1-97523ecb6e4f"
 		},
 		{
-			"id": "62c21c12-56fa-4f1c-b02b-b396d135f8f3",
+			"id": "911beeb5-61c1-bdb5-a850-96171a6686ae",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/vpp-nsh:vpp-nsh-state/nsh-maps/",
+			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "GET",
+			"method": "PUT",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679740794,
-			"name": "Get nsh-map - oper",
+			"time": 1477449346905,
+			"name": "Add nsh-map - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\",\r\n            \"nsh-action\": \"push\",\r\n            \"encap-type\": \"vxlan-gpe\",\r\n            \"encap-if-name\": \"vxlanGpeTun3\"\r\n        }\r\n    ]\r\n}"
 		},
 		{
-			"id": "793a461b-f7f4-715d-80a4-a6587a08605d",
+			"id": "b18d5cc2-7c42-0aee-152b-27b822a7bc66",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
+			"url": "https://localhost:8443/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -265,17 +248,18 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679745291,
-			"name": "Add nsh-map - cfg",
+			"time": 1473679767979,
+			"name": "Add virtual ifc - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \"nsh-map\": [\r\n        {\r\n            \"name\": \"nshMap5\",\r\n            \"nsp\": \"184\",\r\n            \"nsi\": \"255\",\r\n            \"mapped-nsp\": \"183\",\r\n            \"mapped-nsi\": \"254\",\r\n            \"encap-type\": \"vxlan-gpe\",\r\n            \"encap-if-name\": \"vxlanGpeTun3\"\r\n        }\r\n    ]\r\n}"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanTun1\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan\" : {\r\n                    \"src\" : \"192.168.1.6\",\r\n                    \"dst\" : \"192.168.1.9\",\r\n                    \"vni\" : \"88\",\r\n                    \"encap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
+			"folder": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b"
 		},
 		{
-			"id": "81185d8f-4160-807f-fc76-f59e69b7d29e",
+			"id": "d19976f1-abc6-7c28-c69f-3bcfe8877658",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-entries/nsh-entry/nshEntry3",
+			"url": "http://localhost:8183/restconf/operational/vpp-nsh:vpp-nsh-state/nsh-maps/",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "GET",
@@ -285,17 +269,39 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473313729119,
-			"name": "Get nsh-entry - cfg",
+			"time": 1477449339914,
+			"name": "Get nsh-map - oper",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
 			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "e23aa3c9-5ce7-0d03-3d42-87936d4ef1e1",
+			"id": "db501b30-8ac3-f889-8892-c8c8245a05fa",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/vxlanGpeTun3",
+			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanTun1",
+			"preRequestScript": "",
+			"pathVariables": {},
+			"method": "DELETE",
+			"data": [],
+			"dataMode": "raw",
+			"version": 2,
+			"tests": "",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1462892071867,
+			"name": "Delete virtual ifc - cfg",
+			"description": "",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
+			"responses": [],
+			"timestamp": null,
+			"rawModeData": "",
+			"folder": "5cbd2f82-b01e-9ebe-11ef-b451d944a11b"
+		},
+		{
+			"id": "df2ec9ba-6a30-fc30-45db-365b666487c8",
+			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+			"url": "http://localhost:8183/restconf/config/vpp-nsh:vpp-nsh/nsh-maps/nsh-map/nshMap5",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "GET",
@@ -305,33 +311,33 @@
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1473679726298,
-			"name": "Get vxlan-gpe - oper",
+			"time": 1477449344219,
+			"name": "Get nsh-map - cfg",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
+			"rawModeData": "{\r\n    \r\n        \"nsh-entry\": [\r\n            {\r\n                \"name\": \"nshEntry5\",\r\n                \"description\": \"for testing nshEntry\",\r\n                \"version\": \"0\",\r\n                \"length\": \"6\",\r\n                \"next-protocol\": \"Ethernet\",\r\n                \"md-type\": \"MdType1\",\r\n                \"nsp\": \"185\",\r\n                \"nsi\": \"255\"             \r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "fd829953-dd1e-47b5-07c3-3cbd14a9c118",
+			"id": "ee2676f9-ce96-cae1-2d47-8515fc58dd78",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/vxlanGpeTun3",
+			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/vxlanGpeTun3",
 			"preRequestScript": "",
 			"pathVariables": {},
-			"method": "DELETE",
+			"method": "GET",
 			"data": [],
 			"dataMode": "raw",
 			"version": 2,
 			"tests": "",
 			"currentHelper": "normal",
 			"helperAttributes": {},
-			"time": 1464764638498,
-			"name": "Delete vxlan-gpe - cfg",
+			"time": 1473679726298,
+			"name": "Get vxlan-gpe - oper",
 			"description": "",
-			"collectionId": "7bc86252-25fb-304b-7de0-d175560c2ecb",
+			"collectionId": "a9a935b5-9481-e4f7-44fb-17d13ef726f9",
 			"responses": [],
-			"rawModeData": "",
-			"folder": "5c285e56-bd8e-5862-b57e-64aa50d1c194"
+			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"vxlanGpeTun3\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"v3po:vxlan-gpe-tunnel\",\r\n                \"enabled\": \"true\",\r\n                \"link-up-down-trap-enable\": \"enabled\",\r\n                \"routing\" : {\r\n                    \"vrf-id\" : \"0\"\r\n                },\r\n                \"vxlan-gpe\" : {\r\n                    \"local\" : \"192.168.50.76\",\r\n                    \"remote\" : \"192.168.50.71\",\r\n                    \"vni\" : \"9\",\r\n                    \"next-protocol\" : \"ethernet\",\r\n                    \"encap-vrf-id\" : \"0\",\r\n                    \"decap-vrf-id\" : \"0\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}",
+			"folder": "c957a93e-c4f6-53d1-0606-207eefd79ac2"
 		}
 	]
 }
\ No newline at end of file