Bug 5706 - Conflicting container node "peer-registry" in bgp-peer and bgp-application...

Renamed bgp-application-peer's container from "peer-registry"
to "bgp-peer-registry" to avoid conflict.

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

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModule.java
index 21ab950b1397d015a5e2f43f6ccadd19cd208741..34adf15ff5a2a83751679c2ed507dde66100ee41 100755 (executable)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModule.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModule.java
@@ -95,7 +95,7 @@ public class BGPApplicationPeerModule extends org.opendaylight.controller.config
     }
 
     private BGPPeerRegistry getPeerRegistryBackwards() {
-        return getPeerRegistry() == null ? StrictBGPPeerRegistry.GLOBAL : getPeerRegistryDependency();
+        return getBgpPeerRegistryDependency() == null ? StrictBGPPeerRegistry.GLOBAL : getBgpPeerRegistryDependency();
     }
 
     private final class AppPeerModuleTracker implements BGPConfigModuleTracker {

diff --git a/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang b/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
index c4869c6896da2d8978f8c47552031ed8e202e792..85823de97a2d134284490e741cce44ca2c96c2bf 100644 (file)
--- a/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
+++ b/bgp/rib-impl/src/main/yang/odl-bgp-rib-impl-cfg.yang
@@ -248,7 +248,7 @@ module odl-bgp-rib-impl-cfg {
                 }
             }
 
-            container peer-registry {
+            container bgp-peer-registry {
                 description "BGP peer registry where current instance of BGP peer will be registered.";
                 uses config:service-ref {
                     refine type {