use name gateway_v6 instead of gateway6
fixes bug #890099 Change-Id: I2b516c4b41d387846f8edb9a7b82f3016f0e0eac
This commit is contained in:
1
Authors
1
Authors
@@ -53,6 +53,7 @@ François Charlier <francois.charlier@enovance.com>
|
|||||||
Gabe Westmaas <gabe.westmaas@rackspace.com>
|
Gabe Westmaas <gabe.westmaas@rackspace.com>
|
||||||
Gary Kotton <garyk@radware.com>
|
Gary Kotton <garyk@radware.com>
|
||||||
Gaurav Gupta <gaurav@denali-systems.com>
|
Gaurav Gupta <gaurav@denali-systems.com>
|
||||||
|
Hengqing Hu <hudayou@hotmail.com>
|
||||||
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
|
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
|
||||||
Hisaki Ohara <hisaki.ohara@intel.com>
|
Hisaki Ohara <hisaki.ohara@intel.com>
|
||||||
Ilya Alekseyev <ilyaalekseyev@acm.org>
|
Ilya Alekseyev <ilyaalekseyev@acm.org>
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ class FlatNetworkTestCase(test.TestCase):
|
|||||||
'dhcp_server': '192.168.%d.1' % i,
|
'dhcp_server': '192.168.%d.1' % i,
|
||||||
'dns': ['192.168.%d.3' % n, '192.168.%d.4' % n],
|
'dns': ['192.168.%d.3' % n, '192.168.%d.4' % n],
|
||||||
'gateway': '192.168.%d.1' % i,
|
'gateway': '192.168.%d.1' % i,
|
||||||
'gateway6': '2001:db8:0:%x::1' % i,
|
'gateway_v6': '2001:db8:0:%x::1' % i,
|
||||||
'ip6s': 'DONTCARE',
|
'ip6s': 'DONTCARE',
|
||||||
'ips': 'DONTCARE',
|
'ips': 'DONTCARE',
|
||||||
'label': 'test%d' % i,
|
'label': 'test%d' % i,
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class VMWareAPIVMTestCase(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
|
|||||||
@@ -332,7 +332,7 @@ class XenAPIVMTestCase(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -412,7 +412,7 @@ class XenAPIVMTestCase(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -688,7 +688,7 @@ class XenAPIVMTestCase(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -858,7 +858,7 @@ class XenAPIMigrateInstance(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -900,7 +900,7 @@ class XenAPIMigrateInstance(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -936,7 +936,7 @@ class XenAPIMigrateInstance(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
@@ -966,7 +966,7 @@ class XenAPIMigrateInstance(test.TestCase):
|
|||||||
{'broadcast': '192.168.0.255',
|
{'broadcast': '192.168.0.255',
|
||||||
'dns': ['192.168.0.1'],
|
'dns': ['192.168.0.1'],
|
||||||
'gateway': '192.168.0.1',
|
'gateway': '192.168.0.1',
|
||||||
'gateway6': 'dead:beef::1',
|
'gateway_v6': 'dead:beef::1',
|
||||||
'ip6s': [{'enabled': '1',
|
'ip6s': [{'enabled': '1',
|
||||||
'ip': 'dead:beef::dcad:beff:feef:0',
|
'ip': 'dead:beef::dcad:beff:feef:0',
|
||||||
'netmask': '64'}],
|
'netmask': '64'}],
|
||||||
|
|||||||
Reference in New Issue
Block a user