[network] Add missing backbone links (#4825), cleanup

120170a6 · Simon Delamare · 0e6b98e4 · 120170a6 · 120170a6 · 120170a6
Commit 120170a6 authored Feb 12, 2013 by Simon Delamare
12 changed files
--- a/data/grid5000/network_equipments/renater5-bordeaux.json
+++ b/data/grid5000/network_equipments/renater5-bordeaux.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-lyon"
        },

--- a/data/grid5000/network_equipments/renater5-grenoble.json
+++ b/data/grid5000/network_equipments/renater5-grenoble.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-lyon"
        },

--- a/data/grid5000/network_equipments/renater5-lille.json
+++ b/data/grid5000/network_equipments/renater5-lille.json
@@ -4,15 +4,10 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 0,
          "rate": 10000000000,
          "uid": "renater5-paris"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000,
          "uid": "renater5-reims"
        },

--- a/data/grid5000/network_equipments/renater5-luxembourg.json
+++ b/data/grid5000/network_equipments/renater5-luxembourg.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-nancy"
        },

--- a/data/grid5000/network_equipments/renater5-lyon.json
+++ b/data/grid5000/network_equipments/renater5-lyon.json
@@ -4,18 +4,21 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 1,
          "rate": 10000000000,
          "uid": "renater5-paris"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-marseille"
        },
+        {
+          "rate": 10000000000,
+          "uid": "renater5-bordeaux"
+        },
+        {
+          "rate": 10000000000,
+          "uid": "renater5-grenoble"
+        },
        {
          "kind": "router",
          "site_uid": "lyon",

--- a/data/grid5000/network_equipments/renater5-marseille.json
+++ b/data/grid5000/network_equipments/renater5-marseille.json
@@ -4,20 +4,14 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-lyon"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-toulouse"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-sophia"
        }

--- a/data/grid5000/network_equipments/renater5-nancy.json
+++ b/data/grid5000/network_equipments/renater5-nancy.json
@@ -4,15 +4,10 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 2,
          "rate": 10000000000,
          "uid": "renater5-paris"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-luxembourg"
        },

--- a/data/grid5000/network_equipments/renater5-paris.json
+++ b/data/grid5000/network_equipments/renater5-paris.json
@@ -4,30 +4,18 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 0,
          "rate": 10000000000,
          "uid": "renater5-lille"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 0,
          "rate": 10000000000,
          "uid": "renater5-lyon"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 0,
          "rate": 10000000000,
          "uid": "renater5-nancy"
        },
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 0,
          "rate": 10000000000,
          "uid": "renater5-rennes"
        }

--- a/data/grid5000/network_equipments/renater5-reims.json
+++ b/data/grid5000/network_equipments/renater5-reims.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000,
          "uid": "renater5-lille"
        },

--- a/data/grid5000/network_equipments/renater5-rennes.json
+++ b/data/grid5000/network_equipments/renater5-rennes.json
@@ -4,9 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
-          "port": 3,
          "rate": 10000000000,
          "uid": "renater5-paris"
        },

--- a/data/grid5000/network_equipments/renater5-sophia.json
+++ b/data/grid5000/network_equipments/renater5-sophia.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-marseille"
        },

--- a/data/grid5000/network_equipments/renater5-toulouse.json
+++ b/data/grid5000/network_equipments/renater5-toulouse.json
@@ -4,8 +4,6 @@
    {
      "ports": [
        {
-          "kind": "virtual",
-          "linecard": 0,
          "rate": 10000000000,
          "uid": "renater5-marseille"
        },