diff --git a/docs/01-NETWORK-MAP.md b/docs/01-NETWORK-MAP.md
index da630d1..5e198b4 100644
--- a/docs/01-NETWORK-MAP.md
+++ b/docs/01-NETWORK-MAP.md
@@ -42,12 +42,12 @@ flowchart TB
CAP["CAP | cAP XL ac
192.168.31.6"]
end
- ISP -->|"H-1 WAN"| HAP1
- HAP1 -->|"H-4 → ZX1-1"| ZX1
- HAP1 -->|"H-3 → CSS1-1"| CSS1
+ ISP -->|"ether1 WAN"| HAP1
+ HAP1 -->|"ether2"| CAP
+ HAP1 -->|"ether3"| CSS1
+ HAP1 -->|"ether4"| XTRMU
+ HAP1 -->|"ether5"| DELL["Dell Monitor
192.168.10.100"]
ZX1 <-->|"⚡ 10G SFP+ ⚡"| CSS1
- ZX1 -->|"ZX1-2/3 via PP2"| XTRMU
- HAP1 -->|"H-2 via PP1"| CAP
CSS1 -->|"Ports 16-24"| PP1
```
@@ -75,14 +75,25 @@ flowchart TB
| U2.5 | PP1 | 19" 24-port Cat6a | - | Room connections |
| U1 | CSS1 | CSS326-24G-2S+ | 192.168.31.9 | 24x1G + 2x10G SFP+ |
+### HAP ax³ Port Assignments
+
+| Port | Connected To | VLAN | Notes |
+|------|--------------|------|-------|
+| ether1 | ISP Gateway | WAN | Vivacom ONT |
+| ether2 | CAP XL ac | 10 (trunk) | Access Point |
+| ether3 | CSS326-24G-2S+ | 10 (trunk) | Distribution Switch |
+| ether4 | XTRM-U (Unraid) | 10 | Main Server |
+| ether5 | Dell Monitor LAN | 10 | Kaloyan workstation |
+
### Backbone Links
| Link | From | To | Speed | Type |
|------|------|----|-------|------|
| **Primary** | ZX1-SFP1 | CSS1-SFP1 | 10G | SFP+ DAC |
-| Router→Core | HAP1 H-4 | ZX1-1 | 2.5G | Cat6a |
-| Router→Dist | HAP1 H-3 | CSS1-1 | 1G | Cat6a |
-| Server Bond | ZX1-2/3 | XTRM-U via PP2 | 2x 2.5G | Cat6a |
+| Router→CAP | HAP1 ether2 | CAP XL ac | 1G | Cat6a |
+| Router→Dist | HAP1 ether3 | CSS1-1 | 1G | Cat6a |
+| Router→Server | HAP1 ether4 | XTRM-U | 1G | Cat6a |
+| Router→Dell | HAP1 ether5 | Dell Monitor | 1G | Cat6a |
---
diff --git a/docs/20-DEVICE-MIGRATION-WORKSHEET.md b/docs/20-DEVICE-MIGRATION-WORKSHEET.md
index d57d7d7..5ce5301 100644
--- a/docs/20-DEVICE-MIGRATION-WORKSHEET.md
+++ b/docs/20-DEVICE-MIGRATION-WORKSHEET.md
@@ -1,6 +1,6 @@
# Device Migration Worksheet
-**Last Updated:** 2026-02-02
+**Last Updated:** 2026-02-01
**Purpose:** Planning worksheet for VLAN/IP reassignment
---
@@ -11,41 +11,42 @@
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| HAP1 (hAP ax³) | 78:9A:18:2C:A5:48 | 192.168.10.1 | 10 | 10 | 192.168.10.1 |
-| CAP XL ac | 18:FD:74:54:3D:BC | 192.168.10.2 | 10 | 10 | 192.168.10.2 |
-| CSS326-24G-2S+ | F4:1E:57:C9:BD:09 | 192.168.10.3 | 10 | 10 | 192.168.10.3 |
-| ZX1 (ZX-SWTGW218AS) | 1C:2A:A3:1E:78:67 | 192.168.10.4 | 10 | 10 | 192.168.10.4 |
-| AdGuard Home (Unraid) | 02:42:C0:A8:1F:04 | 192.168.10.10 | 10 | 10 | 192.168.10.10 |
-| XTRM-U (Unraid) | A8:B8:E0:02:B6:15 | 192.168.10.20 | 10 | 10 | 192.168.10.20 |
-| NanoKVM | 48:DA:35:6F:BE:50 | 192.168.10.200 | 10 | 10 | 192.168.10.200 |
-| AdGuard (MikroTik) | 46:D0:27:F7:1F:CA | 172.17.0.2 | 10 | 10 | 172.17.0.2 |
-| Tailscale (MikroTik) | 0C:AB:39:8D:8C:FC | 172.17.0.3 | 10 | 10 | 172.17.0.3 |
-| Dell Monitor LAN (ether5) | 08:92:04:C6:07:C5 | 192.168.20.16 | 20 | 10 | 192.168.10.100 |
+| HAP1 (hAP ax³) | 78:9A:18:2C:A5:48 | 192.168.10.1 | 10 | | |
+| CAP XL ac | 18:FD:74:54:3D:BC | 192.168.10.2 | 10 | | |
+| CSS326-24G-2S+ | F4:1E:57:C9:BD:09 | 192.168.10.3 | 10 | | |
+| ZX1 (ZX-SWTGW218AS) | 1C:2A:A3:1E:78:67 | 192.168.10.4 | 10 | | |
+| AdGuard Home (Unraid) | 02:42:C0:A8:1F:04 | 192.168.10.10 | 10 | | |
+| XTRM-U (Unraid) | A8:B8:E0:02:B6:15 | 192.168.10.20 | 10 | | |
+| NanoKVM | 48:DA:35:6F:BE:50 | 192.168.10.200 | 10 | | |
+| AdGuard (MikroTik) | 46:D0:27:F7:1F:CA | 172.17.0.2 | 10 | | |
+| Tailscale (MikroTik) | 0C:AB:39:8D:8C:FC | 172.17.0.3 | 10 | | |
---
-### VLAN 20 - Trusted (Kaloyan Only)
+### VLAN 20 - Trusted (Family Devices)
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| Samsung S25 Ultra (Kaloyan) | AA:ED:8B:2A:40:F1 | 192.168.20.11 | 20 | 20 | 192.168.20.11 |
-| MacBook Pro WiFi 5GHz (Kaloyan) | BE:A7:95:87:19:4A | 192.168.20.12 | 20 | 20 | 192.168.20.12 |
-| MacBook Pro WiFi 2.4GHz (Kaloyan) | CE:B8:11:EA:8D:55 | 192.168.20.13 | 20 | 20 | 192.168.20.13 |
-| USB Hub (Kaloyan) | 34:0A:33:2C:1E:28 | 192.168.20.14 | 20 | 20 | 192.168.20.14 |
-| Gaming PC LAN (Kaloyan) | 1C:83:41:32:F3:AF | 192.168.20.17 | 20 | 20 | 192.168.20.17 |
-| Gaming PC WiFi (Kaloyan) | TBD | TBD | - | 20 | 192.168.20.18 |
+| MacBook Air (Nora) | 82:6D:FB:D9:E0:47 | 192.168.20.10 | 20 | | |
+| Samsung S25 Ultra (Kaloyan) | AA:ED:8B:2A:40:F1 | 192.168.20.11 | 20 | | |
+| iPhone (Dancho) | F2:B8:14:61:C8:27 | 192.168.20.12 | 20 | | |
+| MacBook Pro WiFi (Kaloyan) | 82:EC:EF:B5:F2:AF | 192.168.20.13 | 20 | | |
+| Notebook (Kimi) | 90:91:64:70:0D:86 | 192.168.20.14 | 20 | | |
+| iPhone (Kimi) | 2A:2B:BA:86:D4:AF | 192.168.20.15 | 20 | | |
+| MacBook Pro LAN (Kaloyan) | 08:92:04:C6:07:C5 | 192.168.20.16 | 20 | | |
+| Gaming PC (Kaloyan) | 1C:83:41:32:F3:AF | 192.168.20.17 | 20 | | |
+| iPad (Compusbg) | A4:D1:D2:7B:52:BE | 192.168.20.18 | 20 | | |
---
-### VLAN 25 - Family
+### VLAN 25 - Kids Devices
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| MacBook Air (Nora) | 82:6D:FB:D9:E0:47 | 192.168.20.10 | 20 | 25 | 192.168.25.10 |
-| iPhone (Dancho) | F2:B8:14:61:C8:27 | 192.168.20.12 | 20 | 25 | 192.168.25.12 |
-| Notebook (Kimi) | 90:91:64:70:0D:86 | 192.168.20.14 | 20 | 25 | 192.168.25.14 |
-| iPhone (Kimi) | 2A:2B:BA:86:D4:AF | 192.168.20.15 | 20 | 25 | 192.168.25.15 |
-| iPad (Compusbg) | A4:D1:D2:7B:52:BE | 192.168.20.18 | 20 | 25 | 192.168.25.18 |
+| iPhone (Dancho) | F2:B8:14:61:C8:27 | 192.168.20.12 | 25 | | |
+| Notebook (Kimi) | 90:91:64:70:0D:86 | 192.168.20.14 | 25 | | |
+| iPhone (Kimi) | 2A:2B:BA:86:D4:AF | 192.168.20.15 | 25 | | |
+| iPad (Compusbg) | A4:D1:D2:7B:52:BE | 192.168.20.18 | 25 | | |
---
@@ -53,18 +54,18 @@
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| GREE Air Conditioner | 50:2C:C6:7A:55:39 | 192.168.30.10 | 30 | 30 | 192.168.30.10 |
-| LG TV (LAN) | B0:37:95:79:AF:9B | 192.168.30.11 | 30 | 30 | 192.168.30.11 |
-| LG TV (WiFi) | DC:03:98:6B:5A:3A | 192.168.30.12 | 30 | 30 | 192.168.30.12 |
-| Chromecast | D0:E7:82:F7:65:DD | 192.168.30.13 | 30 | 30 | 192.168.30.13 |
-| Roborock S7 Vacuum | B0:4A:39:3F:9A:14 | 192.168.30.14 | 30 | 30 | 192.168.30.14 |
-| Bosch Smart Oven | 94:27:70:1E:0C:EE | 192.168.30.20 | 30 | 30 | 192.168.30.20 |
-| Bosch Dishwasher | C8:D7:78:40:65:40 | 192.168.30.21 | 30 | 30 | 192.168.30.21 |
-| Bosch Washer | C8:D7:78:D6:DC:FC | 192.168.30.22 | 30 | 30 | 192.168.30.22 |
-| Tuya Smart Device | 18:DE:50:5B:C8:A6 | 192.168.30.31 | 30 | 30 | 192.168.30.31 |
-| Tuya Smart Gateway (JMWZG1) | 38:1F:8D:04:6F:E4 | 192.168.30.32 | 30 | 30 | 192.168.30.5 |
-| Tuya/Intellirocks Device | D4:AD:FC:BE:13:B0 | 192.168.30.33 | 30 | 30 | 192.168.30.33 |
-| Xiaomi Air Purifier | C8:5C:CC:52:EA:53 | 192.168.30.39 | 30 | 30 | 192.168.30.39 |
+| GREE Air Conditioner | 50:2C:C6:7A:55:39 | 192.168.30.10 | 30 | | |
+| LG TV (LAN) | B0:37:95:79:AF:9B | 192.168.30.11 | 30 | | |
+| LG TV (WiFi) | DC:03:98:6B:5A:3A | 192.168.30.12 | 30 | | |
+| Chromecast | D0:E7:82:F7:65:DD | 192.168.30.13 | 30 | | |
+| Roborock S7 Vacuum | B0:4A:39:3F:9A:14 | 192.168.30.14 | 30 | | |
+| Bosch Smart Oven | 94:27:70:1E:0C:EE | 192.168.30.20 | 30 | | |
+| Bosch Dishwasher | C8:D7:78:40:65:40 | 192.168.30.21 | 30 | | |
+| Bosch Washer | C8:D7:78:D6:DC:FC | 192.168.30.22 | 30 | | |
+| Tuya Smart Device | 18:DE:50:5B:C8:A6 | 192.168.30.31 | 30 | | |
+| Xiaomi Smart Device | 38:1F:8D:04:6F:E4 | 192.168.30.32 | 30 | | |
+| Tuya/Intellirocks Device | D4:AD:FC:BE:13:B0 | 192.168.30.33 | 30 | | |
+| Xiaomi Air Purifier | C8:5C:CC:52:EA:53 | 192.168.30.39 | 30 | | |
---
@@ -72,7 +73,7 @@
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| Reolink Doorbell | 48:9E:9D:0E:16:F7 | 192.168.35.10 | 35 | 35 | 192.168.35.10 |
+| Reolink Doorbell | 48:9E:9D:0E:16:F7 | 192.168.35.10 | 35 | | |
---
@@ -80,7 +81,7 @@
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| HP LaserJet | 64:4E:D7:D8:43:3E | 192.168.40.19 | 40 | 40 | 192.168.40.19 |
+| HP LaserJet | 64:4E:D7:D8:43:3E | 192.168.40.19 | 40 | | |
---
@@ -88,10 +89,10 @@
| Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
|--------|-------------|------------|--------------|----------|--------|
-| Apple Device (unknown) | AC:87:A3:77:8F:BD | 192.168.50.10 | 50 | 50 | 192.168.50.10 |
-| Unknown Device (Privacy MAC) | 22:4C:7F:1D:85:8E | 192.168.50.11 | 50 | 50 | 192.168.50.11 |
-| Unknown Device | D0:C9:07:92:1A:8E | 192.168.50.12 | 50 | 50 | 192.168.50.12 |
-| Unknown Device | D0:C9:07:8C:C9:46 | 192.168.50.13 | 50 | 50 | 192.168.50.13 |
+| Apple Device (unknown) | AC:87:A3:77:8F:BD | 192.168.50.10 | 50 | | |
+| Unknown Device (Privacy MAC) | 22:4C:7F:1D:85:8E | 192.168.50.11 | 50 | | |
+| Unknown Device | D0:C9:07:92:1A:8E | 192.168.50.12 | 50 | | |
+| Unknown Device | D0:C9:07:8C:C9:46 | 192.168.50.13 | 50 | | |
---
@@ -99,41 +100,74 @@
| VLAN | Name | Subnet | Device Count |
|------|------|--------|--------------|
-| 10 | Management | 192.168.10.0/24 | 10 |
-| 20 | Trusted | 192.168.20.0/24 | 6 |
-| 25 | Family | 192.168.25.0/24 | 5 |
+| 10 | Mgmt | 192.168.10.0/24 | 9 |
+| 20 | Trusted | 192.168.20.0/24 | 9 |
+| 25 | Kids | 192.168.25.0/24 | 4 |
| 30 | IoT | 192.168.30.0/24 | 12 |
| 35 | Cameras | 192.168.35.0/24 | 1 |
| 40 | Servers | 192.168.40.0/24 | 1 |
| 50 | Guest | 192.168.50.0/24 | 4 |
-| **Total** | | | **38** |
+| **Total** | | | **40** |
---
-## Migration Notes
+## Flat List (All Devices)
-### Devices Moving VLANs
-
-| Device | From VLAN | To VLAN | Notes |
-|--------|-----------|---------|-------|
-| Dell Monitor LAN | 20 | 10 | Connected to HAP ether5 |
-| MacBook Air (Nora) | 20 | 25 | Family device |
-| iPhone (Dancho) | 20 | 25 | Family device |
-| Notebook (Kimi) | 20 | 25 | Family device |
-| iPhone (Kimi) | 20 | 25 | Family device |
-| iPad (Compusbg) | 20 | 25 | Family device |
-
-### TBD - Need MAC Addresses
-
-| Device | Owner | Notes |
-|--------|-------|-------|
-| Gaming PC WiFi | Kaloyan | Need to identify WiFi MAC |
+| # | Device | MAC Address | Current IP | Current VLAN | New VLAN | New IP |
+|---|--------|-------------|------------|--------------|----------|--------|
+| 1 | HAP1 (hAP ax³) | 78:9A:18:2C:A5:48 | 192.168.10.1 | 10 | | |
+| 2 | CAP XL ac | 18:FD:74:54:3D:BC | 192.168.10.2 | 10 | | |
+| 3 | CSS326-24G-2S+ | F4:1E:57:C9:BD:09 | 192.168.10.3 | 10 | | |
+| 4 | ZX1 (ZX-SWTGW218AS) | 1C:2A:A3:1E:78:67 | 192.168.10.4 | 10 | | |
+| 5 | AdGuard Home (Unraid) | 02:42:C0:A8:1F:04 | 192.168.10.10 | 10 | | |
+| 6 | XTRM-U (Unraid) | A8:B8:E0:02:B6:15 | 192.168.10.20 | 10 | | |
+| 7 | NanoKVM | 48:DA:35:6F:BE:50 | 192.168.10.200 | 10 | | |
+| 8 | AdGuard (MikroTik) | 46:D0:27:F7:1F:CA | 172.17.0.2 | 10 | | |
+| 9 | Tailscale (MikroTik) | 0C:AB:39:8D:8C:FC | 172.17.0.3 | 10 | | |
+| 10 | MacBook Air (Nora) | 82:6D:FB:D9:E0:47 | 192.168.20.10 | 20 | | |
+| 11 | Samsung S25 Ultra (Kaloyan) | AA:ED:8B:2A:40:F1 | 192.168.20.11 | 20 | | |
+| 12 | iPhone (Dancho) | F2:B8:14:61:C8:27 | 192.168.20.12 | 20/25 | | |
+| 13 | MacBook Pro WiFi (Kaloyan) | 82:EC:EF:B5:F2:AF | 192.168.20.13 | 20 | | |
+| 14 | Notebook (Kimi) | 90:91:64:70:0D:86 | 192.168.20.14 | 20/25 | | |
+| 15 | iPhone (Kimi) | 2A:2B:BA:86:D4:AF | 192.168.20.15 | 20/25 | | |
+| 16 | MacBook Pro LAN (Kaloyan) | 08:92:04:C6:07:C5 | 192.168.20.16 | 20 | | |
+| 17 | Gaming PC (Kaloyan) | 1C:83:41:32:F3:AF | 192.168.20.17 | 20 | | |
+| 18 | iPad (Compusbg) | A4:D1:D2:7B:52:BE | 192.168.20.18 | 20/25 | | |
+| 19 | GREE Air Conditioner | 50:2C:C6:7A:55:39 | 192.168.30.10 | 30 | | |
+| 20 | LG TV (LAN) | B0:37:95:79:AF:9B | 192.168.30.11 | 30 | | |
+| 21 | LG TV (WiFi) | DC:03:98:6B:5A:3A | 192.168.30.12 | 30 | | |
+| 22 | Chromecast | D0:E7:82:F7:65:DD | 192.168.30.13 | 30 | | |
+| 23 | Roborock S7 Vacuum | B0:4A:39:3F:9A:14 | 192.168.30.14 | 30 | | |
+| 24 | Bosch Smart Oven | 94:27:70:1E:0C:EE | 192.168.30.20 | 30 | | |
+| 25 | Bosch Dishwasher | C8:D7:78:40:65:40 | 192.168.30.21 | 30 | | |
+| 26 | Bosch Washer | C8:D7:78:D6:DC:FC | 192.168.30.22 | 30 | | |
+| 27 | Tuya Smart Device | 18:DE:50:5B:C8:A6 | 192.168.30.31 | 30 | | |
+| 28 | Xiaomi Smart Device | 38:1F:8D:04:6F:E4 | 192.168.30.32 | 30 | | |
+| 29 | Tuya/Intellirocks Device | D4:AD:FC:BE:13:B0 | 192.168.30.33 | 30 | | |
+| 30 | Xiaomi Air Purifier | C8:5C:CC:52:EA:53 | 192.168.30.39 | 30 | | |
+| 31 | Reolink Doorbell | 48:9E:9D:0E:16:F7 | 192.168.35.10 | 35 | | |
+| 32 | HP LaserJet | 64:4E:D7:D8:43:3E | 192.168.40.19 | 40 | | |
+| 33 | Apple Device (unknown) | AC:87:A3:77:8F:BD | 192.168.50.10 | 50 | | |
+| 34 | Unknown Device (Privacy MAC) | 22:4C:7F:1D:85:8E | 192.168.50.11 | 50 | | |
+| 35 | Unknown Device | D0:C9:07:92:1A:8E | 192.168.50.12 | 50 | | |
+| 36 | Unknown Device | D0:C9:07:8C:C9:46 | 192.168.50.13 | 50 | | |
---
## Notes
-- **VLAN 20 (Trusted)**: Kaloyan's personal devices only
-- **VLAN 25 (Family)**: All other family members' devices
+- Devices marked with `20/25` in Current VLAN are in both Trusted and Kids VLANs (kids devices with family access)
- MikroTik containers (AdGuard, Tailscale) use internal Docker IPs (172.17.0.x)
-- Dell Monitor LAN connects to HAP ether5, assigned to VLAN 10
+- Fill in "New VLAN" and "New IP" columns to plan migration
+
+---
+
+## HAP ax³ Port Assignments
+
+| Port | Device | VLAN |
+|------|--------|------|
+| ether1 | ISP Gateway (WAN) | - |
+| ether2 | CAP XL ac | 10 (trunk) |
+| ether3 | CSS326-24G-2S+ | 10 (trunk) |
+| ether4 | XTRM-U (Unraid) | 10 |
+| ether5 | Dell Monitor LAN | 10 |