[lille] Use network lookup functions (Florentin work)

7b98df7c · Simon Delamare · f5d84a05 · 7b98df7c · 7b98df7c · 7b98df7c
Commit 7b98df7c authored Jun 27, 2014 by Simon Delamare
77 changed files
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-1.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/7",
+      "switch_port": "GigabitEthernet3/7",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-1-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-10.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/16",
+      "switch_port": "GigabitEthernet3/16",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-10-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-11.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/17",
+      "switch_port": "GigabitEthernet3/17",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-11-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-12.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/18",
+      "switch_port": "GigabitEthernet3/18",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-12-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-13.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/19",
+      "switch_port": "GigabitEthernet3/19",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-13-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-14.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/20",
+      "switch_port": "GigabitEthernet3/20",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-14-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-15.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/23",
+      "switch_port": "GigabitEthernet3/23",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-15-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-16.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/22",
+      "switch_port": "GigabitEthernet3/22",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-16-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-17.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/21",
+      "switch_port": "GigabitEthernet3/21",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-17-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-18.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/24",
+      "switch_port": "GigabitEthernet3/24",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-18-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-19.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/28",
+      "switch_port": "GigabitEthernet3/28",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-19-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-2.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/9",
+      "switch_port": "GigabitEthernet3/9",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-2-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-20.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/27",
+      "switch_port": "GigabitEthernet3/27",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-20-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-3.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/8",
+      "switch_port": "GigabitEthernet3/8",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-3-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-4.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/11",
+      "switch_port": "GigabitEthernet3/11",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-4-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-5.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/10",
+      "switch_port": "GigabitEthernet3/10",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-5-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-6.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/12",
+      "switch_port": "GigabitEthernet3/12",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-6-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-7.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/14",
+      "switch_port": "GigabitEthernet3/14",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-7-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-8.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/13",
+      "switch_port": "GigabitEthernet3/13",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-8-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
@@ -40,7 +40,7 @@
      "network_address": "chimint-9.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi3/15",
+      "switch_port": "GigabitEthernet3/15",
      "vendor": "Broadcom",
      "version": "NetXtreme II BCM5716"
    },
@@ -68,9 +68,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chimint-9-impi.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "rate": 1000000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-1.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/1",
+      "switch_port": "GigabitEthernet2/1",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-1-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-10.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/10",
+      "switch_port": "GigabitEthernet2/10",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-10-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-11.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/11",
+      "switch_port": "GigabitEthernet2/11",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-11-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-12.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/12",
+      "switch_port": "GigabitEthernet2/12",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-12-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-13.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi4/26",
+      "switch_port": "GigabitEthernet2/13",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-13-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -55,8 +55,8 @@
      "mounted": true,
      "network_address": "chinqchint-14.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi4/29",
+      "switch": null,
+      "switch_port": null,
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-14-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-15.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/15",
+      "switch_port": "GigabitEthernet2/15",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-15-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"
+      "rate": 100000000
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -56,7 +56,7 @@
      "network_address": "chinqchint-16.lille.grid5000.fr",
      "rate": 1000000000,
      "switch": "gw-lille",
-      "switch_port": "Gi2/16",
+      "switch_port": "GigabitEthernet2/16",
      "vendor": "Intel",
      "version": "80003ES2LAN"
    },
@@ -87,8 +87,7 @@
      "mountable": false,
      "mounted": false,
      "network_address": "chinqchint-16-ipmi.lille.grid5000.fr",
-      "rate": 100000000,
-      "switch": "gw-lille"