Update restconf links in documentation

In order to reflect that bierman restconf is no more available,
fix all documentation files under docs.

JIRA: BGPCEP-1024
Signed-off-by: tobias.pobocik <tobias.pobocik@pantheon.tech>
Change-Id: If843d498506d73813a5efbc1bc2994f24b55caec

diff --git a/docs/algo/algo-user-guide-running-algo.rst b/docs/algo/algo-user-guide-running-algo.rst
index 95ebb037a33eeb8fc9585ee19e6d8e397e0a7813..d7ffaafa584c1ff8e87eaf6637a7ecf6329fa3a4 100644 (file)
--- a/docs/algo/algo-user-guide-running-algo.rst
+++ b/docs/algo/algo-user-guide-running-algo.rst
@@ -109,7 +109,7 @@ Path Computation algorithms are accessible through the RPC described below:
 
 -----
 
-**URL:** ``restconf/operations/path-computation:get-constrained-path``
+**URL:** ``rests/operations/path-computation:get-constrained-path``
 
 **Method:** ``POST``
 

diff --git a/docs/bgp-monitoring-protocol-developer-guide.rst b/docs/bgp-monitoring-protocol-developer-guide.rst
index e1246d4d2f30b0fb417cb2b6d9d6a60746e664c6..4b6c18bf1e42da8055a8841cff9cfb6b39edddca 100644 (file)
--- a/docs/bgp-monitoring-protocol-developer-guide.rst
+++ b/docs/bgp-monitoring-protocol-developer-guide.rst
@@ -88,7 +88,7 @@ RIB data structure.
 BMP data is displayed only through one URL that is accessible from the
 base BMP URL:
 
-*`http://<controllerIP>:8181/restconf/operational/bmp-monitor:bmp-monitor <http://<controllerIP>:8181/restconf/operational/bmp-monitor:bmp-monitor>`__*
+``http://<controllerIP>:8181/rests/data/bmp-monitor:bmp-monitor?content=nonconfig``
 
 Each Monitor station will be displayed and it may contains multiple
 monitored routers and peers within:

diff --git a/docs/bgp/bgp-user-guide-additional-path-capability.rst b/docs/bgp/bgp-user-guide-additional-path-capability.rst
index 63044b008d28345157487e415f8f7fe226b5fbc1..7b8a64a1a81d86079e69af8b437aa83f0dfef88f 100644 (file)
--- a/docs/bgp/bgp-user-guide-additional-path-capability.rst
+++ b/docs/bgp/bgp-user-guide-additional-path-capability.rst
@@ -19,9 +19,7 @@ BGP Speaker
 '''''''''''
 To enable ADD-PATH capability in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -99,7 +97,7 @@ To enable ADD-PATH capability in BGP plugin, first configure BGP speaker instanc
 
 Here is an example for update a specific family with enable ADD-PATH capability
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/global/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/global/afi-safis/afi-safi=openconfig-bgp-types:IPV4%2DUNICAST``
 
 **Method:** ``PUT``
 
@@ -141,7 +139,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled ADD-PATH capability.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -201,7 +199,7 @@ Here is an example for BGP peer configuration with enabled ADD-PATH capability.
 
 Here is an example for update specific family BGP peer configuration with enabled ADD-PATH capability.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor=192.0.2.1/afi-safis=afi-safi/openconfig-bgp-types:IPV4%2DUNICAST``
 
 **Method:** ``PUT``
 
@@ -243,7 +241,7 @@ Usage
 ^^^^^
 The IPv4 Unicast table with enabled ADD-PATH capability in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-bgp-application-peer.rst b/docs/bgp/bgp-user-guide-bgp-application-peer.rst
index edecf4f592093e893880f70609bd72d75a60fc4f..e56d5ac35ac25b134f2aa83b2c96221a91b89768 100644 (file)
--- a/docs/bgp/bgp-user-guide-bgp-application-peer.rst
+++ b/docs/bgp/bgp-user-guide-bgp-application-peer.rst
@@ -10,7 +10,7 @@ Application Peer configuration
 ''''''''''''''''''''''''''''''
 Following configuration sample show a way to configure the *Application Peer*:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -66,9 +66,7 @@ Following configuration sample show a way to configure the *Application Peer*:
 
 The *Application Peer* presence can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/peer/bgp:%2F%2F10.25.1.9``
-
-**RFC8040 URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F10.25.1.9?content=nonconfig``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F10.25.1.9?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -155,7 +153,7 @@ Programmable RIB
 ''''''''''''''''
 Next example shows how to inject a route into the programmable RIB.
 
-**URL:** ``/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``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes``
 
 **Method:** ``POST``
 
@@ -217,9 +215,7 @@ Next example shows how to inject a route into the programmable RIB.
 
 Now the injected route appears in *Application Peer's* RIBs and in local speaker's Loc-RIB:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/peer/bgp:%2F%2F10.25.1.9``
-
-**RFC8040 URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F10.25.1.9?content=nonconfig``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F10.25.1.9?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -368,7 +364,7 @@ Now the injected route appears in *Application Peer's* RIBs and in local speaker
 
 -----
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -468,7 +464,7 @@ Now the injected route appears in *Application Peer's* RIBs and in local speaker
 
 This route is also advertised to the remote peer (*192.0.2.1*), hence route appears in its Adj-RIB-Out:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/peer/bgp:%2F%2F192.0.2.1/adj-rib-out/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/peer/bgp:%2F%2F192.0.2.1/adj-rib-out/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -526,7 +522,7 @@ This route is also advertised to the remote peer (*192.0.2.1*), hence route appe
 
 The injected route can be modified (i.e. different path attribute):
 
-**URL:** ``/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:** ``/rests/data/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``
 
 **Method:** ``PUT``
 
@@ -588,7 +584,7 @@ The injected route can be modified (i.e. different path attribute):
 
 The route can be removed from programmable RIB in a following way:
 
-**URL:** ``/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:** ``/rests/data/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``
 
 **Method:** ``DELETE``
 
@@ -596,7 +592,7 @@ The route can be removed from programmable RIB in a following way:
 
 Also it is possible to remove all routes from a particular table at once:
 
-**URL:** ``/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/``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-bgp-peering.rst b/docs/bgp/bgp-user-guide-bgp-peering.rst
index d61535eb54cbb141496bfa461e9a71aa1ab01287..cfef19d1bc1b3b70ebeaa1bbb37d2fa642b77dc5 100644 (file)
--- a/docs/bgp/bgp-user-guide-bgp-peering.rst
+++ b/docs/bgp/bgp-user-guide-bgp-peering.rst
@@ -8,7 +8,7 @@ The TCP connection is established between two peers and they exchange messages t
 
 Here is a sample basic neighbor configuration:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -116,9 +116,7 @@ Here is a sample basic neighbor configuration:
 Once the remote peer is connected and it advertised routes to local BGP system, routes are stored in peer's RIBs.
 The RIBs can be checked via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/peer/bgp:%2F%2F192.0.2.1``
-
-**RFC8040 URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F192.0.2.1?content=nonconfig``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example/peer=bgp%3A%2F%2F192.0.2.1?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -322,7 +320,7 @@ The RIBs can be checked via REST:
 
 Also the same route should appeared in Loc-RIB now:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -749,7 +747,7 @@ External peering configuration
 An example above provided configuration for internal peering only.
 Following configuration sample is intended for external peering:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -815,7 +813,7 @@ AS 62 will be prepended to updates that are sent to and received from R3.
 
 Following configuration sample is intended for external peering with Local AS:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -876,7 +874,7 @@ Route reflector configuration
 The local BGP speaker can be configured with a specific *cluster ID*.
 Following example adds the cluster ID to the existing speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/global/config``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/global/config``
 
 **Method:** ``PUT``
 
