Merge "Boron update of SXP aDocs"

[docs.git] / manuals / user-guide / src / main / asciidoc / bgpcep / odl-bgpcep-bgp-all-user.adoc

diff --git a/manuals/user-guide/src/main/asciidoc/bgpcep/odl-bgpcep-bgp-all-user.adoc b/manuals/user-guide/src/main/asciidoc/bgpcep/odl-bgpcep-bgp-all-user.adoc
index 1cf66241f3fbdbab9b6e8b42dad9fb525617e026..65b4d83cfae069209a39981220a5a3afe69be187 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/bgpcep/odl-bgpcep-bgp-all-user.adoc
+++ b/manuals/user-guide/src/main/asciidoc/bgpcep/odl-bgpcep-bgp-all-user.adoc
@@ -67,7 +67,7 @@ uncomment the module containing bgp-peer.
  <holdtimer>180</holdtimer>
  <peer-role>ibgp</peer-role>
  <rib>
-  <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+  <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-instance</type>
   <name>example-bgp-rib</name>
  </rib>
  ...
@@ -220,9 +220,11 @@ used in BGP Best Path Selection algorithm.
 - *target-rib* - RIB ID of existing RIB where the data should be transferred
 - *application-rib-id* - RIB ID of local application RIB (all the routes that you put to OpenDaylight will be displayed here)
 
-To populate RIB use //TODO: internal link to Populate RIB
+//TODO: internal link to Populate RIB
+//To populate RIB use 
 
-In order to get routes advertised to other peers, you have to also configure the peers, as described in section BGP Peer //TODO: internal jump to section?
+//TODO: internal jump to section?
+//In order to get routes advertised to other peers, you have to also configure the peers, as described in section BGP Peer 
 
 === Configuration through RESTCONF ===
 
@@ -341,7 +343,7 @@ and *peer-role* (if necessary).
  <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">180</holdtimer>
  <peer-role xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">ibgp</peer-role>
  <rib xmlns"urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">x:rib</type>
+  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">x:rib-instance</type>
   <name>example-bgp-rib</name>
  </rib>
  <peer-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
@@ -387,8 +389,8 @@ BGP Best Path Selection algorithm.
   </target-rib>
  <application-rib-id xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">example-app-rib</application-rib-id>
  <data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
-  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">x:binding-async-data-broker</type>
-  <name>pingpong-binding-data-broker</name>
+  <type xmlns:x="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">x:dom-async-data-broker</type>
+  <name>pingpong-broker</name>
  </data-broker>
 </module>
 ----
@@ -497,7 +499,7 @@ If your peer is configured, you can populate the RIB by making following POST ca
 [source,xml]
 ----
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ipv4-routes xmlns="urn:opendaylight:params:xml:ns:yang:bgp-rib">
+<ipv4-routes xmlns="urn:opendaylight:params:xml:ns:yang:bgp-inet">
  <ipv4-route>
   <prefix>200.20.160.1/32</prefix>
   <attributes>