From 2b641b358d4236e25a7ab7784054497b26a34b2e Mon Sep 17 00:00:00 2001 From: Thomas Carmet <8408330+tcarmet@users.noreply.github.com> Date: Tue, 12 Mar 2024 00:18:52 +0000 Subject: [PATCH] Do not recreate client if not necessary --- runner_manager/backend/vsphere.py | 10 ++++++++-- runner_manager/models/backend.py | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/runner_manager/backend/vsphere.py b/runner_manager/backend/vsphere.py index c1ac858d..f6724142 100644 --- a/runner_manager/backend/vsphere.py +++ b/runner_manager/backend/vsphere.py @@ -35,15 +35,21 @@ class VsphereBackend(BaseBackend): @property def client(self) -> VsphereClient: + # Create the vSphere client if it wasn't already + # created in the class instance + if not hasattr(self, "_client"): + self._create_client() + return self._client + + def _create_client(self): session = Session() session.verify = self.config.verify_ssl - client = create_vsphere_client( + self._client = create_vsphere_client( server=self.config.server, username=self.config.username, password=self.config.password, session=session, ) - return client def get_folder(self, datacenter_name, folder_name): """ diff --git a/runner_manager/models/backend.py b/runner_manager/models/backend.py index 14577bc4..6037ffc8 100644 --- a/runner_manager/models/backend.py +++ b/runner_manager/models/backend.py @@ -200,7 +200,6 @@ class VsphereConfig(BackendConfig): server: str username: str password: str - bearer_token: Optional[str] = None verify_ssl: bool = False