@@ -926,7 +924,7 @@ Following example adds the cluster ID to the existing speaker instance:
 
 Following configuration sample is intended for route reflector client peering:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -997,7 +995,7 @@ Using multiple cluster IDs allows updates to propagate to nodes that reside in a
 
 Following configuration sample is intended for route reflector client peering using specific cluster id:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -1066,7 +1064,7 @@ MD5 authentication configuration
 The OpenDaylight BGP implementation is supporting TCP MD5 for authentication.
 Sample configuration below shows how to set authentication password for a peer:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -1121,7 +1119,7 @@ Allows the creation of a peer group configuration that applies to all peers conf
 
 A sample peer group configuration follows:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/peer-groups``
 
 **Method:** ``POST``
 
@@ -1290,7 +1288,7 @@ A sample peer group configuration follows:
 
 A sample basic neighbor configuration using a peer group follows:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 

diff --git a/docs/bgp/bgp-user-guide-bgp-server.rst b/docs/bgp/bgp-user-guide-bgp-server.rst
index eb0188b8b43e3b42b0a575d812824c74c98677e7..c81f67dc49fd3562a1092a865565729a522c350c 100644 (file)
--- a/docs/bgp/bgp-user-guide-bgp-server.rst
+++ b/docs/bgp/bgp-user-guide-bgp-server.rst
@@ -9,9 +9,7 @@ One of the workarounds is to use port redirection. In case other port is desired
 
 Here is a sample of bgp port listening re-configuration:
 
-**URL:** ``/restconf/config/odl-bgp-peer-acceptor-config:bgp-peer-acceptor-config/default``
-
-**RFC8040 URL:** ``/rests/data/odl-bgp-peer-acceptor-config:bgp-peer-acceptor-config=default``
+**URL:** ``/rests/data/odl-bgp-peer-acceptor-config:bgp-peer-acceptor-config=default``
 
 **Method:** ``PUT``
 

diff --git a/docs/bgp/bgp-user-guide-evpn-family.rst b/docs/bgp/bgp-user-guide-evpn-family.rst
index 4a88771e493ba6e95296861d7cb7e63e9925dc12..26ff1f5e36a57ebb987bdc636db1f80a963eff93 100644 (file)
--- a/docs/bgp/bgp-user-guide-evpn-family.rst
+++ b/docs/bgp/bgp-user-guide-evpn-family.rst
@@ -19,9 +19,7 @@ BGP Speaker
 '''''''''''
 To enable EVPN support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -89,7 +87,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled EVPN family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -310,7 +308,7 @@ Usage
 ^^^^^
 The L2VPN EVPN table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/evpn-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=odl-bgp-evpn:l2vpn-address-family,odl-bgp-evpn:evpn-subsequent-address-family/evpn-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -414,7 +412,7 @@ There are four different types of EVPN routes, and several extended communities.
 Routes can be used for variety of use-cases supported by BGP/MPLS EVPN, PBB EVPN and NVO EVPN.
 Make sure the *Application Peer* is configured first.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib=10.25.1.9/tables=odl-bgp-evpn:l2vpn-address-family,odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes``
 
 **Method:** ``POST``
 
@@ -998,7 +996,7 @@ EVPN Routes
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes/evpn-route/evpn/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes/evpn-route/evpn/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-flowspec-family.rst b/docs/bgp/bgp-user-guide-flowspec-family.rst
index 3727cf1341cc42256ea2adfc6e7b85fb7471cfaa..1d4fe5e6b72a16e292b5a5cbf3b7f58151115a38 100644 (file)
--- a/docs/bgp/bgp-user-guide-flowspec-family.rst
+++ b/docs/bgp/bgp-user-guide-flowspec-family.rst
@@ -17,9 +17,7 @@ BGP Speaker
 '''''''''''
 To enable BGP-FS support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -105,7 +103,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled BGP-FS family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -359,7 +357,7 @@ IPv4 Flow Specification
 '''''''''''''''''''''''
 The IPv4 Flowspec table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -528,7 +526,7 @@ IPv6 Flows Specification
 ''''''''''''''''''''''''
 The IPv6 Flowspec table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv6-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv6-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -648,7 +646,7 @@ IPv4 L3VPN Flows Specification
 ''''''''''''''''''''''''''''''
 The IPv4 L3VPN Flowspec table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -734,7 +732,7 @@ IPv4 Flow Specification
 This examples show how to originate and remove IPv4 fowspec route via programmable RIB.
 Make sure the *Application Peer* is configured first.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes``
 
 **Method:** ``POST``
 
@@ -1182,7 +1180,7 @@ Make sure the *Application Peer* is configured first.
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes/bgp-flowspec:flowspec-route/flow1/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes/bgp-flowspec:flowspec-route/flow1/0``
 
 **Method:** ``DELETE``
 
@@ -1190,7 +1188,7 @@ IPv4 L3VPN Flow Specification
 '''''''''''''''''''''''''''''
 This examples show how to originate and remove IPv4 L3VPN fowspec route via programmable RIB.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes``
 
 **Method:** ``POST``
 
@@ -1273,7 +1271,7 @@ This examples show how to originate and remove IPv4 L3VPN fowspec route via prog
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes/flowspec-l3vpn-route/flow-l3vpn/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-flowspec:flowspec-l3vpn-subsequent-address-family/bgp-flowspec:flowspec-l3vpn-ipv4-routes/flowspec-l3vpn-route/flow-l3vpn/0``
 
 **Method:** ``DELETE``
 
@@ -1281,7 +1279,7 @@ IPv6 Flow Specification
 '''''''''''''''''''''''
 This examples show how to originate and remove IPv6 fowspec route via programmable RIB.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv6-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv6-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes``
 
 **Method:** ``POST``
 
@@ -1382,7 +1380,7 @@ This examples show how to originate and remove IPv6 fowspec route via programmab
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv6-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes/bgp-flowspec:flowspec-route/flow-v6/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv6-address-family,bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-ipv6-routes/bgp-flowspec:flowspec-route/flow-v6/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-graceful-restart-capability.rst b/docs/bgp/bgp-user-guide-graceful-restart-capability.rst
index 5ec6f53d33d6e7b2226d98c40f6e7f3d09da93e2..36eb74fd502cab91d0e738514b1ddf70a8c75a42 100644 (file)
--- a/docs/bgp/bgp-user-guide-graceful-restart-capability.rst
+++ b/docs/bgp/bgp-user-guide-graceful-restart-capability.rst
@@ -19,11 +19,11 @@ Graceful Restart Timer
 ''''''''''''''''''''''
 Routing information for configured families are preserved for time given by Graceful Restart timer in seconds. This can be configured in *graceful-restart* section of *neighbor* or *peer-group* configuration.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/graceful-restart``
 
 or
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/graceful-restart``
 
 **Method:** ``PUT``
 
