This commit is contained in:
Evan
2025-12-22 03:46:00 +00:00
parent 72c71a9abd
commit 2f4ea8641e
2 changed files with 8 additions and 16 deletions

View File

@@ -1,7 +1,6 @@
from ipaddress import ip_address from ipaddress import ip_address
from itertools import count from itertools import count
from exo.routing.connection_message import SocketAddress
from exo.shared.types.common import NodeId from exo.shared.types.common import NodeId
from exo.shared.types.profiling import ( from exo.shared.types.profiling import (
MemoryPerformanceProfile, MemoryPerformanceProfile,
@@ -11,7 +10,6 @@ from exo.shared.types.profiling import (
from exo.shared.types.topology import Connection, ConnectionProfile, NodeInfo from exo.shared.types.topology import Connection, ConnectionProfile, NodeInfo
ip_octet_iter = count() ip_octet_iter = count()
port_iter = count(5000)
def create_node(memory: int, node_id: NodeId | None = None) -> NodeInfo: def create_node(memory: int, node_id: NodeId | None = None) -> NodeInfo:
@@ -39,21 +37,15 @@ def create_connection(
source_node_id: NodeId, source_node_id: NodeId,
sink_node_id: NodeId, sink_node_id: NodeId,
*, *,
port: int | None = None,
ip_octet: int | None = None, ip_octet: int | None = None,
) -> Connection: ) -> Connection:
global ip_octet_iter global ip_octet_iter
global port_iter
return Connection( return Connection(
source_id=source_node_id, source_id=source_node_id,
sink_id=sink_node_id, sink_id=sink_node_id,
sink_addr=SocketAddress( sink_addr=ip_address(
ip=ip_address( f"169.254.0.{ip_octet if ip_octet is not None else next(ip_octet_iter)}"
f"169.254.0.{ip_octet if ip_octet is not None else next(ip_octet_iter)}"
),
port=port if port is not None else next(port_iter),
zone_id=None,
), ),
connection_profile=ConnectionProfile( connection_profile=ConnectionProfile(
throughput=1000, latency=1000, jitter=1000 throughput=1000, latency=1000, jitter=1000

View File

@@ -351,11 +351,11 @@ def test_tensor_rdma_backend_connectivity_matrix(
network_interfaces=[ network_interfaces=[
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en3", name="en3",
ip_address=conn_c_a.sink_addr.ip, ip_address=conn_c_a.sink_addr,
), ),
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en4", name="en4",
ip_address=conn_b_a.sink_addr.ip, ip_address=conn_b_a.sink_addr,
), ),
ethernet_interface, ethernet_interface,
], ],
@@ -369,11 +369,11 @@ def test_tensor_rdma_backend_connectivity_matrix(
network_interfaces=[ network_interfaces=[
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en3", name="en3",
ip_address=conn_c_b.sink_addr.ip, ip_address=conn_c_b.sink_addr,
), ),
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en4", name="en4",
ip_address=conn_a_b.sink_addr.ip, ip_address=conn_a_b.sink_addr,
), ),
ethernet_interface, ethernet_interface,
], ],
@@ -387,11 +387,11 @@ def test_tensor_rdma_backend_connectivity_matrix(
network_interfaces=[ network_interfaces=[
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en3", name="en3",
ip_address=conn_a_c.sink_addr.ip, ip_address=conn_a_c.sink_addr,
), ),
NetworkInterfaceInfo( NetworkInterfaceInfo(
name="en4", name="en4",
ip_address=conn_b_c.sink_addr.ip, ip_address=conn_b_c.sink_addr,
), ),
ethernet_interface, ethernet_interface,
], ],