Update sailmaker network diagram

20221129120529-sailmaker_network.org

@@ -2,6 +2,7 @@
 :ID:       e83c1ece-35f6-414d-986f-59533fb3d6a9
 :END:
 #+title: Sailmaker Network
+#+startup: hideblocks
 
 The network topology for [[id:2059634f-422e-4be2-8812-22f5f0dc2626][Our house]]. Service is provided via Verizon FIOS. The
 coax connection from Verizon is disconnected to avoid interference from our
@@ -22,7 +23,8 @@ local MoCA network.
 ?: up duct along stairs facing dining room wall.
 #+end_notes
 
-#+begin_src dot :file sailmaker-network-connections.svg
+#+name: sailmaker-network
+#+begin_src dot :file sailmaker-network.png :exports results
   digraph {
       internet [label="FIOS",shape="doublecircle"]
 
@@ -45,13 +47,7 @@ local MoCA network.
 
       subgraph cluster_basement {
           label="Basement"
-          subgraph cluster_ont {
+          ont[label="ONT",shape="square"]
-              label="ONT"
-              node[shape="circle"]
-              ont_in[label="IN"]
-              node[shape="square"]
-              ont_ethernet[label="OUT"]
-          }
           subgraph cluster_splitter_basement {
               label="Splitter"
               node[shape="circle"]
@@ -64,40 +60,21 @@ local MoCA network.
           label="First Floor"
           subgraph cluster_living_room {
               label="Living Room"
-              subgraph cluster_living_room_adapter {
+              living_room_adapter[label="MoCA Adapter",shape="rectangle"]
-                  label="MoCA Adapter"
+              living_room_switch[label="Switch",shape="rectangle"]
-                  node[shape="circle"]
+              living_room_tv[label="Living Room TV", shape="rectangle"]
-                  la_in[label="IN"]
+              ps5[label="PS5",shape="rectangle"]
-                  node[shape="square"]
+              nespi[label="NESPi",shape="rectangle"]
-                  la_out[label="OUT"]
+
-              }
+              edge[color="blue",penwidth=2] // Ethernet
-              subgraph cluster_living_room_switch {
+              living_room_switch -> living_room_tv
-                  label="Switch"
+              living_room_switch -> ps5
-                  ls_1[label="1"]
+              living_room_switch -> nespi
-                  ls_2[label="2"]
-                  ls_3[label="3"]
-                  ls_4[label="4"]
-                  ls_5[label="5"]
-              }
           }
           subgraph cluster_media_room {
               label="Media Room"
-              subgraph cluster_router {
+              router[label="Router",shape="rectangle"]
-                  label="Router"
+              router_adapter[label="MoCA Adapter",shape="rectangle"]
-                  node[shape="square"]
-                  router_in[label="IN"]
-                  router_1[label="1"]
-                  router_2[label="2"]
-                  router_3[label="3"]
-                  router_4[label="4"]
-              }
-              subgraph cluster_router_adapter {
-                  label="MoCA Adapter"
-                  node[shape="square"]
-                  router_adapter_in[label="IN"]
-                  node[shape="circle"]
-                  router_adapter_out[label="OUT"]
-          }
           }
           subgraph cluster_kitchen {
               label="Kitchen Island"
@@ -109,11 +86,18 @@ local MoCA network.
           label="Second Floor"
           subgraph cluster_office {
               label="Office"
-              subgraph cluster_office_adapter {
+              office_adapter[label="MoCA Adapter",shape="rectangle"]
-                  label="MoCA Adapter"
+              office_switch[label="Switch",shape="rectangle"]
-                  node[shape="circle"]
+              office_dock[label="Laptop Dock",shape="rectangle"]
-                  office_in[label="IN"]
+              office_tv[label="Office TV",shape="rectangle"]
-              }
+              reason[label="Reason",shape="square"]
+
+              edge[color="blue",penwidth=2] // Ethernet
+              office_adapter -> office_switch
+              office_switch -> office_dock
+              office_switch -> office_tv
+              office_switch -> reason
+
           }
           subgraph cluster_josh{
               label="Josh's Room"
@@ -124,129 +108,44 @@ local MoCA network.
                   josh_1[label="1"]
                   josh_2[label="2"]
               }
-              subgraph cluster_josh_adapter {
+              josh_adapter[label="MoCA Adapter",shape="rectangle"]
-                  label="MoCA Adapter"
+              josh_pc[label="Josh's PC",shape="square"]
-                  node[shape="circle"]
+
-                  josh_adapter_in[label="IN"]
+              edge[color="blue",penwidth=2] // Ethernet
-                  node[shape="square"]
+              josh_adapter -> josh_pc
-                  josh_adapter_out[label="OUT"]
-              }
           }
           subgraph cluster_cat{
               label="Cat's Room"
-              subgraph cluster_cat_adapter {
+              cat_adapter[label="MoCA Adapter",shape="rectangle"]
-                  label="MoCA Adapter"
+              cat_pc[label="Cat's PC",shape="square"]
-                  node[shape="circle"]
+
-                  cat_in[label="IN"]
+              edge[color="blue",penwidth=2] // Ethernet
-              }
+              cat_adapter -> cat_pc
           }
       }
 
-      internet -> ont_in
+      edge[color="red",penwidth=3] // Fiber-optic
-      ont_ethernet -> router_in
+      internet -> ont
-      router_1 -> router_adapter_in
+
-      router_adapter_out -> s1
+      edge[color="blue",penwidth=2] // Ethernet
+      ont -> router
+      router -> router_adapter
+
+      edge[color="black",penwidth=5] // Coaxial
+      router_adapter -> s1 [constraint=none]
       s1_1 -> josh_in
-      josh_1 -> josh_adapter_in
+      josh_1 -> josh_adapter
-      josh_2 -> cat_in
+      josh_2 -> cat_adapter
 
       s1_3 -> s3
       s1_4 -> s4
       s3_1 -> kitchen_in
-      s3_2 -> la_in
+      s3_2 -> living_room_adapter
-      la_out -> ls_1
+      living_room_adapter -> living_room_switch
-      s4_1 -> office_in
+      s4_1 -> office_adapter
   }
 #+end_src
 
-#+RESULTS:
+#+attr_org: :width 1000
-[[file:sailmaker-network-connections.svg]]
+#+RESULTS: sailmaker-network
-* Diagram (old) :ARCHIVE:
+[[file:sailmaker-network.png]]
-#+name: network
-#+begin_src plantuml :file sailmaker-network.svg
-  skinparam linetype ortho
-
-  frame Outside {
-          component ONT
-          component "Outside 4-Way Splitter\n(5-1000Mhz)" {
-                  port os4_in
-                  port os4_1
-                  port os4_2
-                  port os4_3
-                  port os4_4
-          }
-          component "Outside 3-Way Splitter\n(5-1670Mhz)" {
-                  port os3_in
-                  port os3_1
-                  port os3_2
-          }
-  }
-  frame Basement {
-          component BasementSplitter {
-                  port bs_in
-                  port bs_1
-                  port bs_2
-          }
-  }
-  frame FirstFloor {
-          frame MediaRoom {
-                  component Router
-                  component Reason
-                  component MoCA1
-          }
-          frame LivingRoom {
-                  component MoCA2
-                  component SwitchTV {
-                          port tvs1
-                          port tvs2
-                          port tvs3
-                  }
-                  component SonyBravia4K
-                  component PS4W
-                  component PS4R
-                  component SwitchW1
-          }
-  }
-  frame SecondFloor {
-          frame Office {
-                  component Zephyrus
-                  component MoCA3
-                  component SwitchOffice {
-                          port ofs1
-                          port ofs2
-                          port ofs3
-                  }
-                  component RokuTV
-                  component SwitchR
-          }
-  }
-
-  SecondFloor -[hidden]down- FirstFloor
-  FirstFloor -[hidden]down- Basement
-  FirstFloor -[hidden]right- Outside
-  LivingRoom -[hidden]left- MediaRoom
-
-  ONT -[#blue,thickness=5]up- Router : Ethernet (1000)
-
-  Router -[#blue,thickness=5] Reason : Ethernet (1000)
-  Router -[#blue,thickness=5] MoCA1 : Ethernet (1000)
-
-
-  os3_in -[#black,thickness=6]up- MoCA1 : Coax
-  os3_2 -[#black,thickness=6]up- MoCA3 : Coax
-  os3_1 -[#black,thickness=6] os4_in : Coax
-
-  bs_in -[#black,thickness=6]up- os4_1 : Coax
-  bs_1 -[#black,thickness=6]up- MoCA2 : Coax
-
-  tvs1 -[#gold,thickness=5] MoCA2
-  tvs2 -[#gold,thickness=5] SonyBravia4K
-  tvs3 -[#gold,thickness=5] PS4R
-
-  ofs1 -[#gold,thickness=5] MoCA3 : Ethernet(100)
-  ofs2 -[#gold,thickness=5] Zephyrus : Ethernet (100)
-  ofs3 -[#gold,thickness=5] RokuTV : Ethernet (100)
-#+end_src
-
-#+RESULTS: network
-[[file:sailmaker-network.svg]]