diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
index 104a03480bcd13fc1dd89edce8c7d5a9b6d5df34..b87bdf316a2cdb8cfa25a311440aea2cb10b1faa 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/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"
},
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
index 615d8a246e2087200afab6b420edf3e1c876797a..a2abff453841d63ae0716ff941660cc147c826bc 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/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"
},
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
index eeae05e1e85e87655d9d73fb74ff634ffc32f143..e288f15b116043ec8c400b128dfe13b3468a5129 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/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"
},
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
index 3f1c2fb764dae3415df3c21d0410374d14a5cce3..58b5026ce6360ff5f3b3a119860b3acff9892f69 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/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"
},
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index 45cbf1af77d63f4c5a475ed1f287650b8fde6504..bc49caa0737ef39826255a9cdf6a5de7b80f3bf6 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/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
diff --git a/data/grid5000/sites/lyon/network_equipments/pat.json b/data/grid5000/sites/lyon/network_equipments/pat.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed8a8abf3aaf4e4e5c7b35aadd44dbb563d125a8
--- /dev/null
+++ b/data/grid5000/sites/lyon/network_equipments/pat.json
@@ -0,0 +1,125 @@
+{
+ "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
diff --git a/generators/input/sites/lyon/clusters/hercule.rb b/generators/input/sites/lyon/clusters/hercule.rb
index 941da34e7afc376ec36c6c6e4baa3c32151a7f92..c7ac45f70af13f52e8c6cbf2cef0507172e13615 100644
--- a/generators/input/sites/lyon/clusters/hercule.rb
+++ b/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')
},
{
diff --git a/generators/input/sites/lyon/net-links/pat.yaml b/generators/input/sites/lyon/net-links/pat.yaml
index a2cb1beae3e4841c4b0a29a1a45da195b49aeb54..ae827e8d77f35009a5f5997f92f835b3c1c1fb8b 100644
--- a/generators/input/sites/lyon/net-links/pat.yaml
+++ b/generators/input/sites/lyon/net-links/pat.yaml
@@ -1,6 +1,6 @@
---
-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