Merge "dynamic tunnels can be programmed only when bgp router is asso…

…ciated to physical router" into R2.20
Juniper · May 19, 2015 · 299453f · 299453f
2 parents 24de32a + 151cf32
commit 299453f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/config/device-manager/device_manager/db.py b/src/config/device-manager/device_manager/db.py
@@ -148,10 +148,9 @@ def push_config(self):
                 self.config_manager.add_bgp_peer(peer.params['address'],
                                                  params, external)
             self.config_manager.set_bgp_config(bgp_router.params)
-
-        bgp_router_ips = bgp_router.get_all_bgp_router_ips()
-        if self.dataplane_ip is not None:
-            self.config_manager.add_dynamic_tunnels(self.dataplane_ip, 
+            bgp_router_ips = bgp_router.get_all_bgp_router_ips()
+            if self.dataplane_ip is not None:
+                self.config_manager.add_dynamic_tunnels(self.dataplane_ip,
                               GlobalSystemConfigDM.ip_fabric_subnets, bgp_router_ips)
         vn_dict = {}
         for vn_id in self.virtual_networks: