Merge branch 'dev'

deNBI · Nov 7, 2023 · 9e296c9 · 9e296c9
2 parents 95aaeec + d66d6c5
commit 9e296c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/simple_vm_client/openstack_connector/openstack_connector.py b/simple_vm_client/openstack_connector/openstack_connector.py
@@ -126,6 +126,9 @@ def load_config_yml(self, config_file: str) -> None:
                 "gateway_security_group_id"
             ]
 
+    def _get_default_security_groups(self):
+        return self.DEFAULT_SECURITY_GROUPS.copy()
+
     def load_env_config(self) -> None:
         logger.info("Load environment config: OpenStack")
 
@@ -1195,7 +1198,7 @@ def start_server(
             network: Network = self.get_network()
             key_name = f"{servername}_{metadata['project_name']}"
             logger.info(f"Key name {key_name}")
-            security_groups = self.DEFAULT_SECURITY_GROUPS
+            security_groups = self._get_default_security_groups()
             if research_environment_metadata:
                 security_groups.append(
                     self.get_or_create_research_environment_security_group(
@@ -1279,7 +1282,7 @@ def start_server_with_playbook(
     ) -> tuple[str, str]:
         logger.info(f"Start Server {servername}")
 
-        security_groups = self.DEFAULT_SECURITY_GROUPS
+        security_groups = self._get_default_security_groups()
         if research_environment_metadata:
             security_groups.append(
                 self.get_or_create_research_environment_security_group(

diff --git a/simple_vm_client/util/state_enums.py b/simple_vm_client/util/state_enums.py
@@ -69,6 +69,7 @@ class VmStates(Enum):
     ERROR = "error"
     SHELVED = "shelved"
     SHELVED_OFFLOADED = "shelved_offloaded"
+    DISABLED = "disabled"
 
     # Custom vm states
     NOT_FOUND = "not_found"