From 8c553107f92645334394097d56338aba609fdc47 Mon Sep 17 00:00:00 2001 From: XTRM-Unraid Date: Sun, 25 Jan 2026 09:40:07 +0200 Subject: [PATCH] Update device names to match NetBox naming convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HAP → HAP1 | hAP ax³ - CSS326 → CSS1 | CSS326-24G-2S+ - 2.5GbE Switch → ZX1 | ZX-SWTGW218AS - ISP Gateway → IGP Fiber Gateway (Vivacom) - CAP-XL-ac → CAP | cAP XL ac - Updated all tables, topology diagram, and IP allocation --- docs/NETWORK-PHYSICAL-MAP.md | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/NETWORK-PHYSICAL-MAP.md b/docs/NETWORK-PHYSICAL-MAP.md index 8ce1c97..fa96163 100644 --- a/docs/NETWORK-PHYSICAL-MAP.md +++ b/docs/NETWORK-PHYSICAL-MAP.md @@ -36,9 +36,9 @@ block-beta | U | Device | Model | Height | Notes | |---|--------|-------|--------|-------| -| U9 | ISP Gateway | Vivacom Fiber ONT | 1U | WAN connection | +| U9 | IGP Fiber Gateway (Vivacom) | Vivacom Fiber ONT | 1U | WAN connection | | U8 | Patch Panel 2 | 10" 12-port Cat6a | 1U | Room connections | -| U7 | 2.5GbE Switch | 8x 2.5G + 2x 10G SFP+ | 1U | Core switch | +| U7 | ZX1 \| ZX-SWTGW218AS | 8x 2.5G + 2x 10G SFP+ | 1U | Core switch | | U6-U4.5 | (1.5 Uempty) | 1.5 U | - | - | | U1-U4.5 | XTRM-Unraid | NAS Server | 2U | 4x 2.5GbE NIC | @@ -66,10 +66,10 @@ block-beta | U | Device | Model | Height | Notes | |---|--------|-------|--------|-------| -| U3 | XTRM-Router | MikroTik hAP ax³ | 1U | On rack shelf | +| U3 | HAP1 \| hAP ax³ | MikroTik hAP ax³ | 1U | On rack shelf | | U2.5 | Patch Panel 1 | 19" 24-port Cat6a | 0.5U | Room connections | | U2.5-U1 | (0.5 U empty) | 0.5 U | - | - | -| U1 | XTRM-Switch | MikroTik CSS326-24G-2S+ | 1U | Distribution switch | +| U1 | CSS1 \| CSS326-24G-2S+ | MikroTik CSS326-24G-2S+ | 1U | Distribution switch | --- @@ -79,8 +79,8 @@ block-beta | Device | Model | IP Address | MAC | Serial | |--------|-------|------------|-----|--------| -| ISP Gateway | Vivacom Fiber ONT | 62.73.120.2 | 9C:E0:41:BB:5E:32 | __________ | -| 2.5GbE Switch | ZX-SWTGW218AS | 192.168.31.7 | 1C:2A:A3:1E:78:67 | 8x2.5G + 10G SFP +| IGP Fiber Gateway (Vivacom) | Vivacom Fiber ONT | 62.73.120.2 | 9C:E0:41:BB:5E:32 | __________ | +| ZX1 \| ZX-SWTGW218AS | 8x 2.5G + 2x 10G SFP+ | 192.168.31.7 | 1C:2A:A3:1E:78:67 | Core Switch | | XTRM-Unraid | NAS (4x 2.5GbE) eth1 | 192.168.31.2 | A8:B8:E0:02:B6:15 | Bond0 | | XTRM-Unraid | NAS (4x 2.5GbE) eth2| x.x.x.3 |A8:B8:E0:02:B6:16| Bond0 | | XTRM-Unraid | NAS (4x 2.5GbE) eth3| x.x.x.4 |A8:B8:E0:02:B6:17| Bond0 | @@ -94,14 +94,14 @@ block-beta | Device | Model | IP Address | MAC | Serial | |--------|-------|------------|-----|--------| -| XTRM-Router | hAP ax³ | 192.168.31.1 eth1| 78:9A:18:2C:A5:48 | __________ | -| XTRM-Switch | CSS326-24G-2S+ eth1| 192.168.31.9 | F4:1E:57:C9:BD:09 | __________ | +| HAP1 \| hAP ax³ | MikroTik hAP ax³ | 192.168.31.1 eth1| 78:9A:18:2C:A5:48 | __________ | +| CSS1 \| CSS326-24G-2S+ | MikroTik CSS326-24G-2S+ eth1| 192.168.31.9 | F4:1E:57:C9:BD:09 | __________ | ### Wireless | Device | Model | IP Address | MAC| Location | Serial | |--------|-------|------------|----|----------|--------| -| CAP-XL-ac | MikroTik cAP ac eth1| 192.168.31.6 |18:FD:74:54:3D:BC | Corridor | HCT085KBH8B | +| CAP \| cAP XL ac | MikroTik cAP ac eth1| 192.168.31.6 |18:FD:74:54:3D:BC | Corridor | HCT085KBH8B | ---
@@ -146,7 +146,7 @@ block-beta |------|--------|---------|-------------|-----------|------|--------| | PP1-1 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-2 | | | POE Adapter 2|PA-1 | Device | ☐ Active ☑ Unused ☐ Disabled | -| PP1-3 | HAP|H2 | POE Adapter 1 | PA-1 | Patch | ☑ Active ☐ Unused ☐ Disabled | +| PP1-3 | HAP1|H-2 | POE Adapter 1 | PA-1 | Patch | ☑ Active ☐ Unused ☐ Disabled | | PP1-4 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-5 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-6 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | @@ -155,7 +155,7 @@ block-beta | PP1-9 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-10 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-11 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | -| PP1-12 | POE Adapter 1|PA1 | CAP1 | CP-1 | Device | ☑ Active ☐ Unused ☐ Disabled | +| PP1-12 | POE Adapter 1|PA-1 | CAP | CP-1 | Device | ☑ Active ☐ Unused ☐ Disabled | | PP1-13 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-14 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | | PP1-15 | | | | | - | ☐ Active ☐ Unused ☑ Disabled | @@ -216,7 +216,7 @@ block-beta ## Switch Port Maps -### [ZX1] ZX-SWTGW218AS 2.5GbE Switch (10" Rack U3) +### [ZX1] ZX1 | ZX-SWTGW218AS 2.5GbE Switch (10" Rack U7) ```mermaid block-beta @@ -232,7 +232,7 @@ block-beta | Port | Speed | Device | Device Port | VLAN | Notes | Status | |------|-------|--------|-------------|------|-------|--------| -| ZX1-1 | 2.5G | HAP | H-4 | | hAP ax³| ☑ Up ☐ Down | +| ZX1-1 | 2.5G | HAP1 | H-4 | | HAP1 \| hAP ax³| ☑ Up ☐ Down | | ZX1-2 | 2.5G | PP2 | PP2-1 | | XTRM-U XU1| ☑ Up ☐ Down | | ZX1-3 | 2.5G | PP2 | PP2-2 | | XTRM-U XU2| ☑ Up ☐ Down | | ZX1-4 | 2.5G | | | | | ☐ Up ☐ Down | @@ -244,7 +244,7 @@ block-beta
-### MikroTik CSS326-24G-2S+ (19" Rack U1) +### [CSS1] CSS1 | CSS326-24G-2S+ (19" Rack U1) ```mermaid block-beta @@ -278,7 +278,7 @@ block-beta Port | Speed | Device | Device Port | VLAN | Notes | Status | |------|-------|--------|-------------|------|-------|--------| -| CSS1-1 | 1G | HAP | H-3 | | hAP ax³| ☑ Up ☐ Down | +| CSS1-1 | 1G | HAP1 | H-3 | | HAP1 \| hAP ax³| ☑ Up ☐ Down | | CSS1-2 | 100M | KVM1 | KVM1-1 | | KVM Switch| ☑ Up ☐ Down | | CSS1-3 | 1G | | | | | ☐ Up ☑ Down | | CSS1-4 | 1G | | | | | ☐ Up ☑ Down | @@ -310,7 +310,7 @@ block-beta
## Router Port Map -### [HAP] MikroTik hAP ax³ (192.168.31.1) +### [HAP1] HAP1 | hAP ax³ (192.168.31.1) ```mermaid block-beta @@ -325,8 +325,8 @@ block-beta | Port | Speed | Device | Device Port | VLAN | Notes | Status | |------|-------|--------|-------------|------|-------|--------| -| H-1 | 2.5G | GW | GW-1 | | ISP Gateway| ☑ Up ☐ Down | -| H-2 | 1G | PP1 | PP1-3 | | CAP ac| ☑ Up ☐ Down | +| H-1 | 2.5G | IGP | GW-1 | | IGP Fiber Gateway| ☑ Up ☐ Down | +| H-2 | 1G | PP1 | PP1-3 | | CAP \| cAP XL ac| ☑ Up ☐ Down | | H-3 | 1G | CSS1 | CSS1-1 | | Uplink| ☑ Up ☐ Down | | H-4 | 1G | ZX1 | ZX1-1 | | Uplink| ☑ Up ☐ Down | | H-5 | 1G | | | | | ☑ Up ☐ Down | @@ -339,7 +339,7 @@ block-beta | Outlet | Room | Switch | SW Port | PP Port | Device | Device Port | Status | |--------|------|--------|---------|---------|--------|-------------|--------| -| C1 | Corridor | HAP | H-2 | PP1-3→PP1-12 | cAP ac | CP-1 | ☑ Active ☐ Unused | +| C1 | Corridor | HAP1 | H-2 | PP1-3→PP1-12 | CAP \| cAP XL ac | CP-1 | ☑ Active ☐ Unused | | L1 | Living Room | CSS1 | CSS1-22 | PP1-22 | | | ☑ Active ☐ Unused | | L2 | Living Room | CSS1 | CSS1-23 | PP1-23 | | | ☑ Active ☐ Unused | | L3 | Living Room | CSS1 | CSS1-24 | PP1-24 |LGTV |LG-1 | ☑ Active ☐ Unused | @@ -368,24 +368,24 @@ block-beta ```mermaid flowchart TB subgraph Internet["Internet"] - ISP["ISP Gateway
Vivacom Fiber
62.73.120.x"] + ISP["IGP Fiber Gateway
(Vivacom)
62.73.120.x"] end subgraph Rack19["19" Rack (3U)"] - HAP["hAP ax³ Router
192.168.31.1"] - PP1["PP1 (24-port)"] - CSS["CSS326-24G-2S+
192.168.31.9"] + HAP1["HAP1 | hAP ax³
192.168.31.1"] + PP1["PP1 | 19" 0.5U 24-port"] + CSS1["CSS1 | CSS326-24G-2S+
192.168.31.9"] end subgraph Rack10["10" Rack (9U)"] - ZX1["ZX1 2.5GbE Switch
192.168.31.7"] - PP2["PP2 (12-port)"] + ZX1["ZX1 | ZX-SWTGW218AS
192.168.31.7"] + PP2["PP2 | 10" 12-port"] UNRAID["XTRM-Unraid
192.168.31.2"] end subgraph AccessPoint["Corridor"] - POE["POE Adapter"] - CAP["cAP ac
192.168.31.6"] + POE["POE Adapter 1"] + CAP["CAP | cAP XL ac
192.168.31.6"] end subgraph Rooms["Room Outlets"] @@ -396,20 +396,20 @@ flowchart TB end subgraph EndDevices["Connected Devices"] - LGTV["LG TV"] + LGTV["LGTV"] NOBARA["XTRM-Nobara"] DELL["Dell Display"] - DANCHO["Dancho PC"] + DANCHO["Dancho"] KVM["KVM Switch"] end %% WAN Connection - ISP -->|"H-1 (2.5G WAN)"| HAP + ISP -->|"H-1 (2.5G WAN)"| HAP1 %% Backbone Links (marked) - HAP -->|"H-4 → ZX1-1
1G Uplink"| ZX1 - HAP -->|"H-3 → CSS1-1
1G Backup"| CSS - ZX1 <-->|"ZX1-SFP1 ↔ CSS1-SFP1
⚡ 10G BACKBONE ⚡"| CSS + HAP1 -->|"H-4 → ZX1-1
1G Uplink"| ZX1 + HAP1 -->|"H-3 → CSS1-1
1G Backup"| CSS1 + ZX1 <-->|"ZX1-SFP1 ↔ CSS1-SFP1
⚡ 10G BACKBONE ⚡"| CSS1 %% Server Connection via PP2 ZX1 -->|"ZX1-2 → PP2-1"| PP2 @@ -417,13 +417,13 @@ flowchart TB PP2 -->|"PP2-1 → XU-1
PP2-2 → XU-2
2.5G Bond"| UNRAID %% CAP Path (wired POE) - HAP -->|"H-2 → PP1-3"| PP1 + HAP1 -->|"H-2 → PP1-3"| PP1 PP1 -->|"PP1-3 rear"| POE POE -->|"PP1-12 rear"| PP1 PP1 -->|"PP1-12 → CP-1"| CAP %% Room Distribution - CSS -->|"CSS1-16..24"| PP1 + CSS1 -->|"CSS1-16..24"| PP1 PP1 -->|"PP1-22..24"| LR PP1 -->|"PP1-19..21"| MB PP1 -->|"PP1-16"| GR @@ -434,12 +434,12 @@ flowchart TB MB -.-> NOBARA MB -.-> DELL BR -.-> DANCHO - CSS -->|"CSS1-2"| KVM + CSS1 -->|"CSS1-2"| KVM %% Styling style ZX1 fill:#bfb,stroke:#333,stroke-width:2px - style CSS fill:#bfb,stroke:#333,stroke-width:2px - style HAP fill:#f9f,stroke:#333,stroke-width:2px + style CSS1 fill:#bfb,stroke:#333,stroke-width:2px + style HAP1 fill:#f9f,stroke:#333,stroke-width:2px style UNRAID fill:#fbb,stroke:#333,stroke-width:2px style ISP fill:#ff9,stroke:#333 style CAP fill:#9ff,stroke:#333 @@ -450,8 +450,8 @@ flowchart TB | Link | From | To | Speed | Type | |------|------|----|-------|------| | **Primary Backbone** | ZX1-SFP1 | CSS1-SFP1 | 10G | SFP+ DAC | -| Router → Core | HAP H-4 | ZX1-1 | 1G | Cat6a | -| Router → Distribution | HAP H-3 | CSS1-1 | 1G | Cat6a (backup) | +| Router → Core | HAP1 H-4 | ZX1-1 | 1G | Cat6a | +| Router → Distribution | HAP1 H-3 | CSS1-1 | 1G | Cat6a (backup) | | Server Bond | ZX1-2/3 | XU-1/2 via PP2 | 2x 2.5G | Cat6a | --- @@ -462,12 +462,12 @@ flowchart TB | IP Address | Hostname | Device | DHCP/Static | |------------|----------|--------|-------------| -| 192.168.31.1 | HAPax3 | Router | Static | +| 192.168.31.1 | HAP1 \| hAP ax³ | Router | Static | | 192.168.31.2 | XTRM-Unraid | Server | Static | | 192.168.31.4 | AdGuard-Unraid | Container | Static | -| 192.168.31.6 | CAP-XL-ac | Access Point | Static | -| 192.168.31.7 | ZX1 | 2.5GbE Switch | Static | -| 192.168.31.9 | CSS326 | Switch | Static | +| 192.168.31.6 | CAP \| cAP XL ac | Access Point | Static | +| 192.168.31.7 | ZX1 \| ZX-SWTGW218AS | 2.5GbE Switch | Static | +| 192.168.31.9 | CSS1 \| CSS326-24G-2S+ | Switch | Static | | 192.168.31.10-99 | - | Reserved | - | | 192.168.31.100-200 | - | DHCP Pool | DHCP | | 192.168.31.201-254 | - | Reserved | - | @@ -494,7 +494,7 @@ flowchart TB ## WiFi Configuration -### Access Point: MikroTik cAP ac +### Access Point: CAP | cAP XL ac | SSID | Band | Channel | Security | Coverage | |------|------|---------|----------|----------|