From f6beaace1b285f6b12e7a35c5c231b7ab058b3fd Mon Sep 17 00:00:00 2001 From: Emile Morel Date: Tue, 24 Sep 2013 14:23:59 +0200 Subject: [PATCH] [Nancy] griffon - correct API informations --- .../clusters/griffon/nodes/griffon-10.json | 4 +-- .../clusters/griffon/nodes/griffon-21.json | 2 +- .../clusters/griffon/nodes/griffon-24.json | 2 +- .../clusters/griffon/nodes/griffon-28.json | 2 +- .../clusters/griffon/nodes/griffon-29.json | 2 +- .../clusters/griffon/nodes/griffon-44.json | 2 +- .../clusters/griffon/nodes/griffon-6.json | 4 +-- .../clusters/griffon/nodes/griffon-69.json | 4 +-- .../clusters/griffon/nodes/griffon-75.json | 2 +- .../clusters/griffon/nodes/griffon-82.json | 2 +- .../clusters/griffon/nodes/griffon-91.json | 2 +- .../nancy/clusters/griffon_generated.yaml | 28 +++++++++---------- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json index 05579a2f6d..bd3a0e4712 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json @@ -59,7 +59,7 @@ "device": "ib0", "driver": "mlx4_core", "enabled": true, - "guid": null, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59", "hwid": "0xC90300027F58", "ib_switch_card": "0x000b8cffff003106", "ib_switch_card_pos": 10, @@ -79,7 +79,7 @@ "device": "ib1", "driver": "mlx4_core", "enabled": false, - "guid": null, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:5a", "interface": "InfiniBand", "management": false, "mountable": false, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json index 1bb33b2783..bcc4eb4852 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json @@ -47,7 +47,7 @@ "driver": "e1000e", "enabled": false, "interface": "Ethernet", - "mac": "00:e0:81:b2:bf:cd", + "mac": "00:e0:81:b2:bf:c3", "management": false, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json index 8914843689..1e34e15795 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json @@ -65,7 +65,7 @@ "ib_switch_card_pos": 5, "interface": "InfiniBand", "ip": "172.18.65.24", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:3:2fd7", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json index 4da269f776..10e4644c6c 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json @@ -47,7 +47,7 @@ "driver": "e1000e", "enabled": false, "interface": "Ethernet", - "mac": "00:e0:81:b2:c0:e6", + "mac": "00:e0:81:b2:c0:5f", "management": false, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json index 834fa0d1e9..999356c0a8 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json @@ -65,7 +65,7 @@ "ib_switch_card_pos": 10, "interface": "InfiniBand", "ip": "172.18.65.29", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:3:3043", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json index 6e9f28846e..e1320659d5 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json @@ -65,7 +65,7 @@ "ib_switch_card_pos": 3, "interface": "InfiniBand", "ip": "172.18.65.44", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:2:80d5", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json index 1f189951db..4b1b113355 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json @@ -47,7 +47,7 @@ "driver": "e1000e", "enabled": false, "interface": "Ethernet", - "mac": "00:e0:81:b1:c4:e8", + "mac": "00:e0:81:b1:c4:7f", "management": false, "mountable": false, "mounted": false, @@ -65,7 +65,7 @@ "ib_switch_card_pos": 6, "interface": "InfiniBand", "ip": "172.18.65.6", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:2:80ad", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json index 8c2379dbbc..b90a145635 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json @@ -65,10 +65,10 @@ "ib_switch_card_pos": 3, "interface": "InfiniBand", "ip": "172.18.65.69", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:3:17b1", "management": false, "mountable": true, - "mounted": false, + "mounted": true, "network_address": "griffon-69-ib0.nancy.grid5000.fr", "rate": 20000000000, "switch": "sgriffonib", diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json index 1f13bc9bff..e307a2bb04 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json @@ -65,7 +65,7 @@ "ib_switch_card_pos": 9, "interface": "InfiniBand", "ip": "172.18.65.75", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:3:1875", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json index baeb2cfd87..eea38df98f 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json @@ -65,7 +65,7 @@ "ib_switch_card_pos": null, "interface": "InfiniBand", "ip": "172.18.65.82", - "ip6": "fe80::202:c903:2:8055", + "ip6": "fe80::202:c903:3:19f9", "management": false, "mountable": true, "mounted": true, diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json index 4f413e2587..e89a57917d 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json @@ -84,7 +84,7 @@ "management": false, "mountable": false, "mounted": false, - "rate": 28000000000, + "rate": 8000000000, "vendor": "Mellanox", "version": "MT26418" }, diff --git a/generators/input/sites/nancy/clusters/griffon_generated.yaml b/generators/input/sites/nancy/clusters/griffon_generated.yaml index 17d33d686a..7e3abbcc31 100644 --- a/generators/input/sites/nancy/clusters/griffon_generated.yaml +++ b/generators/input/sites/nancy/clusters/griffon_generated.yaml @@ -460,7 +460,7 @@ griffon-6: eth1: interface: Ethernet driver: e1000e - mac: 00:e0:81:b1:c4:e8 + mac: 00:e0:81:b1:c4:7f enabled: false mountable: false mounted: false @@ -468,7 +468,7 @@ griffon-6: ib0: interface: InfiniBand ip: 172.18.65.6 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:2:80ad driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad rate: 20000000000 @@ -802,7 +802,7 @@ griffon-10: ip: 172.18.65.10 ip6: fe80::202:c903:2:7f59 driver: mlx4_core - guid: + guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59 rate: 20000000000 version: MT26418 enabled: true @@ -812,7 +812,7 @@ griffon-10: ib1: interface: InfiniBand driver: mlx4_core - guid: + guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:5a rate: 28000000000 version: MT26418 enabled: false @@ -1717,7 +1717,7 @@ griffon-21: eth1: interface: Ethernet driver: e1000e - mac: 00:e0:81:b2:bf:cd + mac: 00:e0:81:b2:bf:c3 enabled: false mountable: false mounted: false @@ -1980,7 +1980,7 @@ griffon-24: ib0: interface: InfiniBand ip: 172.18.65.24 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:3:2fd7 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7 rate: 20000000000 @@ -2299,7 +2299,7 @@ griffon-28: eth1: interface: Ethernet driver: e1000e - mac: 00:e0:81:b2:c0:e6 + mac: 00:e0:81:b2:c0:5f enabled: false mountable: false mounted: false @@ -2400,7 +2400,7 @@ griffon-29: ib0: interface: InfiniBand ip: 172.18.65.29 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:3:3043 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43 rate: 20000000000 @@ -3660,7 +3660,7 @@ griffon-44: ib0: interface: InfiniBand ip: 172.18.65.44 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:2:80d5 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5 rate: 20000000000 @@ -5760,14 +5760,14 @@ griffon-69: ib0: interface: InfiniBand ip: 172.18.65.69 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:3:17b1 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1 rate: 20000000000 version: MT26418 enabled: true mountable: true - mounted: false + mounted: true management: false ib1: interface: InfiniBand @@ -6264,7 +6264,7 @@ griffon-75: ib0: interface: InfiniBand ip: 172.18.65.75 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:3:1875 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75 rate: 20000000000 @@ -6852,7 +6852,7 @@ griffon-82: ib0: interface: InfiniBand ip: 172.18.65.82 - ip6: fe80::202:c903:2:8055 + ip6: fe80::202:c903:3:19f9 driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9 rate: 20000000000 @@ -7596,7 +7596,7 @@ griffon-91: interface: InfiniBand driver: mlx4_core guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:26 - rate: 28000000000 + rate: 8000000000 version: MT25418 enabled: false mountable: false -- GitLab