1 files changed, 11 insertions, 83 deletions

diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py b/test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py
index 242b0204..b0ff7fe3 100644
--- a/test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py
+++ b/test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py
@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import configparser
-import os
 
 from ....util import (
     ApplicationError,
@@ -13,11 +12,6 @@ from ....config import (
     IntegrationConfig,
 )
 
-from ....containers import (
-    CleanupMode,
-    run_support_container,
-)
-
 from . import (
     CloudEnvironment,
     CloudEnvironmentConfig,
@@ -28,66 +22,16 @@ from . import (
 class VcenterProvider(CloudProvider):
     """VMware vcenter/esx plugin. Sets up cloud resources for tests."""
 
-    DOCKER_SIMULATOR_NAME = 'vcenter-simulator'
-
     def __init__(self, args: IntegrationConfig) -> None:
         super().__init__(args)
 
-        # The simulator must be pinned to a specific version to guarantee CI passes with the version used.
-        if os.environ.get('ANSIBLE_VCSIM_CONTAINER'):
-            self.image = os.environ.get('ANSIBLE_VCSIM_CONTAINER')
-        else:
-            self.image = 'quay.io/ansible/vcenter-test-container:1.7.0'
-
-        # VMware tests can be run on govcsim or BYO with a static config file.
-        # The simulator is the default if no config is provided.
-        self.vmware_test_platform = os.environ.get('VMWARE_TEST_PLATFORM', 'govcsim')
-
-        if self.vmware_test_platform == 'govcsim':
-            self.uses_docker = True
-            self.uses_config = False
-        elif self.vmware_test_platform == 'static':
-            self.uses_docker = False
-            self.uses_config = True
+        self.uses_config = True
 
     def setup(self) -> None:
         """Setup the cloud resource before delegation and register a cleanup callback."""
         super().setup()
 
-        self._set_cloud_config('vmware_test_platform', self.vmware_test_platform)
-
-        if self.vmware_test_platform == 'govcsim':
-            self._setup_dynamic_simulator()
-            self.managed = True
-        elif self.vmware_test_platform == 'static':
-            self._use_static_config()
-            self._setup_static()
-        else:
-            raise ApplicationError('Unknown vmware_test_platform: %s' % self.vmware_test_platform)
-
-    def _setup_dynamic_simulator(self) -> None:
-        """Create a vcenter simulator using docker."""
-        ports = [
-            443,
-            8080,
-            8989,
-            5000,  # control port for flask app in simulator
-        ]
-
-        run_support_container(
-            self.args,
-            self.platform,
-            self.image,
-            self.DOCKER_SIMULATOR_NAME,
-            ports,
-            allow_existing=True,
-            cleanup=CleanupMode.YES,
-        )
-
-        self._set_cloud_config('vcenter_hostname', self.DOCKER_SIMULATOR_NAME)
-
-    def _setup_static(self) -> None:
-        if not os.path.exists(self.config_static_path):
+        if not self._use_static_config():
             raise ApplicationError('Configuration file does not exist: %s' % self.config_static_path)
 
 
@@ -96,37 +40,21 @@ class VcenterEnvironment(CloudEnvironment):
 
     def get_environment_config(self) -> CloudEnvironmentConfig:
         """Return environment configuration for use in the test environment after delegation."""
-        try:
-            # We may be in a container, so we cannot just reach VMWARE_TEST_PLATFORM,
-            # We do a try/except instead
-            parser = configparser.ConfigParser()
-            parser.read(self.config_path)  # static
-
-            env_vars = {}
-            ansible_vars = dict(
-                resource_prefix=self.resource_prefix,
-            )
-            ansible_vars.update(dict(parser.items('DEFAULT', raw=True)))
-        except KeyError:  # govcsim
-            env_vars = dict(
-                VCENTER_HOSTNAME=str(self._get_cloud_config('vcenter_hostname')),
-                VCENTER_USERNAME='user',
-                VCENTER_PASSWORD='pass',
-            )
-
-            ansible_vars = dict(
-                vcsim=str(self._get_cloud_config('vcenter_hostname')),
-                vcenter_hostname=str(self._get_cloud_config('vcenter_hostname')),
-                vcenter_username='user',
-                vcenter_password='pass',
-            )
+        # We may be in a container, so we cannot just reach VMWARE_TEST_PLATFORM,
+        # We do a try/except instead
+        parser = configparser.ConfigParser()
+        parser.read(self.config_path)  # static
+
+        ansible_vars = dict(
+            resource_prefix=self.resource_prefix,
+        )
+        ansible_vars.update(dict(parser.items('DEFAULT', raw=True)))
 
         for key, value in ansible_vars.items():
             if key.endswith('_password'):
                 display.sensitive.add(value)
 
         return CloudEnvironmentConfig(
-            env_vars=env_vars,
             ansible_vars=ansible_vars,
             module_defaults={
                 'group/vmware': {