x/gantt
Code Issues Proposed changes

migration gateway_v6 to network_info

Browse Source
This commit is contained in:
Eldar Nugaev
2011-03-24 00:36:07 +03:00
parent 8d8c8698d8
commit d3abc0b00b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/test_virt.py
View File

@@ -785,7 +785,8 @@ class NWFilterTestCase(test.TestCase):
instance_ref = db.instance_create(self.context, instance_ref = db.instance_create(self.context,
{'user_id': 'fake', {'user_id': 'fake',
'project_id': 'fake'}) 'project_id': 'fake',
'mac_address': '00:A0:C9:14:C8:29'})
inst_id = instance_ref['id'] inst_id = instance_ref['id']
ip = '10.11.12.13' ip = '10.11.12.13'

14
nova/utils.py
View File

@@ -309,11 +309,15 @@ def get_my_linklocal(interface):
def to_global_ipv6(prefix, mac): def to_global_ipv6(prefix, mac):
mac64 = netaddr.EUI(mac).eui64().words try:
int_addr = int(''.join(['%02x' % i for i in mac64]), 16) mac64 = netaddr.EUI(mac).eui64().words
mac64_addr = netaddr.IPAddress(int_addr) int_addr = int(''.join(['%02x' % i for i in mac64]), 16)
maskIP = netaddr.IPNetwork(prefix).ip mac64_addr = netaddr.IPAddress(int_addr)
return (mac64_addr ^ netaddr.IPAddress('::0200:0:0:0') | maskIP).format() maskIP = netaddr.IPNetwork(prefix).ip
return (mac64_addr ^ netaddr.IPAddress('::0200:0:0:0') | maskIP).\
format()
except TypeError:
raise TypeError(_("Bad mac for to_global_ipv6: %s" % mac))
def to_mac(ipv6_address): def to_mac(ipv6_address):