arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #431 from ChrisMacNaughton/minimize-vars

Browse Source 
Only configure private Neutron CIDR if it is configured
This commit is contained in:
Liam Young
2020-09-28 13:14:20 +01:00
committed by GitHub
parent 1ab3aea3a5 7bf624b007
commit ea803ad9cd
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unit_tests/charm_tests/test_tempest.py
View File

@@ -42,7 +42,7 @@ class TestTempestSetup(unittest.TestCase):
'TEST_GATEWAY': 'test',
'TEST_CIDR_EXT': 'test',
'TEST_FIP_RANGE': 'test',
'TEST_NAMESERVER': 'test',
'TEST_NAME_SERVER': 'test',
'TEST_CIDR_PRIV': 'test',
}
tempest_setup.add_environment_var_config(ctxt, ['neutron'])
@@ -55,7 +55,7 @@ class TestTempestSetup(unittest.TestCase):
ctxt = {}
get_deployment_context.return_value = {
'TEST_GATEWAY': 'test',
'TEST_NAMESERVER': 'test',
'TEST_NAME_SERVER': 'test',
'TEST_CIDR_PRIV': 'test',
}
with self.assertRaises(Exception) as context:

7
zaza/openstack/charm_tests/tempest/setup.py
View File

@@ -26,10 +26,12 @@ import zaza.openstack.charm_tests.glance.setup as glance_setup
SETUP_ENV_VARS = {
'neutron': ['TEST_GATEWAY', 'TEST_CIDR_EXT', 'TEST_FIP_RANGE',
'TEST_NAMESERVER', 'TEST_CIDR_PRIV'],
'TEST_NAME_SERVER', 'TEST_CIDR_PRIV'],
'swift': ['TEST_SWIFT_IP'],
}
IGNORABLE_VARS = ['TEST_CIDR_PRIV']
TEMPEST_FLAVOR_NAME = 'm1.tempest'
TEMPEST_ALT_FLAVOR_NAME = 'm2.tempest'
TEMPEST_SVC_LIST = ['ceilometer', 'cinder', 'glance', 'heat', 'horizon',
@@ -198,7 +200,8 @@ def add_environment_var_config(ctxt, services):
if value:
ctxt[var.lower()] = value
else:
missing_vars.append(var)
if var not in IGNORABLE_VARS:
missing_vars.append(var)
if missing_vars:
raise ValueError(
("Environment variables [{}] must all be set to run this"

4
zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
View File

@@ -52,9 +52,11 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
{% if 'neutron' in enabled_services %}
[network]
{% if test_cidr_priv %}
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
dns_servers = {{ test_name_server }}
project_networks_reachable = false
[network-feature-enabled]

4
zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
View File

@@ -54,9 +54,11 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
{% if 'neutron' in enabled_services %}
[network]
{% if test_cidr_priv %}
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
dns_servers = {{ test_name_server }}
project_networks_reachable = false
floating_network_name = {{ ext_net }}