diff --git a/examples/.~lock.table.csv# b/examples/.~lock.table.csv# new file mode 100644 index 0000000..e7bd669 --- /dev/null +++ b/examples/.~lock.table.csv# @@ -0,0 +1 @@ +,krosh,loki-nixos,07.04.2026 16:24,file:///home/krosh/.config/libreoffice/4; \ No newline at end of file diff --git a/examples/NABC/.~lock.NANBNC.csv# b/examples/NABC/.~lock.NANBNC.csv# new file mode 100644 index 0000000..1c86c2f --- /dev/null +++ b/examples/NABC/.~lock.NANBNC.csv# @@ -0,0 +1 @@ +,krosh,loki-nixos,08.04.2026 02:40,file:///home/krosh/.config/libreoffice/4; \ No newline at end of file diff --git a/examples/NABC/NANB.csv b/examples/NABC/NANB.csv new file mode 100644 index 0000000..836e88a --- /dev/null +++ b/examples/NABC/NANB.csv @@ -0,0 +1,9 @@ +Name,Role,Adapter,Interface,Network +H1,Host,Adapter1,eth1,NA +H1,Host,Adapter2,eth2,NB +H2,Host,Adapter1,eth1,NA +H3,Host,Adapter1,eth1,NA +H4,Host,Adapter1,eth1,NB +H5,Host,Adapter1,eth1, +H6,Host,Adapter1,eth1, +H6,Host,Adapter2,eth2, diff --git a/examples/NABC/NANBNC.csv b/examples/NABC/NANBNC.csv new file mode 100644 index 0000000..5aafa4b --- /dev/null +++ b/examples/NABC/NANBNC.csv @@ -0,0 +1,9 @@ +Name,Role,Adapter,Interface,Network +H1,Host,Adapter1,eth1,NA +H1,Host,Adapter2,eth2,NB +H2,Host,Adapter1,eth1,NA +H3,Host,Adapter1,eth1,NA +H4,Host,Adapter1,eth1,NB +H5,Host,Adapter1,eth1,NC +H6,Host,Adapter1,eth1, +H6,Host,Adapter2,eth2,NC diff --git a/examples/NABC/NANC.csv b/examples/NABC/NANC.csv new file mode 100644 index 0000000..ed4f766 --- /dev/null +++ b/examples/NABC/NANC.csv @@ -0,0 +1,9 @@ +Name,Role,Adapter,Interface,Network +H1,Host,Adapter1,eth1,NA +H1,Host,Adapter2,eth2, +H2,Host,Adapter1,eth1,NA +H3,Host,Adapter1,eth1,NA +H4,Host,Adapter1,eth1, +H5,Host,Adapter1,eth1,NC +H6,Host,Adapter1,eth1, +H6,Host,Adapter2,eth2,NC diff --git a/examples/table.csv b/examples/table.csv new file mode 100644 index 0000000..9c10781 --- /dev/null +++ b/examples/table.csv @@ -0,0 +1,4 @@ +Name,Role,Adapter,Interface,Network,Mask,Device IP +PC1,Host,Adapter1,uplink,main,/24,10.0.12.1 +PC2,Host,Adapter1,uplink,main,/24,10.0.12.2 +PC3,Host,Adapter1,uplink,main,/24,10.0.12.3 diff --git a/examples/vlan/.~lock.table.csv# b/examples/vlan/.~lock.table.csv# new file mode 100644 index 0000000..9ca398e --- /dev/null +++ b/examples/vlan/.~lock.table.csv# @@ -0,0 +1 @@ +,krosh,loki-nixos,07.04.2026 16:48,file:///home/krosh/.config/libreoffice/4; \ No newline at end of file diff --git a/examples/vlan/table.csv b/examples/vlan/table.csv new file mode 100644 index 0000000..9f50b32 --- /dev/null +++ b/examples/vlan/table.csv @@ -0,0 +1,19 @@ +Name,Role,Adapter,Interface,Slave Interfaces,Parent Interface,Network,VLAN,Network IP,Mask,Device IP +hostA,Host,Adapter1,eth1,,,netA,,10.0.0.0,/24,10.0.0.1 +hostB,Host,Adapter1,eth1,,,netB,,10.0.0.0,/24,10.0.0.2 +hostD,Host,Adapter1,eth1,,,netD,,10.0.0.0,/24,10.0.0.3 +hostE,Host,Adapter1,eth1,,,netE,,10.0.0.0,/24,10.0.0.4 +bright,Switch,Adapter1,eth1,,,netA,,,, +bright,Switch,Adapter2,eth2,,,netB,,,, +bright,Switch,Adapter3,eth3,,,netC,,,, +bright,Switch,,vlan5,,eth3,,5,,, +bright,Switch,,vlan7,,eth3,,7,,, +bright,Switch,,br5,"eth1,vlan5",,,,,, +bright,Switch,,br7,"eth2,vlan7",,,,,, +bleft,Switch,Adapter1,eth1,,,netD,,,, +bleft,Switch,Adapter2,eth2,,,netE,,,, +bleft,Switch,Adapter3,eth3,,,netC,,,, +bleft,Switch,,vlan5,,eth3,,5,,, +bleft,Switch,,vlan7,,eth3,,7,,, +bleft,Switch,,br5,"eth1,vlan5",,,,,, +bleft,Switch,,br7,"eth2,vlan7",,,,,, diff --git a/src/netdiag/output/d2.py b/src/netdiag/output/d2.py index 1168711..dee44e2 100644 --- a/src/netdiag/output/d2.py +++ b/src/netdiag/output/d2.py @@ -102,7 +102,7 @@ def _generate_picture(diagram: Path, output_path: Path) -> None: ) res = subprocess.run( - ["d2", f"--theme={THEME_NUMBER}", str(diagram)], + ["d2", str(diagram)], check=True, capture_output=True, )