Merge branch 'dev' into staging

deNBI · Nov 17, 2023 · bf8263a · bf8263a
2 parents 6e6209c + f97397f
commit bf8263a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black
   - repo: https://github.com/sondrelg/pep585-upgrade

diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -41,7 +41,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:8.10.4
+    image: docker.elastic.co/beats/filebeat:8.11.1
     env_file:
       - .env
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.10.4
+    image: docker.elastic.co/beats/filebeat:8.11.1
     env_file:
       - .env
     volumes:

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ python-keystoneclient==5.2.0
 openstacksdk==1.5.0
 deprecated==1.2.14
 Click==8.1.7
-ansible==8.5.0
+ansible==8.6.1
 flake8==6.1.0
 paramiko==2.12.0
 ruamel.yaml==0.18.5

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"