Change path for DRA callback and cluster comparison

Author: heerener

hpc_provisioner/src/hpc_provisioner/cluster.py

@@ -67,3 +67,11 @@ def as_dict(self) -> dict:
         d = copy.deepcopy(self.__dict__)
         d["name"] = self.name
         return d
+
+    def __eq__(self, other) -> bool:
+        compare_props = ["benchmark", "dev", "include_lustre", "project_id", "tier", "vlab_id"]
+        for prop in compare_props:
+            if getattr(self, prop) != getattr(other, prop):
+                print(f"{prop}: {getattr(self, prop)} != {getattr(other, prop)}")
+                return False
+        return True

hpc_provisioner/src/hpc_provisioner/dynamodb_actions.py

@@ -103,8 +103,13 @@ def get_cluster_by_name(dynamodb_resource, cluster_name: str) -> Optional[dict]:
 
 
 def register_cluster(dynamodb_resource, cluster: Cluster) -> None:
-    if get_cluster_by_name(dynamodb_resource, cluster.name):
-        raise ClusterAlreadyRegistered(f"Cluster {cluster} already registered")
+    if registered_cluster := get_cluster_by_name(dynamodb_resource, cluster.name):
+        if cluster != register_cluster:
+            raise ClusterAlreadyRegistered(
+                f"Cluster {cluster} already registered with different parameters"
+            )
+        else:
+            return
 
     table = dynamodb_resource.Table(CLUSTER_TABLE_NAME)
     table.put_item(Item=cluster.as_dict())

hpc_provisioner/src/hpc_provisioner/handlers.py

@@ -16,7 +16,12 @@
     PROJECT_TAG_KEY,
     VLAB_TAG_KEY,
 )
-from hpc_provisioner.dynamodb_actions import delete_cluster, dynamodb_resource, register_cluster
+from hpc_provisioner.dynamodb_actions import (
+    ClusterAlreadyRegistered,
+    delete_cluster,
+    dynamodb_resource,
+    register_cluster,
+)
 from hpc_provisioner.utils import (
     generate_public_key,
     get_sbonexusdata_bucket,
@@ -102,8 +107,8 @@ def pcluster_handler(event, _context=None):
             if event["path"] == "/hpc-provisioner/pcluster":
                 logger.debug("POST pcluster")
                 return pcluster_create_request_handler(event, _context)
-            if event["path"] == "/hpc-provisioner/efs":
-                logger.debug("POST EFS")
+            if event["path"] == "/hpc-provisioner/dra":
+                logger.debug("POST DRA")
                 return dra_ready_handler(event, _context)
         elif event["httpMethod"] == "DELETE":
             logger.debug("DELETE pcluster")
@@ -121,7 +126,14 @@ def pcluster_create_request_handler(event, _context=None):
 
     cluster = _get_vlab_query_params(event)
     dynamo = dynamodb_resource()
-    register_cluster(dynamo, cluster)
+    try:
+        register_cluster(dynamo, cluster)
+    except ClusterAlreadyRegistered as e:
+        return response_text(text=e.__str__(), code=500)
+    else:
+        logger.debug(
+            f"Cluster {cluster.name} already registered with identical parameters; proceeding"
+        )
 
     ec2_client = boto3.client("ec2")
     sm_client = boto3.client("secretsmanager")