From 8b4c36ef501a96742c52b4d532cc3adda25aa71b Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 8 Dec 2016 14:19:01 +0530 Subject: [PATCH] CLOUDSTACK-9659: mismatch in traffic type in ip_associations.json and ips.json As part of the bug 'CLOUDSTACK-9339 Virtual Routers don't handle Multiple Public Interfaces correctly' issue of mismatch of traffic type represented by 'nw_type' in config sent by management server in ip_associations.json and how it is persisted in the ips.json data bag are differnet, is addressed, however missed the change in final merge. this bug is to add the functionality in cs_ip.py, to lower the traffic type sent by management server before persisting in the ips.json databag --- systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py index c34fc01d9e3..1ce78f9fd87 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py @@ -41,6 +41,8 @@ def merge(dbag, ip): ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen) if 'nw_type' not in ip.keys(): ip['nw_type'] = 'public' + else: + ip['nw_type'] = ip['nw_type'].lower() if ip['nw_type'] == 'control': dbag['eth' + str(nic_dev_id)] = [ip] else: