Merge pull request #614 from deNBI/fix/cluster_worker_names_and_deletion

dweinholz · web-flow · commit 59538f4663be · 2024-10-16T16:50:23.000+02:00
Fix/cluster worker names and deletion
diff --git a/portal_client.thrift b/portal_client.thrift
@@ -170,6 +170,8 @@ struct Image{
 
     /** Title of the image */
     13:optional string title
+
+    14:optional string slurm_version
 }
 /**
  * This Struct defines a VirtualMachine.
diff --git a/simple_vm_client/ttypes.py b/simple_vm_client/ttypes.py
diff --git a/simple_vm_client/util/thrift_converter.py b/simple_vm_client/util/thrift_converter.py
@@ -18,6 +18,7 @@ def os_to_thrift_image(openstack_image: OpenStack_Image) -> Image:
     if not properties:
         properties = {}
     image_type = properties.get("image_type", "image")
+    slurm_version = properties.get("slurm_version", "")
     image = Image(
         name=openstack_image.name,
         min_disk=openstack_image.min_disk,
@@ -27,6 +28,7 @@ def os_to_thrift_image(openstack_image: OpenStack_Image) -> Image:
         updated_at=openstack_image.updated_at,
         os_version=openstack_image.get("os_version", ""),
         os_distro=openstack_image.get("os_distro", ""),
+        slurm_version=openstack_image.get("slurm_version", slurm_version),
         title=properties.get("title", ""),
         openstack_id=openstack_image.id,
         description=properties.get("description", ""),

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ struct Image{`
`170`	`170`
`171`	`171`	`/** Title of the image */`
`172`	`172`	`13:optional string title`
	`173`	`+`
	`174`	`+ 14:optional string slurm_version`
`173`	`175`	`}`
`174`	`176`	`/**`
`175`	`177`	`* This Struct defines a VirtualMachine.`