@@ -74,11 +74,11 @@ BGP Neighbor Families Graceful Restart Configuration
 ''''''''''''''''''''''''''''''''''''''''''''''''''''
 Preserving specific family during Graceful Restart must be enabled in *graceful-restart* section of family configuration for *neighbor* or *peer-group*.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
 
 or
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
 
 **Method:** ``PUT``
 
@@ -127,7 +127,7 @@ Usage
 In case when we are invoking Graceful Restart we act as Restarting Speaker and we are additionally postponing path selection process until end-of-rib is received for all families or Selection Deferral timer expires, whichever happens first.
 To perform Graceful Restart with peer, invoke RPC:
 
-**URL:** ``/restconf/operations/bgp-peer-rpc:restart-gracefully``
+**URL:** ``/rests/operations/bgp-peer-rpc:restart-gracefully``
 
 **Method:** ``POST``
 

diff --git a/docs/bgp/bgp-user-guide-ip-unicast-family.rst b/docs/bgp/bgp-user-guide-ip-unicast-family.rst
index f1470cfcac83d27ad82ac62c15de7275d053fac0..2c8cbc00783617e1388116b2873470ee959c0bd8 100644 (file)
--- a/docs/bgp/bgp-user-guide-ip-unicast-family.rst
+++ b/docs/bgp/bgp-user-guide-ip-unicast-family.rst
@@ -19,9 +19,7 @@ BGP Speaker
 '''''''''''
 To enable IPv4 and IPv6 Unicast support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -95,7 +93,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled IPv4 and IPv6 Unicast family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/ests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -272,7 +270,7 @@ IPv4 Unicast
 ''''''''''''
 The IPv4 Unicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -337,7 +335,7 @@ IPv6 Unicast
 ''''''''''''
 The IPv6 Unicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/ipv6-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/ipv6-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -409,7 +407,7 @@ Make sure the *Application Peer* is configured first.
 
 .. note:: IPv4 Route Key must be equal to prefix.
 
-**URL:** ``/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``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes``
 
 **Method:** ``POST``
 
@@ -474,7 +472,7 @@ Make sure the *Application Peer* is configured first.
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/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:** ``/rests/data/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``
 
 **Method:** ``DELETE``
 
@@ -484,7 +482,7 @@ This examples show how to originate and remove IPv6 route via programmable RIB:
 
 .. note:: IPv6 Route Key must be equal to prefix.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv6-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv6-address-family,bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes``
 
 **Method:** ``POST``
 
@@ -549,7 +547,7 @@ This examples show how to originate and remove IPv6 route via programmable RIB:
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv6-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes/ipv6-route/2001:db8:30::3%2F128/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv6-address-family,bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes/ipv6-route/2001:db8:30::3%2F128/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-l3vpn-family.rst b/docs/bgp/bgp-user-guide-l3vpn-family.rst
index 8d32dbf503ca67a1fcb99be169dc5f1cb25c2c50..82ac8738651239ab17159b4171e4813fe17ac349 100644 (file)
--- a/docs/bgp/bgp-user-guide-l3vpn-family.rst
+++ b/docs/bgp/bgp-user-guide-l3vpn-family.rst
@@ -17,9 +17,7 @@ BGP Speaker
 '''''''''''
 To enable IPv4 and IPv6 L3VPN support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -105,7 +103,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled IPv4 and IPv6 L3VPN family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -222,7 +220,7 @@ IPv4 L3VPN Unicast
 ''''''''''''''''''
 The IPv4 L3VPN Unicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -307,7 +305,7 @@ IPv6 L3VPN Unicast
 ''''''''''''''''''
 The IPv6 L3VPN Unicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv6-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv6:vpn-ipv6-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv6-address-family,bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv6:vpn-ipv6-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -392,7 +390,7 @@ IPv4 L3VPN Multicast
 ''''''''''''''''''''
 The IPv4 L3VPN Multicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-types:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -475,7 +473,7 @@ IPv6 L3VPN Multicast
 ''''''''''''''''''''
 The IPv4 L3VPN Multicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv6-address-family/bgp-types:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv6-address-family,bgp-types:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -559,7 +557,7 @@ Programming
 This examples show how to originate and remove IPv4 L3VPN Unicast route via programmable RIB.
 Make sure the *Application Peer* is configured first.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes``
 
 **Method:** ``POST``
 
@@ -644,7 +642,7 @@ Make sure the *Application Peer* is configured first.
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes/vpn-route/vpn1/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes/vpn-route/vpn1/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-labeled-family.rst b/docs/bgp/bgp-user-guide-labeled-family.rst
index f140b4f164cf04ec540b85ff66411b1a40ec9afb..4e629b70d6819538b9335e0d2bdd544ef9c6ea11 100644 (file)
--- a/docs/bgp/bgp-user-guide-labeled-family.rst
+++ b/docs/bgp/bgp-user-guide-labeled-family.rst
@@ -19,9 +19,7 @@ BGP Speaker
 '''''''''''
 To enable IPv4 and IPv6 Labeled Unicast support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -95,7 +93,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled IPv4 and IPv6 Labeled Unicast family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -186,7 +184,7 @@ Usage
 ^^^^^
 The IPv4 Labeled Unicast table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-labeled-unicast:labeled-unicast-subsequent-address-family/bgp-labeled-unicast:labeled-unicast-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-labeled-unicast:labeled-unicast-subsequent-address-family/bgp-labeled-unicast:labeled-unicast-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -258,7 +256,7 @@ IPv4 Labeled
 This examples show how to originate and remove IPv4 labeled route via programmable RIB.
 Make sure the *Application Peer* is configured first.
 
-**URL:** ``/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:** ``/rests/data/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``
 
 **Method:** ``POST``
 
@@ -371,7 +369,7 @@ In addition, BGP-LU Spring extension allows to attach BGP Prefix SID attribute t
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/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/bgp-labeled-unicast:labeled-unicast-route/label1/0``
+**URL:** ``/rests/data/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/bgp-labeled-unicast:labeled-unicast-route/label1/0``
 
 **Method:** ``DELETE``
 
@@ -379,7 +377,7 @@ IPv6 Labeled
 ''''''''''''
 This examples show how to originate and remove IPv6 labeled route via programmable RIB.
 
-**URL:** ``/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-ipv6-routes``
+**URL:** ``/rests/data/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-ipv6-routes``
 
 **Method:** ``POST``
 
@@ -452,7 +450,7 @@ This examples show how to originate and remove IPv6 labeled route via programmab
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/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-ipv6-routes/bgp-labeled-unicast:labeled-unicast-route/label1/0``
+**URL:** ``/rests/data/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-ipv6-routes/bgp-labeled-unicast:labeled-unicast-route/label1/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-linkstate-family.rst b/docs/bgp/bgp-user-guide-linkstate-family.rst
index 630ee48aa5bb5fba1bc49443072c7ef65d05ff6d..a4edeb0179e63203a000733351b6623bbe8ef6e0 100644 (file)
--- a/docs/bgp/bgp-user-guide-linkstate-family.rst
+++ b/docs/bgp/bgp-user-guide-linkstate-family.rst
@@ -20,9 +20,7 @@ BGP Speaker
 '''''''''''
 To enable BGP-LS support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -108,7 +106,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled BGP-LS family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -585,7 +583,7 @@ Usage
 ^^^^^
 The Link-State table in a instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-linkstate:linkstate-address-family/bgp-linkstate:linkstate-subsequent-address-family/linkstate-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-linkstate:linkstate-address-family,bgp-linkstate:linkstate-subsequent-address-family/linkstate-routes?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst b/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
index 0f3710b6d7236c80ed02701e187d41b941b9d6f6..c5b42b005ce8f1f94f30f5753aab7ff5f026f8a9 100644 (file)
--- a/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
+++ b/docs/bgp/bgp-user-guide-long-lived-graceful-restart-capability.rst
@@ -14,11 +14,11 @@ Configuration
 ^^^^^^^^^^^^^
 Long-Live Graceful Restart is enabled and configured per family in *ll-graceful-restart* section of *neighbor* or *peer-group* family configuration.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
 
 or
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbors/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST/graceful-restart``
 
 **Method:** ``PUT``
 

diff --git a/docs/bgp/bgp-user-guide-mvpn-family.rst b/docs/bgp/bgp-user-guide-mvpn-family.rst
index a51815f0cb062e2333a9254f7995606b32eee56e..7d5dc7e4e509a99cd074b38e9421068f6e62d826 100644 (file)
--- a/docs/bgp/bgp-user-guide-mvpn-family.rst
+++ b/docs/bgp/bgp-user-guide-mvpn-family.rst
@@ -19,9 +19,7 @@ BGP Speaker
 '''''''''''
 To enable MCAST-VPN support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -95,7 +93,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled IPV4 MCAST-VPN family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -296,7 +294,7 @@ Usage
 ^^^^^
 The Ipv4 Multicast VPN table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -357,7 +355,7 @@ The Ipv4 Multicast VPN table in an instance of the speaker's Loc-RIB can be veri
 
 The Ipv6 Multicast VPN table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -423,7 +421,7 @@ There are seven different types of MCAST-VPN routes, and multiples extended comm
 Routes can be used for variety of use-cases supported by BGP/MPLS MCAST-VPN.
 Make sure the *Application Peer* is configured first.
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes``
 
 **Method:** ``POST``
 
