diff --git a/src/aleph/vm/haproxy.py b/src/aleph/vm/haproxy.py index d6426ba6..72e0d2bc 100644 --- a/src/aleph/vm/haproxy.py +++ b/src/aleph/vm/haproxy.py @@ -256,6 +256,10 @@ def update_haproxy_backend(socket_path, backend_name, instances, map_file_path, for instance in instances: server_name = instance["name"] local_ip = instance["ipv4"]["local"] + + if local_ip == None: + continue + # custom domain name doesn't return the ip addr but the network range addr = local_ip.split("/")[0] if addr.endswith(".1"): diff --git a/src/aleph/vm/orchestrator/views/__init__.py b/src/aleph/vm/orchestrator/views/__init__.py index 0cee1dfa..113521ca 100644 --- a/src/aleph/vm/orchestrator/views/__init__.py +++ b/src/aleph/vm/orchestrator/views/__init__.py @@ -207,16 +207,18 @@ async def list_executions_v2(request: web.Request) -> web.Response: return web.json_response( { item_hash: { - "networking": { - "ipv4_network": execution.vm.tap_interface.ip_network, - "host_ipv4": pool.network.host_ipv4, - "ipv6_network": execution.vm.tap_interface.ipv6_network, - "ipv6_ip": execution.vm.tap_interface.guest_ipv6.ip, - "ipv4_ip": execution.vm.tap_interface.guest_ip.ip, - "mapped_ports": execution.mapped_ports, - } - if execution.vm and execution.vm.tap_interface - else {}, + "networking": ( + { + "ipv4_network": execution.vm.tap_interface.ip_network, + "host_ipv4": pool.network.host_ipv4, + "ipv6_network": execution.vm.tap_interface.ipv6_network, + "ipv6_ip": execution.vm.tap_interface.guest_ipv6.ip, + "ipv4_ip": execution.vm.tap_interface.guest_ip.ip, + "mapped_ports": execution.mapped_ports, + } + if execution.vm and execution.vm.tap_interface + else {} + ), "status": execution.times, "running": execution.is_running, }