[Nancy] Clean old yaml and regenerate griffon cluster

1c6660d7 · Sebastien Badia · a997d6f5 · 1c6660d7 · 1c6660d7 · 1c6660d7
Commit 1c6660d7 authored Apr 08, 2011 by Sebastien Badia
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-1.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "1",
+      "switch_port": "Gi1/0/1",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-1-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "1",
+      "switch_port": "1/0/1",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-10.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "10",
+      "switch_port": "Gi1/O/9",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-10-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "10",
+      "switch_port": "1/0/10",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-11.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "25",
+      "switch_port": "Gi1/0/25",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-11-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "25",
+      "switch_port": "1/0/25",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-12.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "26",
+      "switch_port": "Gi1/0/26",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-12-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "26",
+      "switch_port": "1/0/26",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-13.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "27",
+      "switch_port": "Gi1/0/27",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-13-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "27",
+      "switch_port": "1/0/27",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-14.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "28",
+      "switch_port": "Gi1/0/28",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-14-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "28",
+      "switch_port": "1/0/28",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-15.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "29",
+      "switch_port": "Gi1/0/29",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-15-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "29",
+      "switch_port": "1/0/29",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-16.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "30",
+      "switch_port": "Gi1/0/30",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-16-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "30",
+      "switch_port": "1/0/30",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-17.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "31",
+      "switch_port": "Gi1/0/31",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-17-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "31",
+      "switch_port": "1/0/31",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-18.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "32",
+      "switch_port": "Gi1/0/32",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-18-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "32",
+      "switch_port": "1/0/32",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-19.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "33",
+      "switch_port": "Gi1/0/33",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-19-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "33",
+      "switch_port": "1/0/33",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-2.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "2",
+      "switch_port": "Gi1/0/2",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-2-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "2",
+      "switch_port": "1/0/2",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-20.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "34",
+      "switch_port": "Gi1/0/34",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-20-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "34",
+      "switch_port": "1/0/34",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-21.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "35",
+      "switch_port": "Gi1/0/35",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-21-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "35",
+      "switch_port": "1/0/35",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-22.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "36",
+      "switch_port": "Gi1/0/36",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-22-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "36",
+      "switch_port": "1/0/36",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-23.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "37",
+      "switch_port": "Gi1/0/37",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-23-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "37",
+      "switch_port": "1/O/37",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-24.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "38",
+      "switch_port": "Gi1/0/38",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-24-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "38",
+      "switch_port": "1/0/38",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-25.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "39",
+      "switch_port": "Gi1/0/39",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-25-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "39",
+      "switch_port": "1/0/39",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-26.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "40",
+      "switch_port": "Gi1/0/40",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-26-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "40",
+      "switch_port": "1/0/40",
      "vendor": "Tyan",
      "version": "M3296"
    }

--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -27,7 +27,7 @@
      "network_address": "griffon-27.nancy.grid5000.fr",
      "rate": 1000000000,
      "switch": "sgriffon1",
-      "switch_port": "41",
+      "switch_port": "Gi1/0/41",
      "vendor": "intel",
      "version": "80003ES2LAN"
    },
@@ -76,7 +76,7 @@
      "network_address": "griffon-27-ipmi.nancy.grid5000.fr",
      "rate": 100000000,
      "switch": "sgriffon1-ipmi",
-      "switch_port": "41",
+      "switch_port": "1/0/41",
      "vendor": "Tyan",
      "version": "M3296"
    }