← Back to branch summary

~zhhuabj/charms/trusty/neutron-api/lp74646

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/network/ip.py

  • Committer: Edward Hope-Morley
  • Date: 2014-10-09 10:34:27 UTC
  • Revision ID: edward.hope-morley@canonical.com-20141009103427-7n3j6pdvd2cu3ioq
[hopem] synced lp:charm-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/network/ip.py
140
140
        if address.version == 4 and netifaces.AF_INET in addresses:
141
141
            addr = addresses[netifaces.AF_INET][0]['addr']
142
142
            netmask = addresses[netifaces.AF_INET][0]['netmask']
143
 
            cidr = netaddr.IPNetwork("%s/%s" % (addr, netmask))
 
143
            network = netaddr.IPNetwork("%s/%s" % (addr, netmask))
 
144
            cidr = network.cidr
144
145
            if address in cidr:
145
146
                if key == 'iface':
146
147
                    return iface
149
150
        if address.version == 6 and netifaces.AF_INET6 in addresses:
150
151
            for addr in addresses[netifaces.AF_INET6]:
151
152
                if not addr['addr'].startswith('fe80'):
152
 
                    cidr = netaddr.IPNetwork("%s/%s" % (addr['addr'],
153
 
                                                        addr['netmask']))
 
153
                    network = netaddr.IPNetwork("%s/%s" % (addr['addr'],
 
154
                                                           addr['netmask']))
 
155
                    cidr = network.cidr
154
156
                    if address in cidr:
155
157
                        if key == 'iface':
156
158
                            return iface
 
159
                        elif key == 'netmask' and cidr:
 
160
                            return str(cidr).split('/')[1]
157
161
                        else:
158
162
                            return addr[key]
159
163
    return None