openstack
/
nova
Code Issues Proposed changes

Add ipv6 support to fake network models 

Currently, the functions in fake_network_cache_model all default to
building a fake ipv4 network, and so the easiest way to test against a
fake ipv6 network is to manually create ipv6 components (subnets,
routes, ips) and plug them into the default fake VIF. This makes testing
ipv6 functionality rather error-prone and laborious.

This patch adds an option to create ipv6 models.

Change-Id: I9aacbc45ce79cab05c6611d38fc2daaf2ba5dab7
Co-Authored-By: Ellen Hui <ellenfkh@gmail.com>
Closes-Bug: #1336094
This commit is contained in:
Ellen Hui 2014-07-01 16:52:22 +00:00 committed by Josh Gachnang
parent 4990e60f2d
commit 93a22d4702
1 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
nova/tests/unit/fake_network_cache_model.py
View File

@ -16,62 +16,94 @@
from nova.network import model
def new_ip(ip_dict=None):
new_ip = dict(address='192.168.1.100')
def new_ip(ip_dict=None, version=4):
if version == 6:
new_ip = dict(address='fd00::1:100', version=6)
elif version == 4:
new_ip = dict(address='192.168.1.100')
ip_dict = ip_dict or {}
new_ip.update(ip_dict)
return model.IP(**new_ip)
def new_fixed_ip(ip_dict=None):
new_fixed_ip = dict(address='192.168.1.100')
def new_fixed_ip(ip_dict=None, version=4):
if version == 6:
new_fixed_ip = dict(address='fd00::1:100', version=6)
elif version == 4:
new_fixed_ip = dict(address='192.168.1.100')
ip_dict = ip_dict or {}
new_fixed_ip.update(ip_dict)
return model.FixedIP(**new_fixed_ip)
def new_route(route_dict=None):
new_route = dict(
cidr='0.0.0.0/24',
gateway=new_ip(dict(address='192.168.1.1')),
interface='eth0')
def new_route(route_dict=None, version=4):
if version == 6:
new_route = dict(
cidr='::/48',
gateway=new_ip(dict(address='fd00::1:1'), version=6),
interface='eth0')
elif version == 4:
new_route = dict(
cidr='0.0.0.0/24',
gateway=new_ip(dict(address='192.168.1.1')),
interface='eth0')
route_dict = route_dict or {}
new_route.update(route_dict)
return model.Route(**new_route)
def new_subnet(subnet_dict=None):
new_subnet = dict(
cidr='10.10.0.0/24',
dns=[new_ip(dict(address='1.2.3.4')),
new_ip(dict(address='2.3.4.5'))],
gateway=new_ip(dict(address='10.10.0.1')),
ips=[new_fixed_ip(dict(address='10.10.0.2')),
new_fixed_ip(dict(address='10.10.0.3'))],
routes=[new_route()])
def new_subnet(subnet_dict=None, version=4):
if version == 6:
new_subnet = dict(
cidr='fd00::/48',
dns=[new_ip(dict(address='1:2:3:4::'), version=6),
new_ip(dict(address='2:3:4:5::'), version=6)],
gateway=new_ip(dict(address='fd00::1'), version=6),
ips=[new_fixed_ip(dict(address='fd00::2'), version=6),
new_fixed_ip(dict(address='fd00::3'), version=6)],
routes=[new_route(version=6)],
version=6)
elif version == 4:
new_subnet = dict(
cidr='10.10.0.0/24',
dns=[new_ip(dict(address='1.2.3.4')),
new_ip(dict(address='2.3.4.5'))],
gateway=new_ip(dict(address='10.10.0.1')),
ips=[new_fixed_ip(dict(address='10.10.0.2')),
new_fixed_ip(dict(address='10.10.0.3'))],
routes=[new_route()])
subnet_dict = subnet_dict or {}
new_subnet.update(subnet_dict)
return model.Subnet(**new_subnet)
def new_network(network_dict=None):
new_net = dict(
id=1,
bridge='br0',
label='public',
subnets=[new_subnet(), new_subnet(dict(cidr='255.255.255.255'))])
def new_network(network_dict=None, version=4):
if version == 6:
new_net = dict(
id=1,
bridge='br0',
label='public',
subnets=[new_subnet(version=6),
new_subnet(dict(cidr='ffff:ffff:ffff:ffff::'),
version=6)])
elif version == 4:
new_net = dict(
id=1,
bridge='br0',
label='public',
subnets=[new_subnet(), new_subnet(dict(cidr='255.255.255.255'))])
network_dict = network_dict or {}
new_net.update(network_dict)
return model.Network(**new_net)
def new_vif(vif_dict=None):
def new_vif(vif_dict=None, version=4):
vif = dict(
id=1,
address='aa:aa:aa:aa:aa:aa',
type='bridge',
network=new_network())
network=new_network(version=version))
vif_dict = vif_dict or {}
vif.update(vif_dict)
return model.VIF(**vif)