@@ -987,7 +985,7 @@ Make sure the *Application Peer* is configured first.
 
 To remove the route added above, following request can be used:
 
-**URL:** ``/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes/mvpn-route/mvpn/0``
+**URL:** ``/rests/data/bgp-rib:application-rib/10.25.1.9/tables=bgp-types:ipv4-address-family,bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes/mvpn-route/mvpn/0``
 
 **Method:** ``DELETE``
 

diff --git a/docs/bgp/bgp-user-guide-operational-state.rst b/docs/bgp/bgp-user-guide-operational-state.rst
index ff8b97950634ec97605da2e11832ef0608af0172..cf1be447eaa87cf45a55201f3d878a788293e3a7 100644 (file)
--- a/docs/bgp/bgp-user-guide-operational-state.rst
+++ b/docs/bgp/bgp-user-guide-operational-state.rst
@@ -13,9 +13,7 @@ The following APIs describe what is available starting with how to change the de
 Operational State Configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/config/bgp-state-config:bgp-state-config``
-
-**RFC8040 URL:** ``/rests/data/bgp-state-config:bgp-state-config``
+**URL:** ``/rests/data/bgp-state-config:bgp-state-config``
 
 **Method:** ``PUT``
 
@@ -62,7 +60,7 @@ Operational State Configuration
 BGP RIB Operational State
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/global/state``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/global/state?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -123,7 +121,7 @@ BGP RIB Operational State
 BGP RIB Families Operational State
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/global/afi-safis``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/global/afi-safis?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -201,7 +199,7 @@ BGP RIB Families Operational State
 BGP Neighbors Operational State
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -260,7 +258,7 @@ BGP Neighbor Operational State
 
 .. note:: Supported Capabilities only provided when session has been established.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/127.0.0.2/state``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/127.0.0.2/state?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -349,7 +347,7 @@ BGP Neighbor Operational State
 BGP Neighbor Families Operational State
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -482,7 +480,7 @@ BGP Neighbor Family Operational State
 
 .. note:: Prefixes state is only provided once session is established.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi/openconfig-bgp-types:IPV4%2DUNICAST``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/afi-safis/afi-safi=openconfig-bgp-types:IPV4%2DUNICAST?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -579,7 +577,7 @@ BGP Neighbor Timers Operational State
 
 .. note:: State is only provided once session is established.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/timers``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/timers?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -634,7 +632,7 @@ BGP Neighbor Transport Operational State
 
 .. note:: State is only provided once session is established.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/transport``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/transport?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -696,7 +694,7 @@ BGP Neighbor Error Handling Operational State
 .. note:: State is only provided once session is established.
 .. note:: Error handling not supported yet. Planned for Carbon.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/error-handling``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/error-handling?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -747,7 +745,7 @@ BGP Neighbor Graceful Restart Operational State
 
 .. note:: Graceful Restart not supported yet. Planned for Carbon.
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/graceful-restart``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/graceful-restart?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -816,7 +814,7 @@ BGP Neighbor Graceful Restart Operational State
 BGP Peer Groups Operational State
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**URL:** ``/restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/peer-groups``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/peer-groups?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-protocol-configuration.rst b/docs/bgp/bgp-user-guide-protocol-configuration.rst
index 4c0949b20cbbae6a64d677dfc3700d16bcabf80d..0bd4125bf91ed94b02f7fb796374a41916207c7a 100644 (file)
--- a/docs/bgp/bgp-user-guide-protocol-configuration.rst
+++ b/docs/bgp/bgp-user-guide-protocol-configuration.rst
@@ -7,9 +7,7 @@ It is a very basic configuration conforming with RFC4271.
 
 .. note:: RIB policy must already be configured and present before configuring the protocol.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
-
-**RFC8040 URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/protocols``
 
 **Method:** ``POST``
 
@@ -111,9 +109,7 @@ It is a very basic configuration conforming with RFC4271.
 
 The new instance presence can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example``
-
-**RFC8040 URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example?content=nonconfig``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib=bgp-example?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-revised-error-handling.rst b/docs/bgp/bgp-user-guide-revised-error-handling.rst
index 3524f7600493d03ca868122802c5d303620ee3c5..94603233a6de1dc26f67da1af9fb4b216b6d78e4 100644 (file)
--- a/docs/bgp/bgp-user-guide-revised-error-handling.rst
+++ b/docs/bgp/bgp-user-guide-revised-error-handling.rst
@@ -14,11 +14,11 @@ Configuration
 
 For *neighbor* configuration:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/error-handling``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors/neighbor/192.0.2.1/error-handling``
 
 For *peer-group* configuration:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbor/error-handling``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/peer-groups/peer-group/external-neighbor/error-handling``
 
 **Method:** ``PUT``
 

diff --git a/docs/bgp/bgp-user-guide-rib-config-policies.rst b/docs/bgp/bgp-user-guide-rib-config-policies.rst
index 6a70e6da9a415a255f343ce33ccbad82b343976a..0e6e4c4205e772ed97ba40d72166f4b58d050a9b 100644 (file)
--- a/docs/bgp/bgp-user-guide-rib-config-policies.rst
+++ b/docs/bgp/bgp-user-guide-rib-config-policies.rst
@@ -7,9 +7,7 @@ The OpenDaylight BGP implementation supports configurable RIB policies that allo
 
 .. note:: Default ODL BGP RIB Config Policy is provided. Default policy is compliant with default behaviour from `RFC8212 <https://tools.ietf.org/html/rfc8212>`_. Any config policy to be used by Protocol must be configured and present before than Protocol configuration is added. If policy is reconfigured, protocol must be re configured again.
 
-**URL:** ``/restconf/config/openconfig-routing-policy:routing-policy``
-
-**RFC8040 URL:** ``/rests/data/openconfig-routing-policy:routing-policy?content=config``
+**URL:** ``/rests/data/openconfig-routing-policy:routing-policy?content=config``
 
 **Method:** ``GET``
 
@@ -125,9 +123,7 @@ Policy Configuration
 
 Conditions may include multiple match or comparison operations; similarly, actions may consist of a multitude of changes to route attributes or a final disposition regarding the acceptance or rejection of the route.
 
-**URL:** ``/restconf/config/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions/``
-
-**RFC8040 URL:** ``/rests/data/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions``
+**URL:** ``/rests/data/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions``
 
 **Method:** ``POST``
 
@@ -223,9 +219,7 @@ Conditions may include multiple match or comparison operations; similarly, actio
 
 The new instance presence can be verified via REST:
 
