diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json index 6e9a8be7996dbce749d3a0f5382bc04de45fad83..8edfca1af93f7f85844dea5a3f38cc98f4c7ea3d 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw.json @@ -29,6 +29,12 @@ "rate": 20000000000, "uid": "orichard-nixbuild" }, + "port-channel40": { + "kind": "switch", + "port": "Po1", + "rate": 20000000000, + "uid": "skinovis2-prod-01" + }, "port-channel50": { "kind": "switch", "port": "lag1", diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json new file mode 100644 index 0000000000000000000000000000000000000000..ecca3167b2be15970bbae28c8334a1af2b6a6a44 --- /dev/null +++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json @@ -0,0 +1,265 @@ +{ + "backplane_bps": 400000000000, + "channels": { + "Po1": { + "kind": "router", + "port": "port-channel40", + "rate": 20000000000, + "uid": "gw" + } + }, + "ip": "172.17.31.245", + "kind": "switch", + "linecards": [ + { + }, + { + "backplane_bps": 400000000000, + "kavlan_pattern": "%LINECARD%/%PORT%", + "kind": "node", + "ports": [ + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "rate": 1000000000, + "snmp_name": "1/38", + "trunk": false, + "uid": "skinovis2-admin-01" + }, + { + "kind": "channel", + "snmp_name": "1/39", + "uid": "Po1" + }, + { + "kind": "channel", + "snmp_name": "1/40", + "uid": "Po1" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "server", + "rate": 100000000000, + "snmp_name": "1/107", + "uid": "srv-data3" + } + ], + "rate": 25000000000, + "snmp_pattern": "%LINECARD%/%PORT%" + } + ], + "managed_by_us": true, + "model": "N9K-C93360YC-FX2", + "serial": "FDO264332V6", + "site": "grenoble", + "snmp_community": "public", + "type": "network_equipment", + "uid": "skinovis2-prod-01", + "warranty": null +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json index bef4f9b91c45fff02f1c76c4af149e5ec3baeb09..53ed0b2c3ab02b4e37aff3940bb3201b5219ca90 100644 --- a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json +++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json @@ -1,6 +1,8 @@ { "ip": "172.17.31.18", "mac": "00:0D:5D:32:DF:29", + "model": "PX3-5488V", "type": "pdu", - "uid": "pdu-kinovis2-1" + "uid": "pdu-kinovis2-1", + "vendor": "Raritan" } \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json index 0ca08df4411ee917dac5ee8a8cb8e37972b3c4ed..e3b6a2af0e83018d0e0fccea09b43058f65cc88b 100644 --- a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json +++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json @@ -1,6 +1,8 @@ { "ip": "172.17.31.19", "mac": "00:0D:5D:32:DF:2B", + "model": "PX3-5488V", "type": "pdu", - "uid": "pdu-kinovis2-2" + "uid": "pdu-kinovis2-2", + "vendor": "Raritan" } \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json index 472843af49ea9559e8e614aeb00218f0cfe7c86d..b7d5a8a3b2a3f55160d3622635c382d391a06481 100644 --- a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json +++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json @@ -1,6 +1,8 @@ { "ip": "172.17.31.20", "mac": "00:0D:5D:32:DF:2D", + "model": "PX3-5488V", "type": "pdu", - "uid": "pdu-kinovis2-3" + "uid": "pdu-kinovis2-3", + "vendor": "Raritan" } \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json index c18c8c9feb2d511843b63a7eb24f47dcdfdbe35f..3bf20a975ca21267e0f0ff92b3f5ee9fcf0d3404 100644 --- a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json +++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json @@ -1,6 +1,8 @@ { "ip": "172.17.31.21", "mac": "00:0D:5D:32:DF:2F", + "model": "PX3-5488V", "type": "pdu", - "uid": "pdu-kinovis2-4" + "uid": "pdu-kinovis2-4", + "vendor": "Raritan" } \ No newline at end of file diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml index b683511624fd752c3dc754b371391231f2d9151c..8dcded0c08a988e45f26efabec05ab3cf33c2e53 100644 --- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml +++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml @@ -299,6 +299,11 @@ gw: port: port-channel30 kind: server rate: 20000000000 + port-channel40: + uid: skinovis2-prod-01 + port: Po1 + kind: switch + rate: 20_000_000_000 port-channel100: uid: ACI-G5K-EXT port: port-channel100 diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cb5ffe1df35f8082b62e1a23cfcf988fa761417c --- /dev/null +++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml @@ -0,0 +1,40 @@ +--- +skinovis2-prod-01: + model: N9K-C93360YC-FX2 + warranty: + serial: FDO264332V6 + kind: switch + managed_by_us: true + site: grenoble + snmp_community: public + ip: 172.17.31.245 + backplane_bps: 400_000_000_000 + linecards: + 1: + snmp_pattern: "%LINECARD%/%PORT%" + kavlan_pattern: "%LINECARD%/%PORT%" + rate: 25_000_000_000 + backplane_bps: 400_000_000_000 + kind: node + ports: + 38: + uid: skinovis2-admin-01 + kind: switch + rate: 1_000_000_000 + trunk: false + 39: + uid: Po1 + kind: channel + 40: + uid: Po1 + kind: channel + 107: + uid: srv-data3 + kind: server + rate: 100_000_000_000 + channels: + Po1: + kind: router + rate: 20_000_000_000 + uid: gw + port: port-channel40 diff --git a/input/grid5000/sites/grenoble/pdus.yaml b/input/grid5000/sites/grenoble/pdus.yaml index ad4276c62d63b734aed7ed9b6c269fdd56de5e92..356d55cecba8e384c9997be45ae17a95b8527f2d 100644 --- a/input/grid5000/sites/grenoble/pdus.yaml +++ b/input/grid5000/sites/grenoble/pdus.yaml @@ -22,6 +22,11 @@ pdus: optional_period: 20 source: protocol: wattmetre + + pdu-kinovis2-[1-4]: + vendor: Raritan + model: PX3-5488V + pdu-kinovis2-1: ip: 172.17.31.18 mac: 00:0D:5D:32:DF:29