diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json index 6098d19a99655c6dad227d76c18d108581c01e67..25971f79fc1d6f48a0eb6e70c2252530dcfc4264 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json @@ -85,7 +85,7 @@ "network_address": "dahu-1.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 1", + "switch_port": "ethernet1/1/1:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json index 7aa0f97a1e3e173d6a0d6b1b9b5429489212b25b..d882e9e85fb17a2d1bfdbf2e4fbdc12dc186449d 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json @@ -85,7 +85,7 @@ "network_address": "dahu-10.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 10", + "switch_port": "ethernet1/1/10:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json index d3fd9564130ae2a968c8de9dec5976b247dbd52f..ae17314e5abc268023cdc71a2c718e7c7c243ee7 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json @@ -85,7 +85,7 @@ "network_address": "dahu-11.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 11", + "switch_port": "ethernet1/1/11:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json index 501107a09216035bde46b20124bb13afbdd1eb0b..ef2c86558eaeb4cc10e094b7954872efc3375144 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json @@ -85,7 +85,7 @@ "network_address": "dahu-12.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 12", + "switch_port": "ethernet1/1/12:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json index 6ff7022fb0e9cf25ce4322710259e54a893e760d..f3e97bb8179fdcad344bcd3a91512749a42f8df5 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json @@ -85,7 +85,7 @@ "network_address": "dahu-13.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 13", + "switch_port": "ethernet1/1/13:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json index 7b5fa3341b0826241c526b231c0808031b76ebde..a0e152bccde7d2858515bf35923a8270cea5f5d8 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json @@ -85,7 +85,7 @@ "network_address": "dahu-14.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 14", + "switch_port": "ethernet1/1/14:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json index 183ff230018f3b64fb0706df550bdf5f1831f02a..2da45de04d9b5e0c33afccdbd1da74cd8f92926e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json @@ -85,7 +85,7 @@ "network_address": "dahu-15.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 15", + "switch_port": "ethernet1/1/15:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json index ed4581361a16072b0ed2d3d421e8a0e8eedb962a..00368c7d5f450f8eadc00ce3d9704805d3f47ff8 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json @@ -85,7 +85,7 @@ "network_address": "dahu-16.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 16", + "switch_port": "ethernet1/1/16:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json index 7342ff79ddf190308e5ccbcc7d465125baf1898d..02c53a5acf58da6731d0ccb34a0d669d964de065 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json @@ -85,7 +85,7 @@ "network_address": "dahu-17.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 17", + "switch_port": "ethernet1/1/17:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json index e2efbc2e344aca47c1d5f8eeee9c32f9e66031ea..9172bf7c5c0d584450d5cfdd2579efe1e933be93 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json @@ -85,7 +85,7 @@ "network_address": "dahu-18.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 18", + "switch_port": "ethernet1/1/18:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json index 77d3ff9963dbc94198441c04fcc70b9ef91caa7e..595dab1cdfc1ea4ec9238db2c1c529fc332db925 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json @@ -85,7 +85,7 @@ "network_address": "dahu-19.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 19", + "switch_port": "ethernet1/1/19:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json index 99667435853b3e44c073901e945b2a47597613b4..62a9409b2e627e667278c67bc7a6370513216806 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json @@ -85,7 +85,7 @@ "network_address": "dahu-2.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 2", + "switch_port": "ethernet1/1/2:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json index 7ff1a2cd44906fe7876bfb1d2f488c487082c2cd..c3a4a5410d3dade9286540a6547684bbb80d466e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json @@ -85,7 +85,7 @@ "network_address": "dahu-20.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 20", + "switch_port": "ethernet1/1/20:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json index 8902de91cd160f61d7a84e5f43074db2d6f226d3..bfab53703a909580c1f85c5090fc239528c93108 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json @@ -85,7 +85,7 @@ "network_address": "dahu-21.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 21", + "switch_port": "ethernet1/1/21:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json index 041d2fde45fd4f9c6118f2d90524a4ff1f46018b..3eb52a6b35ed729293f31ba2db77c8d8478d09f9 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json @@ -85,7 +85,7 @@ "network_address": "dahu-22.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 22", + "switch_port": "ethernet1/1/22:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json index 2bc70864a0ef76996a3445560262d4cd6a614693..783293b63ca46bffe28e4d1ebc3d9113a146691a 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json @@ -85,7 +85,7 @@ "network_address": "dahu-23.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 23", + "switch_port": "ethernet1/1/23:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json index 68ceabf57ce0b59eda6a694a0395abaef896363f..1fc868f33df2d1537bc9d3dfeaf9958ba9ce1071 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json @@ -85,7 +85,7 @@ "network_address": "dahu-24.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 24", + "switch_port": "ethernet1/1/24:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json index 4684ed3217a3f8a556be56f619b1fec09044f766..fcd3a06433aff9c935b0ad86e4dbc892920cb75c 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json @@ -85,7 +85,7 @@ "network_address": "dahu-25.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 25", + "switch_port": "ethernet1/1/25:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json index e072c65b41c094085d5bb3b5c6104f4641a3cd8c..c74c2a985c8c54a23b68cc277604f4cdd5d0a574 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json @@ -85,7 +85,7 @@ "network_address": "dahu-26.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 26", + "switch_port": "ethernet1/1/26:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json index c97fee461d53fadae9352fa64e5b90b95385faa5..5e83d9c4a56b0fc5fc75d9468043a14793e3990f 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json @@ -85,7 +85,7 @@ "network_address": "dahu-27.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 27", + "switch_port": "ethernet1/1/27:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json index d798ecf32f8f2d6125c2ef6edf06958d059f51ee..8f744c1e930087cb1bc28488b3f3d17a9e28ef0b 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json @@ -85,7 +85,7 @@ "network_address": "dahu-28.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 28", + "switch_port": "ethernet1/1/28:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json index 51d971b2951c60c858e885fa80fa742089b84902..8e728deccf6cf777a75be252595bede8f7831512 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json @@ -85,7 +85,7 @@ "network_address": "dahu-29.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 29", + "switch_port": "ethernet1/1/29:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json index 2ae2f82a495f84d46b9a1dd2aa7716ab6ecd4d2d..689d98987d72bfbd5767d7a1b86e2ef746618ed7 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json @@ -85,7 +85,7 @@ "network_address": "dahu-3.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 3", + "switch_port": "ethernet1/1/3:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json index 173313ee807b0ea5ded4811069732e8772474bcd..f4561cbb93a4679616fa9eecf4805af17c380ed4 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json @@ -85,7 +85,7 @@ "network_address": "dahu-30.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 30", + "switch_port": "ethernet1/1/30:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json index c06e893c2f10e9ef196cef38f5f17433e04b98ed..b8120a0c724dfbdf961c1f3e7dbaaef983052b2b 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json @@ -85,7 +85,7 @@ "network_address": "dahu-31.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 31", + "switch_port": "ethernet1/1/31:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json index d27b84d4faa9a087b5bec55526e43d40cde33d5a..6ecbf630f61b0559877efa74a0e38c0781f16cf6 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json @@ -85,7 +85,7 @@ "network_address": "dahu-32.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 32", + "switch_port": "ethernet1/1/32:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json index b7b7ff86d133c00152998199025fb65eff90f9f3..e1acd3aae628ce0f8d678f1faadc2ce0fdf3a4a9 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json @@ -85,7 +85,7 @@ "network_address": "dahu-4.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 4", + "switch_port": "ethernet1/1/4:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json index a88bd6601d6640d11edd2293c499a685c7449599..1681c77da05728eb5692d553bb4e0a8dd4225c5f 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json @@ -85,7 +85,7 @@ "network_address": "dahu-5.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 5", + "switch_port": "ethernet1/1/5:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json index b0f880441ddfa8dc58de11963eb60834617c0033..499f0a9c31f9fbf821f3f08a0a9b801c99545599 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json @@ -85,7 +85,7 @@ "network_address": "dahu-6.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 6", + "switch_port": "ethernet1/1/6:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json index c6813d469b8ef0dee1be205a695d3b50a838bf46..8920d520f8277239a13c53ce45d8200ccbfe8d52 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json @@ -85,7 +85,7 @@ "network_address": "dahu-7.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 7", + "switch_port": "ethernet1/1/7:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json index d8f9840fb8a574268e6b0fc8399df4be03d30886..c5d9f7525bad37ed36696a3d7d7437f6a461dac1 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json @@ -85,7 +85,7 @@ "network_address": "dahu-8.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 8", + "switch_port": "ethernet1/1/8:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json index 4a37098c300cc2f8002e012045fab716f2a4df53..d2ad863fe3be3cb9ea78d6daa7d62bccc88f3924 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json @@ -85,7 +85,7 @@ "network_address": "dahu-9.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 9", + "switch_port": "ethernet1/1/9:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json index ba05c3f3546a781ff5328ba89d2e90242de4ec8c..6d952ecc582f06c0d029cec17b26264c8abc8e56 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/drac.json +++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json @@ -3,7 +3,28 @@ "exotic": true, "kavlan": true, "metrics": [ - + { + "description": "Input byte counter for the network device port", + "labels": { + "interface": "eth0" + }, + "name": "network_ifacein_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } + }, + { + "description": "Output byte counter for the network device port", + "labels": { + "interface": "eth0" + }, + "name": "network_ifaceout_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } + } ], "model": "IBM PowerNV S822LC (8335-GTB)", "queues": [ diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json index 3ec43b5d65fbe04e9b2d3a6aa2a28015b17dd6f1..515858255246f1d6f06d8e9988c7e917301d0318 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-1.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/37:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json index 4927f0903b9d068dc3e7bfbd193252a9dfd5fcf6..2843dae26a4cce8d86058e34ce465272056e8b58 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-10.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/46:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json index 9d539b9232f4e0a354401768989c9f2316620f83..db735fa459e956047ee6aaca6787628d675b1a0e 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-11.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/47:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json index 2f00f880d3f319be6af9ae1f50aef150e1d6e67f..0c6c0d0194f7d9ef386729a55d6cfbf4d0ec5444 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-12.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/48:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json index fb930c26d395a9a7da3edf02663f3738cb5ee2fe..54a67265aa6fbb55e9d221c4b4198f9d6e57f247 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-2.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/38:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json index 5543cb579a33fe1108b6ae018f4abc8cf5f7ef1b..77855b93b8a2b7685400446901e03cc06db840d2 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-3.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/39:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json index abddf3d9e6d5dd9b51c520aab6656750f75e82de..eccc3ac5359dee13459252ce6e3b433bdd899cb8 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-4.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/40:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json index 3af52ca5cf7e01fd15c31e93d07354ec8f0b0809..e2e68bbb4fe7afe1762e2f5d3a52f0db43897306 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-5.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/41:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json index 261484e4ce663eeaea920b2c3d142d78a853c207..658bbb5098422ab88fbd6b6c13a49222ac03c2bb 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-6.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/42:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json index dca384e83cb521b17b8a8d397aa88e6c2875b478..e69230a02c9cb10e7900409b3396698904e131ee 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-7.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/43:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json index 933bc65bc5fbebdbc0b510ad15f38be47ce59f02..4c5fdbeed116f728d2c6c17b91ee5e8d59171fc3 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-8.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/44:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json index 3f4630a7a4ca861c5b2fa1a9efd7380a30e1a739..349194aae9f9c5e6ce3a16d372d462d4b5c2253d 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json @@ -122,7 +122,7 @@ "name": "enP1p1s0f0", "network_address": "drac-9.grenoble.grid5000.fr", "rate": 10000000000, - "switch": "gw-new", + "switch": "gw", "switch_port": "ethernet1/1/45:1", "vendor": "Broadcom" }, diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json index ecd8b0b613a783ac221fb86f8188fe943fc92e5a..a715dd4c0c279ae2f6b0e7a7096bdbd50a685bac 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json @@ -85,9 +85,9 @@ "mounted": true, "name": "eno1", "network_address": "troll-1.grenoble.grid5000.fr", - "rate": 10000000000, + "rate": 25000000000, "switch": "gw", - "switch_port": "X670V-48x Port 37", + "switch_port": "ethernet1/1/77", "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json index da3051cd8fb70a1e133de17992362169659c1c39..144a5d718f8b94db7e2e0bd188795a42f66a5c73 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json @@ -85,9 +85,9 @@ "mounted": true, "name": "eno1", "network_address": "troll-2.grenoble.grid5000.fr", - "rate": 10000000000, + "rate": 25000000000, "switch": "gw", - "switch_port": "X670V-48x Port 38", + "switch_port": "ethernet1/1/78", "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json index 79f7e7dde4aeeea07017df3a31c4ddaeed5c02f5..e143eb2d759ed3abc6b112915380b165f1af8fcf 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json @@ -85,9 +85,9 @@ "mounted": true, "name": "eno1", "network_address": "troll-3.grenoble.grid5000.fr", - "rate": 10000000000, + "rate": 25000000000, "switch": "gw", - "switch_port": "X670V-48x Port 39", + "switch_port": "ethernet1/1/79", "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json index 8c5cb543d8f931db497f74ed3b93fea29250e231..953623c59309a5f54f734f1fbaeb3c9dd2d311df 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json @@ -85,9 +85,9 @@ "mounted": true, "name": "eno1", "network_address": "troll-4.grenoble.grid5000.fr", - "rate": 10000000000, + "rate": 25000000000, "switch": "gw", - "switch_port": "X670V-48x Port 40", + "switch_port": "ethernet1/1/80", "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json index 4627a88ae1e3517e48c5ec65b9a8b8db5ac3bfe1..e9036735f5e142633165ed3bc5bc3de7a3f76074 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json @@ -85,7 +85,7 @@ "network_address": "yeti-1.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 33", + "switch_port": "ethernet1/1/33:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json index e975a591a1e3690c64906736f8305bb65ba66557..dbb0b0d9a84774dcd7878548acbf200ff7ebd502 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json @@ -85,7 +85,7 @@ "network_address": "yeti-2.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 34", + "switch_port": "ethernet1/1/34:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json index 9b62ce580e14eea97344d09d5f5a6d496b086eba..cc94be8eac3f12685b3d04555fe5076fe3b2107a 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json @@ -85,7 +85,7 @@ "network_address": "yeti-3.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 35", + "switch_port": "ethernet1/1/35:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json index bdc932049341906c29ed72c41af2a7fa9a6b129f..6de7723591bbfaf60e07b3d340dbdf042028aa5d 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json @@ -85,7 +85,7 @@ "network_address": "yeti-4.grenoble.grid5000.fr", "rate": 10000000000, "switch": "gw", - "switch_port": "X670V-48x Port 36", + "switch_port": "ethernet1/1/36:1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-new.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json deleted file mode 100644 index e9cb2d5ba949938e7f4e46c6603a56d94bf232a1..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/grenoble/network_equipments/gw-new.json +++ /dev/null @@ -1,258 +0,0 @@ -{ - "backplane_bps": 6400000000000, - "ip": "172.16.31.252", - "kind": "switch", - "linecards": [ - { - "kavlan_pattern": "ethernet1/1/%PORT%:1", - "kind": "node", - "ports": [ - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/37:1", - "uid": "drac-1" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/38:1", - "uid": "drac-2" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/39:1", - "uid": "drac-3" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/40:1", - "uid": "drac-4" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/41:1", - "uid": "drac-5" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/42:1", - "uid": "drac-6" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/43:1", - "uid": "drac-7" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/44:1", - "uid": "drac-8" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/45:1", - "uid": "drac-9" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/46:1", - "uid": "drac-10" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/47:1", - "uid": "drac-11" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/48:1", - "uid": "drac-12" - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - "kind": "switch", - "snmp_name": "ethernet1/1/91:1", - "uid": "sw-aci-333" - } - ], - "rate": 10000000000, - "snmp_pattern": "ethernet1/1/%PORT%:1" - } - ], - "model": "Dell S5296F-ON", - "role": "production", - "serial": "H47D9Z2", - "site": "grenoble", - "snmp_community": "public", - "type": "network_equipment", - "uid": "gw-new", - "warranty": "2027-11-03" -} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json index 9eb10eefcd250268d419e1f700ee8b8beb39eea6..99dc40d5b7a137abc78996bf1ab16f24d16b16ea 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw.json @@ -3,21 +3,32 @@ "sw-imag", "gw-grenoble" ], - "backplane_bps": 800000000000, + "backplane_bps": 6400000000000, "channels": { - "X670V-48x Port 43": { - "kind": "switch", - "port": "TN-G5K-INT", - "rate": 30000000000, - "uid": "sw-aci-333" + "port-channel10": { + "kind": "server", + "port": "port-channel10", + "rate": 50000000000, + "uid": "dignfs" + }, + "port-channel100": { + "kind": "other", + "port": "port-channel100", + "rate": 40000000000, + "uid": "ACI-G5K-EXT" + }, + "port-channel20": { + "kind": "server", + "port": "port-channel20", + "rate": 20000000000, + "uid": "digsed" } }, "ip": "172.16.31.254", "kind": "router", "linecards": [ { - "backplane_bps": 48000000000, - "kavlan_pattern": "%PORT%", + "kavlan_pattern": "ethernet1/1/%PORT%:1", "kind": "node", "ports": [ { @@ -25,286 +36,455 @@ { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 1", + "snmp_name": "ethernet1/1/1:1", "uid": "dahu-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 2", + "snmp_name": "ethernet1/1/2:1", "uid": "dahu-2" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 3", + "snmp_name": "ethernet1/1/3:1", "uid": "dahu-3" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 4", + "snmp_name": "ethernet1/1/4:1", "uid": "dahu-4" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 5", + "snmp_name": "ethernet1/1/5:1", "uid": "dahu-5" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 6", + "snmp_name": "ethernet1/1/6:1", "uid": "dahu-6" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 7", + "snmp_name": "ethernet1/1/7:1", "uid": "dahu-7" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 8", + "snmp_name": "ethernet1/1/8:1", "uid": "dahu-8" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 9", + "snmp_name": "ethernet1/1/9:1", "uid": "dahu-9" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 10", + "snmp_name": "ethernet1/1/10:1", "uid": "dahu-10" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 11", + "snmp_name": "ethernet1/1/11:1", "uid": "dahu-11" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 12", + "snmp_name": "ethernet1/1/12:1", "uid": "dahu-12" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 13", + "snmp_name": "ethernet1/1/13:1", "uid": "dahu-13" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 14", + "snmp_name": "ethernet1/1/14:1", "uid": "dahu-14" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 15", + "snmp_name": "ethernet1/1/15:1", "uid": "dahu-15" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 16", + "snmp_name": "ethernet1/1/16:1", "uid": "dahu-16" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 17", + "snmp_name": "ethernet1/1/17:1", "uid": "dahu-17" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 18", + "snmp_name": "ethernet1/1/18:1", "uid": "dahu-18" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 19", + "snmp_name": "ethernet1/1/19:1", "uid": "dahu-19" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 20", + "snmp_name": "ethernet1/1/20:1", "uid": "dahu-20" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 21", + "snmp_name": "ethernet1/1/21:1", "uid": "dahu-21" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 22", + "snmp_name": "ethernet1/1/22:1", "uid": "dahu-22" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 23", + "snmp_name": "ethernet1/1/23:1", "uid": "dahu-23" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 24", + "snmp_name": "ethernet1/1/24:1", "uid": "dahu-24" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 25", + "snmp_name": "ethernet1/1/25:1", "uid": "dahu-25" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 26", + "snmp_name": "ethernet1/1/26:1", "uid": "dahu-26" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 27", + "snmp_name": "ethernet1/1/27:1", "uid": "dahu-27" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 28", + "snmp_name": "ethernet1/1/28:1", "uid": "dahu-28" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 29", + "snmp_name": "ethernet1/1/29:1", "uid": "dahu-29" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 30", + "snmp_name": "ethernet1/1/30:1", "uid": "dahu-30" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 31", + "snmp_name": "ethernet1/1/31:1", "uid": "dahu-31" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 32", + "snmp_name": "ethernet1/1/32:1", "uid": "dahu-32" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 33", + "snmp_name": "ethernet1/1/33:1", "uid": "yeti-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 34", + "snmp_name": "ethernet1/1/34:1", "uid": "yeti-2" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 35", + "snmp_name": "ethernet1/1/35:1", "uid": "yeti-3" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 36", + "snmp_name": "ethernet1/1/36:1", "uid": "yeti-4" }, { "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 37", + "snmp_name": "ethernet1/1/37:1", + "uid": "drac-1" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/38:1", + "uid": "drac-2" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/39:1", + "uid": "drac-3" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/40:1", + "uid": "drac-4" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/41:1", + "uid": "drac-5" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/42:1", + "uid": "drac-6" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/43:1", + "uid": "drac-7" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/44:1", + "uid": "drac-8" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/45:1", + "uid": "drac-9" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/46:1", + "uid": "drac-10" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/47:1", + "uid": "drac-11" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/48:1", + "uid": "drac-12" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kavlan_pattern": "ethernet1/1/%PORT%", + "kind": "node", + "port": "eth0", + "rate": 25000000000, + "snmp_name": "ethernet1/1/77", "uid": "troll-1" }, { + "kavlan_pattern": "ethernet1/1/%PORT%", "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 38", + "rate": 25000000000, + "snmp_name": "ethernet1/1/78", "uid": "troll-2" }, { + "kavlan_pattern": "ethernet1/1/%PORT%", "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 39", + "rate": 25000000000, + "snmp_name": "ethernet1/1/79", "uid": "troll-3" }, { + "kavlan_pattern": "ethernet1/1/%PORT%", "kind": "node", "port": "eth0", - "snmp_name": "X670V-48x Port 40", + "rate": 25000000000, + "snmp_name": "ethernet1/1/80", "uid": "troll-4" }, { - "kind": "server", - "snmp_name": "X670V-48x Port 41", - "uid": "dighyp1" }, { - "kind": "server", - "snmp_name": "X670V-48x Port 42", - "uid": "dighyp2" }, { "kind": "channel", - "snmp_name": "X670V-48x Port 43", - "uid": "X670V-48x Port 43" + "rate": 25000000000, + "snmp_name": "ethernet1/1/83:1", + "uid": "port-channel10" }, { "kind": "channel", - "snmp_name": "X670V-48x Port 44", - "uid": "X670V-48x Port 43" + "rate": 25000000000, + "snmp_name": "ethernet1/1/84:1", + "uid": "port-channel10" }, { "kind": "channel", - "snmp_name": "X670V-48x Port 45", - "uid": "X670V-48x Port 43" + "snmp_name": "ethernet1/1/85:1", + "uid": "port-channel20" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/86:1", + "uid": "port-channel20" + }, + { + "kind": "server", + "snmp_name": "ethernet1/1/87:1", + "uid": "dighyp1" }, { "kind": "server", - "snmp_name": "X670V-48x Port 46", + "snmp_name": "ethernet1/1/88:1", + "uid": "dighyp2" + }, + { + "kind": "server", + "snmp_name": "ethernet1/1/89:1", "uid": "digwatt" }, + { + }, { "kind": "other", - "snmp_name": "X670V-48x Port 47", - "uid": "ACI-G5K-EXT" + "snmp_name": "ethernet1/1/91:1", + "uid": "ACI-G5K-INT" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/92:1", + "uid": "port-channel100" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/93:1", + "uid": "port-channel100" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/94:1", + "uid": "port-channel100" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/95:1", + "uid": "port-channel100" }, { "kind": "backbone", - "snmp_name": "X670V-48x Port 48", - "uid": "renater5" + "snmp_name": "ethernet1/1/96:1", + "uid": "renater-grenoble" } ], "rate": 10000000000, - "snmp_pattern": "X670V-48x Port %PORT%" + "snmp_pattern": "ethernet1/1/%PORT%:1" } ], "metrics": [ @@ -327,8 +507,9 @@ } } ], - "model": "ExtremeNetworks", + "model": "Dell S5296F-ON", "role": "production", + "serial": "H47D9Z2", "site": "grenoble", "snmp_community": "public", "type": "network_equipment", @@ -411,5 +592,5 @@ "name": "kavlan-11" } }, - "warranty": "expired" + "warranty": "2027-11-03" } \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json deleted file mode 100644 index f11a3e528785b9733601250a8c14918280910e2f..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "channels": { - "TN-G5K-INT": { - "kind": "switch", - "port": "X670V-48x Port 43", - "rate": 30000000000, - "uid": "gw" - } - }, - "kind": "switch", - "linecards": [ - { - "kind": "switch", - "ports": [ - { - }, - { - }, - { - }, - { - }, - { - }, - { - "kind": "switch", - "snmp_name": "5", - "uid": "gw-new" - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - "kind": "channel", - "snmp_name": "17", - "uid": "TN-G5K-INT" - }, - { - "kind": "channel", - "snmp_name": "18", - "uid": "TN-G5K-INT" - }, - { - "kind": "channel", - "snmp_name": "19", - "uid": "TN-G5K-INT" - } - ], - "rate": 10000000000, - "snmp_pattern": "%PORT%" - } - ], - "model": "Cisco ACI leaf", - "role": "production", - "site": "grenoble", - "snmp_community": "public", - "type": "network_equipment", - "uid": "sw-aci-333", - "warranty": "N/A" -} \ No newline at end of file