From 1906d75907e36b84609dd860e34cd1563a13f37a Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Wed, 12 May 2021 19:07:21 -0400 Subject: [PATCH] Adding DigitalOcean cloud support to ansible-test (#74222) --- .../74222-ansible-test-digitalocean.yml | 2 + .../testing/sanity/integration-aliases.rst | 1 + .../integration/cloud/digitalocean.py | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 changelogs/fragments/74222-ansible-test-digitalocean.yml create mode 100644 test/lib/ansible_test/_internal/commands/integration/cloud/digitalocean.py diff --git a/changelogs/fragments/74222-ansible-test-digitalocean.yml b/changelogs/fragments/74222-ansible-test-digitalocean.yml new file mode 100644 index 00000000000..07e3aff37de --- /dev/null +++ b/changelogs/fragments/74222-ansible-test-digitalocean.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Adding DigitalOcean cloud support to ansible-test (https://github.com/ansible/ansible/pull/74222). diff --git a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst index e6cc1e91ead..a393b2cfbd7 100644 --- a/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst +++ b/docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst @@ -155,6 +155,7 @@ Some of the available aliases are: - ``cloud/aws`` - ``cloud/azure`` - ``cloud/cs`` +- ``cloud/digitalocean`` - ``cloud/foreman`` - ``cloud/openshift`` - ``cloud/tower`` diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/digitalocean.py b/test/lib/ansible_test/_internal/commands/integration/cloud/digitalocean.py new file mode 100644 index 00000000000..0ea771dc6cc --- /dev/null +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/digitalocean.py @@ -0,0 +1,55 @@ +"""DigitalOcean plugin for integration tests.""" +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +from ....util import ( + ConfigParser, + display, +) + +from ....config import ( + IntegrationConfig, +) + +from . import ( + CloudEnvironment, + CloudEnvironmentConfig, + CloudProvider, +) + + +class DigitalOceanCloudProvider(CloudProvider): + """Checks if a configuration file has been passed or fixtures are going to be used for testing""" + def __init__(self, args): # type: (IntegrationConfig) -> None + super(DigitalOceanCloudProvider, self).__init__(args) + + self.uses_config = True + + def setup(self): # type: () -> None + """Setup the cloud resource before delegation and register a cleanup callback.""" + super(DigitalOceanCloudProvider, self).setup() + + self._use_static_config() + + +class DigitalOceanCloudEnvironment(CloudEnvironment): + """Updates integration test environment after delegation. Will setup the config file as parameter.""" + def get_environment_config(self): # type: () -> CloudEnvironmentConfig + """Return environment configuration for use in the test environment after delegation.""" + parser = ConfigParser() + parser.read(self.config_path) + + env_vars = dict( + DO_API_KEY=parser.get('default', 'key'), + ) + + display.sensitive.add(env_vars['DO_API_KEY']) + + ansible_vars = dict( + resource_prefix=self.resource_prefix, + ) + + return CloudEnvironmentConfig( + env_vars=env_vars, + ansible_vars=ansible_vars, + )