Merge branch 'dev' into staging

deNBI · Aug 22, 2024 · e94cfa2 · e94cfa2
2 parents 3c85a17 + 18e51b9
commit e94cfa2
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 27 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
-setuptools==72.1.0
+setuptools==73.0.1
 thrift==0.20.0
 python-keystoneclient==5.4.0
 openstacksdk==3.1.0
 deprecated==1.2.14
 Click==8.1.7
-ansible==9.8.0
+ansible==9.9.0
 flake8==7.1.1
 paramiko==3.4.1
 ruamel.yaml==0.18.6
@@ -16,6 +16,6 @@ pre-commit==3.8.0
 types-PyYAML==6.0.12.20240808
 sympy==1.13.2
 colorama==0.4.6
-types-redis==4.6.0.20240806
+types-redis==4.6.0.20240819
 gevent
 pytest
diff --git a/simple_vm_client/openstack_connector/openstack_connector.py b/simple_vm_client/openstack_connector/openstack_connector.py
@@ -6,6 +6,7 @@
 import sys
 import urllib
 import urllib.parse
+import threading
 from contextlib import closing
 from typing import Union
 from uuid import uuid4
@@ -54,6 +55,9 @@
 
 ALL_TEMPLATES = [BIOCONDA]
 
+lock_dict = {}
+lock_access = threading.Lock()
+
 
 class OpenStackConnector:
     def __init__(self, config_file: str):
@@ -1034,33 +1038,41 @@ def get_or_create_vm_security_group(self, openstack_id):
 
     def get_or_create_project_security_group(self, project_name, project_id):
         security_group_name = f"{project_name}_{project_id}"
-        logger.info(
-            f"Check if Security Group for project - [{project_name}-{project_id}] exists... "
-        )
-        sec = self.openstack_connection.get_security_group(
-            name_or_id=security_group_name
-        )
-        if sec:
+
+        with lock_access:
+            if security_group_name not in lock_dict:
+                lock_dict[security_group_name] = threading.Lock()
+            lock = lock_dict[security_group_name]
+
+        with lock:
             logger.info(
-                f"Security group [{project_name}-{project_id}]  already exists."
+                f"Check if Security Group for project - [{project_name}-{project_id}] exists... "
             )
-            return sec["id"]
+            sec = self.openstack_connection.get_security_group(
+                name_or_id=security_group_name
+            )
+            if sec:
+                logger.info(
+                    f"Security group [{project_name}-{project_id}]  already exists."
+                )
+                return sec["id"]
 
-        logger.info(
-            f"No security Group for [{project_name}-{project_id}]  exists. Creating.. "
-        )
-        new_security_group = self.openstack_connection.create_security_group(
-            name=security_group_name, description=f"{project_name} Security Group"
-        )
-        self.openstack_connection.network.create_security_group_rule(
-            direction="ingress",
-            protocol="tcp",
-            port_range_max=22,
-            port_range_min=22,
-            security_group_id=new_security_group["id"],
-            remote_group_id=new_security_group["id"],
-        )
-        return new_security_group["id"]
+            logger.info(
+                f"No security Group for [{project_name}-{project_id}]  exists. Creating.. "
+            )
+            new_security_group = self.openstack_connection.create_security_group(
+                name=security_group_name, description=f"{project_name} Security Group"
+            )
+            self.openstack_connection.network.create_security_group_rule(
+                direction="ingress",
+                protocol="tcp",
+                port_range_max=22,
+                port_range_min=22,
+                security_group_id=new_security_group["id"],
+                remote_group_id=new_security_group["id"],
+            )
+            return new_security_group["id"]
+
 
     def get_limits(self) -> dict[str, str]:
         logger.info("Get Limits")