-**URL:** ``/restconf/config/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions/policy-definition/odl-policy-example``
-
-**RFC8040 URL:** ``/rests/data/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions/policy-definition=odl-policy-example``
+**URL:** ``/rests/data/openconfig-routing-policy:routing-policy/openconfig-routing-policy:policy-definitions/policy-definition=odl-policy-example``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-route-refresh-capability.rst b/docs/bgp/bgp-user-guide-route-refresh-capability.rst
index bd7c31cf904ef55c99874f668ce4e55fd78b4e22..e425fca7746a7860dcc534527c3ba293060cfb74 100644 (file)
--- a/docs/bgp/bgp-user-guide-route-refresh-capability.rst
+++ b/docs/bgp/bgp-user-guide-route-refresh-capability.rst
@@ -17,9 +17,7 @@ Usage
 ^^^^^
 To send a Route Refresh request from OpenDaylight BGP speaker instance to its neighbor, invoke RPC:
 
-**URL:** ``/restconf/operations/bgp-peer-rpc:route-refresh-request``
-
-**RFC8040 URL:** ``/rests/data/bgp-peer-rpc:route-refresh-request?content=non-config``
+**URL:** ``/rests/data/bgp-peer-rpc:route-refresh-request``
 
 **Method:** ``POST``
 
@@ -76,9 +74,7 @@ Usage
 ^^^^^
 To release neighbor session, invoke RPC:
 
-**URL:** ``/restconf/operations/bgp-peer-rpc:reset-session``
-
-**RFC8040 URL:** ``/rests/data/bgp-peer-rpc:reset-session?content=non-config``
+**URL:** ``/rests/data/bgp-peer-rpc:reset-session``
 
 **Method:** ``POST``
 

diff --git a/docs/bgp/bgp-user-guide-route-target-family.rst b/docs/bgp/bgp-user-guide-route-target-family.rst
index 419ed1aa229642d03cf0d0096bb6cb9ee27a26b4..d6a2efa294ed401d6ae66dcbea8e7498950a12a0 100644 (file)
--- a/docs/bgp/bgp-user-guide-route-target-family.rst
+++ b/docs/bgp/bgp-user-guide-route-target-family.rst
@@ -17,7 +17,7 @@ BGP Speaker
 '''''''''''
 To enable ROUTE-TARGET-CONSTRAIN support in BGP plugin, first configure BGP speaker instance:
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols``
 
 **Method:** ``POST``
 
@@ -85,7 +85,7 @@ BGP Peer
 ''''''''
 Here is an example for BGP peer configuration with enabled ROUTE-TARGET-CONSTRAIN family.
 
-**URL:** ``/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
+**URL:** ``/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types:BGP/bgp-example/bgp/neighbors``
 
 **Method:** ``POST``
 
@@ -162,7 +162,7 @@ Usage
 ^^^^^
 The ROUTE TARGET CONSTRAIN table in an instance of the speaker's Loc-RIB can be verified via REST:
 
-**URL:** ``/restconf/operational/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes``
+**URL:** ``/rests/data/bgp-rib:bgp-rib/rib/bgp-example/loc-rib/tables=bgp-types:ipv4-address-family,bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-running-bgp.rst b/docs/bgp/bgp-user-guide-running-bgp.rst
index 9ed13bdc9cc3804fefbc3211ea90e9a97f40f599..546bb0f455a39f29273f24cf36cc01fa5be8620c 100644 (file)
--- a/docs/bgp/bgp-user-guide-running-bgp.rst
+++ b/docs/bgp/bgp-user-guide-running-bgp.rst
@@ -15,9 +15,7 @@ This section explains how to install BGP plugin.
 2. The BGP plugin contains a default configuration, which is applied after the feature starts up.
    One instance of BGP plugin is created (named *example-bgp-rib*), and its presence can be verified via REST:
 
-   **URL:** ``/restconf/operational/bgp-rib:bgp-rib``
-
-   **RFC8040 URL:** ``/rests/data/bgp-rib:bgp-rib?content=non-config``
+   **URL:** ``/rests/data/bgp-rib:bgp-rib?content=non-config``
 
    **Method:** ``GET``
 

diff --git a/docs/bgp/bgp-user-guide-test-tools.rst b/docs/bgp/bgp-user-guide-test-tools.rst
index a476239adb41422f449d9092fe0e2c839da744a1..5be6c88b04d36549bdd17a1ba93070f3c8164d44 100644 (file)
--- a/docs/bgp/bgp-user-guide-test-tools.rst
+++ b/docs/bgp/bgp-user-guide-test-tools.rst
@@ -68,9 +68,7 @@ Configuration
 As a first step install BGP and RESTCONF, then configure *Application Peer*.
 Install ``odl-bgpcep-bgp-benchmark`` feature and reconfigure BGP Application Peer Benchmark application as per following:
 
-**URL:** ``/restconf/config/odl-bgp-app-peer-benchmark-config:config``
-
-**RFC8040 URL:** ``/rests/data/odl-bgp-app-peer-benchmark-config:config``
+**URL:** ``/rests/data/odl-bgp-app-peer-benchmark-config:config``
 
 **Method:** ``PUT``
 
@@ -114,9 +112,7 @@ Inject routes
 '''''''''''''
 Routes injection can be invoked via RPC:
 
-**URL:** ``/restconf/operations/odl-bgp-app-peer-benchmark:add-prefix``
-
-**RFC8040 URL:** ``/rests/operations/odl-bgp-app-peer-benchmark:add-prefix``
+**URL:** ``/rests/operations/odl-bgp-app-peer-benchmark:add-prefix``
 
 **Method:** ``POST``
 
@@ -220,9 +216,7 @@ Remove routes
 '''''''''''''
 Routes deletion can be invoked via RPC:
 
-**URL:** ``/restconf/operations/odl-bgp-app-peer-benchmark:delete-prefix``
-
-**RFC8040 URL:** ``/rests/operations/odl-bgp-app-peer-benchmark:delete-prefix``
+**URL:** ``/rests/operations/odl-bgp-app-peer-benchmark:delete-prefix``
 
 **Method:** ``POST``
 

diff --git a/docs/bgp/bgp-user-guide-topology-provider.rst b/docs/bgp/bgp-user-guide-topology-provider.rst
index e4110cca9b5cee54ae94d030135ca5580995edc2..4b738f7017f058f3191d6a0cbd174d964d633e16 100644 (file)
--- a/docs/bgp/bgp-user-guide-topology-provider.rst
+++ b/docs/bgp/bgp-user-guide-topology-provider.rst
@@ -19,9 +19,7 @@ Configuration
 '''''''''''''
 Following example shows how to create a new instance of IPv4 BGP topology exporter:
 
-**URL:** ``/restconf/config/network-topology:network-topology``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology``
+**URL:** ``/rests/data/network-topology:network-topology``
 
 **Method:** ``POST``
 
@@ -83,9 +81,7 @@ Following example shows how to create a new instance of IPv4 BGP topology export
 
 The topology exporter instance can be removed in a following way:
 
-**URL:** ``/restconf/config/network-topology:network-topology/topology/bgp-example-ipv4-topology``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology/topology=bgp-example-ipv4-topology``
+**URL:** ``/rests/data/network-topology:network-topology/topology=bgp-example-ipv4-topology``
 
 **Method:** ``DELETE``
 
@@ -93,9 +89,7 @@ The topology exporter instance can be removed in a following way:
 
 Following example shows how to create a new instance of IPv6 BGP topology exporter:
 
-**URL:** ``/restconf/config/network-topology:network-topology``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology``
+**URL:** ``/rests/data/network-topology:network-topology``
 
 **Method:** ``POST``
 
@@ -141,9 +135,7 @@ Usage
 '''''
 Operational state of the topology can be verified via REST:
 
