from pprint import pprint
from netaddr import *

def merge(dbag, ip):
    added = False
    for dev in dbag:
        if dev == "id":
           continue
        for address in dbag[dev]:
            if address['public_ip'] == ip['public_ip']:
               dbag[dev].remove(address)
    if ip['add']:
       ipo = IPNetwork(ip['public_ip'] + '/' + ip['netmask'])
       ip['device'] = 'eth' + str(ip['nic_dev_id'])
       ip['cidr'] = str(ipo.ip) + '/' + str(ipo.prefixlen)
       ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
       if 'nw_type' not in ip.keys():
           ip['nw_type'] = 'public'
       dbag.setdefault('eth' + str(ip['nic_dev_id']), []).append( ip )
    return dbag

from pprint import pprint
from netaddr import *

def merge(dbag, ip):
    added = False
    for dev in dbag:
        if dev == "id":
           continue
        for address in dbag[dev]:
            if address['public_ip'] == ip['public_ip']:
               dbag[dev].remove(address)
    if ip['add']:
       ipo = IPNetwork(ip['public_ip'] + '/' + ip['netmask'])
       ip['device'] = 'eth' + str(ip['nic_dev_id'])
       ip['cidr'] = str(ipo.ip) + '/' + str(ipo.prefixlen)
       ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
       if 'nw_type' not in ip.keys():
           ip['nw_type'] = 'public'
       if ip['nw_type'] == 'control':
           dbag['eth' + str(ip['nic_dev_id'])] = [ ip ]
       else:
           dbag.setdefault('eth' + str(ip['nic_dev_id']), []).append( ip )
    return dbag

Fix a bug that would add updated control ip address instead of replace
Fix a bug that would add updated control ip address instead of replace
