From 7cfa7ea2bf09017647433917309fbea01ae8adc4 Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Mon, 10 Jul 2023 17:53:23 +0200 Subject: [PATCH] Split visualisation directives to separate file. This allows us to safely reuse the OspfFileTopologyParser without having it ignore unknown directives. --- reference.ospf | 64 --------------------------------- visualisation.ospf | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 64 deletions(-) create mode 100644 visualisation.ospf diff --git a/reference.ospf b/reference.ospf index 53d23f5..7423391 100644 --- a/reference.ospf +++ b/reference.ospf @@ -11,76 +11,50 @@ area 0.0.0.0 distance 30 network [172.23.100.4-3] metric 10 network [172.23.100.10-2] metric 10 - # Visualization of the link - visualisation default - # future syntax idea: - #label hello - #polyline [0 0] [2 2] [3 3] - # Visualization of router itself - visualisation default - position [0 1300] router 172.23.100.2 distance 30 network [172.23.100.6-3] metric 10 network [172.23.100.10-2] metric 10 - visualisation default - position [400 1300] router 172.23.100.3 distance 40 network [172.23.100.8-3] metric 10 network [172.23.100.4-3] metric 10 - visualisation default - position [300 1800] router 172.23.100.4 distance 40 network [172.23.100.7-3] metric 10 network [172.23.100.4-3] metric 10 - visualisation default - position [0 1700] router 172.23.100.5 distance 40 network [172.23.100.8-3] metric 10 network [172.23.100.6-3] metric 10 - visualisation default - position [400 1700] router 172.23.100.6 distance 40 network [172.23.100.7-3] metric 10 network [172.23.100.6-3] metric 10 - visualisation default - position [300 1600] router 172.23.100.7 distance 50 network [172.23.100.9-2] metric 10 network [172.23.100.7-3] metric 10 - visualisation default - position [0 2100] router 172.23.100.8 distance 50 network [172.23.100.9-2] metric 10 network [172.23.100.8-3] metric 10 - visualisation default - position [400 2100] router 172.23.100.9 distance 60 network [172.23.100.9-2] metric 10 - visualisation default - position [200 2500] router 172.23.100.10 distance 20 network [172.23.100.10-2] metric 10 network [192.168.15.1-10] metric 10 - visualisation default - position [200 900] router 192.168.15.1 distance 0 @@ -88,57 +62,33 @@ area 0.0.0.0 network [192.168.15.1-10] metric 20 stubnet 192.168.101.0/24 metric 10 # stubnets are only here, so need to be configured here - visualisation default - position [400 650] stubnet 192.168.201.0/24 metric 10 - visualisation default - position [400 750] - visualisation default - position [200 700] router 192.168.15.7 distance 10 network [192.168.15.7-24] metric 10 stubnet 192.168.15.0/24 metric 10 - visualisation default - position [600 300] stubnet 192.168.0.0/24 metric 20 - visualisation default - position [600 200] stubnet 192.168.42.0/24 metric 20 - visualisation default - position [600 100] external 0.0.0.0/0 metric 50 - visualisation default - position [200 0] - visualisation default - position [400 200] router 192.168.15.10 distance 10 network [192.168.15.7-24] metric 10 external 0.0.0.0/0 metric 300 # Already positioned, so nothing allowed here? - visualisation default - position [0 200] router 192.168.15.11 distance 10 network [192.168.15.7-24] metric 10 external 0.0.0.0/0 metric 300 - visualisation default - position [200 200] network [172.23.100.4-3] distance 40 router 172.23.100.4 - # visualisation not supported here. router 172.23.100.1 router 172.23.100.3 address 172.23.4.0/24 - # visualisation of network node - visualisation default - position [0 1500] network [172.23.100.6-3] distance 40 @@ -146,8 +96,6 @@ area 0.0.0.0 router 172.23.100.5 router 172.23.100.2 address 172.23.5.0/24 - visualisation default - position [400 1500] network [172.23.100.7-3] distance 50 @@ -155,8 +103,6 @@ area 0.0.0.0 router 172.23.100.4 router 172.23.100.6 address 172.23.3.0/24 - visualisation default - position [0 1900] network [172.23.100.8-3] distance 50 @@ -164,8 +110,6 @@ area 0.0.0.0 router 172.23.100.5 router 172.23.100.3 address 172.23.2.0/24 - visualisation default - position [400 1900] network [172.23.100.9-2] distance 60 @@ -173,8 +117,6 @@ area 0.0.0.0 router 172.23.100.7 router 172.23.100.8 address 172.23.1.0/24 - visualisation default - position [200 2300] network [172.23.100.10-2] distance 30 @@ -182,16 +124,12 @@ area 0.0.0.0 router 172.23.100.1 router 172.23.100.2 address 172.23.6.0/24 - visualisation default - position [200 1100] network [192.168.15.1-10] distance 20 router 192.168.15.1 router 172.23.100.10 address 172.23.7.0/24 - visualisation default - position [200 800] address 192.168.101.0/24 network [192.168.15.7-24] @@ -201,5 +139,3 @@ area 0.0.0.0 router 192.168.15.11 router 192.168.15.1 address 192.168.16.0/24 - visualisation default - position [200 500] diff --git a/visualisation.ospf b/visualisation.ospf new file mode 100644 index 0000000..194f4ec --- /dev/null +++ b/visualisation.ospf @@ -0,0 +1,89 @@ +visualisation default + + router 172.23.100.1 + position [0 1300] + + network [172.23.100.10-2] + # future syntax idea: + #label hello + #polyline [0 0] [2 2] [3 3] + + router 172.23.100.2 + position [400 1300] + + router 172.23.100.3 + position [300 1800] + + router 172.23.100.4 + position [0 1700] + + router 172.23.100.5 + position [400 1700] + + router 172.23.100.6 + position [300 1600] + + router 172.23.100.7 + position [0 2100] + + router 172.23.100.8 + position [400 2100] + + router 172.23.100.9 + position [200 2500] + + router 172.23.100.10 + position [200 900] + + router 192.168.15.1 + position [200 700] + stubnet 192.168.101.0/24 + position [400 650] + stubnet 192.168.201.0/24 + position [400 750] + + router 192.168.15.7 + position [400 200] + + stubnet 192.168.15.0/24 metric 10 + router 192.168.15.7 + position [600 300] + stubnet 192.168.0.0/24 metric 20 + router 192.168.15.7 + position [600 200] + stubnet 192.168.42.0/24 metric 20 + router 192.168.15.7 + position [600 100] + external 0.0.0.0/0 metric 50 + router 192.168.15.7 + position [200 0] + + router 192.168.15.10 + position [0 200] + + router 192.168.15.11 + position [200 200] + + network [172.23.100.4-3] + position [0 1500] + + network [172.23.100.6-3] + position [400 1500] + + network [172.23.100.7-3] + position [0 1900] + + network [172.23.100.8-3] + position [400 1900] + + network [172.23.100.9-2] + position [200 2300] + + network [172.23.100.10-2] + position [200 1100] + + network [192.168.15.1-10] + position [200 800] + + network [192.168.15.7-24] + position [200 500]