From f51be9b8009da18cddc4e68a041a346dfa425650 Mon Sep 17 00:00:00 2001 From: sbalineni Date: Fri, 9 Dec 2016 11:00:33 -0800 Subject: [PATCH] [DM]: Fix for supporting flat ip subnets Change-Id: Idcdf3f005b8018aa4011b18610d427ff84aa9777 Closes-Bug: #1648655 --- src/config/device-manager/device_manager/dm_utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/config/device-manager/device_manager/dm_utils.py b/src/config/device-manager/device_manager/dm_utils.py index a28a15a28db..ea0aea775eb 100644 --- a/src/config/device-manager/device_manager/dm_utils.py +++ b/src/config/device-manager/device_manager/dm_utils.py @@ -36,8 +36,11 @@ def get_network_gateways(ipam_refs=[]): gateways = {} for ipam_ref in ipam_refs or []: for subnet in ipam_ref['attr'].get('ipam_subnets', []): - prefix = subnet['subnet']['ip_prefix'] - prefix_len = subnet['subnet']['ip_prefix_len'] + prefix = '0.0.0.0' + prefix_len = 0 + if 'subnet' in subnet: + prefix = subnet['subnet']['ip_prefix'] + prefix_len = subnet['subnet']['ip_prefix_len'] gateways[prefix + '/' + str(prefix_len)] = \ {"default_gateway": subnet.get('default_gateway', ''), "subnet_uuid": subnet.get('subnet_uuid')}