diff options
Diffstat (limited to 'snaps/openstack/tests/openstack_tests.py')
| -rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 4b00922..3bd94c1 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -316,31 +316,50 @@ def ubuntu_image_settings(name, url=None, image_metadata=None, def get_priv_net_config(net_name, subnet_name, router_name=None, - cidr='10.55.0.0/24', external_net=None): + cidr='10.55.0.0/24', external_net=None, + netconf_override=None): return OSNetworkConfig(net_name, subnet_name, cidr, router_name, - external_gateway=external_net) + external_gateway=external_net, + netconf_override=netconf_override) def get_pub_net_config(net_name, subnet_name=None, router_name=None, - cidr='10.55.1.0/24', external_net=None): + cidr='10.55.1.0/24', external_net=None, + netconf_override=None): return OSNetworkConfig(net_name, subnet_name, cidr, router_name, - external_gateway=external_net) + external_gateway=external_net, + netconf_override=netconf_override) class OSNetworkConfig: """ Represents the settings required for the creation of a network in OpenStack + where netconf_override is used to reconfigure the network_type, + physical_network and segmentation_id """ def __init__(self, net_name, subnet_name=None, subnet_cidr=None, - router_name=None, external_gateway=None): - + router_name=None, external_gateway=None, + netconf_override=None): + """ + :param netconf_override: dict() containing the reconfigured network_type, + physical_network and segmentation_id + """ + + network_conf = None if subnet_name and subnet_cidr: - self.network_settings = NetworkConfig( + network_conf = NetworkConfig( name=net_name, subnet_settings=[ SubnetConfig(cidr=subnet_cidr, name=subnet_name)]) else: - self.network_settings = NetworkConfig(name=net_name) + network_conf = NetworkConfig(name=net_name) + if netconf_override: + network_conf.network_type = netconf_override.get('network_type') + network_conf.physical_network = netconf_override.get( + 'physical_network') + network_conf.segmentation_id = netconf_override.get( + 'segmentation_id') + self.network_settings = network_conf if router_name: if subnet_name: |