refactor address plan

README.md

@@ -50,11 +50,12 @@
 | Prefix              | Usage                       | Routing              |
 | ------------------- | --------------------------- | -------------------- |
 | 2a10:f0c0:0000::/48 | Core Linknets and Loopbacks | Some subnets may BGP |
-| 2a10:f0c0:1000::/40 | BGP-speaking Infrastructure | Can speak BGP        |
-| 2a10:f0c0:1001::/48 | Infrastructure at TN2       | Can speak BGP        |
-| 2a10:f0c0:1002::/48 | Infrastructure at LD5       | Can speak BGP        |
-| 2a10:f0c0:1003::/48 | Infrastructure at MA1       | Can speak BGP        |
-| 2a10:f0c0:1004::/48 | Infrastructure at PUE       | Can speak BGP        |
+| 2a10:f0c0:1000::/36 | BGP-speaking Infrastructure | Can speak BGP        |
+| 2a10:f0c0:1000::/40 | Core to Aggregation         | Can speak BGP        |
+| 2a10:f0c0:1001::/48 | Core at TN2 to Aggregation  | Can speak BGP        |
+| 2a10:f0c0:1002::/48 | Core at LD5 to Aggregation  | Can speak BGP        |
+| 2a10:f0c0:1003::/48 | Core at MA1 to Aggregation  | Can speak BGP        |
+| 2a10:f0c0:1004::/48 | Core at PUE to Aggregation  | Can speak BGP        |
 
 ### Infrastructure Linknets to Aggregation Routers
 
@@ -73,9 +74,10 @@ Prefix scheme is `2a10:f0c0:10ss:CCCC:NNNN:YYYY:ZZZZ::/112` where:
   - `03` = MA1
   - `04` = PUE
 * `CCCC` = Core router IPv6 loopback last 16 bits
-* `NNNN` = NNI number
-* `YYYY` = outer VLAN tag (VLAN tag ordered with Neos goes here)
-* `ZZZZ` = inner VLAN tag (if double-tagging for some future reason)
+  - or `feXX` for labs and other test links (where `XX` is some arbitrary interface number)
+* `NNNN` = NNI number, represented in decimal
+* `YYYY` = outer VLAN tag, represented in decimal (VLAN tag ordered with Neos goes here); else `0000`
+* `ZZZZ` = inner VLAN tag, represented in decimal (if double-tagging for some future reason); else `0000`
 
 Addressing within the prefix is as follows: