[sophia] Corrected gw-sophia renater port.

data/grid5000/sites/sophia/network_equipments/gw-sophia.json

@@ -9,7 +9,21 @@
 
     },
     {
+      "backplane_bps": null,
+      "kind": "switch",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
+      "ports": [
+        {
 
+        },
+        {
+          "kind": "renater",
+          "site": "virtual",
+          "uid": "renater-sophia"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
     },
     {
       "backplane_bps": 20000000000,
@@ -498,9 +512,7 @@
 
         },
         {
-          "kind": "virtual",
-          "rate": 10000000000,
-          "uid": "renater-sophia"
+
         },
         {
           "port": "eth0",

generators/input/sites/sophia/net-links/gw-sophia.yaml

@@ -11,7 +11,7 @@ gw-sophia:
     "vlan100":
       administrative: yes
       addresses:
-        - 172.16.143.254    
+        - 172.16.143.254
     "vlan101":
       addresses:
         - 172.17.143.254
@@ -52,7 +52,7 @@ gw-sophia:
     "vlan705":
       name: kavlan-5
       addresses:
-        - 10.32.64.0/18	
+        - 10.32.64.0/18
     "vlan706":
       name: kavlan-6
       addresses:
@@ -60,11 +60,11 @@ gw-sophia:
     "vlan707":
       name: kavlan-7
       addresses:
-        - 10.32.192.0/18	
+        - 10.32.192.0/18
     "vlan708":
       name: kavlan-8
       addresses:
-        - 10.33.0.0/18	
+        - 10.33.0.0/18
     "vlan709":
       name: kavlan-9
       addresses:
@@ -77,6 +77,17 @@ gw-sophia:
   backplane_bps: 900000000000
 
   linecards:
+    1:
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
+      snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
+      kind: switch
+      backplane_bps:
+      rate: 10000000000
+      ports:
+        1:
+          uid: renater-sophia
+          kind: renater
+          site: virtual
     2:
       naming_pattern: "ethernet%LINECARD%/%PORT%"
       snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
@@ -195,10 +206,6 @@ gw-sophia:
           uid: sol-50
           kind: node
         6: sw-myrinet
-        9:
-          uid: renater-sophia
-          kind: virtual
-          rate: 10000000000
         10:
           uid: stock
           port: eth0