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

Only use TEST_ prefix

Browse Source
This commit is contained in:
David Ames
2019-10-18 11:26:37 -07:00
parent f29aac19c4
commit 13fa5e9851
2 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
unit_tests/utilities/test_zaza_utilities_generic.py
View File

@@ -125,22 +125,6 @@ class TestGenericUtils(ut_utils.BaseTestCase):
return _env.get(key)
self.get.side_effect = _get_env
# OSCI backward compatible env vars
_env = {"NET_ID": "netid",
"NAMESERVER": "10.0.0.10",
"GATEWAY": "10.0.0.1",
"CIDR_EXT": "10.0.0.0/24",
"FIP_RANGE": "10.0.200.0:10.0.200.254"}
_expected_result = {}
_expected_result["net_id"] = _env["NET_ID"]
_expected_result["external_dns"] = _env["NAMESERVER"]
_expected_result["default_gateway"] = _env["GATEWAY"]
_expected_result["external_net_cidr"] = _env["CIDR_EXT"]
_expected_result["start_floating_ip"] = _env["FIP_RANGE"].split(":")[0]
_expected_result["end_floating_ip"] = _env["FIP_RANGE"].split(":")[1]
self.assertEqual(generic_utils.get_undercloud_env_vars(),
_expected_result)
# Prefered OSCI TEST_ env vars
_env = {"NET_ID": "netid",
"NAMESERVER": "10.0.0.10",

35
zaza/openstack/utilities/generic.py
View File

@@ -140,31 +140,20 @@ def get_undercloud_env_vars():
:rtype: dict
"""
# Handle OSCI environment variables
# Over time we have changed the names of prefixes. Try them all in
# ascending order of significance.
# Note: TEST_* is the preferred prefix
_prefixes = ["AMULET_", "MOJO_", "OS_", "", "TEST_"]
# Note: TEST_* is the only prefix honored
_vars = {}
for prefix in _prefixes:
if os.environ.get('{}NET_ID'.format(prefix)) is not None:
_vars['net_id'] = os.environ.get('{}NET_ID'.format(prefix))
if os.environ.get('{}NAMESERVER'.format(prefix))is not None:
_vars['external_dns'] = os.environ.get(
'{}NAMESERVER'.format(prefix))
if os.environ.get('{}GATEWAY'.format(prefix)) is not None:
_vars['default_gateway'] = os.environ.get(
'{}GATEWAY'.format(prefix))
if os.environ.get('{}CIDR_EXT'.format(prefix)) is not None:
_vars['external_net_cidr'] = os.environ.get(
'{}CIDR_EXT'.format(prefix))
_vars['net_id'] = os.environ.get('TEST_NET_ID')
_vars['external_dns'] = os.environ.get('TEST_NAMESERVER')
_vars['default_gateway'] = os.environ.get('TEST_GATEWAY')
_vars['external_net_cidr'] = os.environ.get('TEST_CIDR_EXT')
# Take FIP_RANGE and create start and end floating ips
_fip_range = os.environ.get('{}FIP_RANGE'.format(prefix))
if _fip_range is not None and ':' in _fip_range:
_vars['start_floating_ip'] = os.environ.get(
'{}FIP_RANGE'.format(prefix)).split(':')[0]
_vars['end_floating_ip'] = os.environ.get(
'{}FIP_RANGE'.format(prefix)).split(':')[1]
# Take FIP_RANGE and create start and end floating ips
_fip_range = os.environ.get('TEST_FIP_RANGE')
if _fip_range is not None and ':' in _fip_range:
_vars['start_floating_ip'] = os.environ.get(
'TEST_FIP_RANGE').split(':')[0]
_vars['end_floating_ip'] = os.environ.get(
'TEST_FIP_RANGE').split(':')[1]
# zaza.openstack.configure.network functions variables still take priority
# for local testing. Override OSCI settings.