Bug-3075: augment BMP pre-policy RIB and post-policy RIB

-augment BMP RIBs with BGP routes extensions (multiprotocol, linkstate, flowspec)

Change-Id: I84a02000c6672ad73d03b8939e274f291939beb2
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml
index 4fbdbb079f170297be4a54f63f15b83acc6e128e..5d9399cc19d528b62ed00c8770d855d5b86c705d 100644 (file)
--- a/bgp/flowspec/pom.xml
+++ b/bgp/flowspec/pom.xml
@@ -105,6 +105,10 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
          </dependency>
+         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-api</artifactId>
+        </dependency>
          <!-- test scope dependencies -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/bgp/flowspec/src/main/yang/bgp-flowspec.yang b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
index 89f385a99faffac2cf2c808b24de5a78cf0b2c79..5b3ba5d3f4886d048cfc871541718434624fd8f5 100644 (file)
--- a/bgp/flowspec/src/main/yang/bgp-flowspec.yang
+++ b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
@@ -9,6 +9,7 @@ module bgp-flowspec {
     import bgp-rib { prefix bgp-rib; revision-date 2013-09-25; }
     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 2015-05-12; }
 
     organization "Cisco Systems, Inc.";
     contact "Dana Kutenicsova <dkutenic@cisco.com>";
@@ -389,4 +390,17 @@ module bgp-flowspec {
             uses flowspec-routes;
         }
     }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:pre-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case flowspec-routes-case {
+            uses flowspec-routes;
+        }
+    }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:post-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case flowspec-routes-case {
+            uses flowspec-routes;
+        }
+    }
+
 }

diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml
index 5e25dafb6a9beaffd88d4013d39adaa4a4358851..ee596babb85b80eb018131814144a162573729a3 100644 (file)
--- a/bgp/inet/pom.xml
+++ b/bgp/inet/pom.xml
@@ -62,6 +62,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/bgp/inet/src/main/yang/bgp-inet.yang b/bgp/inet/src/main/yang/bgp-inet.yang
index 107766c3614f980d28b7cf28689820d6cb9ff165..2a17aac90230fc238afc9bdae6e3b1b1be507b4b 100644 (file)
--- a/bgp/inet/src/main/yang/bgp-inet.yang
+++ b/bgp/inet/src/main/yang/bgp-inet.yang
@@ -7,6 +7,7 @@ module bgp-inet {
     import bgp-multiprotocol { prefix bgp-mp; revision-date 2013-09-19; }
     import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
     import bgp-message { prefix bgp-msg; revision-date 2013-09-19; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2015-05-12; }
 
     organization "Cisco Systems, Inc.";
     contact "Dana Kutenicsova <dkutenic@cisco.com>";
@@ -150,5 +151,25 @@ module bgp-inet {
             uses ipv6-routes;
         }
     }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:pre-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case ipv4-routes-case {
+            uses ipv4-routes;
+        }
+
+        case ipv6-routes-case {
+            uses ipv6-routes;
+        }
+    }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:post-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case ipv4-routes-case {
+            uses ipv4-routes;
+        }
+
+        case ipv6-routes-case {
+            uses ipv6-routes;
+        }
+    }
 }
 

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index b0d6d8df4276f9d922780d393ffa44a68ac50288..2a17006a4832cddb9b4f2ce7b7cde3e306097d09 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -104,6 +104,10 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
          </dependency>
+         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-api</artifactId>
+         </dependency>
          <!-- test scope dependencies -->
          <dependency>
              <groupId>junit</groupId>

diff --git a/bgp/linkstate/src/main/yang/bgp-linkstate.yang b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
index a97ad524ecbf93d857196b4e080e69171420a23e..26f1aa52fa83ebdbd8524f644ee2d9beddb5057a 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-linkstate.yang
+++ b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
@@ -12,6 +12,7 @@ module bgp-linkstate {
     import rsvp { prefix rsvp; revision-date 2013-08-20; }
     import bgp-segment-routing { prefix bgp-sr; revision-date 2015-02-06; }
     import bgp-epe { prefix bgp-epe; revision-date 2015-06-22; }
+    import bmp-monitor { prefix bmp-mon; revision-date 2015-05-12; }
 
     organization "Cisco Systems, Inc.";
     contact "Dana Kutenicsova <dkutenic@cisco.com>";
@@ -675,4 +676,17 @@ module bgp-linkstate {
             uses linkstate-routes;
         }
     }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:pre-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case linkstate-routes-case {
+            uses linkstate-routes;
+        }
+    }
+
+    augment "/bmp-mon:bmp-monitor/bmp-mon:monitor/bmp-mon:router/bmp-mon:peer/bmp-mon:post-policy-rib/bmp-mon:tables/bmp-mon:routes" {
+        case linkstate-routes-case {
+            uses linkstate-routes;
+        }
+    }
+
 }

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
index 746a3d6428831fc30ad2bacb57d24abb07f94b95..84b718b3a18f8e210906f449fa8388a2e9e37078 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
@@ -40,6 +40,9 @@ public class Ipv4ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo
         paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/l3-unicast-igp-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/bgp-inet.yang");
+        paths.add("/META-INF/yang/bmp-monitor.yang");
+        paths.add("/META-INF/yang/bmp-message.yang");
+        paths.add("/META-INF/yang/ietf-yang-types.yang");
         return paths;
     }
 

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
index 197140f30094eac2426b6ab5ce4fe88195fb14f9..9fbc50e4efe2f1b6c3e8813cf9af768f304c7604 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
@@ -40,6 +40,9 @@ public class Ipv6ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo
         paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/l3-unicast-igp-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/bgp-inet.yang");
+        paths.add("/META-INF/yang/bmp-monitor.yang");
+        paths.add("/META-INF/yang/bmp-message.yang");
+        paths.add("/META-INF/yang/ietf-yang-types.yang");
         return paths;
     }
 

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
index f8503d9dcb29f6dfe967215697987529d8a6d4c5..5eab0a684e6937825698baceb9ec9dafbb2f6e39 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
@@ -42,6 +42,9 @@ public class LinkstateTopologyBuilderModuleTest extends AbstractRIBImplModuleTes
         paths.add("/META-INF/yang/rsvp.yang");
         paths.add("/META-INF/yang/iana.yang");
         paths.add("/META-INF/yang/bgp-epe.yang");
+        paths.add("/META-INF/yang/bmp-monitor.yang");
+        paths.add("/META-INF/yang/bmp-message.yang");
+        paths.add("/META-INF/yang/ietf-yang-types.yang");
         return paths;
     }
 

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 84ea56180117db14b5b7f36eac61e17bf726edf8..8e1df4fd802bec6674ce1c5c5a76af83874b85de 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -208,6 +208,10 @@
           <groupId>${project.groupId}</groupId>
           <artifactId>util</artifactId>
       </dependency>
+      <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>bgp-bmp-api</artifactId>
+      </dependency>
 
       <dependency>
         <groupId>io.netty</groupId>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index d37a9bc4d002b7acc234e3b7541244a76ab211a0..55271a073e41958ca9b9e19904e9cdcb1602e7ca 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -48,6 +48,7 @@
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-inet/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-bmp-api/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-parser' version='${project.version}'>
@@ -73,12 +74,14 @@
         <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-bmp-api/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-flowspec' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-flowspec/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-bmp-api/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-bgpcep-bgp-rib-impl' version='${project.version}'>