-**URL:** ``/restconf/operational/network-topology:network-topology/topology/bgp-example-ipv4-topology``
-
-**RFC8040 URL:**: ``/rests/data/network-topology:network-topology/topology=bgp-example-ipv4-topology?content=nonconfig``
+**URL:**: ``/rests/data/network-topology:network-topology/topology=bgp-example-ipv4-topology?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -221,9 +213,7 @@ Configuration
 '''''''''''''
 Following example shows how to create a new instance of linkstate BGP topology exporter:
 
-**URL:** ``/restconf/config/network-topology:network-topology``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology``
+**URL:** ``/rests/data/network-topology:network-topology``
 
 **Method:** ``POST``
 
@@ -270,9 +260,7 @@ Usage
 Operational state of the topology can be verified via REST.
 A sample output below represents a two node topology with two unidirectional links interconnecting those nodes.
 
-**URL:** ``/restconf/operational/network-topology:network-topology/topology/bgp-example-linkstate-topology``
-
-**RFC8040 URL:**: ``/rests/data/network-topology:network-topology/topology=bgp-example-linkstate-topology?content=nonconfig``
+**URL:**: ``/rests/data/network-topology:network-topology/topology=bgp-example-linkstate-topology?content=nonconfig``
 
 **Method:** ``GET``
 

diff --git a/docs/bmp/bgp-monitoring-protocol-user-guide-config-concepts.rst b/docs/bmp/bgp-monitoring-protocol-user-guide-config-concepts.rst
index ce75583b33874cf8c10066b46b0501abbf335ca8..d31c6a2206617c77f53da238b3aea6f2ea948901 100644 (file)
--- a/docs/bmp/bgp-monitoring-protocol-user-guide-config-concepts.rst
+++ b/docs/bmp/bgp-monitoring-protocol-user-guide-config-concepts.rst
@@ -19,7 +19,7 @@ Monitoring station configuration
 ''''''''''''''''''''''''''''''''
 In order to change default's BMP monitoring station configuration, use following request.
 
-**URL:** ``/restconf/config/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
+**URL:** ``/rests/data/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
 
 **Method:** ``PUT``
 
@@ -49,7 +49,7 @@ Active mode configuration
 '''''''''''''''''''''''''
 In order to enable active connection, use following request.
 
-**URL:** ``/restconf/config/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
+**URL:** ``/rests/data/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
 
 **Method:** ``PUT``
 
@@ -86,7 +86,7 @@ MD5 authentication configuration
 ''''''''''''''''''''''''''''''''
 In order to enable active connection, use following request.
 
-**URL:** ``/restconf/config/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
+**URL:** ``/rests/data/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
 
 **Method:** ``PUT``
 
@@ -291,7 +291,7 @@ Operations
 The BMP plugin offers view of collected routes and statistical information from monitored peers.
 To get top-level view of monitoring station:
 
-**URL:** ``/restconf/operational/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor``
+**URL:** ``/rests/data/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -403,7 +403,7 @@ To get top-level view of monitoring station:
 -----
 
 * To view collected information from particular monitored router:
-      **URL:** ``/restconf/operational/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor/router/10.10.10.10``
+      **URL:** ``/rests/data/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor/router/10.10.10.10?content=nonconfig``
 
 * To view collected information from particular monitored peer:
-      **URL:** ``/restconf/operational/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor/router/10.10.10.10/peer/20.20.20.20``
+      **URL:** ``/rests/data/bmp-monitor:bmp-monitor/monitor/example-bmp-monitor/router/10.10.10.10/peer/20.20.20.20?content=nonconfig``

diff --git a/docs/bmp/bgp-monitoring-protocol-user-guide-running-bmp.rst b/docs/bmp/bgp-monitoring-protocol-user-guide-running-bmp.rst
index 3e58d26ddcfe99856d266b7305d7d80a91946b1d..c01af1b078d942d0ae42f64ccad61afe61b98118 100644 (file)
--- a/docs/bmp/bgp-monitoring-protocol-user-guide-running-bmp.rst
+++ b/docs/bmp/bgp-monitoring-protocol-user-guide-running-bmp.rst
@@ -15,7 +15,7 @@ This section explains how to install BMP plugin.
 2. The BMP plugin contains a default configuration, which is applied after the feature starts up.
    One instance of BMP monitoring station is created (named *example-bmp-monitor*), and its presence can be verified via REST:
 
-   **URL:** ``/restconf/config/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor``
+   **URL:** ``/rests/data/odl-bmp-monitor-config:odl-bmp-monitors/bmp-monitor-config/example-bmp-monitor?content=config``
 
    **Method:** ``GET``
 

diff --git a/docs/graph/graph-user-guide-manage-graph.rst b/docs/graph/graph-user-guide-manage-graph.rst
index e90fc6bcd27796ac4b0460735355c0c57333ae2f..dbbf38357228e516b371cac2a42235ea9d1a831b 100644 (file)
--- a/docs/graph/graph-user-guide-manage-graph.rst
+++ b/docs/graph/graph-user-guide-manage-graph.rst
@@ -28,9 +28,9 @@ associated to the Connected Graph in the OpenDaylight operational Data Store.
 
 In fact, two graphs are stored in the Data Store:
 
-* Operational Graph in ``restconf/operational`` which is the graph
+* Operational Graph in ``/rests/data/...?content=nonconfig`` which is the graph
   associated with the Connected Graph stored in memory
-* Configuration Graph in ``restconf/config`` which is the graph that
+* Configuration Graph in ``/rests/data/...?content=config`` which is the graph that
   could be create / modify / delete in order to produce the Connected
   Graph and thus, the associated Graph stored in operational Data Store
 
@@ -89,7 +89,7 @@ through the ``graph:graph-topology`` namespace as follow:
 
 -----
 
-**URL:** ``restconf/operational/graph:graph-topology``
+**URL:** ``rests/data/graph:graph-topology?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -126,7 +126,7 @@ API with the same namespace as follow:
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology``
+**URL:** ``rests/data/graph:graph-topology?content=config``
 
 **Method:** ``GET``
 
@@ -167,7 +167,7 @@ Data Store. This includes all modification and associated Connected Graphs.
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology``
+**URL:** ``rests/data/graph:graph-topology``
 
 **Method:** ``PUT``
 
@@ -243,7 +243,7 @@ Removing a graph used the DELETE method as follow:
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example``
+**URL:** ``rests/data/graph:graph-topology/graph/example``
 
 **Method:** ``DELETE``
 
@@ -258,7 +258,7 @@ it will be automatically created. Only POST method must be used.
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example``
+**URL:** ``rests/data/graph:graph-topology/graph/example``
 
 **Method:** ``POST``
 
@@ -286,7 +286,7 @@ Removing a vertex used the DELETE method as follow:
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example/vertex/10``
+**URL:** ``rests/data/graph:graph-topology/graph/example/vertex/10``
 
 **Method:** ``DELETE``
 
@@ -301,7 +301,7 @@ it will be automatically created. Only POST method must be used.
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example``
+**URL:** ``rests/data/graph:graph-topology/graph/example``
 
 **Method:** ``POST``
 
@@ -336,7 +336,7 @@ Removing an edge used the DELETE method as follow:
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example/edge/10``
+**URL:** ``rests/data/graph:graph-topology/graph/example/edge/10``
 
 **Method:** ``DELETE``
 
@@ -351,7 +351,7 @@ it will be automatically created. Only POST method must be used.
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example``
+**URL:** ``rests/data/graph:graph-topology/graph/example``
 
 **Method:** ``POST``
 
@@ -378,7 +378,7 @@ Removing a prefix used the DELETE method as follow:
 
 -----
 
