diff --git a/Authors b/Authors index 83594bafd72..d8cf9d7a0a8 100644 --- a/Authors +++ b/Authors @@ -53,6 +53,7 @@ François Charlier Gabe Westmaas Gary Kotton Gaurav Gupta +Hengqing Hu Hisaharu Ishii Hisaki Ohara Ilya Alekseyev diff --git a/nova/network/manager.py b/nova/network/manager.py index a135050094a..a86b6577482 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -766,7 +766,7 @@ def rxtx_cap(instance_type, network): info['ip6s'] = [ip6_dict()] # TODO(tr3buchet): handle ip6 routes here as well if network['gateway_v6']: - info['gateway6'] = network['gateway_v6'] + info['gateway_v6'] = network['gateway_v6'] if network['dns1']: info['dns'].append(network['dns1']) if network['dns2']: diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index 9f1fd992b52..32e441db856 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -456,7 +456,7 @@ def ip_dict(ip, subnet): info['ip6s'] = [ip_dict(ip, v6_subnet) for ip in v6_ips] if v6_subnet['gateway']: - info['gateway6'] = v6_subnet['gateway'] + info['gateway_v6'] = v6_subnet['gateway'] dns_dict = {} for s in [v4_subnet, v6_subnet]: diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 9ed779f4eac..4eee3c8d444 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -168,7 +168,7 @@ def test_get_instance_nw_info(self): '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 b1b297107af..a1d0af44040 100644 --- a/nova/tests/test_vmwareapi.py +++ b/nova/tests/test_vmwareapi.py @@ -63,7 +63,7 @@ def setUp(self): {'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 eecbc82b832..712640d94f6 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -332,7 +332,7 @@ def check_vm_record(self, conn, check_injection=False): {'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 @@ def _test_spawn(self, image_ref, kernel_id, ramdisk_id, {'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 @@ def _create_instance(self, instance_id=1, spawn=True): {'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 @@ def fake_finish_revert_migration(*args, **kwargs): {'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 @@ def fake_vdi_resize(*args, **kwargs): {'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 @@ def fake_vdi_resize(*args, **kwargs): {'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 @@ def fake_vdi_resize(*args, **kwargs): {'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/utils.py b/nova/tests/utils.py index cc387fbcd66..f78ba3f2ec4 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -83,7 +83,7 @@ def get_test_network_info(count=1): mapping = {'mac': fake, 'dhcp_server': fake, 'gateway': fake, - 'gateway6': fake, + 'gateway_v6': fake, 'ips': [{'ip': fake_ip}, {'ip': fake_ip}]} if ipv6: mapping['ip6s'] = [{'ip': fake_ip}, diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 8a6fa7c1617..3ce5243929a 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -1014,7 +1014,7 @@ def basepath(fname='', suffix=suffix): if FLAGS.use_ipv6: address_v6 = mapping['ip6s'][0]['ip'] netmask_v6 = mapping['ip6s'][0]['netmask'] - gateway_v6 = mapping['gateway6'] + gateway_v6 = mapping['gateway_v6'] net_info = {'name': 'eth%d' % ifc_num, 'address': address, 'netmask': netmask, @@ -1022,7 +1022,7 @@ def basepath(fname='', suffix=suffix): 'broadcast': mapping['broadcast'], 'dns': ' '.join(mapping['dns']), 'address_v6': address_v6, - 'gateway6': gateway_v6, + 'gateway_v6': gateway_v6, 'netmask_v6': netmask_v6} nets.append(net_info) diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 835c609259a..debc186d670 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -345,7 +345,7 @@ def prepare_instance_filter(self, instance, network_info): if FLAGS.use_ipv6: networks = [network for (network, info) in network_info if - info['gateway6']] + info['gateway_v6']] if networks: instance_secgroup_filter_children.\ @@ -634,7 +634,7 @@ def instance_rules(instance, network_info): # they're not worth the clutter. if FLAGS.use_ipv6: # Allow RA responses - gateways_v6 = [mapping['gateway6'] for (_n, mapping) in + gateways_v6 = [mapping['gateway_v6'] for (_n, mapping) in network_info] for gateway_v6 in gateways_v6: ipv6_rules.append( diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 9b452f2a78f..b98aecb87fe 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -41,7 +41,7 @@ class LibvirtBridgeDriver(VIFDriver): def _get_configurations(self, network, mapping): """Get a dictionary of VIF configurations for bridge type.""" # Assume that the gateway also acts as the dhcp server. - gateway6 = mapping.get('gateway6') + gateway_v6 = mapping.get('gateway_v6') mac_id = mapping['mac'].replace(':', '') if FLAGS.allow_same_net_traffic: @@ -67,8 +67,8 @@ def _get_configurations(self, network, mapping): 'extra_params': extra_params, } - if gateway6: - result['gateway6'] = gateway6 + "/128" + if gateway_v6: + result['gateway_v6'] = gateway_v6 + "/128" return result diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index fdb626d26df..c0ac3ed8db6 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1527,7 +1527,7 @@ def _prepare_injectables(inst, networks_info): 'dns': dns, 'address_v6': ip_v6 and ip_v6['ip'] or '', 'netmask_v6': ip_v6 and ip_v6['netmask'] or '', - 'gateway_v6': ip_v6 and info['gateway6'] or '', + 'gateway_v6': ip_v6 and info['gateway_v6'] or '', 'use_ipv6': FLAGS.use_ipv6} interfaces_info.append(interface_info)