Merge branch 'dev' into staging

Author: dweinholz

portal_client.thrift

@@ -548,7 +548,9 @@ service VirtualMachineService {
      12:optional list<string> additional_security_group_ids,
      13:optional string slurm_version,
      14:optional string metadata_token,
-     15:optional string metadata_endpoint
+     15:optional string metadata_endpoint,
+     16:optional string additional_script
+
 
     )
 
@@ -586,6 +588,8 @@ service VirtualMachineService {
     11:list <string> additional_user_keys,
     12:optional string metadata_token,
     13:optional string metadata_endpoint,
+    14:optional string additional_script
+
 
 
 

requirements.txt

@@ -3,14 +3,14 @@ thrift==0.22.0
 openstacksdk==4.7.1
 deprecated==1.2.18
 Click==8.3.0
-ansible==11.9.0
+ansible==11.10.0
 flake8==7.3.0
 paramiko==4.0.0
 ruamel.yaml==0.18.15
 pyvim==3.0.3
 redis==6.4.0
 requests==2.32.5
-pyyaml==6.0.2
+pyyaml==6.0.3
 pre-commit==4.3.0
 types-PyYAML==6.0.12.20250915
 sympy==1.14.0

simple_vm_client/VirtualMachineHandler.py

@@ -424,6 +424,7 @@ def start_server(
         slurm_version: str = None,
         metadata_token: str = None,
         metadata_endpoint: str = None,
+        additional_script: str = "",
     ) -> str:
         if research_environment:
             research_environment_metadata = (
@@ -448,6 +449,7 @@ def start_server(
             slurm_version=slurm_version,
             metadata_token=metadata_token,
             metadata_endpoint=metadata_endpoint,
+            additional_script=additional_script,
         )
 
     def start_server_with_custom_key(
@@ -464,6 +466,7 @@ def start_server_with_custom_key(
         additional_user_keys: list[str],
         metadata_token: str = None,
         metadata_endpoint: str = None,
+        additional_script: str = "",
     ) -> str:
         if research_environment:
             research_environment_metadata = (
@@ -486,6 +489,7 @@ def start_server_with_custom_key(
             additional_security_group_ids=additional_security_group_ids,
             metadata_token=metadata_token,
             metadata_endpoint=metadata_endpoint,
+            additional_script=additional_script,
         )
         self.forc_connector.set_vm_wait_for_playbook(
             openstack_id=openstack_id, private_key=private_key, name=servername
@@ -552,7 +556,6 @@ def start_cluster(
         metadata: ClusterInstanceMetadata,
         shared_volume: ClusterVolume = None,
     ) -> ClusterMessage:
-        
 
         return self.bibigrid_connector.start_cluster(
             public_keys=public_keys,

simple_vm_client/VirtualMachineService-remote

@@ -61,12 +61,12 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
     )
     print("  void unrescue_server(string openstack_id)")
     print(
-        "  string start_server(string flavor_name, string image_name, string public_key, string servername,  metadata,  volume_ids_path_new,  volume_ids_path_attach,  additional_owner_keys,  additional_user_keys, string research_environment,  additional_security_group_ids, string slurm_version, string metadata_token, string metadata_endpoint)"
+        "  string start_server(string flavor_name, string image_name, string public_key, string servername,  metadata,  volume_ids_path_new,  volume_ids_path_attach,  additional_owner_keys,  additional_user_keys, string research_environment,  additional_security_group_ids, string slurm_version, string metadata_token, string metadata_endpoint, string additional_script)"
     )
     print("  bool is_bibigrid_available()")
     print("  void detach_ip_from_server(string server_id, string floating_ip)")
     print(
-        "  string start_server_with_custom_key(string flavor_name, string image_name, string servername,  metadata, string research_environment,  volume_ids_path_new,  volume_ids_path_attach,  additional_security_group_ids,  additional_owner_keys,  additional_user_keys, string metadata_token, string metadata_endpoint)"
+        "  string start_server_with_custom_key(string flavor_name, string image_name, string servername,  metadata, string research_environment,  volume_ids_path_new,  volume_ids_path_attach,  additional_security_group_ids,  additional_owner_keys,  additional_user_keys, string metadata_token, string metadata_endpoint, string additional_script)"
     )
     print("  bool exist_server(string name)")
     print(
@@ -452,8 +452,8 @@ elif cmd == "unrescue_server":
     )
 
 elif cmd == "start_server":
-    if len(args) != 14:
-        print("start_server requires 14 args")
+    if len(args) != 15:
+        print("start_server requires 15 args")
         sys.exit(1)
     pp.pprint(
         client.start_server(
@@ -471,6 +471,7 @@ elif cmd == "start_server":
             args[11],
             args[12],
             args[13],
+            args[14],
         )
     )
 
@@ -492,8 +493,8 @@ elif cmd == "detach_ip_from_server":
     )
 
 elif cmd == "start_server_with_custom_key":
-    if len(args) != 12:
-        print("start_server_with_custom_key requires 12 args")
+    if len(args) != 13:
+        print("start_server_with_custom_key requires 13 args")
         sys.exit(1)
     pp.pprint(
         client.start_server_with_custom_key(
@@ -509,6 +510,7 @@ elif cmd == "start_server_with_custom_key":
             eval(args[9]),
             args[10],
             args[11],
+            args[12],
         )
     )