Provide Add Path support for all AFI/SAFI

Update route model, adding by default path-id
and route-key to be used as key for routes lists.

BGPCEP-781
Change-Id: Ie62c2f304976cb275ede8f52ad6d07812f46f15a
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/evpn/src/main/yang/odl-bgp-evpn.yang b/bgp/evpn/src/main/yang/odl-bgp-evpn.yang
index 5e1ba83001a128086ad4d0ca044c29c3729e8ac1..4c29d0ed2233ace68e8f17f53ca63aa1c9218a0d 100644 (file)
--- a/bgp/evpn/src/main/yang/odl-bgp-evpn.yang
+++ b/bgp/evpn/src/main/yang/odl-bgp-evpn.yang
@@ -8,8 +8,8 @@ module odl-bgp-evpn {
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import ietf-yang-types {prefix yang; revision-date 2013-07-15;}
     import network-concepts { prefix netc; revision-date 2013-11-25; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
     import pmsi-tunnel { prefix pmsi; revision-date 2016-08-12; }
@@ -419,18 +419,15 @@ module odl-bgp-evpn {
     grouping evpn-destination {
         list evpn-destination {
             uses evpn;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
     grouping evpn-routes {
         container evpn-routes {
             list evpn-route {
-                leaf route-key {
-                    type string;
-                }
                 key "route-key path-id";
                 uses evpn;
-                uses bgp-msg:path-id-grouping;
                 uses bgp-rib:route {
                     augment "attributes" {
                         ext:augment-identifier pmsi-tunnel-augmentation;

diff --git a/bgp/flowspec/src/main/yang/bgp-flowspec.yang b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
index d988ba6e571fd6e69dbc52ef85066515de2cc3a5..7f13b2a426a822a476e58e325cd2b3e259b9fd7d 100644 (file)
--- a/bgp/flowspec/src/main/yang/bgp-flowspec.yang
+++ b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
@@ -6,10 +6,10 @@ module bgp-flowspec {
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-types { prefix bgp-t; revision-date 2013-09-19; }
     import network-concepts { prefix netc; revision-date 2013-11-25; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
 
     organization "Cisco Systems, Inc.";
     contact "Dana Kutenicsova <dkutenic@cisco.com>";
@@ -25,6 +25,10 @@ module bgp-flowspec {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }
@@ -220,7 +224,6 @@ module bgp-flowspec {
                 }
             }
         }
-        uses bgp-msg:path-id-grouping;
     }
 
     grouping flowspec-destination-group-ipv4 {
@@ -287,12 +290,14 @@ module bgp-flowspec {
     grouping flowspec-destination-ipv4 {
         container destination-flowspec {
             uses flowspec-destination-group-ipv4;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
     grouping flowspec-destination-ipv6 {
         container destination-flowspec {
             uses flowspec-destination-group-ipv6;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
@@ -307,6 +312,7 @@ module bgp-flowspec {
         container destination-flowspec-l3vpn-ipv4 {
             uses flowspec-l3vpn-rd;
             uses flowspec-destination-group-ipv4;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
@@ -314,6 +320,7 @@ module bgp-flowspec {
         container destination-flowspec-l3vpn-ipv6 {
             uses flowspec-l3vpn-rd;
             uses flowspec-destination-group-ipv6;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
@@ -466,14 +473,6 @@ module bgp-flowspec {
     }
 
     grouping flowspec-ipv4-route-list {
-        leaf route-key {
-            description
-                "The sole function of this leaf
-                to act as the key in the list.
-                Its format does not form the
-                API contract of this model.";
-            type string;
-        }
         uses flowspec-destination-group-ipv4;
         uses bgp-rib-route;
     }
@@ -496,14 +495,6 @@ module bgp-flowspec {
     grouping flowspec-ipv6-route-list {
         uses flowspec-destination-group-ipv6;
         uses bgp-rib-route;
-        leaf route-key {
-            description
-                "The sole function of this leaf
-                to act as the key in the list.
-                Its format does not form the
-                API contract of this model.";
-            type string;
-        }
     }
 
     grouping flowspec-ipv6-route {

diff --git a/bgp/inet/src/main/yang/bgp-inet.yang b/bgp/inet/src/main/yang/bgp-inet.yang
index d44132cd7288beaea06f881d415d88777a482629..900febf61f4e7dc966c23ec7f44a21bc6c4ddd5d 100644 (file)
--- a/bgp/inet/src/main/yang/bgp-inet.yang
+++ b/bgp/inet/src/main/yang/bgp-inet.yang
@@ -3,11 +3,11 @@ module bgp-inet {
         namespace "urn:opendaylight:params:xml:ns:yang:bgp-inet";
         prefix "bgp-inet";
 
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
 
     organization "Cisco Systems, Inc.";
     contact "Dana Kutenicsova <dkutenic@cisco.com>";
@@ -23,6 +23,10 @@ module bgp-inet {
             accompanies this distribution, and is available at
             http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }
@@ -36,7 +40,6 @@ module bgp-inet {
         leaf prefix {
             type inet:ipv6-prefix;
         }
-        uses bgp-msg:path-id-grouping;
     }
 
     grouping ipv4-prefixes {
@@ -51,6 +54,7 @@ module bgp-inet {
         container destination-ipv6 {
             list ipv6-prefixes {
                 uses ipv6-prefix;
+                uses bgp-msg:path-id-grouping;
             }
         }
     }
@@ -58,11 +62,11 @@ module bgp-inet {
     grouping ipv4-routes {
         container ipv4-routes {
             list ipv4-route {
-                uses bgp-msg:ipv4-prefix-and-path-id;
-
-                key "prefix path-id";
-
+                key "route-key path-id";
                 uses bgp-rib:route;
+                leaf prefix {
+                    type inet:ipv4-prefix;
+                }
             }
         }
     }
@@ -80,10 +84,9 @@ module bgp-inet {
     grouping ipv6-routes {
         container ipv6-routes {
             list ipv6-route {
+                key "route-key path-id";
                 uses ipv6-prefix;
 
-                key "prefix path-id";
-
                 uses bgp-rib:route {
                     augment "attributes/bgp-prefix-sid/bgp-prefix-sid-tlvs/bgp-prefix-sid-tlv" {
                         case ipv6-sid-tlv {

diff --git a/bgp/l3vpn/src/main/yang/bgp-vpn-ipv4.yang b/bgp/l3vpn/src/main/yang/bgp-vpn-ipv4.yang
index a13483b7d8a2322222e910c7f002f1e974df4196..a3a0c6202215291e66a1da2e01996f423e2f24c1 100644 (file)
--- a/bgp/l3vpn/src/main/yang/bgp-vpn-ipv4.yang
+++ b/bgp/l3vpn/src/main/yang/bgp-vpn-ipv4.yang
@@ -4,8 +4,8 @@ module bgp-vpn-ipv4 {
 
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-vpn { prefix bgp-vpn; revision-date 2018-03-29; }
 
     organization "Cisco Systems, Inc.";
@@ -22,6 +22,10 @@ module bgp-vpn-ipv4 {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }

diff --git a/bgp/l3vpn/src/main/yang/bgp-vpn-ipv6.yang b/bgp/l3vpn/src/main/yang/bgp-vpn-ipv6.yang
index 2c2607aa0921decf265dd6a9361d0d89a7256451..02626938acc5729b0f997e29c2c288713c0e3fdc 100644 (file)
--- a/bgp/l3vpn/src/main/yang/bgp-vpn-ipv6.yang
+++ b/bgp/l3vpn/src/main/yang/bgp-vpn-ipv6.yang
@@ -4,8 +4,8 @@ module bgp-vpn-ipv6 {
 
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-vpn { prefix bgp-vpn; revision-date 2018-03-29; }
 
     organization "Brocade Communications Systems, Inc.";
@@ -22,6 +22,10 @@ module bgp-vpn-ipv6 {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }

diff --git a/bgp/l3vpn/src/main/yang/bgp-vpn.yang b/bgp/l3vpn/src/main/yang/bgp-vpn.yang
index 42b79437e6886111c76b94891fe7e0b6e6589187..a344d001f158329278576c7819c110f648759ef3 100644 (file)
--- a/bgp/l3vpn/src/main/yang/bgp-vpn.yang
+++ b/bgp/l3vpn/src/main/yang/bgp-vpn.yang
@@ -2,9 +2,9 @@ module bgp-vpn {
     namespace "urn:opendaylight:params:xml:ns:yang:bgp-vpn";
     prefix "bgp-vpn";
 
-    import bgp-labeled-unicast { prefix bgp-lu; revision-date 2017-12-07; }
+    import bgp-labeled-unicast { prefix bgp-lu; revision-date 2018-03-29; }
     import bgp-types { prefix bgp-t; revision-date 2013-09-19; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
 
     organization "Brocade Communications Systems, Inc.";
@@ -49,9 +49,6 @@ module bgp-vpn {
     grouping l3vpn-ip-route {
         list vpn-route {
             key "route-key path-id";
-            leaf route-key {
-                type string;
-            }
             uses l3vpn;
             uses bgp-rib:route;
         }

diff --git a/bgp/labeled-unicast/src/main/yang/bgp-labeled-unicast.yang b/bgp/labeled-unicast/src/main/yang/bgp-labeled-unicast.yang
index bbbf2688d43fdf033b6dc131eef3b322b21fdabe..8c7ae9511472a49d4c7e3bbb0e793c8fd13d6632 100644 (file)
--- a/bgp/labeled-unicast/src/main/yang/bgp-labeled-unicast.yang
+++ b/bgp/labeled-unicast/src/main/yang/bgp-labeled-unicast.yang
@@ -6,11 +6,11 @@ module bgp-labeled-unicast {
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-types { prefix bgp-t; revision-date 2013-09-19; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import network-concepts { prefix netc; revision-date 2013-11-25; }
-    import bgp-inet { prefix bgp-inet; revision-date 2017-12-07; }
+    import bgp-inet { prefix bgp-inet; revision-date 2018-03-29; }
 
     organization "Cisco Systems, Inc.";
     contact "GE QU <gequ@cisco.com>"
@@ -27,6 +27,10 @@ module bgp-labeled-unicast {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }
@@ -70,20 +74,17 @@ module bgp-labeled-unicast {
         leaf prefix {
             type inet:ip-prefix;
         }
-        uses bgp-msg:path-id-grouping;
     }
 
     grouping labeled-unicast-destination {
         list c-labeled-unicast-destination {
             uses labeled-unicast;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
     grouping labeled-unicast-routes-list {
         list labeled-unicast-route {
-            leaf route-key {
-                type string;
-            }
             key "route-key path-id";
             uses labeled-unicast;
             uses bgp-rib:route {

diff --git a/bgp/linkstate/src/main/yang/bgp-linkstate.yang b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
index 326767d7d98ecc1ffdb97ae99746659b6e6b21d2..d0a35586fc679c5821c78e17ba43e67da30addd1 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-linkstate.yang
+++ b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
@@ -6,13 +6,13 @@ module bgp-linkstate {
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import bgp-message { prefix bgp-msg; revision-date 2017-12-07; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import bgp-types { prefix bgp-t; revision-date 2013-09-19; }
     import network-concepts { prefix netc; revision-date 2013-11-25; }
     import rsvp { prefix rsvp; revision-date 2015-08-20; }
     import bgp-segment-routing { prefix bgp-sr; revision-date 2015-10-14; }
     import bgp-epe { prefix bgp-epe; revision-date 2015-06-22; }
-    import bmp-monitor { prefix bmp-mon; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2018-03-29; }
     import yang-ext { prefix ext; revision-date 2013-07-09; }
 
     organization "Cisco Systems, Inc.";
@@ -395,6 +395,7 @@ module bgp-linkstate {
     grouping linkstate-destination {
         list c-linkstate-destination {
             uses linkstate;
+            uses bgp-msg:path-id-grouping;
         }
     }
 
@@ -738,19 +739,9 @@ module bgp-linkstate {
                     have any effects on keys, especially they
                     must not impact equality tests.";
 
-                leaf route-key {
-                    description
-                        "The sole function of this leaf
-                        to act as the key in the list.
-                        Its format does not form the
-                        API contract of this model.";
-                    type binary;
-                }
                 key "route-key path-id";
 
                 uses linkstate;
-                uses bgp-msg:path-id-grouping;
-
                 uses bgp-rib:route {
                     augment attributes {
                         uses linkstate-path-attribute;

diff --git a/bgp/openconfig-api/src/main/yang/bgp-openconfig-extensions.yang b/bgp/openconfig-api/src/main/yang/bgp-openconfig-extensions.yang
index 0341f939f3b903f31187deeb5cb289995867c986..ab4df24f8f73d43708de342ac5d1bcc708afba1b 100644 (file)
--- a/bgp/openconfig-api/src/main/yang/bgp-openconfig-extensions.yang
+++ b/bgp/openconfig-api/src/main/yang/bgp-openconfig-extensions.yang
@@ -8,7 +8,7 @@ module bgp-openconfig-extensions {
     import openconfig-bgp { prefix openconfig-bgp; }
     import ietf-inet-types { prefix inet; }
     import yang-ext { prefix ext; revision-date 2013-07-09; }
-    import bgp-rib { prefix bgp-rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix bgp-rib; revision-date 2018-03-29; }
     import openconfig-bgp-operational { prefix bgp-op; }
 
     organization "Cisco Systems, Inc.";
@@ -25,6 +25,10 @@ module bgp-openconfig-extensions {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision 2018-03-21 {
         description "Augment Peer group with transport config.";
     }

diff --git a/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang b/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
index 4d2d85f5482a09fbe379b4fb05819a576f622c54..181a756670da30fe147ea01f56b8c0a5e1f47b84 100644 (file)
--- a/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
+++ b/bgp/openconfig-api/src/main/yang/odl-bgp-default-policy.yang
@@ -6,7 +6,7 @@ module odl-bgp-policy {
     import yang-ext { prefix ext; revision-date 2013-07-09; }
     import openconfig-network-instance { prefix netinst; }
     import openconfig-bgp { prefix openconfig-bgp; }
-    import bgp-rib { prefix rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix rib; revision-date 2018-03-29; }
     import openconfig-routing-policy { prefix rpol; }
     import openconfig-bgp-policy { prefix bgppol; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
@@ -26,6 +26,10 @@ module odl-bgp-policy {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2018-01-09" {
         description
             "ODL BGP policy models";

diff --git a/bgp/rib-api/src/main/yang/bgp-peer-rpc.yang b/bgp/rib-api/src/main/yang/bgp-peer-rpc.yang
index 8ad4227a5d16c16e5a7457a9779a457504134ef0..bbf4d8378ee1c9b82e3fc3b081ba929937a04604 100644 (file)
--- a/bgp/rib-api/src/main/yang/bgp-peer-rpc.yang
+++ b/bgp/rib-api/src/main/yang/bgp-peer-rpc.yang
@@ -3,7 +3,7 @@ module bgp-peer-rpc {
     prefix "bgp-rpc";
 
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
-    import bgp-rib { prefix rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix rib; revision-date 2018-03-29; }
     import yang-ext { prefix ext; revision-date "2013-07-09"; }
 
     organization "Cisco Systems, Inc.";
@@ -19,6 +19,10 @@ module bgp-peer-rpc {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision 2017-12-07 {
         description "Add support for add-path in base BGP NLRI.";
     }

diff --git a/bgp/rib-api/src/main/yang/bgp-rib.yang b/bgp/rib-api/src/main/yang/bgp-rib.yang
index fa2aca5e5c0230b27879652368afb5d321db04c7..189a2e2402557e533cea085967149bd9054f81de 100644 (file)
--- a/bgp/rib-api/src/main/yang/bgp-rib.yang
+++ b/bgp/rib-api/src/main/yang/bgp-rib.yang
@@ -21,6 +21,10 @@ module bgp-rib {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }
@@ -58,6 +62,15 @@ module bgp-rib {
     }
 
     grouping route {
+        uses bgp-msg:path-id-grouping;
+        leaf route-key {
+            description
+                "The sole function of this leaf
+                to act as the key in the list.
+                Its format does not form the
+                API contract of this model.";
+            type string;
+        }
         uses bgp-msg:path-attributes;
     }
 

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryKey.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryKey.java
deleted file mode 100644 (file)
index 169daad..0000000
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryKey.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.rib.spi.entry;
-
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-
-/**
- * Route Entry Key containing prefix.
- */
-public interface RouteEntryKey<N extends Identifier> {
-    /**
-     * Returns route containing prefix.
-     *
-     * @return Route key
-     */
-    @Nonnull
-    N getRouteKey();
-}

diff --git a/bgp/topology-provider/src/main/yang/odl-bgp-topology-config.yang b/bgp/topology-provider/src/main/yang/odl-bgp-topology-config.yang
index 2d4057f1a0b44042517a7bdcf65631ed60ba06a6..c9944da7f1aeb2737225c996667aba037c48596f 100644 (file)
--- a/bgp/topology-provider/src/main/yang/odl-bgp-topology-config.yang
+++ b/bgp/topology-provider/src/main/yang/odl-bgp-topology-config.yang
@@ -5,7 +5,7 @@ module odl-bgp-topology-config {
     prefix "bgp-topo-cfg";
 
     import network-topology { prefix nt; revision-date 2013-10-21; }
-    import bgp-rib { prefix rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix rib; revision-date 2018-03-29; }
     import odl-bgp-topology-types { prefix topology-tpes; revision-date 2016-05-24; }
 
     organization "Cisco Systems, Inc.";
@@ -23,6 +23,10 @@ module odl-bgp-topology-config {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }

diff --git a/bmp/bmp-api/src/main/yang/bmp-monitor.yang b/bmp/bmp-api/src/main/yang/bmp-monitor.yang
index f95bc00ffec9309f622a8c914fad816e9c273a99..6864853416fbc8a8c37545e1972a1f1640e7d0f3 100644 (file)
--- a/bmp/bmp-api/src/main/yang/bmp-monitor.yang
+++ b/bmp/bmp-api/src/main/yang/bmp-monitor.yang
@@ -3,7 +3,7 @@ module bmp-monitor {
     namespace "urn:opendaylight:params:xml:ns:yang:bmp-monitor";
     prefix "bmp-mon";
 
-    import bgp-rib { prefix rib; revision-date 2017-12-07; }
+    import bgp-rib { prefix rib; revision-date 2018-03-29; }
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2017-12-07; }
     import bmp-message { prefix bmp-msg; revision-date 2017-12-07; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
@@ -22,6 +22,10 @@ module bmp-monitor {
         accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }

diff --git a/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang b/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
index 34e1ce7776a45e3696b65e1b24b173041f4f5d34..416bd5b5ea53a38a75a4706f04fd645b113a176a 100644 (file)
--- a/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
+++ b/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
@@ -5,7 +5,7 @@ module odl-bmp-monitor-config {
 
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import rfc2385 { prefix rfc2385; revision-date 2016-03-24; }
-    import bmp-monitor { prefix bmp-monitor; revision-date 2017-12-07; }
+    import bmp-monitor { prefix bmp-monitor; revision-date 2018-03-29; }
 
     description
         "This module contains the base YANG definitions for
@@ -17,6 +17,10 @@ module odl-bmp-monitor-config {
          accompanies this distribution, and is available at
          http://www.eclipse.org/legal/epl-v10.html";
 
+    revision "2018-03-29" {
+        description "Add support for add-path for all afi/safi.";
+    }
+
     revision "2017-12-07" {
         description "Add support for add-path in base BGP NLRI.";
     }