Test new endpoint, add fix for non prepared Execution

Author: olethanh

src/aleph/vm/orchestrator/resources.py

@@ -21,6 +21,7 @@
 )
 
 
+
 class Period(BaseModel):
     datetime: datetime
 

src/aleph/vm/orchestrator/views/__init__.py

@@ -183,9 +183,12 @@ async def list_executions_v2(request: web.Request) -> web.Response:
         {
             item_hash: {
                 "networking": {
-                    "ipv4": execution.vm.tap_interface.ip_network,
-                    "ipv6": execution.vm.tap_interface.ipv6_network,
-                },
+                    "ipv4_network": execution.vm.tap_interface.ip_network,
+                    "ipv6_network": execution.vm.tap_interface.ipv6_network,
+                    "ipv6_ip": execution.vm.tap_interface.guest_ipv6.ip,
+                }
+                if execution.vm and execution.vm.tap_interface
+                else {},
                 "status": execution.times,
                 "running": execution.is_controller_running,
             }

tests/supervisor/test_views.py

@@ -11,11 +11,39 @@
 from pytest_mock import MockerFixture
 
 from aleph.vm.conf import settings
+from aleph.vm.models import VmExecution
 from aleph.vm.orchestrator.supervisor import setup_webapp
 from aleph.vm.pool import VmPool
 from aleph.vm.sevclient import SevClient
 
 
+@pytest.fixture()
+def mock_instance_content():
+    fake = {
+        "address": "0x101d8D16372dBf5f1614adaE95Ee5CCE61998Fc9",
+        "time": 1713874241.800818,
+        "allow_amend": False,
+        "metadata": None,
+        "authorized_keys": None,
+        "variables": None,
+        "environment": {"reproducible": False, "internet": True, "aleph_api": True, "shared_cache": False},
+        "resources": {"vcpus": 1, "memory": 256, "seconds": 30, "published_ports": None},
+        "payment": {"type": "superfluid", "chain": "BASE"},
+        "requirements": None,
+        "replaces": None,
+        "rootfs": {
+            "parent": {"ref": "63f07193e6ee9d207b7d1fcf8286f9aee34e6f12f101d2ec77c1229f92964696"},
+            "ref": "63f07193e6ee9d207b7d1fcf8286f9aee34e6f12f101d2ec77c1229f92964696",
+            "use_latest": True,
+            "comment": "",
+            "persistence": "host",
+            "size_mib": 1000,
+        },
+    }
+
+    return fake
+
+
 @pytest.mark.asyncio
 async def test_allocation_fails_on_invalid_item_hash(aiohttp_client):
     """Test that the allocation endpoint fails when an invalid item_hash is provided."""
@@ -137,6 +165,124 @@ def get_persistent_executions(self):
     assert await response.json() == {"success": True, "successful": [], "failing": [], "errors": {}}
 
 
+@pytest.mark.asyncio
+async def test_v2_executions_list_one_vm(aiohttp_client, mock_app_with_pool, mock_instance_content):
+    web_app = await mock_app_with_pool
+    pool = web_app["vm_pool"]
+    message = InstanceContent.model_validate(mock_instance_content)
+
+    hash = "decadecadecadecadecadecadecadecadecadecadecadecadecadecadecadeca"
+
+    execution = VmExecution(
+        vm_hash=hash,
+        message=message,
+        original=message,
+        persistent=False,
+        snapshot_manager=None,
+        systemd_manager=None,
+    )
+    pool.executions = {hash: execution}
+    client = await aiohttp_client(web_app)
+    response: web.Response = await client.get(
+        "/v2/about/executions/list",
+    )
+    assert response.status == 200
+    assert await response.json() == {
+        "decadecadecadecadecadecadecadecadecadecadecadecadecadecadecadeca": {
+            "networking": {},
+            "status": {
+                "defined_at": str(execution.times.defined_at),
+                "preparing_at": None,
+                "prepared_at": None,
+                "starting_at": None,
+                "started_at": None,
+                "stopping_at": None,
+                "stopped_at": None,
+            },
+            "running": None,
+        }
+    }
+
+
+@pytest.mark.asyncio
+async def test_v2_executions_list_vm_network(aiohttp_client, mocker, mock_app_with_pool, mock_instance_content):
+    "Test locally but do not create"
+    web_app = await mock_app_with_pool
+    pool = web_app["vm_pool"]
+    message = InstanceContent.model_validate(mock_instance_content)
+
+    vm_hash = "decadecadecadecadecadecadecadecadecadecadecadecadecadecadecadeca"
+
+    execution = VmExecution(
+        vm_hash=hash,
+        message=message,
+        original=message,
+        persistent=False,
+        snapshot_manager=None,
+        systemd_manager=None,
+    )
+    vm_id = 3
+    from aleph.vm.network.hostnetwork import Network, make_ipv6_allocator
+
+    network = Network(
+        vm_ipv4_address_pool_range=settings.IPV4_ADDRESS_POOL,
+        vm_network_size=settings.IPV4_NETWORK_PREFIX_LENGTH,
+        external_interface=settings.NETWORK_INTERFACE,
+        ipv6_allocator=make_ipv6_allocator(
+            allocation_policy=settings.IPV6_ALLOCATION_POLICY,
+            address_pool=settings.IPV6_ADDRESS_POOL,
+            subnet_prefix=settings.IPV6_SUBNET_PREFIX,
+        ),
+        use_ndp_proxy=False,
+        ipv6_forwarding_enabled=False,
+    )
+    network.setup()
+
+    from aleph.vm.vm_type import VmType
+
+    vm_type = VmType.from_message_content(message)
+    tap_interface = await network.prepare_tap(vm_id, vm_hash, vm_type)
+    # await network.create_tap(vm_id, tap_interface)
+    execution.vm = mocker.Mock()
+    execution.vm.tap_interface = tap_interface
+
+    pool.executions = {vm_hash: execution}
+    client = await aiohttp_client(web_app)
+    response: web.Response = await client.get(
+        "/v2/about/executions/list",
+    )
+    assert response.status == 200
+    assert await response.json() == {
+        "decadecadecadecadecadecadecadecadecadecadecadecadecadecadecadeca": {
+            "networking": {
+                "ipv4_network": "172.16.3.0/24",
+                "ipv6_network": "fc00:1:2:3:3:deca:deca:dec0/124",
+                "ipv6_ip": "fc00:1:2:3:3:deca:deca:dec1",
+            },
+            "status": {
+                "defined_at": str(execution.times.defined_at),
+                "preparing_at": None,
+                "prepared_at": None,
+                "starting_at": None,
+                "started_at": None,
+                "stopping_at": None,
+                "stopped_at": None,
+            },
+            "running": None,
+        }
+    }
+
+
+@pytest.mark.asyncio
+async def test_v2_executions_list_empty(aiohttp_client, mock_app_with_pool):
+    client = await aiohttp_client(await mock_app_with_pool)
+    response: web.Response = await client.get(
+        "/v2/about/executions/list",
+    )
+    assert response.status == 200
+    assert await response.json() == {}
+
+
 @pytest.mark.asyncio
 async def test_about_certificates_missing_setting(aiohttp_client):
     """Test that the certificates system endpoint returns an error if the setting isn't enabled"""
@@ -268,7 +414,6 @@ def mock_is_kernel_enabled_gpu(pci_host: str) -> bool:
     )
 
     mocker.patch.object(settings, "ENABLE_GPU_SUPPORT", True)
-    loop = asyncio.new_event_loop()
     pool = VmPool()
     await pool.setup()
     app = setup_webapp(pool=pool)