Merge branch 'dev' into staging

dweinholz · dweinholz · commit d0a057cfedb0 · 2025-01-09T08:14:32.000+01:00
diff --git a/portal_client.thrift b/portal_client.thrift
@@ -612,8 +612,8 @@ service VirtualMachineService {
 
 
     void set_metadata_server_data(1:string ip,3:VirtualMachineServerMetadata metadata) throws (1:MetadataServerNotAvailableException m,2:MetadataServerNotAllowedException b)
-        void remove_metadata_server_data(1:string ip) throws (1:MetadataServerNotAvailableException m,2:MetadataServerNotAllowedException b)
-        void is_metadata_server_available() throws (1:MetadataServerNotAvailableException m,2:MetadataServerNotAllowedException b)
+    void remove_metadata_server_data(1:string ip) throws (1:MetadataServerNotAvailableException m,2:MetadataServerNotAllowedException b)
+    bool is_metadata_server_available() throws (1:MetadataServerNotAvailableException m,2:MetadataServerNotAllowedException b)
 
     /** Delete a backend*/
     void delete_backend(
diff --git a/simple_vm_client/VirtualMachineService-remote b/simple_vm_client/VirtualMachineService-remote
@@ -86,7 +86,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
         "  void set_metadata_server_data(string ip, VirtualMachineServerMetadata metadata)"
     )
     print("  void remove_metadata_server_data(string ip)")
-    print("  void is_metadata_server_available()")
+    print("  bool is_metadata_server_available()")
     print("  void delete_backend(i64 id)")
     print("   add_user_to_backend(i64 backend_id, string user_id)")
     print("   get_users_from_backend(i64 backend_id)")
diff --git a/simple_vm_client/VirtualMachineService.py b/simple_vm_client/VirtualMachineService.py

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":`
`86`	`86`	`" void set_metadata_server_data(string ip, VirtualMachineServerMetadata metadata)"`
`87`	`87`	`)`
`88`	`88`	`print(" void remove_metadata_server_data(string ip)")`
`89`		`- print(" void is_metadata_server_available()")`
	`89`	`+ print(" bool is_metadata_server_available()")`
`90`	`90`	`print(" void delete_backend(i64 id)")`
`91`	`91`	`print(" add_user_to_backend(i64 backend_id, string user_id)")`
`92`	`92`	`print(" get_users_from_backend(i64 backend_id)")`