From 59a3d84562a0fdeb16a4a566371294790d110ad4 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Mon, 14 Jun 2021 21:37:15 -0500 Subject: testing: OCI availability domain is now required (SC-59) (#910) --- tests/integration_tests/clouds.py | 9 ++++++++- tests/integration_tests/integration_settings.py | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py index 1378b215..4a0d3008 100644 --- a/tests/integration_tests/clouds.py +++ b/tests/integration_tests/clouds.py @@ -247,8 +247,15 @@ class OciCloud(IntegrationCloud): integration_instance_cls = IntegrationOciInstance def _get_cloud_instance(self): + if not integration_settings.ORACLE_AVAILABILITY_DOMAIN: + raise Exception( + 'ORACLE_AVAILABILITY_DOMAIN must be set to a valid ' + 'availability domain. If using the oracle CLI, ' + 'try `oci iam availability-domain list`' + ) return OCI( - tag='oci-integration-test' + tag='oci-integration-test', + availability_domain=integration_settings.ORACLE_AVAILABILITY_DOMAIN ) diff --git a/tests/integration_tests/integration_settings.py b/tests/integration_tests/integration_settings.py index 0703be58..e4a790c2 100644 --- a/tests/integration_tests/integration_settings.py +++ b/tests/integration_tests/integration_settings.py @@ -97,6 +97,13 @@ KEYPAIR_NAME = None # in `openstack network list` OPENSTACK_NETWORK = None +################################################################## +# OCI SETTINGS +################################################################## +# Availability domain to use for Oracle. Should be one of the namess found +# in `oci iam availability-domain list` +ORACLE_AVAILABILITY_DOMAIN = None + ################################################################## # USER SETTINGS OVERRIDES ################################################################## -- cgit v1.2.3