From 123d0609266a77abf45d637ccf259deafc4f766e Mon Sep 17 00:00:00 2001 From: sbalineni Date: Wed, 22 Jun 2016 16:44:59 -0700 Subject: [PATCH] [DM]: if dataplane ip is not conifgured, use bgp router ip for tunneling when dataplane ip is not configured explicitly, use bgp router's ip and configure dynamic tunnels Change-Id: I81dd70162b90751b0d35d92ce0f81ea37161ba0b Closes-Bug: #1494401 --- src/config/device-manager/device_manager/db.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/config/device-manager/device_manager/db.py b/src/config/device-manager/device_manager/db.py index 370d4d31c9d..dd223288c1b 100644 --- a/src/config/device-manager/device_manager/db.py +++ b/src/config/device-manager/device_manager/db.py @@ -569,10 +569,12 @@ def push_config(self): self.config_manager.set_bgp_config(bgp_router.params) self.config_manager.set_global_routing_options(bgp_router.params) bgp_router_ips = bgp_router.get_all_bgp_router_ips() - if (self.dataplane_ip is not None and - self.is_valid_ip(self.dataplane_ip)): + tunnel_ip = self.dataplane_ip + if not tunnel_ip and bgp_router.params: + tunnel_ip = bgp_router.params.get('address') + if (tunnel_ip and self.is_valid_ip(tunnel_ip)): self.config_manager.add_dynamic_tunnels( - self.dataplane_ip, + tunnel_ip, GlobalSystemConfigDM.ip_fabric_subnets, bgp_router_ips)