Add FEL network
authorHeinz Junkes <junkes@fhi-berlin.mpg.de>
Wed, 17 Jan 2018 17:33:45 +0100
changeset 9 526bf7695cbd
parent 8 ddf057390578
child 10 f7c1eb1e5733
Add FEL network
FEL/_static/v30_p1.png
FEL/_static/v30_p2.png
FEL/_static/v31_p1.png
FEL/_static/v31_p2.png
FEL/_static/v32_p1.png
FEL/_static/v32_p2.png
FEL/index.rst
FEL/intro/.net.rst.swp
FEL/intro/net.rst
Binary file FEL/_static/v30_p1.png has changed
Binary file FEL/_static/v30_p2.png has changed
Binary file FEL/_static/v31_p1.png has changed
Binary file FEL/_static/v31_p2.png has changed
Binary file FEL/_static/v32_p1.png has changed
Binary file FEL/_static/v32_p2.png has changed
--- a/FEL/index.rst	Wed Jan 17 14:38:51 2018 +0100
+++ b/FEL/index.rst	Wed Jan 17 17:33:45 2018 +0100
@@ -9,6 +9,7 @@
    :maxdepth: 2
 
    intro/general
+   intro/net
    intro/rtemsEpics
    intro/features
    intro/license
Binary file FEL/intro/.net.rst.swp has changed
--- a/FEL/intro/net.rst	Wed Jan 17 14:38:51 2018 +0100
+++ b/FEL/intro/net.rst	Wed Jan 17 17:33:45 2018 +0100
@@ -3,8 +3,9 @@
 -------
 
 New Switches :
-  2 x DELL N1548 Gbit/s Switch 48 Port
-  2 x DELL N4064F 10 Gbit/s Switch 48 Port
+
+2 x DELL N1548 Gbit/s Switch 48 Port
+2 x DELL N4064F 10 Gbit/s Switch 48 Port
 
 
 .. uml::
@@ -16,41 +17,74 @@
    endheader
 
    cloud "FHI-Net" as FHINet <<"141.14.128.0/20">> {
-     ["Switch xx, Port yy"] as SP_xx_yy
-     ["Switch XX, Port YY"] as SP_XX_YY
-     ["Switch AA, Port AA"] as SP_AA_AA
-     ["Switch BB, Port BB"] as SP_BB_BB
+     ["Switch 24, Port 04"] as SP_24_04
+     ["Switch 24, Port 05"] as SP_24_05
+     ["Switch 24, Port 06"] as SP_24_06
+     ["Switch 33, Port 04"] as SP_33_04
+     ["Switch 33, Port 05"] as SP_33_05
+     ["Switch 33, Port 06"] as SP_33_06
    }
 
-
-   cloud "Q-Management" as mgmt <<192.168.1.0/24>> {
-    node q <<Frontend>> {
-     [emx1] <<192.168.1.1>>
-    }
-   ' node "node-0-0-sp" as OOSP <<"x.x.x.x">>
-   ' node "node-0-1-sp" as 01SP <<"y.y.y.y">>
+   cloud "FEL-Net" as FELNet <<"10.0.0.0/23">> {
+     ["Switch 24, Port 21"] as SP_24_21
+     ["Switch 24, Port 23"] as SP_24_23
+     ["Switch 24, Port 24"] as SP_24_24
    }
 
-   'cloud "Q-Interconnect" <<"10.1.1.0/24">> {
-   ' node "q_p7p1" <<"10.1.1.1">>
-   '}
-
-
-   node "q-msw-01" as qmsw01 {
-    [Port_01_48] <<"141.14.128.59">>
+   cloud "esx-Cluster" as FELesx {
+     node vsw141 {
+      [v30_vmnic1]
+      [v31_vmnic1]
+      [v32_vmnic1]
+      [v30_vmnic2]
+      [v31_vmnic2]
+      [v32_vmnic2]
+     }
+     node vsw10 {
+      [v30_vmnic3]
+      [v31_vmnic3]
+      [v32_vmnic3]
+     }
+   node v30 <<esx host>> {
+     node felgate {
+       [ens192] <<10.0.0.8>>
+       [ens160] <<141.14.132.69>>
+    }
    }
 
-
+   node v31 <<esx host>> {
+     node sagmalwas {
+       [xxx] <<10.0.0.8>>
+       [yyy] <<141.14.132.69>>
+    }
+   }
 
- 
-   node "q-msw-02" 
-   node "q-dsw-01" 
-   node "q-dsw-02" 
+   node v32 <<esx host>> {
+   }
+   }
+   [SP_24_04] <-down-> [v30_vmnic1] : "10Gbit/s" 
+   [SP_33_04] <-down-> [v30_vmnic2] : "1Gbit/s-Standby" 
+   [SP_24_05] <-down-> [v31_vmnic1] : "10Gbit/s" 
+   [SP_33_05] <-down-> [v31_vmnic2] : "1Gbit/s-Standby" 
+   [SP_24_06] <-down-> [v32_vmnic1] : "10Gbit/s" 
+   [SP_33_06] <-down-> [v32_vmnic2] : "1Gbit/s-Standby" 
 
-   [SP_xx_yy] <-down-> [Port_01_48] : "1Gbit/s" 
-   qmsw01 <-down-> mgmt : "1Gbit/s" 
+   [SP_24_21] <-down-> [v30_vmnic3] : "10Gbit/s" 
+   [SP_24_23] <-down-> [v31_vmnic3] : "10Gbit/s" 
+   [SP_24_24] <-down-> [v32_vmnic3] : "10Gbit/s" 
+
+   vsw10 <-down-> [ens160] : "10Gbit/s" 
+   vsw141 <-down-> [ens192] : "10Gbit/s" 
+
    @enduml
 
+.. image:: ../_static/v30_p1.png
+.. image:: ../_static/v30_p2.png
+.. image:: ../_static/v31_p1.png
+.. image:: ../_static/v31_p2.png
+.. image:: ../_static/v32_p1.png
+.. image:: ../_static/v32_p2.png
+
 Configuring the switches
 ========================
 The Dell Networking N151548 front panel provides 48 Gigabit Ethernet RJ-45 ports and