[Lyon] Netlinks for switch pat (cluster hercule) updated

data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json

@@ -66,6 +66,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
@@ -80,6 +82,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },

data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json

@@ -66,6 +66,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
@@ -80,6 +82,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },

data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json

@@ -66,6 +66,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
@@ -80,6 +82,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },

data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json

@@ -66,6 +66,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
@@ -80,6 +82,8 @@
       "mountable": true,
       "mounted": false,
       "rate": 1000000000,
+      "switch": "pat",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "Intel Corporation"
     },

data/grid5000/sites/lyon/network_equipments/force10.json

@@ -142,6 +142,23 @@
           "kind": "router",
           "port": "9:2",
           "uid": "gw-lyon"
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+          "kind": "switch",
+          "port": "1:25",
+          "uid": "pat"
         }
       ],
       "rate": 10000000000

data/grid5000/sites/lyon/network_equipments/pat.json

+{
+  "backplane_bps": 40000000000,
+  "channels": {
+    "naming_pattern": "Po%CHANNELID%"
+  },
+  "kind": "switch",
+  "linecards": [
+    {
+
+    },
+    {
+      "kind": "node",
+      "naming_pattern": "%LINECARD%/%PORT%",
+      "ports": [
+        {
+
+        },
+        {
+          "uid": "hercule-1-eth2"
+        },
+        {
+          "uid": "hercule-2-eth2"
+        },
+        {
+          "uid": "hercule-3-eth2"
+        },
+        {
+          "uid": "hercule-4-eth2"
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+          "uid": "hercule-1-eth3"
+        },
+        {
+          "uid": "hercule-2-eth3"
+        },
+        {
+          "uid": "hercule-3-eth3"
+        },
+        {
+          "uid": "hercule-4-eth3"
+        },
+        {
+          "kind": "switch",
+          "port": "0:47",
+          "uid": "force10"
+        },
+        {
+          "kind": "switch",
+          "port": "0:37",
+          "uid": "chris"
+        }
+      ],
+      "rate": 100000000
+    }
+  ],
+  "model": "Foundry EdgeIron",
+  "mtu": 1500,
+  "routes": {
+
+  },
+  "site": "lyon",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "pat",
+  "vlans": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan1": {
+      "addresses": [
+        "172.17.63.250"
+      ],
+      "administrative": true
+    }
+  },
+  "weathermap": {
+    "use_cacti": "no"
+  }
+}
\ No newline at end of file

generators/input/sites/lyon/clusters/hercule.rb

@@ -121,6 +121,8 @@ site :lyon do |site_uid|
           :vendor           => "Intel",
           :version          => "Intel Corporation",
           :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :switch           => "pat",
+          :switch_port      => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
           :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
@@ -135,6 +137,8 @@ site :lyon do |site_uid|
           :vendor           => "Intel",
           :version          => "Intel Corporation",
           :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :switch           => "pat",
+          :switch_port      => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
           :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {

generators/input/sites/lyon/net-links/pat.yaml

 ---
-edgeiron:
-  model: Foundry
+pat:
+  model: Foundry EdgeIron
   kind: switch
   site: lyon
   snmp_community: public
@@ -17,17 +17,6 @@ edgeiron:
   backplane_bps: 40000000000
 
   linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 1000000000
-      ports:
-        1:
-          uid: gw-sophia
-          port: ethernet2/1
-        2:
-          uid: gw-sophia
-          port: ethernet2/2
     1:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: node