Merge branch 'dev' into staging

Author: dweinholz

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:

simple_vm_client/bibigrid_connector/bibigrid_connector.py

@@ -233,6 +233,7 @@ def start_cluster(
                     "type": master_instance.type,
                     "image": master_instance.image,
                 },
+                "nfs": True,
                 "workerInstances": worker_config,
                 "sshUser": "ubuntu",
                 "subnet": self._SUB_NETWORK,

simple_vm_client/config/config_giessen.yml

@@ -38,8 +38,8 @@ openstack:
   # subnetwork for starting Clusters
   sub_network: SimpleVMGieTest-Subnetz
 
-  ssh_port_calculation: 30000 + x + y * 256
-  udp_port_calculation: 30000 + x + y * 256
+  ssh_port_calculation: 30000 + 256 * oct3 + oct4
+  udp_port_calculation: 30000 + 256 * oct3 + oct4
 
 cloud_site: giessen
 

simple_vm_client/openstack_connector/openstack_connector.py

@@ -1472,22 +1472,13 @@ def unrescue_server(self, openstack_id: str) -> None:
             raise OpenStackConflictException(message=e.message)
 
     def _calculate_vm_ports(self, server: Server):
-        fixed_ip = server.private_v4
-        base_port = int(fixed_ip.split(".")[-1])  # noqa F841
-        subnet_port = int(fixed_ip.split(".")[-2])  # noqa F841
+        octets = {
+            f"oct{enum + 1}": int(elem)
+            for enum, elem in enumerate(server.private_v4.split("."))
+        }
+        ssh_port = int(sympy.sympify(self.SSH_PORT_CALCULATION).subs(dict(octets)))
+        udp_port = int(sympy.sympify(self.UDP_PORT_CALCULATION).subs(dict(octets)))
 
-        oct4 = sympy.symbols("oct4")
-        oct3 = sympy.symbols("oct3")
-        ssh_port = int(
-            sympy.sympify(self.SSH_PORT_CALCULATION).evalf(
-                subs={oct4: base_port, oct3: subnet_port}
-            )
-        )
-        udp_port = int(
-            sympy.sympify(self.UDP_PORT_CALCULATION).evalf(
-                subs={oct4: base_port, oct3: subnet_port}
-            )
-        )
         return ssh_port, udp_port
 
     def get_vm_ports(self, openstack_id: str) -> dict[str, str]: