diff --git a/Authors b/Authors
index 83594baf..d8cf9d7a 100644
--- a/Authors
+++ b/Authors
@@ -53,6 +53,7 @@ François Charlier <francois.charlier@enovance.com>
 Gabe Westmaas <gabe.westmaas@rackspace.com>
 Gary Kotton <garyk@radware.com>
 Gaurav Gupta <gaurav@denali-systems.com>
+Hengqing Hu <hudayou@hotmail.com>
 Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
 Hisaki Ohara <hisaki.ohara@intel.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 9ed779f4..4eee3c8d 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -168,7 +168,7 @@ class FlatNetworkTestCase(test.TestCase):
                      'dhcp_server': '192.168.%d.1' % i,
                      'dns': ['192.168.%d.3' % n, '192.168.%d.4' % n],
                      'gateway': '192.168.%d.1' % i,
-                     'gateway6': '2001:db8:0:%x::1' % i,
+                     'gateway_v6': '2001:db8:0:%x::1' % i,
                      'ip6s': 'DONTCARE',
                      'ips': 'DONTCARE',
                      'label': 'test%d' % i,
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index b1b29710..a1d0af44 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -63,7 +63,7 @@ class VMWareAPIVMTestCase(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index eecbc82b..712640d9 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -332,7 +332,7 @@ class XenAPIVMTestCase(test.TestCase):
                               {'broadcast': '192.168.0.255',
                                'dns': ['192.168.0.1'],
                                'gateway': '192.168.0.1',
-                               'gateway6': 'dead:beef::1',
+                               'gateway_v6': 'dead:beef::1',
                                'ip6s': [{'enabled': '1',
                                          'ip': 'dead:beef::dcad:beff:feef:0',
                                                'netmask': '64'}],
@@ -412,7 +412,7 @@ class XenAPIVMTestCase(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
@@ -688,7 +688,7 @@ class XenAPIVMTestCase(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
@@ -858,7 +858,7 @@ class XenAPIMigrateInstance(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
@@ -900,7 +900,7 @@ class XenAPIMigrateInstance(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
@@ -936,7 +936,7 @@ class XenAPIMigrateInstance(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],
@@ -966,7 +966,7 @@ class XenAPIMigrateInstance(test.TestCase):
                           {'broadcast': '192.168.0.255',
                            'dns': ['192.168.0.1'],
                            'gateway': '192.168.0.1',
-                           'gateway6': 'dead:beef::1',
+                           'gateway_v6': 'dead:beef::1',
                            'ip6s': [{'enabled': '1',
                                      'ip': 'dead:beef::dcad:beff:feef:0',
                                            'netmask': '64'}],