summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-01-31 15:38:48 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-01-31 16:11:01 +0000
commite7579ac9c300dd8dc99a88bb5453ff995f7571ed (patch)
tree90fe63e1bb8a619096e2b2f86d52b0a6ab2789ee
parent7f93ac8c5231775acb2f7c09af5d8496271557ca (diff)
Update BGP INET examples
- removes LU examples - moves postman collection to inet dir - updates BGP user guide Change-Id: I5844508bcd1898a9aec9b2d07fb66fb1cdf62098 Signed-off-by: Marek Gradzki <mgradzki@cisco.com> (cherry picked from commit 33980cbf88a02a511c13d727eb6dc44d2155f571)
-rw-r--r--bgp/inet/bgp_inet_postman_collection.json (renamed from bgp/bgp_postman_collection.json)388
-rw-r--r--release-notes/src/main/asciidoc/user_guide/bgp_in_honeycomb_user_guide.adoc36
-rw-r--r--release-notes/src/main/asciidoc/user_guide/user_guide.adoc2
3 files changed, 170 insertions, 256 deletions
diff --git a/bgp/bgp_postman_collection.json b/bgp/inet/bgp_inet_postman_collection.json
index fe42432ff..303e56636 100644
--- a/bgp/bgp_postman_collection.json
+++ b/bgp/inet/bgp_inet_postman_collection.json
@@ -1,34 +1,33 @@
{
- "id": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
+ "id": "4092bf75-52e9-d793-36ab-c78696e33253",
"name": "Hc2vpp BGP RESTCONF calls",
- "description": "Examples of BGP configration based on \nhttp://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html",
+ "description": "Examples of BGP configration based on \nhttp://docs.opendaylight.org/en/stable-nitrogen/user-guide/bgp-user-guide.html",
"order": [
- "0779736c-2276-3275-b5c1-eccf8cf2fd22",
- "0aae4294-1688-f0c1-3f20-21fc93a6dead",
- "7097be0f-e36b-2e43-715b-a3d47c47fd94",
- "3762ddc0-d7bc-57c9-e9b8-d536a1809fa8",
- "5f1886a1-f957-126b-7093-963bce523c90",
- "554e0087-3b7a-ea91-80aa-059400fee2ad",
- "d13aea58-fb5f-3d4a-d6f4-25b4a67b3539",
- "a62df5d6-53ab-f91c-c90c-efb054ef1aa3",
- "02a81cd8-758b-8ba9-58f4-1744afb1ea74",
- "b69ed7d0-cd9d-82d5-ae17-3be02a254a5f",
- "3c3abdc7-0613-0260-46ec-020f0ff5d9d7",
- "b49b3af6-cb64-cd30-8294-cc0bd2a61f76",
- "1b683e04-c542-df6b-783e-dc1b16ae8f52",
- "a24b4cde-e80a-8571-7c64-efaeb2fc1238",
- "0b0f2068-5fbb-4d44-e58e-8c4562cda8ad",
- "c30eb27b-8883-ab64-2286-a8bbabd95ba9"
+ "6f86a479-0973-2d0c-20d5-81e8d44d20a7",
+ "adcc08ea-3525-aafb-2aeb-4f5bb93fca1b",
+ "63945ffe-709c-5368-9a0d-bd7ea5617973",
+ "307b9972-af2b-ff8a-8fae-be83b075c6e6",
+ "3941a6b9-784a-8f80-a12f-d7451f832465",
+ "820727b2-88ea-6b49-c31d-f6dd4d5f64d8",
+ "e3d003ba-9796-adcd-75e3-f0d5fc041744",
+ "9a8903dd-3fca-26c7-2c66-dc1a4b95cfce",
+ "32d6df51-2adb-a472-42dd-88aee1c66845",
+ "96f9f5ef-d97c-a3c1-3061-55d75d223077",
+ "e794b5b4-612f-010b-e726-c45cfa221530",
+ "4334b011-5945-180b-dd1a-932720b2ff58",
+ "e2701dbf-741b-9afa-219b-a15b562d6aff",
+ "e5aeee97-5530-5bb4-90f2-f1f48b6fee5b",
+ "60af084c-5bbf-2843-39e9-8bdb80586b91"
],
"folders": [],
"timestamp": 1494477000331,
- "owner": "567303",
+ "owner": 0,
"public": false,
"requests": [
{
"folder": null,
- "id": "02a81cd8-758b-8ba9-58f4-1744afb1ea74",
- "name": "show speeker's Loc-RIB",
+ "id": "307b9972-af2b-ff8a-8fae-be83b075c6e6",
+ "name": "show 127.0.0.2 peer state",
"dataMode": "raw",
"data": [],
"descriptionFormat": null,
@@ -36,7 +35,7 @@
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"method": "GET",
"pathVariables": {},
- "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/loc-rib",
+ "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/peer/bgp:%2F%2F127.0.0.2",
"preRequestScript": null,
"tests": null,
"currentHelper": "normal",
@@ -44,13 +43,13 @@
"queryParams": null,
"headerData": null,
"pathVariableData": null,
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>10.25.1.9</neighbor-address>\n <config>\n <peer-group>application-peers</peer-group>\n </config>\n</neighbor>"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
},
{
"folder": null,
- "id": "0779736c-2276-3275-b5c1-eccf8cf2fd22",
- "name": "show hc-bgp-instance",
+ "id": "32d6df51-2adb-a472-42dd-88aee1c66845",
+ "name": "show speeker's Loc-RIB",
"dataMode": "raw",
"data": [],
"descriptionFormat": null,
@@ -58,7 +57,7 @@
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"method": "GET",
"pathVariables": {},
- "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance",
+ "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/loc-rib",
"preRequestScript": null,
"tests": null,
"currentHelper": "normal",
@@ -66,90 +65,38 @@
"queryParams": null,
"headerData": null,
"pathVariableData": null,
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
- },
- {
- "id": "0aae4294-1688-f0c1-3f20-21fc93a6dead",
- "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "headerData": [
- {
- "key": "Content-Type",
- "value": "application/json",
- "description": "",
- "enabled": true
- },
- {
- "key": "Authorization",
- "value": "Basic YWRtaW46YWRtaW4=",
- "description": "",
- "enabled": true
- }
- ],
- "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
- "queryParams": [],
- "preRequestScript": null,
- "pathVariables": {},
- "pathVariableData": [],
- "method": "PUT",
- "data": [],
- "dataMode": "raw",
- "tests": null,
- "currentHelper": "normal",
- "helperAttributes": {},
- "time": 1500013934256,
- "name": "add bgp peer",
- "description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "responses": [],
- "rawModeData": "{\n\t\"neighbor\": {\n \"neighbor-address\": \"127.0.0.2\",\n \"config\": {\n \"peer-type\": \"INTERNAL\"\n },\n \"timers\": {\n \"config\": {\n \"connect-retry\": 10,\n \"hold-time\": 90\n }\n },\n \"transport\": {\n \"config\": {\n \"remote-port\": 17900,\n \"passive-mode\": false\n }\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n}\n}"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>10.25.1.9</neighbor-address>\n <config>\n <peer-group>application-peers</peer-group>\n </config>\n</neighbor>"
},
{
- "id": "0b0f2068-5fbb-4d44-e58e-8c4562cda8ad",
+ "id": "3941a6b9-784a-8f80-a12f-d7451f832465",
"headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "headerData": [
- {
- "key": "Content-Type",
- "value": "application/json",
- "description": "",
- "enabled": true
- },
- {
- "key": "Authorization",
- "value": "Basic YWRtaW46YWRtaW4=",
- "description": "",
- "enabled": true
- }
- ],
- "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
- "queryParams": [],
+ "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/10.25.1.9",
"preRequestScript": null,
"pathVariables": {},
- "pathVariableData": [],
"method": "PUT",
"data": [],
"dataMode": "raw",
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1500014475038,
- "name": "update bgp peer",
+ "time": 1517409419557,
+ "name": "add application peer",
"description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
"responses": [],
- "rawModeData": "{\n\t\"neighbor\": {\n \"neighbor-address\": \"127.0.0.2\",\n \"config\": {\n \"peer-type\": \"INTERNAL\"\n },\n \"timers\": {\n \"config\": {\n \"connect-retry\": 10,\n \"hold-time\": 91\n }\n },\n \"transport\": {\n \"config\": {\n \"remote-port\": 17900,\n \"passive-mode\": false\n }\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n}\n}"
+ "rawModeData": "{\n \"neighbor\": {\n \"neighbor-address\": \"10.25.1.9\",\n \"config\": {\n \"peer-group\": \"application-peers\"\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n }\n}"
},
{
"folder": null,
- "id": "1b683e04-c542-df6b-783e-dc1b16ae8f52",
- "name": "remove second ipv4unicast route",
+ "id": "4334b011-5945-180b-dd1a-932720b2ff58",
+ "name": "update second ipv4unicast route",
"dataMode": "raw",
"data": [],
- "rawModeData": "",
"descriptionFormat": null,
"description": "",
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "method": "DELETE",
+ "method": "PUT",
"pathVariables": {},
"url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
"preRequestScript": null,
@@ -172,69 +119,46 @@
}
],
"pathVariableData": [],
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d"
- },
- {
- "folder": null,
- "id": "3762ddc0-d7bc-57c9-e9b8-d536a1809fa8",
- "name": "show 127.0.0.2 peer state",
- "dataMode": "raw",
- "data": [],
- "descriptionFormat": null,
- "description": "",
- "headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "method": "GET",
- "pathVariables": {},
- "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/peer/bgp:%2F%2F127.0.0.2",
- "preRequestScript": null,
- "tests": null,
- "currentHelper": "normal",
- "helperAttributes": {},
- "queryParams": null,
- "headerData": null,
- "pathVariableData": null,
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>102</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
{
- "id": "3c3abdc7-0613-0260-46ec-020f0ff5d9d7",
- "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+ "id": "60af084c-5bbf-2843-39e9-8bdb80586b91",
+ "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
- "key": "Authorization",
- "value": "Basic YWRtaW46YWRtaW4=",
+ "key": "Content-Type",
+ "value": "application/json",
"description": "",
"enabled": true
},
{
- "key": "Content-Type",
- "value": "application/json",
+ "key": "Authorization",
+ "value": "Basic YWRtaW46YWRtaW4=",
"description": "",
"enabled": true
}
],
- "url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/learned-protocol-0/static-routes/hc2vpp-ietf-ipv4-unicast-routing:ipv4",
+ "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
"queryParams": [],
+ "preRequestScript": null,
"pathVariables": {},
"pathVariableData": [],
- "preRequestScript": null,
- "method": "GET",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
+ "method": "DELETE",
"data": [],
"dataMode": "raw",
- "name": "get VPP IPv4 routes",
- "description": "",
- "descriptionFormat": "html",
- "time": 1501156310525,
- "version": 2,
- "responses": [],
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "rawModeData": "{\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}"
+ "time": 1500014574942,
+ "name": "delete bgp peer",
+ "description": "",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "responses": [],
+ "rawModeData": ""
},
{
- "id": "554e0087-3b7a-ea91-80aa-059400fee2ad",
+ "id": "63945ffe-709c-5368-9a0d-bd7ea5617973",
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
@@ -250,7 +174,7 @@
"enabled": true
}
],
- "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/peer/bgp:%2F%2F10.25.1.9",
+ "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/",
"queryParams": [],
"preRequestScript": null,
"pathVariables": {},
@@ -261,49 +185,37 @@
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1500015544451,
- "name": "show 10.25.1.9 app peer state",
+ "time": 1499946714543,
+ "name": "read network instance (config)",
"description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "responses": [],
"rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
},
{
- "id": "5f1886a1-f957-126b-7093-963bce523c90",
- "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "headerData": [
- {
- "key": "Content-Type",
- "value": "application/json",
- "description": "",
- "enabled": true
- },
- {
- "key": "Authorization",
- "value": "Basic YWRtaW46YWRtaW4=",
- "description": "",
- "enabled": true
- }
- ],
- "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/10.25.1.9",
- "queryParams": [],
- "preRequestScript": null,
- "pathVariables": {},
- "pathVariableData": [],
- "method": "PUT",
- "data": [],
+ "folder": null,
+ "id": "6f86a479-0973-2d0c-20d5-81e8d44d20a7",
+ "name": "show hc-bgp-instance",
"dataMode": "raw",
+ "data": [],
+ "descriptionFormat": null,
+ "description": "",
+ "headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
+ "method": "GET",
+ "pathVariables": {},
+ "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance",
+ "preRequestScript": null,
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1500014801163,
- "name": "add application peer",
- "description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "responses": [],
- "rawModeData": "{\n \"neighbor\": {\n \"neighbor-address\": \"10.25.1.9\",\n \"config\": {\n \"peer-group\": \"application-peers\"\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n },\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-LABELLED-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n }\n}"
+ "queryParams": null,
+ "headerData": null,
+ "pathVariableData": null,
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
},
{
- "id": "7097be0f-e36b-2e43-715b-a3d47c47fd94",
+ "id": "820727b2-88ea-6b49-c31d-f6dd4d5f64d8",
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
@@ -319,7 +231,7 @@
"enabled": true
}
],
- "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/",
+ "url": "http://localhost:8183/restconf/operational/bgp-rib:bgp-rib/rib/hc-bgp-instance/peer/bgp:%2F%2F10.25.1.9",
"queryParams": [],
"preRequestScript": null,
"pathVariables": {},
@@ -330,25 +242,24 @@
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1499946714543,
- "name": "read network instance (config)",
+ "time": 1500015544451,
+ "name": "show 10.25.1.9 app peer state",
"description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "responses": [],
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
"rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
},
{
"folder": null,
- "id": "a24b4cde-e80a-8571-7c64-efaeb2fc1238",
- "name": "add IPv4 labeled unicast route",
+ "id": "96f9f5ef-d97c-a3c1-3061-55d75d223077",
+ "name": "add another ipv4unicast route",
"dataMode": "raw",
"data": [],
"descriptionFormat": null,
"description": "",
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "method": "POST",
+ "method": "PUT",
"pathVariables": {},
- "url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-labeled-unicast:labeled-unicast-subsequent-address-family/bgp-labeled-unicast:labeled-unicast-routes",
+ "url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
"preRequestScript": null,
"tests": null,
"currentHelper": "normal",
@@ -369,12 +280,12 @@
}
],
"pathVariableData": [],
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<labeled-unicast-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-labeled-unicast\">\n <route-key>label1</route-key>\n <prefix>1.1.1.1/32</prefix>\n <path-id>1</path-id>\n <label-stack>\n <label-value>800322</label-value>\n </label-stack>\n <attributes>\n <ipv4-next-hop>\n <global>199.20.160.41</global>\n </ipv4-next-hop>\n <origin>\n <value>igp</value>\n </origin>\n <as-path/>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n </attributes>\n</labeled-unicast-route>"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
{
"folder": null,
- "id": "a62df5d6-53ab-f91c-c90c-efb054ef1aa3",
+ "id": "9a8903dd-3fca-26c7-2c66-dc1a4b95cfce",
"name": "show 127.0.0.2 peer's adj-rib-out",
"dataMode": "raw",
"data": [],
@@ -391,30 +302,16 @@
"queryParams": null,
"headerData": null,
"pathVariableData": null,
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
"rawModeData": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n <neighbor-address>192.0.2.1</neighbor-address>\n <timers>\n <config>\n <hold-time>90</hold-time>\n <connect-retry>10</connect-retry>\n </config>\n </timers>\n <transport>\n <config>\n <remote-port>179</remote-port>\n <passive-mode>false</passive-mode>\n </config>\n </transport>\n <config>\n <peer-type>INTERNAL</peer-type>\n </config>\n</neighbor>"
},
{
- "folder": null,
- "id": "b49b3af6-cb64-cd30-8294-cc0bd2a61f76",
- "name": "update second ipv4unicast route",
- "dataMode": "raw",
- "data": [],
- "descriptionFormat": null,
- "description": "",
- "headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "method": "PUT",
- "pathVariables": {},
- "url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
- "preRequestScript": null,
- "tests": null,
- "currentHelper": "normal",
- "helperAttributes": {},
- "queryParams": [],
+ "id": "adcc08ea-3525-aafb-2aeb-4f5bb93fca1b",
+ "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
"key": "Content-Type",
- "value": "application/xml",
+ "value": "application/json",
"description": "",
"enabled": true
},
@@ -425,20 +322,35 @@
"enabled": true
}
],
+ "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
+ "queryParams": [],
+ "preRequestScript": null,
+ "pathVariables": {},
"pathVariableData": [],
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>102</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "method": "PUT",
+ "data": [],
+ "dataMode": "raw",
+ "tests": null,
+ "currentHelper": "normal",
+ "helperAttributes": {},
+ "time": 1500013934256,
+ "name": "add bgp peer",
+ "description": "",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "responses": [],
+ "rawModeData": "{\n\t\"neighbor\": {\n \"neighbor-address\": \"127.0.0.2\",\n \"config\": {\n \"peer-type\": \"INTERNAL\"\n },\n \"timers\": {\n \"config\": {\n \"connect-retry\": 10,\n \"hold-time\": 90\n }\n },\n \"transport\": {\n \"config\": {\n \"remote-port\": 17900,\n \"passive-mode\": false\n }\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n}\n}"
},
{
"folder": null,
- "id": "b69ed7d0-cd9d-82d5-ae17-3be02a254a5f",
- "name": "add another ipv4unicast route",
+ "id": "e2701dbf-741b-9afa-219b-a15b562d6aff",
+ "name": "remove second ipv4unicast route",
"dataMode": "raw",
"data": [],
+ "rawModeData": "",
"descriptionFormat": null,
"description": "",
"headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
- "method": "PUT",
+ "method": "DELETE",
"pathVariables": {},
"url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
"preRequestScript": null,
@@ -461,16 +373,15 @@
}
],
"pathVariableData": [],
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253"
},
{
- "id": "c30eb27b-8883-ab64-2286-a8bbabd95ba9",
- "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
+ "id": "e3d003ba-9796-adcd-75e3-f0d5fc041744",
+ "headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
"key": "Content-Type",
- "value": "application/json",
+ "value": "application/xml",
"description": "",
"enabled": true
},
@@ -481,31 +392,30 @@
"enabled": true
}
],
- "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
+ "url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.11%2F32/0",
"queryParams": [],
"preRequestScript": null,
"pathVariables": {},
"pathVariableData": [],
- "method": "DELETE",
+ "method": "PUT",
"data": [],
"dataMode": "raw",
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1500014574942,
- "name": "delete bgp peer",
+ "time": 1501153693347,
+ "name": "add ipv4unicast route",
"description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "responses": [],
- "rawModeData": ""
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.11/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
{
- "id": "d13aea58-fb5f-3d4a-d6f4-25b4a67b3539",
- "headers": "Content-Type: application/xml\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
+ "id": "e5aeee97-5530-5bb4-90f2-f1f48b6fee5b",
+ "headers": "Content-Type: application/json\nAuthorization: Basic YWRtaW46YWRtaW4=\n",
"headerData": [
{
"key": "Content-Type",
- "value": "application/xml",
+ "value": "application/json",
"description": "",
"enabled": true
},
@@ -516,7 +426,7 @@
"enabled": true
}
],
- "url": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.11%2F32/0",
+ "url": "http://localhost:8183/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/hc-bgp-instance/bgp/bgp-openconfig-extensions:neighbors/neighbor/127.0.0.2",
"queryParams": [],
"preRequestScript": null,
"pathVariables": {},
@@ -527,11 +437,49 @@
"tests": null,
"currentHelper": "normal",
"helperAttributes": {},
- "time": 1501153693347,
- "name": "add ipv4unicast route",
+ "time": 1500014475038,
+ "name": "update bgp peer",
"description": "",
- "collectionId": "93836ad6-9489-6642-2539-b0a0aefd8f4d",
- "rawModeData": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.11/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "responses": [],
+ "rawModeData": "{\n\t\"neighbor\": {\n \"neighbor-address\": \"127.0.0.2\",\n \"config\": {\n \"peer-type\": \"INTERNAL\"\n },\n \"timers\": {\n \"config\": {\n \"connect-retry\": 10,\n \"hold-time\": 91\n }\n },\n \"transport\": {\n \"config\": {\n \"remote-port\": 17900,\n \"passive-mode\": false\n }\n },\n \"afi-safis\": {\n \"afi-safi\": [\n {\n \"afi-safi-name\": \"openconfig-bgp-types:IPV4-UNICAST\",\n \"receive\": true,\n \"send-max\": 0\n }\n ]\n }\n}\n}"
+ },
+ {
+ "id": "e794b5b4-612f-010b-e726-c45cfa221530",
+ "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+ "headerData": [
+ {
+ "key": "Authorization",
+ "value": "Basic YWRtaW46YWRtaW4=",
+ "description": "",
+ "enabled": true
+ },
+ {
+ "key": "Content-Type",
+ "value": "application/json",
+ "description": "",
+ "enabled": true
+ }
+ ],
+ "url": "http://localhost:8183/restconf/operational/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols/routing-protocol/learned-protocol-0/static-routes/hc2vpp-ietf-ipv4-unicast-routing:ipv4",
+ "queryParams": [],
+ "pathVariables": {},
+ "pathVariableData": [],
+ "preRequestScript": null,
+ "method": "GET",
+ "collectionId": "4092bf75-52e9-d793-36ab-c78696e33253",
+ "data": [],
+ "dataMode": "raw",
+ "name": "get VPP IPv4 routes",
+ "description": "",
+ "descriptionFormat": "html",
+ "time": 1501156310525,
+ "version": 2,
+ "responses": [],
+ "tests": null,
+ "currentHelper": "normal",
+ "helperAttributes": {},
+ "rawModeData": "{\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}"
}
]
} \ No newline at end of file
diff --git a/release-notes/src/main/asciidoc/user_guide/bgp_in_honeycomb_user_guide.adoc b/release-notes/src/main/asciidoc/user_guide/bgp_in_honeycomb_user_guide.adoc
index 4b5931caa..b89a03184 100644
--- a/release-notes/src/main/asciidoc/user_guide/bgp_in_honeycomb_user_guide.adoc
+++ b/release-notes/src/main/asciidoc/user_guide/bgp_in_honeycomb_user_guide.adoc
@@ -77,14 +77,6 @@ BGP server configuration can be verified using RESTCONF/NETCONF. We
"attributes": {
"uptodate": true
}
- },
- {
- "afi": "bgp-types:ipv4-address-family",
- "safi": "bgp-labeled-unicast:labeled-unicast-subsequent-address-family",
- "bgp-labeled-unicast:labeled-unicast-routes": {},
- "attributes": {
- "uptodate": true
- }
}
]
}
@@ -352,11 +344,6 @@ Following configuration sample show a way to configure the Application Peer:
"afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
"receive": true,
"send-max": 0
- },
- {
- "afi-safi-name": "openconfig-bgp-types:IPV4-LABELLED-UNICAST",
- "receive": true,
- "send-max": 0
}
]
}
@@ -387,14 +374,6 @@ The Application Peer presence can be verified via REST:
"attributes": {
"uptodate": false
}
- },
- {
- "afi": "bgp-types:ipv4-address-family",
- "safi": "bgp-labeled-unicast:labeled-unicast-subsequent-address-family",
- "bgp-labeled-unicast:labeled-unicast-routes": {},
- "attributes": {
- "uptodate": false
- }
}
]
},
@@ -408,14 +387,6 @@ The Application Peer presence can be verified via REST:
"attributes": {
"uptodate": false
}
- },
- {
- "afi": "bgp-types:ipv4-address-family",
- "safi": "bgp-labeled-unicast:labeled-unicast-subsequent-address-family",
- "bgp-labeled-unicast:labeled-unicast-routes": {},
- "attributes": {
- "uptodate": false
- }
}
]
}
@@ -722,11 +693,6 @@ Also the same route should appeared in Loc-RIB now:
}
]
}
- },
- {
- "afi": "bgp-types:ipv4-address-family",
- "safi": "bgp-labeled-unicast:labeled-unicast-subsequent-address-family",
- "bgp-labeled-unicast:labeled-unicast-routes": {}
}
]
}
@@ -840,4 +806,4 @@ In order to remove persisted configuration, simply rm -rf /var/lib/honeycomb bef
== Postman collection with examples
-All the request examples can be found {project-git-web}/bgp/bgp_postman_collection?h={project-branch}[BGP postman collection]. \ No newline at end of file
+All the request examples can be found {project-git-web}/bgp/inet/bgp_inet_postman_collection.json?h={project-branch}[BGP postman collection]. \ No newline at end of file
diff --git a/release-notes/src/main/asciidoc/user_guide/user_guide.adoc b/release-notes/src/main/asciidoc/user_guide/user_guide.adoc
index 928882de8..268851747 100644
--- a/release-notes/src/main/asciidoc/user_guide/user_guide.adoc
+++ b/release-notes/src/main/asciidoc/user_guide/user_guide.adoc
@@ -85,4 +85,4 @@ collection]
** {project-git-web}/vpp-classifier/vpp_classifier_postman_collection.json?h={project-branch}[VPP classifier postman collection]
** {project-git-web}/vpp-classifier/policer_postman_collection.json?h={project-branch}[Policer postman collection]
* BGP plugin
-** {project-git-web}/bgp/bgp_postman_collection.json?h={project-branch}[BGP postman collection].
+** {project-git-web}/bgp/inet/bgp_inet_postman_collection.json?h={project-branch}[BGP postman collection].