diff --git a/data/grid5000/sites/toulouse/servers/dns.json b/data/grid5000/sites/toulouse/servers/dns.json
new file mode 100644
index 0000000000000000000000000000000000000000..fcbadb94d9ce929bc5bfd2f2ed916dd66e8e4050
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/dns.json
@@ -0,0 +1,13 @@
+{
+  "alias": [
+    "ns"
+  ],
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.106"
+    }
+  },
+  "type": "server",
+  "uid": "dns"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/g5kservices1.json b/data/grid5000/sites/toulouse/servers/g5kservices1.json
new file mode 100644
index 0000000000000000000000000000000000000000..e643affd0a5d1f33576502509d75ecafe0493b63
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/g5kservices1.json
@@ -0,0 +1,19 @@
+{
+  "alias": [
+    "adminfront",
+    "osirim-home5k"
+  ],
+  "kind": "physical",
+  "network_adapters": {
+    "adm": {
+      "ip": "172.17.127.1"
+    },
+    "default": {
+      "ip": "172.16.127.1"
+    }
+  },
+  "serial": null,
+  "type": "server",
+  "uid": "g5kservices1",
+  "warranty": 1.201
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/gw.json b/data/grid5000/sites/toulouse/servers/gw.json
new file mode 100644
index 0000000000000000000000000000000000000000..d8bb721003abf4c357927a7aaa25226e818a1a48
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/gw.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.254"
+    }
+  },
+  "type": "server",
+  "uid": "gw"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/ldap.json b/data/grid5000/sites/toulouse/servers/ldap.json
new file mode 100644
index 0000000000000000000000000000000000000000..cbeb6a7c6a75412ae5ac7cf7ed8121316a90c031
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/ldap.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.102"
+    }
+  },
+  "type": "server",
+  "uid": "ldap"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/mail.json b/data/grid5000/sites/toulouse/servers/mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..09122d0714dfe3a9f1e9669740504ed0d0b3188c
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/mail.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.113"
+    }
+  },
+  "type": "server",
+  "uid": "mail"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/osirim-gw.json b/data/grid5000/sites/toulouse/servers/osirim-gw.json
new file mode 100644
index 0000000000000000000000000000000000000000..0cf621c1711901094700bd95b5a64d5efeab7a6f
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/osirim-gw.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.113.8"
+    }
+  },
+  "type": "server",
+  "uid": "osirim-gw"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/osirim.json b/data/grid5000/sites/toulouse/servers/osirim.json
new file mode 100644
index 0000000000000000000000000000000000000000..feedb4c27fd1013d6278f678bb980ea689d7fe62
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/osirim.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.113.7"
+    }
+  },
+  "type": "server",
+  "uid": "osirim"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/puppet.json b/data/grid5000/sites/toulouse/servers/puppet.json
new file mode 100644
index 0000000000000000000000000000000000000000..84f63155d21be6f553a0c6a02a8b2f3715a2ca19
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/puppet.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.110"
+    }
+  },
+  "type": "server",
+  "uid": "puppet"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
new file mode 100644
index 0000000000000000000000000000000000000000..eab255b4ac280ea79c2208fd124c5bc9cac90c5a
--- /dev/null
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -0,0 +1,4 @@
+{
+  "type": "site",
+  "uid": "toulouse"
+}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index c58def6c7dc750c1ce0b7a9d346396324362ae48..c955c8486e5f2153d3b864b8278b8402f6393266 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -243059,6 +243059,105 @@
       "user_support_contact": "support-staff@lists.grid5000.fr",
       "virt_ip_range": "10.164.0.0/14",
       "web": "http://www.grid5000.fr/mediawiki/index.php/Sophia:Home"
+    },
+    "toulouse": {
+      "network_equipments": null,
+      "servers": {
+        "dns": {
+          "alias": [
+            "ns"
+          ],
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.127.106"
+            }
+          },
+          "type": "server",
+          "uid": "dns"
+        },
+        "g5kservices1": {
+          "alias": [
+            "adminfront",
+            "osirim-home5k"
+          ],
+          "kind": "physical",
+          "network_adapters": {
+            "adm": {
+              "ip": "172.17.127.1"
+            },
+            "default": {
+              "ip": "172.16.127.1"
+            }
+          },
+          "serial": null,
+          "type": "server",
+          "uid": "g5kservices1",
+          "warranty": 1.201
+        },
+        "gw": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.127.254"
+            }
+          },
+          "type": "server",
+          "uid": "gw"
+        },
+        "ldap": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.127.102"
+            }
+          },
+          "type": "server",
+          "uid": "ldap"
+        },
+        "mail": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.127.113"
+            }
+          },
+          "type": "server",
+          "uid": "mail"
+        },
+        "osirim": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.113.7"
+            }
+          },
+          "type": "server",
+          "uid": "osirim"
+        },
+        "osirim-gw": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.113.8"
+            }
+          },
+          "type": "server",
+          "uid": "osirim-gw"
+        },
+        "puppet": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.127.110"
+            }
+          },
+          "type": "server",
+          "uid": "puppet"
+        }
+      },
+      "type": "site",
+      "uid": "toulouse"
     }
   },
   "type": "grid",
diff --git a/input/grid5000/sites/toulouse/servers/servers.yaml b/input/grid5000/sites/toulouse/servers/servers.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cf1d0a003c5bb02ef2214601e6ef7c3224aa7e63
--- /dev/null
+++ b/input/grid5000/sites/toulouse/servers/servers.yaml
@@ -0,0 +1,33 @@
+g5kservices1:
+  kind: physical
+  alias: [adminfront, osirim-home5k]
+  warranty: 01.2010
+  serial:
+  network_adapters:
+    default:
+      ip: 172.16.127.1
+    adm:
+      ip: 172.17.127.1
+
+dns:
+  kind: virtual
+  alias: [ns]
+  network_adapters: {default: {ip: 172.16.127.106}}
+ldap:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.127.102}}
+mail:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.127.113}}
+puppet:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.127.110}}
+osirim-gw:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.113.8}}
+osirim:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.113.7}}
+gw:
+  kind: virtual
+  network_adapters: {default: {ip: 172.16.127.254}}