Commit 8e12373e authored by Cyril Rohr's avatar Cyril Rohr Committed by Gaetan SIMO
Browse files

[lille,lyon,nancy] First pass at a network equipment description.

parent 53b7ebb6
......@@ -9,55 +9,91 @@
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-1"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-23"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-2"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-24"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-3"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-25"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-4"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-26"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-5"
},
{
......@@ -66,103 +102,171 @@
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-6"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-28"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-7"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-29"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-8"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-30"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-9"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-31"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-10"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-32"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-11"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-33"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-12"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-34"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-13"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-35"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-14"
},
{
......@@ -171,91 +275,151 @@
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-15"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-37"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-16"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-38"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-17"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-39"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-18"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-40"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-19"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-41"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-20"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-42"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-21"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-43"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-22"
},
{
......@@ -269,13 +433,21 @@
},
{
"kind": "router",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"trunked": true,
"uid": "gw"
},
{
"kind": "router",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"trunked": true,
"uid": "gw"
}
......
......@@ -9,85 +9,141 @@
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-44"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-4"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-45"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chimint-20"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chinqchint-46"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-2"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chimint-2"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-1"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chimint-1"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-3"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chimint-5"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-6"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chimint-3"
},
{
"device": "eth0",
"kind": "node",
<<<<<<< HEAD
"rate": 1000000000,
=======
"rate": 1000000,
>>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
"uid": "chirloute-8"