-**URL:** ``restconf/config/graph:graph-topology/graph/example/prefix/192%2e168%2e1%2e0%2f24``
+**URL:** ``rests/data/graph:graph-topology/graph/example/prefix/192%2e168%2e1%2e0%2f24``
 
 **Method:** ``DELETE``
 

diff --git a/docs/graph/graph-user-guide-running-graph.rst b/docs/graph/graph-user-guide-running-graph.rst
index bf78bfb7b3237813793953c2e0d4d5ea7920b159..287e80e8d7616caa183f2d3907f61aff29de7e01 100644 (file)
--- a/docs/graph/graph-user-guide-running-graph.rst
+++ b/docs/graph/graph-user-guide-running-graph.rst
@@ -16,7 +16,7 @@ This section explains how to install Graph plugin.
    after the feature starts up. One instance of Graph plugin is created
    (named *graph-topology*), and its presence can be verified via REST:
 
-   **URL:** ``restconf/config/graph:graph-topology``
+   **URL:** ``rests/data/graph:graph-topology?content=config``
 
    **Method:** ``GET``
 
@@ -29,7 +29,7 @@ This section explains how to install Graph plugin.
    It is also posible to access to the operational graph topology which is
    also empty by default via REST:
 
-   **URL:** ``restconf/operational/graph:graph-topology``
+   **URL:** ``rests/data/graph:graph-topology?content=nonconfig``
 
    **Method:** ``GET``
 

diff --git a/docs/pcep-developer-guide.rst b/docs/pcep-developer-guide.rst
index 9b3d852dcaf3e0dad5878f813796561a66d44e35..2dd21d7d83943b1a7daf2736bb2a44234608a6e9 100644 (file)
--- a/docs/pcep-developer-guide.rst
+++ b/docs/pcep-developer-guide.rst
@@ -259,7 +259,7 @@ PCEP Topology
 PCEP data is displayed only through one URL that is accessible from the
 base network-topology URL:
 
-*http://localhost:8181/restconf/operational/network-topology:network-topology/topology/pcep-topology*
+*http://localhost:8181/rests/data/network-topology:network-topology/topology/pcep-topology?content=nonconfig*
 
 Each PCC will be displayed as a node:
 

diff --git a/docs/pcep/pcep-user-guide-active-stateful-pce.rst b/docs/pcep/pcep-user-guide-active-stateful-pce.rst
index 75007f865564cce0a6265d5c8bfd7debfeafaf69..19ee932eff8cacebee89f80c4319f3ea8ac37807 100644 (file)
--- a/docs/pcep/pcep-user-guide-active-stateful-pce.rst
+++ b/docs/pcep/pcep-user-guide-active-stateful-pce.rst
@@ -21,9 +21,7 @@ TLV that may be included in the OPEN Object when a PCEP speaker
 wishes to determine if state synchronization can be skipped when a
 PCEP session is restarted.
 
-**URL:** ``/restconf/config/network-topology:network-topology/topology/pcep-topology/node/43.43.43.43``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=43.43.43.43``
+**URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=43.43.43.43``
 
 **Method:** ``PUT``
 
@@ -78,9 +76,7 @@ MD5 authentication configuration
 The OpenDaylight PCEP implementation supports TCP MD5 for authentication.
 The sample configuration below shows how to set authentication password for a particular PCC.
 
-**URL:** ``/restconf/config/network-topology:network-topology/topology/pcep-topology/node/43.43.43.43``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=43.43.43.43``
+**URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=43.43.43.43``
 
 **Method:** ``PUT``
 
@@ -473,9 +469,7 @@ The LSP-DB is accessible via RESTCONF.
 The PCC's LSPs are stored in the ``pcep-topology`` while the session is active.
 In a next example, there is one PCEP session with PCC identified by its IP address (*43.43.43.43*) and one reported LSP (*foo*).
 
-**URL:** ``/restconf/operational/network-topology:network-topology/topology/pcep-topology/node/pcc:%2F%2F43.43.43.43``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=pcc%3A%2F%2F43.43.43.43``
+**URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=pcc%3A%2F%2F43.43.43.43``
 
 **Method:** ``GET``
 
@@ -717,9 +711,7 @@ The LSP control is delegated to at most one PCE at the same time.
 
 Following RPC example illustrates a request for the LSP delegation give up:
 
-**URL:** ``/restconf/operations/network-topology-pcep:update-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:update-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:update-lsp``
 
 **Method:** ``POST``
 
@@ -813,9 +805,7 @@ The LSP update is done in *make-before-break* fashion - first, new LSP is initia
 
 Following RPC example shows a request for the LSP update:
 
-**URL:** ``/restconf/operations/network-topology-pcep:update-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:update-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:update-lsp``
 
 **Method:** ``POST``
 
@@ -954,9 +944,7 @@ PCE-initiated LSPs are identified by *Create* flag.
 
 Following RPC example shows a request for the LSP initiation:
 
-**URL:** ``/restconf/operations/network-topology-pcep:add-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:add-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:add-lsp``
 
 **Method:** ``POST``
 
@@ -1093,9 +1081,7 @@ The PCE must be delegation holder for this particular LSP.
 
 Following RPC example shows a request for the LSP deletion:
 
-**URL:** ``/restconf/operations/network-topology-pcep:remove-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:remove-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:remove-lsp``
 
 **Method:** ``POST``
 
@@ -1160,9 +1146,7 @@ The PCE may ask for a delegation of the orphan LSP.
 
 Following RPC example illustrates a request for the LSP delegation:
 
-**URL:** ``/restconf/operations/network-topology-pcep:update-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:update-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:update-lsp``
 
 **Method:** ``POST``
 
@@ -1251,9 +1235,7 @@ Configuration
 '''''''''''''
 This capability is enabled by default. In order to disable it, a configuration should be changed as follows:
 
-**URL:** ``/restconf/config/pcep-segment-routing-app-config:pcep-segment-routing-app-config``
-
-**RFC8040 URL:** ``/rests/data/pcep-segment-routing-app-config:pcep-segment-routing-app-config``
+**URL:** ``/rests/data/pcep-segment-routing-app-config:pcep-segment-routing-app-config``
 
 **Method:** ``PUT``
 
@@ -1299,9 +1281,7 @@ IANA code points
 In PCEP-SR draft version 6, SR Explicit Route Object/Record Route Object subobjects IANA code points change was proposed.
 In order to use the latest code points, a configuration should be changed as follows:
 
-**URL:** ``/restconf/config/pcep-segment-routing-app-config:pcep-segment-routing-config``
-
-**RFC8040 URL:** ``/rests/data/pcep-segment-routing-app-config:pcep-segment-routing-config``
+**URL:** ``/rests/data/pcep-segment-routing-app-config:pcep-segment-routing-config``
 
 **Method:** ``PUT``
 
@@ -1368,9 +1348,7 @@ The PCEP SR extension defines new ERO subobject - *SR-ERO subobject* capable of
 
 Following RPC example illustrates a request for the SR-TE LSP creation:
 
-**URL:** ``/restconf/operations/network-topology-pcep:add-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:add-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:add-lsp``
 
 **Method:** ``POST``
 
@@ -1478,9 +1456,7 @@ Following RPC example illustrates a request for the SR-TE LSP creation:
 
 Following RPC example illustrates a request for the SR-TE LSP update including modified path:
 
-**URL:** ``/restconf/operations/network-topology-pcep:update-lsp``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:update-lsp``
+**URL:** ``/rests/operations/network-topology-pcep:update-lsp``
 
 **Method:** ``POST``
 
@@ -1617,9 +1593,7 @@ The PCE-triggered Initial Synchronization procedure is intended to do let PCE co
 
 Following RPC example illustrates a request for the initial synchronization:
 
