HC2VPP-253 - Bump routing models

This patch updates (for support of SRv6 and MPLS) routing models to:
- hc2vpp-ietf-routing@2018-03-13.yang
  (RFC 8349, https://tools.ietf.org/html/rfc8349)
- hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang (RFC 8349)
- hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang (RFC 8349)
- hc2vpp-ietf-ipv6-router-advertisements@2018-03-13 (RFC 8349)
- hc2vpp-ietf-routing-types@2017-12-04
  (RFC 8294 ,https://tools.ietf.org/html/rfc8294)
Due to odl bugs these models were changed,
see HC2VPP-298 for more details.

Significant changes in updated models:
- Routing instance was removed, we used vpp-routing-instance
  as single instance before, which is no longer needed.
- Routing-protocol and Routing-protocols were refactored to
  Control-plane-protocol/s. Control-protocol now uses type and name as key
- Route Key was changed from id to ipPrefix
- Next-hop and Next-Hop-list were refactored
See attached routing_postman_collection.json for updated data structures
and examples for both IPv4 and IPv6 routes.
For router advertisements see routing_advertisments_postman_collection.json

Another fixes in this patch:
- fixes in MPLS module due to Routing model updates
- fixes doc module due to changes in Routing model

Change-Id: I33704a50061aef97dfbd73a7701ff6fe5274d6f0
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

1 files changed, 851 insertions, 224 deletions

diff --git a/routing/routing_postman_collection.json b/routing/routing_postman_collection.json
index 2838dae8a..de9a02e2c 100644..100755
--- a/routing/routing_postman_collection.json
+++ b/routing/routing_postman_collection.json
@@ -1,242 +1,869 @@
 {
-	"id": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-	"name": "Routing",
-	"description": "",
-	"order": [
-		"c5701b6a-a684-0a4f-9991-6f1a866baddd",
-		"e8216de3-757d-ce34-87e4-8e25ee6b1f44",
-		"e3510e60-17e7-887b-6a55-5e0f651512b0",
-		"2bf3def8-ef34-fa83-0789-ecebb03f297f",
-		"ea4e8b3d-2333-6c17-1da2-32fd0b88da96",
-		"86b915a1-f85c-939a-0814-fd98b1154162",
-		"41585a9d-5067-05d8-2dc1-3ace153a70b6",
-		"6244bd7f-dedd-bd6d-45c3-00b0fd10bb21",
-		"260fce67-2d84-8557-ff03-b4371fc62cdb",
-		"c50cc4a4-a760-f91a-fe66-dd8a66d6085b",
-		"de73785a-6784-b280-a9bc-6d6e48199f09"
-	],
-	"folders": [],
-	"timestamp": 1476089780702,
-	"owner": "658985",
-	"public": false,
-	"requests": [
+	"info": {
+		"_postman_id": "926b89ec-267c-68e1-a4ba-0373a956f692",
+		"name": "Routing",
+		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
+	},
+	"item": [
 		{
-			"id": "260fce67-2d84-8557-ff03-b4371fc62cdb",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1476096572969,
-			"name": "Get Routes",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-instance\":\n\t{\n\t\t\"name\":\"routing-1\",\n\t\t\"enabled\":\"true\",\n\t\t\"router-id\":\"192.168.2.1\",\n\t\t\"description\":\"Test routing instance\",\n\t\t\"routing-protocols\":{\n\t\t\t\"routing-protocol\":[\n\t\t\t\t{\n\t\t\t\t\t\"name\":\"test-routing-protocol\",\n\t\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\t\"enabled\":\"true\",\n\t\t\t\t\t\"type\":\"static\",\n\t\t\t\t\t\"static-routes\":{\n\t\t\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\t\t\"route\":[\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":1,\n\t\t\t\t\t\t\t\t\t\"description\":\"Test static route\",\n\t\t\t\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.3/32\",\n\t\t\t\t\t\t\t\t\t\"next-hop\":\"192.168.2.8\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\t\n\t\t\t]\n\t\t}\n\t}\t\n}"
-		},
-		{
-			"id": "2bf3def8-ef34-fa83-0789-ecebb03f297f",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-2",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502653953,
-			"name": "Add multi hop ipv4",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-2\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"2\"\n            },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\"route\":{\n\t\t\t\t\t\t\t\"id\":2,\n\t\t\t\t\t\t\t\"description\":\"Test static route multi hop ipv4\",\n\t\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.4/32\",\n\t\t\t\t\t\t\t\"vpp-ipv4-route\":{\n\t\t\t\t\t\t\t\t\"secondary-vrf\":2\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\"next-hop-list\":{\n\t\t\t\t\t\t\t\t\"next-hop\":[\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":\"1\",\n\t\t\t\t\t\t\t\t\t\"address\":\"192.168.2.5\",\n\t\t\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\t\t\"weight\":\"1\"\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":\"2\",\n\t\t\t\t\t\t\t\t\t\"address\":\"192.168.2.6\",\n\t\t\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\t\t\"weight\":\"2\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t]\n}\n"
-		},
-		{
-			"id": "41585a9d-5067-05d8-2dc1-3ace153a70b6",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-5",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502689477,
-			"name": "Add multi hop ipv6",
+			"name": "IPv4",
 			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-5\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"5\"\n            },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv6\":{\n\t\t\t\t\t\"route\":{\n\t\t\t\t\t\t\t\"id\":2,\n\t\t\t\t\t\t\t\"description\":\"Test static route multi hop ipv6\",\n\t\t\t\t\t\t\t\"destination-prefix\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t\t\t\t\"vpp-ipv6-route\":{\n\t\t\t\t\t\t\t\t\"secondary-vrf\":\"1\"\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\"next-hop-list\":{\n\t\t\t\t\t\t\t\t\"next-hop\":[\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":\"1\",\n\t\t\t\t\t\t\t\t\t\"address\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0002\",\n\t\t\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\t\t\"weight\":\"1\"\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":\"2\",\n\t\t\t\t\t\t\t\t\t\"address\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0003\",\n\t\t\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\t\t\"weight\":\"2\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t]\n}\n"
+			"item": [
+				{
+					"name": "SimpleNextHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add single hop ipv4",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\":{\n\t    \t\t\t\"ipv4\":{\n\t    \t\t\t\t\"route\":[\n\t\t\t            {\n\t\t\t            \t\"description\":\"Test static route single hop ipv4\",\n\t\t\t                \"destination-prefix\":\"192.168.2.3/32\",\n\t\t\t                \"next-hop\": {\n\t\t\t                \t\"next-hop-address\" : \"192.168.2.8\",\n            \t\t\t\t\t\"outgoing-interface\": \"local0\"\n\t\t\t                },\n\t\t\t                \"vpp-ipv4-route\":{\n\t\t\t                \t\"classify-table\":\"1\"\n\t\t\t            \t}\n\t\t\t            }\n\t\t\t            ]\n\t\t\t        }\n\t    \t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get single hop ipv4",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.3%2F32"
+							},
+							"response": []
+						},
+						{
+							"name": "get single hop ipv4 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.3%2F32"
+							},
+							"response": []
+						},
+						{
+							"name": "delete single hop ipv4",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.3%2F32"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "MultiNextHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add multi hop ipv4",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t    \"ipv4\": {\n\t\t\t\t      \"route\": [\n\t\t\t\t        {\n\t\t\t\t          \"destination-prefix\": \"192.168.2.1/24\",\n\t\t\t\t          \"vpp-v4ur:vpp-ipv4-route\": {\n\t\t\t\t            \"classify-table\": \"1\"\n\t\t\t\t          },\n\t\t\t\t          \"next-hop\":{\n\t\t\t\t            \t\"next-hop-list\": {\n\t\t\t\t            \t\t\"next-hop\": [\n\t\t\t\t                \t\t{\n\t\t\t\t                \t\t\t\"index\": \"1\",\n\t\t\t\t                \t\t\t\"next-hop-address\": \"192.168.2.1\",\n\t\t\t\t                \t\t\t\"outgoing-interface\": \"local0\",\n\t\t\t\t                \t\t\t\"weight\": \"2\"\n\t\t\t\t                \t\t},\n\t\t\t\t                \t\t{\n\t\t\t\t\t\t                    \"index\": \"2\",\n\t\t\t\t\t\t                    \"next-hop-address\": \"192.168.2.2\",\n\t\t\t\t\t\t                    \"outgoing-interface\": \"local0\",\n\t\t\t\t\t\t                \t\"weight\": \"3\"\n\t\t\t\t                \t\t}\n\t\t\t\t            \t\t]\n\t\t\t\t            \t\t}\n\t\t\t\t        \t\t}\n\t\t\t\t        \t}\n\t\t\t\t    \t]\n\t\t\t\t    }\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get multi hop ipv4",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "get multi hop ipv4 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "delete multi hop ipv4",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.2.1%2F24"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "SpecialHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add special hop ipv4",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t\"ipv4\": {\n\t\t\t\t\t\"route\": [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"destination-prefix\": \"192.168.3.1/24\",\n\t\t\t\t\t\t\t\"next-hop\": {\n\t\t\t\t\t\t\t\t\"special-next-hop-enum\": \"blackhole\"\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get special hop ipv4",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.3.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "get special hop ipv4 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.3.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "delete special hop ipv4",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.3.1%2F24"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "TableHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add tablehop ipv4",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t\"ipv4\": {\n\t\t\t\t\t\"route\": [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"destination-prefix\": \"192.168.4.1/24\",\n\t\t\t\t\t\t\t\"next-hop\": {\n                                \"secondary-vrf\": 0\n                            }\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get tablehop ipv4",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.4.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "get tablehop ipv4 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.4.1%2F24"
+							},
+							"response": []
+						},
+						{
+							"name": "delete tablehop ipv4",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv4/route/192.168.4.1%2F24"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				}
+			]
 		},
 		{
-			"id": "6244bd7f-dedd-bd6d-45c3-00b0fd10bb21",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-6",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502701577,
-			"name": "Add special hop ipv6",
+			"name": "IPv6",
 			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-6\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"6\"\n            },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv6\":{\n\t\t\t\t\t\"route\":{\n\t\t\t\t\t\t\"id\":3,\n\t\t\t\t\t\t\"description\":\"Test static route multi hop ipv6\",\n\t\t\t\t\t\t\"destination-prefix\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t\t\t\"special-next-hop\":\"receive\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t]\n}\n\t\n"
+			"item": [
+				{
+					"name": "SimpleNextHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add single hop ipv6",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\":{\n\t    \t\t\t\"ipv6\":{\n\t    \t\t\t\t\"route\":[\n\t\t\t            {\n\t\t\t            \t\"description\":\"Test static route single hop ipv6\",\n\t\t\t                \"destination-prefix\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t                \"next-hop\": {\n\t\t\t                \t\"next-hop-address\" : \"2001:0db8:0a0b:12f0:0000:0000:0000:0002\",\n            \t\t\t\t\t\"outgoing-interface\": \"local0\"\n\t\t\t                },\n\t\t\t                \"vpp-ipv6-route\":{\n\t\t\t                \t\"classify-table\":\"1\"\n\t\t\t            \t}\n\t\t\t            }\n\t\t\t            ]\n\t\t\t        }\n\t    \t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get single hop ipv6",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "get single hop ipv6 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "delete single hop ipv6",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "MultiNextHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add multi hop ipv6",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t    \"ipv6\": {\n\t\t\t\t      \"route\": [\n\t\t\t\t        {\n\t\t\t\t          \"destination-prefix\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t          \"vpp-ipv6-unicast-routing:vpp-ipv6-route\": {\n\t\t\t\t              \"classify-table\": \"classify-table-1\"\n\t\t\t\t          },\n\t\t\t\t          \"next-hop\":{\n\t\t\t\t            \t\"next-hop-list\": {\n\t\t\t\t            \t\t\"next-hop\": [\n\t\t\t\t                \t\t{\n\t\t\t\t                \t\t\t\"index\": \"1\",\n\t\t\t\t                \t\t\t\"next-hop-address\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0002\",\n\t\t\t\t                \t\t\t\"outgoing-interface\": \"local0\",\n\t\t\t\t                \t\t\t\"weight\": \"2\"\n\t\t\t\t                \t\t},\n\t\t\t\t                \t\t{\n\t\t\t\t\t\t                    \"index\": \"2\",\n\t\t\t\t\t\t                    \"next-hop-address\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0003\",\n\t\t\t\t\t\t                    \"outgoing-interface\": \"local0\",\n\t\t\t\t\t\t                \t\"weight\": \"3\"\n\t\t\t\t                \t\t}\n\t\t\t\t            \t\t]\n\t\t\t\t            \t\t}\n\t\t\t\t        \t\t}\n\t\t\t\t        \t}\n\t\t\t\t    \t]\n\t\t\t\t    }\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get multi hop ipv6",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "get multi hop ipv6 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "delete multi hop ipv6",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "SpecialHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add special hop ipv6",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t\"ipv6\": {\n\t\t\t\t\t\"route\": [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"destination-prefix\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t\t\t\t\"next-hop\": {\n\t\t\t\t\t\t\t\t\"special-next-hop-enum\": \"receive\"\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get special hop ipv6",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "get special hop ipv6 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "delete special hop ipv6",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "TableHop",
+					"description": "",
+					"item": [
+						{
+							"name": "Add tablehop ipv6",
+							"request": {
+								"method": "PUT",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"routing\": {\n\t\t\"control-plane-protocols\": {\n\t\t\t\"control-plane-protocol\": [\n\t\t\t{\n\t\t\t\t\"type\": \"static\",\n\t\t\t\t\"name\": \"test-routing-protocol-1\",\n\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\"vpp-protocol-attributes\": {\n                \t\"primary-vrf\": \"1\"\n\t            },\n\t    \t\t\"static-routes\": {\n\t\t\t\t\"ipv6\": {\n\t\t\t\t\t\"route\": [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"destination-prefix\": \"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t\t\t\t\"next-hop\": {\n                                \"secondary-vrf\": 0\n                            }\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t]\n\t\t}\n\t}\n}"
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/"
+							},
+							"response": []
+						},
+						{
+							"name": "get tablehop ipv6",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "get tablehop ipv6 Operational",
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						},
+						{
+							"name": "delete tablehop ipv6",
+							"request": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "Basic YWRtaW46YWRtaW4="
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/hc2vpp-ietf-routing:control-plane-protocols/hc2vpp-ietf-routing:control-plane-protocol/hc2vpp-ietf-routing:static/test-routing-protocol-1/static-routes/ipv6/route/2001:0db8:0a0b:12f0:0000:0000:0000:0001%2F64"
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				}
+			]
 		},
 		{
-			"id": "86b915a1-f85c-939a-0814-fd98b1154162",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-4",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502678772,
-			"name": "Add single hop ipv6",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-4\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"4\"\n            },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv6\":{\n\t\t\t\t\t\"route\":[\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"id\":1,\n\t\t\t\t\t\t\t\"description\":\"Test static route single hop ipv6\",\n\t\t\t\t\t\t\t\"destination-prefix\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0001/64\",\n\t\t\t\t\t\t\t\"next-hop\":\"2001:0db8:0a0b:12f0:0000:0000:0000:0002\",\n\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\"vpp-ipv6-route\":{\n\t\t\t\t\t\t\t\t\"secondary-vrf\":\"2\"\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t}\n\t\t}\t\n\t]\n}"
-		},
-		{
-			"id": "c50cc4a4-a760-f91a-fe66-dd8a66d6085b",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1479200930229,
-			"name": "Get Routes Operational",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-instance\":\n\t{\n\t\t\"name\":\"routing-1\",\n\t\t\"enabled\":\"true\",\n\t\t\"router-id\":\"192.168.2.1\",\n\t\t\"description\":\"Test routing instance\",\n\t\t\"routing-protocols\":{\n\t\t\t\"routing-protocol\":[\n\t\t\t\t{\n\t\t\t\t\t\"name\":\"test-routing-protocol\",\n\t\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\t\"enabled\":\"true\",\n\t\t\t\t\t\"type\":\"static\",\n\t\t\t\t\t\"static-routes\":{\n\t\t\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\t\t\"route\":[\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":1,\n\t\t\t\t\t\t\t\t\t\"description\":\"Test static route\",\n\t\t\t\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.3/32\",\n\t\t\t\t\t\t\t\t\t\"next-hop\":\"192.168.2.8\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\t\n\t\t\t]\n\t\t}\n\t}\t\n}"
-		},
-		{
-			"id": "c5701b6a-a684-0a4f-9991-6f1a866baddd",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/naming-context:contexts",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1478601413071,
 			"name": "Naming Context Read ",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"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": "de73785a-6784-b280-a9bc-6d6e48199f09",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/vpp-routing-protocol_2",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1479210482272,
-			"name": "Get Specific route Operational",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-instance\":\n\t{\n\t\t\"name\":\"routing-1\",\n\t\t\"enabled\":\"true\",\n\t\t\"router-id\":\"192.168.2.1\",\n\t\t\"description\":\"Test routing instance\",\n\t\t\"routing-protocols\":{\n\t\t\t\"routing-protocol\":[\n\t\t\t\t{\n\t\t\t\t\t\"name\":\"test-routing-protocol\",\n\t\t\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\t\t\"enabled\":\"true\",\n\t\t\t\t\t\"type\":\"static\",\n\t\t\t\t\t\"static-routes\":{\n\t\t\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\t\t\"route\":[\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\t\"id\":1,\n\t\t\t\t\t\t\t\t\t\"description\":\"Test static route\",\n\t\t\t\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.3/32\",\n\t\t\t\t\t\t\t\t\t\"next-hop\":\"192.168.2.8\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\t\n\t\t\t]\n\t\t}\n\t}\t\n}"
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Authorization",
+						"value": "Basic YWRtaW46YWRtaW4="
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\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}"
+				},
+				"url": "http://localhost:8183/restconf/operational/naming-context:contexts"
+			},
+			"response": []
 		},
 		{
-			"id": "e3510e60-17e7-887b-6a55-5e0f651512b0",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-1",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502842270,
-			"name": "Add single hop ipv4",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-1\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"1\"\n            },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\"route\":[\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"id\":1,\n\t\t\t\t\t\t\t\"description\":\"Test static route single hop ipv4\",\n\t\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.3/32\",\n\t\t\t\t\t\t\t\"next-hop\":\"192.168.2.8\",\n\t\t\t\t\t\t\t\"outgoing-interface\":\"local0\",\n\t\t\t\t\t\t\t\"vpp-ipv4-route\":{\n\t\t\t\t\t\t\t\t\"secondary-vrf\":\"2\"\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t}\n\t\t}\t\n\t]\n}"
+			"name": "Multi Naming Context Read",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Authorization",
+						"value": "Basic YWRtaW46YWRtaW4="
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\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}"
+				},
+				"url": "http://localhost:8183/restconf/operational/naming-context:contexts\\multi-naming-context:multi-naming-contexts"
+			},
+			"response": []
 		},
 		{
-			"id": "e8216de3-757d-ce34-87e4-8e25ee6b1f44",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/operational/naming-context:contexts\\multi-naming-context:multi-naming-contexts",
-			"preRequestScript": "",
-			"pathVariables": {},
-			"method": "GET",
-			"data": [],
-			"dataMode": "raw",
-			"tests": "",
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1478778211905,
-			"name": "Multi Naming Context Read",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"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}"
+			"name": "Get Routes",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Authorization",
+						"value": "Basic YWRtaW46YWRtaW4="
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n  \"routing-instance\":\n  {\n    \"name\":\"routing-1\",\n    \"enabled\":\"true\",\n    \"router-id\":\"192.168.2.1\",\n    \"description\":\"Test routing instance\",\n    \"routing-protocols\":{\n      \"routing-protocol\":[\n        {\n          \"name\":\"test-routing-protocol\",\n          \"description\":\"Test routing protocol\",\n          \"enabled\":\"true\",\n          \"type\":\"static\",\n          \"static-routes\":{\n            \"ipv4\":{\n              \"route\":[\n                {\n                  \"id\":1,\n                  \"description\":\"Test static route\",\n                  \"destination-prefix\":\"192.168.2.3/32\",\n                  \"next-hop\":\"192.168.2.8\"\n                }\n              ]\n            }\n          }\n        }  \n      ]\n    }\n  }  \n}"
+				},
+				"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing"
+			},
+			"response": []
 		},
 		{
-			"id": "ea4e8b3d-2333-6c17-1da2-32fd0b88da96",
-			"headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-			"url": "http://localhost:8183/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/test-routing-protocol-3",
-			"preRequestScript": null,
-			"pathVariables": {},
-			"method": "PUT",
-			"data": [],
-			"dataMode": "raw",
-			"version": 2,
-			"tests": null,
-			"currentHelper": "normal",
-			"helperAttributes": {},
-			"time": 1480502667293,
-			"name": "Add special hop ipv4",
-			"description": "",
-			"collectionId": "91b6ff58-8e6f-06aa-8067-caecb9f95c88",
-			"responses": [],
-			"rawModeData": "{\n\t\"routing-protocol\":[\n\t\t{\n\t\t\t\"name\":\"test-routing-protocol-3\",\n\t\t\t\"description\":\"Test routing protocol\",\n\t\t\t\"enabled\":\"true\",\n\t\t\t\"type\":\"static\",\n\t\t\t\"vpp-protocol-attributes\": {\n\t              \"primary-vrf\": \"3\"\n\t        },\n\t\t\t\"static-routes\":{\n\t\t\t\t\"ipv4\":{\n\t\t\t\t\t\"route\":{\n\t\t\t\t\t\t\"id\":3,\n\t\t\t\t\t\t\"description\":\"Test static route multi hop ipv4\",\n\t\t\t\t\t\t\"destination-prefix\":\"192.168.2.5/32\",\n\t\t\t\t\t\t\"special-next-hop\":\"receive\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t]\n}\n\t\n"
+			"name": "Get Routes Operational",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Authorization",
+						"value": "Basic YWRtaW46YWRtaW4="
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n  \"routing-instance\":\n  {\n    \"name\":\"routing-1\",\n    \"enabled\":\"true\",\n    \"router-id\":\"192.168.2.1\",\n    \"description\":\"Test routing instance\",\n    \"routing-protocols\":{\n      \"routing-protocol\":[\n        {\n          \"name\":\"test-routing-protocol\",\n          \"description\":\"Test routing protocol\",\n          \"enabled\":\"true\",\n          \"type\":\"static\",\n          \"static-routes\":{\n            \"ipv4\":{\n              \"route\":[\n                {\n                  \"id\":1,\n                  \"description\":\"Test static route\",\n                  \"destination-prefix\":\"192.168.2.3/32\",\n                  \"next-hop\":\"192.168.2.8\"\n                }\n              ]\n            }\n          }\n        }  \n      ]\n    }\n  }  \n}"
+				},
+				"url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing"
+			},
+			"response": []
 		}
 	]
 }
\ No newline at end of file