HC2VPP-127: update v3po collection after API split

- removes ACL folder (moved to vpp_classifier_postman_collection.json)
- updates BD requests
- removes RPCs folder (moved to vpp_management_postman_collection.json)
- removes vpp and vpp-state read requests

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

1 files changed, 9 insertions, 397 deletions

diff --git a/v3po/postman_rest_collection.json b/v3po/postman_rest_collection.json
index a9e973638..e3a17de86 100644
--- a/v3po/postman_rest_collection.json
+++ b/v3po/postman_rest_collection.json
@@ -5,34 +5,11 @@
 	"order": [
 		"9362a506-1e6f-38eb-b7a9-e1bec3fc2177",
 		"11ae838d-68f0-8755-6b8b-16466512a1bf",
-		"8f5860a3-ac28-811b-3830-52df067c1a60",
-		"4166392e-d64c-34b9-1117-cbd36974fa7e",
 		"7b592c36-12a3-2867-ed71-80ec74695dec",
 		"2a3a5de9-ed06-6468-2c11-ddbdc4ec1224"
 	],
 	"folders": [
 		{
-			"id": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"name": "ACL",
-			"description": "",
-			"order": [
-				"e59e4c3d-e2d9-7124-3d94-6fe77b88e8ec",
-				"e332c510-7523-f788-3670-dc801b10d391",
-				"9b3cbedf-15b4-fee0-6424-b32bc4781ca3",
-				"ed295c83-ac16-df21-9ac5-7176369736d9",
-				"2d25db9f-6c65-5fe0-1602-5484c058bd1b",
-				"e1bd94dd-ed59-9a39-9997-916c4f9a207e",
-				"c4923db5-50eb-0106-10fc-3f1361593d2a",
-				"24ac98f0-1556-e623-ec87-1c2d7f4f089c",
-				"2796296f-2c09-7c3e-4cd9-9a366c1cb61c",
-				"5b0d301e-c2d1-5179-41eb-d1fb07cc93f0",
-				"aa1f621e-4ae7-f266-e85f-ec3797c3552a",
-				"a78cecbf-1b20-3051-af3e-213c947c94ac"
-			],
-			"owner": "45557",
-			"collectionId": "e9ba4e80-fb4d-1eae-07e7-97b323164130"
-		},
-		{
 			"id": "f59ae95c-b691-1283-8b2b-539a00da0178",
 			"name": "Loopback",
 			"description": "",
@@ -165,17 +142,6 @@
 			"owner": "45557"
 		},
 		{
-			"id": "750a0c20-15f3-e3c0-6289-0b86b2b0eacb",
-			"name": "RPCs",
-			"description": "",
-			"order": [
-				"8361186c-2a8d-dd4e-7738-c6f2c8c82cab",
-				"df9a46eb-f87e-4da6-05b1-ed6b478aba9d",
-				"341d60db-8e70-eec5-9dd5-5136d4a03317"
-			],
-			"owner": "45557"
-		},
-		{
 			"id": "df84e568-dac6-7014-f798-57dc87869aed",
 			"name": "SPAN",
 			"description": "",
@@ -597,68 +563,6 @@
 			"rawModeData": ""
 		},
 		{
-			"id": "8361186c-2a8d-dd4e-7738-c6f2c8c82cab",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operations/v3po:cli-inband",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "POST",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1481614302662,
-			"name": "show version",
-			"description": "The cli-inband rpc provides support for CLI commands.\nHere is equivalent of show version.",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"rawModeData": "{\n  \"input\" :\n  {\n     \"cmd\" : \"show version\"\n  }\n}"
-		},
-		{
-			"id": "df9a46eb-f87e-4da6-05b1-ed6b478aba9d",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operations/v3po:cli-inband",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "POST",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1481614804300,
-			"name": "show interfaces",
-			"description": "The cli-inband rpc provides support for CLI commands.\nHere is equivalent of show int.",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"rawModeData": "{\n  \"input\" :\n  {\n     \"cmd\" : \"show int\"\n  }\n}"
-		},
-		{
-			"id": "341d60db-8e70-eec5-9dd5-5136d4a03317",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operations/v3po:cli-inband",
-			"pathVariables": {},
-			"preRequestScript": "",
-			"method": "POST",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"data": [],
-			"dataMode": "raw",
-			"name": "create loopback interface",
-			"description": "The cli-inband rpc provides support for CLI commands.\nHere is equivalent of create loopback interface",
-			"descriptionFormat": "html",
-			"time": 1481614794119,
-			"version": 2,
-			"responses": [],
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"folder": "750a0c20-15f3-e3c0-6289-0b86b2b0eacb",
-			"rawModeData": "{\n  \"input\" :\n  {\n     \"cmd\" : \"create loopback interface\"\n  }\n}"
-		},
-		{
 			"id": "10ffdfa8-97bf-9d9f-e057-d18bd22291ea",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0",
@@ -742,27 +646,6 @@
 			"folder": "015dc7da-a47b-fcdf-3dee-2760fb5de9fd"
 		},
 		{
-			"id": "24ac98f0-1556-e623-ec87-1c2d7f4f089c",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/acl/ingress",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468495690154,
-			"name": "Enable L2 and Ipv4 ACL on local0 interface",
-			"description": "Enables L2 and Ipv4 ACL on local0. Corresponding vpp cli commands:\n\nset int input acl intfc local0 l2-table 0\n\nset int input acl intfc local0 ip4-table 0\n\nTo verify invoke:\n\nvppctl show inacl type l2\n\nthen:\n\nvppctl show inacl type ip4",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": "{\n    \"ingress\": {\n      \"l2-acl\": {\n        \"classify-table\": \"table0\"\n      },\n      \"ip4-acl\": {\n        \"classify-table\": \"table0\"\n      }\n    }\n}"
-		},
-		{
 			"id": "24fdd76e-e90b-d552-c0d1-87a745a5ac6f",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/tapp2",
@@ -784,27 +667,6 @@
 			"folder": "ebed4cf3-96db-7ea3-1216-a0802c8f47d3"
 		},
 		{
-			"id": "2796296f-2c09-7c3e-4cd9-9a366c1cb61c",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/v3po:acl/",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467380189765,
-			"name": "Disable ACL on local0 interface",
-			"description": "Disables ACL on local0. To verify invoke:\n\nvppctl show inacl type l2\n\nand:\n\nvppctl show inacl type ip4",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
 			"id": "2a3a5de9-ed06-6468-2c11-ddbdc4ec1224",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0",
@@ -825,27 +687,6 @@
 			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"local0\",\r\n                \"description\": \"for testing purposes only\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\",\r\n                \"routing\" : {\r\n                    \"ipv4-vrf-id\" : \"7\"\r\n                }\r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "2d25db9f-6c65-5fe0-1602-5484c058bd1b",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table1",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468493298160,
-			"name": "Add classify table1",
-			"description": "Adds classify table1 chained to classify table0.\n\nCorresponding vpp cli command:\n\nvppctl classify table mask l2 dst next-table 0\n\nTo verify invoke:\n\nvppctl sh class table verbose\n\nor:\n\nvat# classify_table_info table_id 1",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": "{\n    \"classify-table\": [\n        {\n            \"name\": \"table1\",\n            \"next_table\": \"table0\",\n            \"nbuckets\": \"2\",\n            \"memory_size\": \"1048576\",\n            \"miss_next\": \"permit\",\n            \"mask\": \"ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00\"\n        }\n    ]\n}"
-		},
-		{
 			"id": "32ef9c3f-94e5-6c15-fbc5-0816806d8f25",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/operational/v3po-context:disabled-interfaces",
@@ -996,26 +837,6 @@
 			"folder": "ded16b18-1c4c-e349-6190-7a5e30813494"
 		},
 		{
-			"id": "4166392e-d64c-34b9-1117-cbd36974fa7e",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1460540006597,
-			"name": "Read vpp - cfg",
-			"description": "",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"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": "3fda19c4-0afe-f738-e4a5-5d4f99e4f588",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/GigabitEthernet0%2F8%2F0/span",
@@ -1038,7 +859,7 @@
 		{
 			"id": "44df5e99-524f-ae01-0d60-54257fd16ad5",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/aa:bb:cc:dd:ee:ff",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/aa:bb:cc:dd:ee:ff",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "DELETE",
@@ -1101,7 +922,7 @@
 		{
 			"id": "4d59da85-1853-8854-6eb6-36d13821cc14",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD",
 			"pathVariables": {},
 			"preRequestScript": "",
 			"method": "PUT",
@@ -1163,30 +984,9 @@
 			"folder": "f15540bc-415f-0ce0-4c25-5a5406d11242"
 		},
 		{
-			"id": "5b0d301e-c2d1-5179-41eb-d1fb07cc93f0",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table0/classify-session/00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468493934488,
-			"name": "Remove classify session",
-			"description": "Removes classify session. To verify invoke:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
 			"id": "5eabbac5-77fc-a886-7070-ba7dfb735301",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/aa:bb:cc:dd:ee:ff",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/aa:bb:cc:dd:ee:ff",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -1249,7 +1049,7 @@
 		{
 			"id": "63fa7145-b1df-0d48-f38b-27c11cb3a5f6",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "GET",
@@ -1394,26 +1194,6 @@
 			"rawModeData": "{\r\n    \r\n        \"interface\": [\r\n            {\r\n                \"name\": \"local0\",\r\n                \"description\": \"for testing purposes\",\r\n                \"type\": \"iana-if-type:ethernetCsmacd\",\r\n                \"enabled\": \"true\"\r\n            }\r\n        ]\r\n    \r\n}"
 		},
 		{
-			"id": "8f5860a3-ac28-811b-3830-52df067c1a60",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/v3po:vpp-state",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1460539994330,
-			"name": "Read vpp-state - oper",
-			"description": "",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"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": "9362a506-1e6f-38eb-b7a9-e1bec3fc2177",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/",
@@ -1434,30 +1214,9 @@
 			"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": "9b3cbedf-15b4-fee0-6424-b32bc4781ca3",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table0",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468493354688,
-			"name": "Add classify table0",
-			"description": "Adds classify table0. Corresponding vpp cli command:\n\nvppctl classify table mask l2 src\n\nTo verify invoke:\n\nvppctl sh class table verbose\n\nor:\n\nvat# classify_table_info table_id 0",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": "{\n    \"classify-table\": [\n        {\n            \"name\": \"table0\",\n            \"nbuckets\": \"2\",\n            \"memory_size\": \"1048576\",\n            \"miss_next\": \"permit\",\n            \"mask\": \"00:00:00:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00\"\n        }\n    ]\n}"
-		},
-		{
 			"id": "9ed8e7a8-8f38-a68c-bdb0-58f0743a55a0",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/arp-termination-table/arp-termination-table-entry/1.2.3.4/aa:bb:cc:dd:ee:ff",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/arp-termination-table/arp-termination-table-entry/1.2.3.4/aa:bb:cc:dd:ee:ff",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "DELETE",
@@ -1478,7 +1237,7 @@
 		{
 			"id": "a47fb37c-a45d-078c-9842-396b80195aaf",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/arp-termination-table/arp-termination-table-entry/1.2.3.4/aa:bb:cc:dd:ee:ff",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/arp-termination-table/arp-termination-table-entry/1.2.3.4/aa:bb:cc:dd:ee:ff",
 			"pathVariables": {},
 			"preRequestScript": "",
 			"method": "PUT",
@@ -1519,48 +1278,6 @@
 			"folder": "e742a44e-2e82-fe0c-d7c1-2f6b6bc1f0e9"
 		},
 		{
-			"id": "a78cecbf-1b20-3051-af3e-213c947c94ac",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table1",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467377388428,
-			"name": "Remove classify table1",
-			"description": "Removes classify table1. Corresponds to the following command:\n\nvppctl classify table del table 1\n\nTo verify invoke:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
-			"id": "aa1f621e-4ae7-f266-e85f-ec3797c3552a",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table0",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "DELETE",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467377830897,
-			"name": "Remove classify table0",
-			"description": "Removes classify table0. Corresponds to the following command:\n\nvppctl classify table del table 0\n\nTo verify invoke:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
 			"id": "ac8d2039-0036-4764-1437-7e08f4a52527",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/greTun1",
@@ -1725,30 +1442,9 @@
 			"rawModeData": "{\r\n            \"address\": [{\r\n                \"ip\" : \"127.0.0.1\",\r\n                \"prefix-length\" : \"24\"\r\n            }]\r\n}"
 		},
 		{
-			"id": "c4923db5-50eb-0106-10fc-3f1361593d2a",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table0/classify-session/00:00:00:00:00:00:01:02:03:04:05:07:00:00:00:00",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468493583927,
-			"name": "Add another classify session",
-			"description": "Adds second classify session to table0. Corresponding vpp cli command:\n\nvppctl classify session acl-hit-next deny opaque-index 0 table-index 0 match l2 src 01:02:03:04:05:07\n\nTo verify invoke:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": "{\n    \"classify-session\": [\n        {\n            \"hit_next\": \"deny\",\n            \"match\": \"00:00:00:00:00:00:01:02:03:04:05:07:00:00:00:00\"\n        }\n    ]\n}"
-		},
-		{
 			"id": "c6272b59-2200-d334-0abc-6e13deb0dedd",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/00:01:02:03:04:05",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/00:01:02:03:04:05",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -1790,7 +1486,7 @@
 		{
 			"id": "ca295d02-4940-e584-e446-64a79ce733f9",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/operational/v3po:vpp-state/bridge-domains/bridge-domain/testBD",
+			"url": "http://localhost:8183/restconf/operational/v3po:bridge-domains-state/bridge-domain/testBD",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "GET",
@@ -1811,7 +1507,7 @@
 		{
 			"id": "ce66b067-e7de-224b-6e46-41a4a4e2305c",
 			"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
-			"url": "http://localhost:8183/restconf/config/v3po:vpp/bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/11:22:33:44:55:66",
+			"url": "http://localhost:8183/restconf/config/v3po:bridge-domains/bridge-domain/testBD/l2-fib-table/l2-fib-entry/11:22:33:44:55:66",
 			"preRequestScript": "",
 			"pathVariables": {},
 			"method": "PUT",
@@ -2165,48 +1861,6 @@
 			"rawModeData": "{\r\n        \"sub-interface\": [\r\n            {\r\n                \"identifier\": \"1\",\r\n                \"vlan-type\": \"802dot1q\",\r\n                \"tags\": {\r\n                    \"tag\": [\r\n                        {\r\n                            \"index\": \"0\",\r\n                            \"dot1q-tag\": {\r\n                                \"tag-type\": \"dot1q-types:s-vlan\",\r\n                                \"vlan-id\": \"100\"\r\n                            }\r\n                        },\r\n                        {\r\n                            \"index\": \"1\",\r\n                            \"dot1q-tag\": {\r\n                                \"tag-type\": \"dot1q-types:c-vlan\",\r\n                                \"vlan-id\": \"any\"\r\n                            }\r\n                        }\r\n                    ]\r\n                },\r\n                \"match\": {\r\n                    \"vlan-tagged\": {\r\n                        \"match-exact-tags\": \"true\"\r\n                    }\r\n                },\r\n                \"enabled\": \"true\"\r\n            }\r\n        ]\r\n}"
 		},
 		{
-			"id": "e1bd94dd-ed59-9a39-9997-916c4f9a207e",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/classify-table/table0/classify-session/00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1468493546163,
-			"name": "Add classify session",
-			"description": "Adds classify session to table0. Corresponding vpp cli command:\n\nvppctl classify session acl-hit-next deny opaque-index 0 table-index 0 match l2 src 01:02:03:04:05:06\n\nTo verify invoke:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": "{\n    \"classify-session\": [\n        {\n            \"hit_next\": \"deny\",\n            \"match\": \"00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00\"\n        }\n    ]\n}"
-		},
-		{
-			"id": "e332c510-7523-f788-3670-dc801b10d391",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/vpp-classifier:vpp-classifier-state/",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467377066230,
-			"name": "Get classify tables - oper",
-			"description": "Shows classify tables configured in the VPP.\n\nCorresponds to:\n\nvppctl sh class table verbose",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
 			"id": "e3dab7db-c96e-1462-ff59-2c69471fa5f3",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/l2/rewrite",
@@ -2228,48 +1882,6 @@
 			"rawModeData": "{\r\n     \"rewrite\": {\r\n                  \"pop-tags\": \"1\"\r\n                }\r\n}"
 		},
 		{
-			"id": "e59e4c3d-e2d9-7124-3d94-6fe77b88e8ec",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/vpp-classifier:vpp-classifier/",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467377260818,
-			"name": "Get classify tables - cfg",
-			"description": "Shows classify table configuration.",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
-			"id": "ed295c83-ac16-df21-9ac5-7176369736d9",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/vpp-classifier:vpp-classifier-state/classify-table/table0",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1467378420028,
-			"name": "Get classify table - oper",
-			"description": "Shows classify table 0 operational state.\n\nCorresponds to:\n\nvat# classify_table_info table_id 0",
-			"collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64",
-			"responses": [],
-			"folder": "d47d6b3b-4c3f-7671-5bba-447d6c59ea3b",
-			"rawModeData": ""
-		},
-		{
 			"id": "f42817ab-a13f-b9ec-50aa-ed037c6b03be",
 			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
 			"url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/greTun1",