Merge pull request #732 from deNBI/staging

Staging

Author: dweinholz

.env.in

@@ -29,4 +29,4 @@ LOG_FILE=log/portal_client.log
 LOG_BACKUP_COUNT=5
 LOG_MAX_BYTES=1073741824
 
-BIBIGRID_TAG=dev
+BIBIGRID_TAG=bibigrid-rest-3.0.0

docker-compose.bibigrid.host.yml

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

docker-compose.bibigrid.yml

@@ -43,7 +43,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:9.0.0
+    image: docker.elastic.co/beats/filebeat:9.0.1
     env_file:
       - .env
     volumes:

docker-compose.host.yml

@@ -29,7 +29,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:9.0.0
+    image: docker.elastic.co/beats/filebeat:9.0.1
     env_file:
       - .env
     volumes:

docker-compose.yml

@@ -29,7 +29,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:9.0.0
+    image: docker.elastic.co/beats/filebeat:9.0.1
     env_file:
       - .env
     volumes:

portal_client.thrift

@@ -678,6 +678,9 @@ service VirtualMachineService {
     **/
 	list<VM> get_servers_by_ids(1:list<string> server_ids)
 
+
+    list<string> get_cluster_supported_ubuntu_os_versions()
+
 	/**
 	* Get servers by bibigrid cluster id.
     **/

simple_vm_client/VirtualMachineHandler.py

@@ -531,6 +531,9 @@ def get_security_group_id_by_name(self, security_group_name) -> str:
             security_group_name=security_group_name
         )
 
+    def get_cluster_supported_ubuntu_os_versions(self) -> list[str]:
+        return self.bibigrid_connector.get_cluster_supported_ubuntu_os_versions()
+
     def get_cluster_info(self, cluster_id) -> ClusterInfo:
         return self.bibigrid_connector.get_cluster_info(cluster_id=cluster_id)
 

simple_vm_client/VirtualMachineService-remote

@@ -94,6 +94,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
     print("   get_allowed_templates()")
     print("   get_servers()")
     print("   get_servers_by_ids( server_ids)")
+    print("   get_cluster_supported_ubuntu_os_versions()")
     print("   get_servers_by_bibigrid_id(string bibigrid_id)")
     print("  string get_security_group_id_by_name(string name)")
     print(
@@ -699,6 +700,12 @@ elif cmd == "get_servers_by_ids":
         )
     )
 
+elif cmd == "get_cluster_supported_ubuntu_os_versions":
+    if len(args) != 0:
+        print("get_cluster_supported_ubuntu_os_versions requires 0 args")
+        sys.exit(1)
+    pp.pprint(client.get_cluster_supported_ubuntu_os_versions())
+
 elif cmd == "get_servers_by_bibigrid_id":
     if len(args) != 1:
         print("get_servers_by_bibigrid_id requires 1 args")