[network_equipments] lyon - corrections for bug #4243

data/grid5000/sites/lyon/lyon.json

 {
-<<<<<<< HEAD
-  "compilation_server": false,
-  "description": "Lyon Grid'5000 Site",
-  "email_contact": "lyon-staff@lists.grid5000.fr",
-  "latitude": 45.7667,
-  "location": "Lyon, France",
-  "longitude": 4.8333,
-  "name": "Lyon",
-  "security_contact": "lyon-staff@lists.grid5000.fr",
-  "sys_admin_contact": "lyon-staff@lists.grid5000.fr",
-  "type": "site",
-  "uid": "lyon",
-  "user_support_contact": "lyon-staff@lists.grid5000.fr",
-  "web": "https://www.grid5000.fr/mediawiki/index.php/Lyon:Home"
-=======
   "type": "site",
   "uid": "lyon"
->>>>>>> network API generator scripts revisited and improved.
 }
\ No newline at end of file

data/grid5000/sites/lyon/network_equipments/gw.json

@@ -203,7 +203,9 @@
           "uid": "sagittaire-39"
         },
         {
-
+          "kind": "node",
+          "rate": 1000000000,
+          "uid": "sagittaire-40"
         },
         {
           "kind": "node",
@@ -318,7 +320,9 @@
           "uid": "sagittaire-61"
         },
         {
-
+          "kind": "node",
+          "rate": 1000000000,
+          "uid": "sagittaire-62"
         },
         {
           "kind": "node",
@@ -356,7 +360,9 @@
           "uid": "sagittaire-69"
         },
         {
-
+          "kind": "node",
+          "rate": 1000000000,
+          "uid": "sagittaire-70"
         },
         {
           "kind": "node",
@@ -431,7 +437,9 @@
           "uid": "capricorne-4"
         },
         {
-
+          "kind": "node",
+          "rate": 1000000000,
+          "uid": "capricorne-5"
         },
         {
           "kind": "node",

generators/input/lyon-network-equipments.yaml

@@ -310,6 +310,12 @@ gw:
     trunked: false
     uid: capricorne-56
     kind: node
+  - linecard: 3
+    port: 5
+    rate: 1000000000
+    trunked: false
+    uid: capricorne-5
+    kind: node
   - linecard: 3
     port: 6
     rate: 1000000000
@@ -532,6 +538,12 @@ gw:
     trunked: false
     uid: sagittaire-3
     kind: node
+  - linecard: 1
+    port: 40
+    rate: 1000000000
+    trunked: false
+    uid: sagittaire-40
+    kind: node
   - linecard: 1
     port: 41
     rate: 1000000000
@@ -670,6 +682,12 @@ gw:
     trunked: false
     uid: sagittaire-61
     kind: node
+  - linecard: 2
+    port: 14
+    rate: 1000000000
+    trunked: false
+    uid: sagittaire-62
+    kind: node
   - linecard: 2
     port: 15
     rate: 1000000000
@@ -718,6 +736,12 @@ gw:
     trunked: false
     uid: sagittaire-6
     kind: node
+  - linecard: 2
+    port: 22
+    rate: 1000000000
+    trunked: false
+    uid: sagittaire-70
+    kind: node  
   - linecard: 2
     port: 23
     rate: 1000000000