-**URL:** ``/restconf/operations/network-topology-pcep:trigger-sync``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:trigger-sync``
+**URL:** ``/rests/operations/network-topology-pcep:trigger-sync``
 
 **Method:** ``POST``
 
@@ -1669,9 +1643,7 @@ The PCE-triggered Re-synchronization: To let PCE re-synchronize the state for sa
 
 Following RPC example illustrates a request for the LSP re-synchronization:
 
-**URL:** ``/restconf/operations/network-topology-pcep:trigger-sync``
-
-**RFC8040 URL:** ``/rests/operations/network-topology-pcep:trigger-sync``
+**URL:** ``/rests/operations/network-topology-pcep:trigger-sync``
 
 **Method:** ``POST``
 

diff --git a/docs/pcep/pcep-user-guide-pce-server.rst b/docs/pcep/pcep-user-guide-pce-server.rst
index ad3f3e704294ef746d2f8def92e6a86ef4ce3a82..9b62f8a73d34951c8cc849e2cffa9b97fb29c84b 100644 (file)
--- a/docs/pcep/pcep-user-guide-pce-server.rst
+++ b/docs/pcep/pcep-user-guide-pce-server.rst
@@ -41,7 +41,7 @@ Create a new graph with the Rest API ``Create Graph``:
 
 .. code-block:: console
 
-    PUT: restconf/config/graph:graph-topology
+    PUT: rests/data/graph:graph-topology
 
 Refer to Graph documentation for details.
 
@@ -71,7 +71,7 @@ Once done, verify that the graph is correctly fulfil with the Rest API:
 
 .. code-block:: console
 
-    GET: restconf/operational/graph:graph-topology
+    GET: rests/data/graph:graph-topology?content=nonconfig
 
 Basic Usage
 ^^^^^^^^^^^
@@ -92,7 +92,7 @@ With PcInitiate message, just use the PCEP Rest API to setup an LSP
 
 .. code-block:: console
 
-    POST: /restconf/operations/network-topology-pcep:add-lsp
+    POST: /rests/data/network-topology-pcep:add-lsp
 
 by omitting the ERO Object. Indeed, an automatic call to the Path Computation
 Algorithm will be triggered when the ERO is absent or empty with the given
@@ -208,12 +208,12 @@ Get PCE tunnels
 
 Tunnels are stored in configuration Data Store and are accesible through the
 ``network-topology:network-topology/topology=pcep-topology`` namespace in both
-operational (with ``?content=nonconfig``) and onfiguration (with
+operational (with ``?content=nonconfig``) and configuration (with
 ``?content=config``) as follow:
 
 -----
 
-**RFC8040:** ``restconf/data/network-topology:network-topology/topology=pcep-topology``
+**RFC8040:** ``rests/data/network-topology:network-topology/topology=pcep-topology``
 
 **Method:** ``GET``
 
@@ -317,7 +317,7 @@ the configuration as follow:
 
 -----
 
-**RFC8040:** ``restconf/data/network-topology:network-topology/topology=pcep-topology/node=10.1.1.1``
+**RFC8040:** ``rests/data/network-topology:network-topology/topology=pcep-topology/node=10.1.1.1``
 
 **Method:** ``POST``
 
@@ -376,7 +376,7 @@ Remove a tunnel
 This simply done by removing the corresponding entry in the configuration by
 using the ``DELETE`` method as follow:
 
-**URL:** ``restconf/data/network-topology:network-topology/topology=pcep-topology/node=10.1.1.1/pcep-server:configured-lsp=test``
+**URL:** ``rests/data/network-topology:network-topology/topology=pcep-topology/node=10.1.1.1/pcep-server:configured-lsp=test``
 
 **Method:** ``DELETE``
 

diff --git a/docs/pcep/pcep-user-guide-running-pcep.rst b/docs/pcep/pcep-user-guide-running-pcep.rst
index c89256aeca3ad9609c71fc083e8934776ad731ff..93cd8a1ef781d9b6321fadd9bc47569422c3565b 100644 (file)
--- a/docs/pcep/pcep-user-guide-running-pcep.rst
+++ b/docs/pcep/pcep-user-guide-running-pcep.rst
@@ -15,9 +15,7 @@ This section explains how to install PCEP plugin.
 2. The PCEP plugin contains a default configuration, which is applied after the feature starts up.
    One instance of PCEP plugin is created (named *pcep-topology*), and its presence can be verified via REST:
 
-   **URL:** ``restconf/operational/network-topology:network-topology/topology/pcep-topology``
-
-   **RFC8040 URL:** ``rests/data/network-topology:network-topology/topology=pcep-topology?content=nonconfig``
+   **URL:** ``rests/data/network-topology:network-topology/topology=pcep-topology?content=nonconfig``
 
    **Method:** ``GET``
 

diff --git a/docs/pcep/pcep-user-guide-session-statistics.rst b/docs/pcep/pcep-user-guide-session-statistics.rst
index 4c13daccaa8cb3499da7ad8b686444f09ae95d8e..2b096fd388fae74aec98e311ab8a43b8810923fa 100644 (file)
--- a/docs/pcep/pcep-user-guide-session-statistics.rst
+++ b/docs/pcep/pcep-user-guide-session-statistics.rst
@@ -7,9 +7,7 @@ The PCEP statistics provides information about PCE <-> PCC session and its state
 Usage
 '''''
 
-**URL:** ``/restconf/operational/network-topology:network-topology/topology/pcep-topology/node/pcc:%2F%2F43.43.43.43/pcep-session-state``
-
-**RFC8040 URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=pcc%3A%2F%2F43.43.43.43/pcep-session-state?content=nonconfig``
+**URL:** ``/rests/data/network-topology:network-topology/topology=pcep-topology/node=pcc%3A%2F%2F43.43.43.43/pcep-session-state?content=nonconfig``
 
 **Method:** ``GET``
 
@@ -231,9 +229,7 @@ statistics for all PCEP sessions under the context are returned.
 Usage
 '''''
 
-**URL:** ``/restconf/operations/pcep-topology-stats-rpc:get-stats``
-
-**RFC8040 URL:** ``/rests/operations/pcep-topology-stats-rpc:get-stats``
+**URL:** ``/rests/operations/pcep-topology-stats-rpc:get-stats``
 
 **Method:** ``POST``
 

diff --git a/docs/pcep/pcep-user-guide-test-tools.rst b/docs/pcep/pcep-user-guide-test-tools.rst
index 341297fc05b520b034e17c53f09846856029cb69..1d07821a0232c53e96487ab0712bf3999a09d677 100644 (file)
--- a/docs/pcep/pcep-user-guide-test-tools.rst
+++ b/docs/pcep/pcep-user-guide-test-tools.rst
@@ -99,9 +99,7 @@ Once we set the configuration, a new data change counter will be created and reg
 
 .. important:: **Clustering** - Each Counter Identifier should be unique.
 
-**URL:** ``/restconf/config/odl-data-change-counter-config:data-change-counter-config/data-change-counter``
-
-**RFC8040 URL:** ``/rests/data/odl-data-change-counter-config:data-change-counter-config=data-change-counter``
+**URL:** ``/rests/data/odl-data-change-counter-config:data-change-counter-config=data-change-counter``
 
 **Method:** ``PUT``
 
@@ -154,9 +152,7 @@ Usage
 
 Counter state for topology
 
-**URL:** ``/restconf/operational/data-change-counter:data-change-counter/counter/data-change-counter``
-
-**RFC8040 URL:** ``/rests/data/data-change-counter:data-change-counter/counter=data-change-counter?content=nonconfig``
+**URL:** ``/rests/data/data-change-counter:data-change-counter/counter=data-change-counter?content=nonconfig``
 
 **Method:** ``GET``