diff --git a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json index eb0c3225004232077cee10582dbfed050318a42c..f096f26701adfa06579dd36de348ba82d44d1ab5 100644 --- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json +++ b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json @@ -23,57 +23,40 @@ { }, { - "uid": "sagittaire-53" }, { - "uid": "sagittaire-54" }, { - "uid": "sagittaire-55" }, { - "uid": "sagittaire-56" }, { - "uid": "sagittaire-57" }, { - "uid": "sagittaire-58" }, { - "uid": "sagittaire-59" }, { - "uid": "sagittaire-60" }, { - "uid": "sagittaire-61" }, { }, { - "uid": "sagittaire-63" }, { - "uid": "sagittaire-64" }, { - "uid": "sagittaire-65" }, { - "uid": "sagittaire-66" }, { - "uid": "sagittaire-67" }, { - "uid": "sagittaire-68" }, { - "uid": "sagittaire-69" }, { - "uid": "sagittaire-52" }, { "uid": "sagittaire-48" @@ -88,25 +71,21 @@ "uid": "sagittaire-51" }, { - "uid": "sagittaire-75" }, { - "uid": "sagittaire-76" }, { - "uid": "sagittaire-77" }, { - "uid": "sagittaire-78" }, { - "uid": "sagittaire-79" }, { }, { }, { + "kind": "other", "uid": "cyrrus-adm" } ], @@ -143,10 +122,8 @@ "uid": "sagittaire-7" }, { - "uid": "sagittaire-42" }, { - "uid": "sagittaire-9" }, { "uid": "sagittaire-43" @@ -185,7 +162,6 @@ "uid": "sagittaire-44" }, { - "uid": "sagittaire-22" }, { "uid": "sagittaire-23" @@ -224,24 +200,18 @@ "uid": "sagittaire-34" }, { - "uid": "sagittaire-35" }, { - "uid": "sagittaire-36" }, { - "uid": "sagittaire-37" }, { - "uid": "sagittaire-38" }, { - "uid": "sagittaire-39" }, { }, { - "uid": "sagittaire-41" }, { }, diff --git a/grid5000-all.json b/grid5000-all.json index be8c8fc2701d421fe940c82e5c81fac7464a9e17..553ad94590643eb0a9dd4f6dc03f1a8728406923 100644 --- a/grid5000-all.json +++ b/grid5000-all.json @@ -64465,33 +64465,14 @@ "kind": "node", "port": "eth1", "ports": { - "10": "sagittaire-58", - "11": "sagittaire-59", - "12": "sagittaire-60", - "13": "sagittaire-61", - "15": "sagittaire-63", - "16": "sagittaire-64", - "17": "sagittaire-65", - "18": "sagittaire-66", - "19": "sagittaire-67", - "20": "sagittaire-68", - "21": "sagittaire-69", - "22": "sagittaire-52", "23": "sagittaire-48", "24": "sagittaire-49", "25": "sagittaire-50", "26": "sagittaire-51", - "27": "sagittaire-75", - "28": "sagittaire-76", - "29": "sagittaire-77", - "30": "sagittaire-78", - "31": "sagittaire-79", - "34": "cyrrus-adm", - "5": "sagittaire-53", - "6": "sagittaire-54", - "7": "sagittaire-55", - "8": "sagittaire-56", - "9": "sagittaire-57" + "34": { + "kind": "other", + "uid": "cyrrus-adm" + } }, "rate": 1000000000, "snmp_pattern": "BD-8810 Port %LINECARD%:%PORT%" @@ -64516,7 +64497,6 @@ "2": "sagittaire-2", "20": "sagittaire-20", "21": "sagittaire-44", - "22": "sagittaire-22", "23": "sagittaire-23", "24": "sagittaire-24", "25": "sagittaire-45", @@ -64530,19 +64510,11 @@ "32": "sagittaire-32", "33": "sagittaire-33", "34": "sagittaire-34", - "35": "sagittaire-35", - "36": "sagittaire-36", - "37": "sagittaire-37", - "38": "sagittaire-38", - "39": "sagittaire-39", "4": "sagittaire-4", - "41": "sagittaire-41", "45": "sagittaire-45", "5": "sagittaire-5", "6": "sagittaire-6", - "7": "sagittaire-7", - "8": "sagittaire-42", - "9": "sagittaire-9" + "7": "sagittaire-7" }, "rate": 1000000000, "snmp_pattern": "BD-8810 Port %LINECARD%:%PORT%" diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml index 60fea4df5b0948450799e27deacc294162fdc377..3e09a3ed0c08b5164618fd76f1ce9082a280aa80 100644 --- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml +++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml @@ -71,33 +71,13 @@ gw-lyon: rate: 1000000000 port: eth1 ports: - 5: sagittaire-53 - 6: sagittaire-54 - 7: sagittaire-55 - 8: sagittaire-56 - 9: sagittaire-57 - 10: sagittaire-58 - 11: sagittaire-59 - 12: sagittaire-60 - 13: sagittaire-61 - 15: sagittaire-63 - 16: sagittaire-64 - 17: sagittaire-65 - 18: sagittaire-66 - 19: sagittaire-67 - 20: sagittaire-68 - 21: sagittaire-69 - 22: sagittaire-52 23: sagittaire-48 24: sagittaire-49 25: sagittaire-50 26: sagittaire-51 - 27: sagittaire-75 - 28: sagittaire-76 - 29: sagittaire-77 - 30: sagittaire-78 - 31: sagittaire-79 - 34: cyrrus-adm + 34: + uid: cyrrus-adm + kind: other 3: snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%" kavlan_pattern: "%LINECARD%:%PORT%" @@ -119,7 +99,6 @@ gw-lyon: 1: sagittaire-1 20: sagittaire-20 21: sagittaire-44 - 22: sagittaire-22 23: sagittaire-23 24: sagittaire-24 25: sagittaire-45 @@ -133,20 +112,12 @@ gw-lyon: 32: sagittaire-32 33: sagittaire-33 34: sagittaire-34 - 35: sagittaire-35 - 36: sagittaire-36 - 37: sagittaire-37 - 38: sagittaire-38 - 39: sagittaire-39 3: sagittaire-3 - 41: sagittaire-41 45: sagittaire-45 4: sagittaire-4 5: sagittaire-5 6: sagittaire-6 7: sagittaire-7 - 8: sagittaire-42 - 9: sagittaire-9 4: snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%" kavlan_pattern: "%LINECARD%:%PORT%"