summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Hooker <matt@cloudscaling.com>2011-07-27 20:32:46 -0400
committerMatthew Hooker <matt@cloudscaling.com>2011-07-27 20:32:46 -0400
commit7026927fa52e34eebc17b387e0ca6feade99727a (patch)
tree8536e15ecf1606cc36b44754bc2f9ad4372dc670
parent26fd6c3f309a2febd7538684a470d462ab83dab3 (diff)
downloadnova-7026927fa52e34eebc17b387e0ca6feade99727a.tar.gz
nova-7026927fa52e34eebc17b387e0ca6feade99727a.tar.xz
nova-7026927fa52e34eebc17b387e0ca6feade99727a.zip
fix call to nonexistant method to_global_ipv6.
Add myself to authors file
-rw-r--r--Authors1
-rw-r--r--nova/db/sqlalchemy/api.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/Authors b/Authors
index 1a07946bd..c31858365 100644
--- a/Authors
+++ b/Authors
@@ -67,6 +67,7 @@ Lvov Maxim <usrleon@gmail.com>
Mark Washenberger <mark.washenberger@rackspace.com>
Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com>
+Matthew Hooker <matt@cloudscaling.com>
Michael Gundlach <michael.gundlach@rackspace.com>
Mike Scherbakov <mihgen@gmail.com>
Mohammed Naser <mnaser@vexxhost.com>
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d7810098a..5de25b37a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1312,7 +1312,7 @@ def instance_get_fixed_addresses_v6(context, instance_id):
# combine prefixes, macs, and project_id into (prefix,mac,p_id) tuples
prefix_mac_tuples = zip(prefixes, macs, [project_id for m in macs])
# return list containing ipv6 address for each tuple
- return [ipv6.to_global_ipv6(*t) for t in prefix_mac_tuples]
+ return [ipv6.to_global(*t) for t in prefix_mac_tuples]
@require_context