Merge branch 'dev' into staging

docker-compose.bibigrid.host.yml

@@ -43,7 +43,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.2
+    image: docker.elastic.co/beats/filebeat:8.15.3
     network_mode: host  # Use the host network namespace
 
     env_file:

docker-compose.bibigrid.yml

@@ -44,7 +44,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:8.15.2
+    image: docker.elastic.co/beats/filebeat:8.15.3
     env_file:
       - .env
     volumes:

docker-compose.host.yml

@@ -30,7 +30,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.2
+    image: docker.elastic.co/beats/filebeat:8.15.3
     env_file:
       - .env
     volumes:

docker-compose.yml

@@ -30,7 +30,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.2
+    image: docker.elastic.co/beats/filebeat:8.15.3
     env_file:
       - .env
     volumes:

portal_client.thrift

@@ -461,6 +461,22 @@ service VirtualMachineService {
 
 	throws (1:ServerNotFoundException e, 2: OpenStackConflictException c)
 
+    void rescue_server(
+
+	/** Id of the server. */
+	1:string openstack_id
+    2:optional string admin_pass
+    3:optional string image_ref)
+
+	throws (1:ServerNotFoundException e, 2: OpenStackConflictException c)
+
+    void unrescue_server(
+
+	/** Id of the server. */
+	1:string openstack_id)
+
+	throws (1:ServerNotFoundException e, 2: OpenStackConflictException c)
+
 
 	string start_server(
 	/** Name of the  Flavor to use.*/

requirements.txt

@@ -1,4 +1,4 @@
-setuptools==75.1.0
+setuptools==75.2.0
 thrift==0.21.0
 openstacksdk==4.0.0
 deprecated==1.2.14
@@ -15,7 +15,7 @@ pre-commit==4.0.1
 types-PyYAML==6.0.12.20240917
 sympy==1.13.3
 colorama==0.4.6
-gevent==24.10.2
+gevent==24.10.3
 pytest==8.3.3
 types-redis==4.6.0.20241004
 oslo.utils==7.3.0

simple_vm_client/VirtualMachineHandler.py

@@ -140,6 +140,16 @@ def stop_server(self, openstack_id: str) -> None:
     def delete_server(self, openstack_id: str) -> None:
         return self.openstack_connector.delete_server(openstack_id=openstack_id)
 
+    def rescue_server(self, openstack_id: str, 
+                      admin_pass: str = None, 
+                      image_ref: str = None) -> None:
+        return self.openstack_connector.rescue_server(openstack_id=openstack_id, 
+                                                      admin_pass=admin_pass, 
+                                                      image_ref=image_ref)
+
+    def unrescue_server(self, openstack_id: str) -> None:
+        return self.openstack_connector.unrescue_server(openstack_id=openstack_id)    
+
     def reboot_hard_server(self, openstack_id: str) -> None:
         return self.openstack_connector.reboot_hard_server(openstack_id=openstack_id)