Bug 4781 - BGP at work is not ready for application of 43-bgp-openconfig.xml

Change starting order - first BGP OpenConfig app is stared, then RIBImpl
is started.
The change avoids problem with reconfiguring RIBImpl instance at startup.

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

diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml
index 8daa45839e98d06f563a2b0f7882ad0c891b7f11..dad106cb19d55af8df2a981e44f9cfc9e5b074aa 100644 (file)
--- a/bgp/controller-config/pom.xml
+++ b/bgp/controller-config/pom.xml
@@ -66,7 +66,7 @@
                                     <classifier>bmp-config-example</classifier>
                                 </artifact>
                                 <artifact>
-                                    <file>${project.build.directory}/classes/initial/43-bgp-openconfig.xml</file>
+                                    <file>${project.build.directory}/classes/initial/40-bgp-openconfig.xml</file>
                                     <type>xml</type>
                                     <classifier>openconfig-config</classifier>
                                 </artifact>

diff --git a/bgp/controller-config/src/main/resources/initial/43-bgp-openconfig.xml b/bgp/controller-config/src/main/resources/initial/40-bgp-openconfig.xml
similarity index 77%
rename from bgp/controller-config/src/main/resources/initial/43-bgp-openconfig.xml
rename to bgp/controller-config/src/main/resources/initial/40-bgp-openconfig.xml
index 1a24b15fd56499961a5a340e9e17fe540eeeeda8..ca936807774e561b963de7310d78d8715f66134d 100644 (file)
--- a/bgp/controller-config/src/main/resources/initial/43-bgp-openconfig.xml
+++ b/bgp/controller-config/src/main/resources/initial/40-bgp-openconfig.xml
@@ -12,7 +12,6 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:openconfig?module=odl-openconfig-bgp-cfg&amp;revision=2015-07-18</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp-openconfig-spi?module=odl-bgp-openconfig-spi-cfg&amp;revision=2015-09-25</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=odl-bgp-rib-impl-cfg&amp;revision=2013-04-09</capability>
     </required-capabilities>
 
     <configuration>
@@ -26,14 +25,6 @@
                         <name>binding-osgi-broker</name>
                     </binding-broker>
                 </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-impl</type>
-                    <name>example-bgp-rib</name>
-                    <openconfig-provider>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp-openconfig-spi">prefix:bgp-openconfig-provider</type>
-                        <name>openconfig-bgp</name>
-                    </openconfig-provider>
-                </module>
             </modules>
 
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">

diff --git a/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
index fe465a930560133ae8c643e5e093241f7ec9708e..773b1ae3bd07a1b07d0c9394992979670589f953 100755 (executable)
--- a/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
+++ b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
@@ -20,6 +20,7 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&amp;revision=2013-11-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:protocol:framework?module=protocol-framework&amp;revision=2014-03-13</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:topology?module=odl-topology-api-cfg&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp-openconfig-spi?module=odl-bgp-openconfig-spi-cfg&amp;revision=2015-09-25</capability>
     </required-capabilities>
     <configuration>
 
@@ -170,6 +171,10 @@
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:protocol:framework">prefix:reconnect-strategy-factory</type>
                         <name>example-reconnect-strategy-factory</name>
                     </tcp-reconnect-strategy>
+                    <openconfig-provider>
+                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp-openconfig-spi">prefix:bgp-openconfig-provider</type>
+                        <name>openconfig-bgp</name>
+                    </openconfig-provider>
                 </module>
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:reachability:ipv4">prefix:bgp-reachability-ipv4</type>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index 84617854c7e8f536f4b15da0e5dbc8b4bdad97e8..49ee224ea071ead0cf49aff336dd400a32d07ff6 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -37,8 +37,8 @@
         <feature version='${project.version}'>odl-bgpcep-bgp-topology</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-openconfig</feature>
         <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/40-bgp-openconfig.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/openconfig-config</configfile>
         <configfile finalname="etc/opendaylight/karaf/41-bgp-example.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config-example</configfile>
-        <configfile finalname="etc/opendaylight/karaf/43-bgp-openconfig.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/openconfig-config</configfile>
     </feature>
 
     <feature name="odl-bgpcep-bgp-openconfig" version='${project.version}'>