diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json index fea929bcdf28d008a91e80a25f00b9c4dca0514e..7c61fd660619a3cd271f4b856f37dc53ddea2d8c 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw.json @@ -5,7 +5,7 @@ ], "backplane_bps": 800000000000, "channels": { - "TN-G5K-INT": { + "ACI-G5K-INT": { "kind": "switch", "port": "TN-G5K-INT", "rate": 30000000000, @@ -275,17 +275,17 @@ { "kind": "channel", "snmp_name": "X670V-48x Port 43", - "uid": "TN-G5K-INT" + "uid": "ACI-G5K-INT" }, { "kind": "channel", "snmp_name": "X670V-48x Port 44", - "uid": "TN-G5K-INT" + "uid": "ACI-G5K-INT" }, { "kind": "channel", "snmp_name": "X670V-48x Port 45", - "uid": "TN-G5K-INT" + "uid": "ACI-G5K-INT" }, { "kind": "server", @@ -293,6 +293,9 @@ "uid": "digwatt" }, { + "kind": "other", + "snmp_name": "X670V-48x Port 47", + "uid": "ACI-G5K-EXT" }, { "kind": "backbone", diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json index bdafca8f8515ffdb3d5e4061d01a23ee280d6036..e8d9a340f76f21bafa8fdce68bbd629fa8976b07 100644 --- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json +++ b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json @@ -2,7 +2,7 @@ "channels": { "TN-G5K-INT": { "kind": "switch", - "port": "TN-G5K-INT", + "port": "ACI-G5K-INT", "rate": 30000000000, "uid": "gw" } diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml index a1effd8a45a5b10912ac505430646fb1580a0853..bfdae1b4988addcbfdb393b568d2432f40df001a 100644 --- a/input/grid5000/sites/grenoble/networks/gw.yaml +++ b/input/grid5000/sites/grenoble/networks/gw.yaml @@ -130,22 +130,25 @@ gw: uid: dighyp2 kind: server 43: - uid: TN-G5K-INT + uid: ACI-G5K-INT kind: channel 44: - uid: TN-G5K-INT + uid: ACI-G5K-INT kind: channel 45: - uid: TN-G5K-INT + uid: ACI-G5K-INT kind: channel 46: uid: digwatt kind: server + 47: + uid: ACI-G5K-EXT + kind: other 48: uid: renater5 kind: backbone channels: - TN-G5K-INT: + ACI-G5K-INT: uid: sw-aci-333 port: TN-G5K-INT kind: switch diff --git a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml index 96ea135c22c0f5c79280d9cfb2944fec35e7200e..e6eb0fea6abd098436b1f37054e99db900de77b0 100644 --- a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml +++ b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml @@ -27,6 +27,6 @@ sw-aci-333: channels: TN-G5K-INT: uid: gw - port: TN-G5K-INT + port: ACI-G5K-INT kind: switch rate: 30000000000