#2450 change link definition schema

This commit is contained in:
Marek Wolan
2024-04-03 22:20:33 +01:00
parent 526dcc7ffe
commit 698cb83e41
14 changed files with 226 additions and 226 deletions

View File

@@ -925,43 +925,43 @@ simulation:
type: DNSClient
links:
- endpoint_a_ref: router_1
- endpoint_a_hostname: router_1
endpoint_a_port: 1
endpoint_b_ref: switch_1
endpoint_b_hostname: switch_1
endpoint_b_port: 8
- endpoint_a_ref: router_1
- endpoint_a_hostname: router_1
endpoint_a_port: 2
endpoint_b_ref: switch_2
endpoint_b_hostname: switch_2
endpoint_b_port: 8
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 1
endpoint_b_ref: domain_controller
endpoint_b_hostname: domain_controller
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 2
endpoint_b_ref: web_server
endpoint_b_hostname: web_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 3
endpoint_b_ref: database_server
endpoint_b_hostname: database_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 4
endpoint_b_ref: backup_server
endpoint_b_hostname: backup_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 7
endpoint_b_ref: security_suite
endpoint_b_hostname: security_suite
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 1
endpoint_b_ref: client_1
endpoint_b_hostname: client_1
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 2
endpoint_b_ref: client_2
endpoint_b_hostname: client_2
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 7
endpoint_b_ref: security_suite
endpoint_b_hostname: security_suite
endpoint_b_port: 2

View File

@@ -1505,43 +1505,43 @@ simulation:
links:
- endpoint_a_ref: router_1
- endpoint_a_hostname: router_1
endpoint_a_port: 1
endpoint_b_ref: switch_1
endpoint_b_hostname: switch_1
endpoint_b_port: 8
- endpoint_a_ref: router_1
- endpoint_a_hostname: router_1
endpoint_a_port: 2
endpoint_b_ref: switch_2
endpoint_b_hostname: switch_2
endpoint_b_port: 8
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 1
endpoint_b_ref: domain_controller
endpoint_b_hostname: domain_controller
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 2
endpoint_b_ref: web_server
endpoint_b_hostname: web_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 3
endpoint_b_ref: database_server
endpoint_b_hostname: database_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 4
endpoint_b_ref: backup_server
endpoint_b_hostname: backup_server
endpoint_b_port: 1
- endpoint_a_ref: switch_1
- endpoint_a_hostname: switch_1
endpoint_a_port: 7
endpoint_b_ref: security_suite
endpoint_b_hostname: security_suite
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 1
endpoint_b_ref: client_1
endpoint_b_hostname: client_1
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 2
endpoint_b_ref: client_2
endpoint_b_hostname: client_2
endpoint_b_port: 1
- endpoint_a_ref: switch_2
- endpoint_a_hostname: switch_2
endpoint_a_port: 7
endpoint_b_ref: security_suite
endpoint_b_hostname: security_suite
endpoint_b_port: 2

View File

@@ -396,8 +396,8 @@ class PrimaiteGame:
# 2. create links between nodes
for link_cfg in links_cfg:
node_a = net.get_node_by_hostname(link_cfg["endpoint_a_ref"])
node_b = net.get_node_by_hostname(link_cfg["endpoint_b_ref"])
node_a = net.get_node_by_hostname(link_cfg["endpoint_a_hostname"])
node_b = net.get_node_by_hostname(link_cfg["endpoint_b_hostname"])
if isinstance(node_a, Switch):
endpoint_a = node_a.network_interface[link_cfg["endpoint_a_port"]]
else: