Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 12a1e226 authored by Nicolas Perrin's avatar Nicolas Perrin
Browse files

Merge branch 'fakesw2irisasw' into 'master'

[rennes][network] Add vss-inria and swdc-a035-02-rb instead of mc-fake-sw

See merge request !512
parents a531fcc6 c0cfb266
No related branches found
No related tags found
1 merge request!512[rennes][network] Add vss-inria and swdc-a035-02-rb instead of mc-fake-sw
Pipeline #851283 passed with warnings
Showing with 2132 additions and 61 deletions
......@@ -164,8 +164,8 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 64,
"switch": "mc-fake-sw",
"switch_port": "Ethernet1/25",
"switch": "swdc-a035-02-rba",
"switch_port": "Eth1/47",
"vendor": "Intel"
},
{
......
......@@ -164,8 +164,8 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 64,
"switch": "mc-fake-sw",
"switch_port": "Ethernet1/26",
"switch": "swdc-a035-02-rba",
"switch_port": "Eth1/48",
"vendor": "Intel"
},
{
......
......@@ -4,21 +4,21 @@
],
"backplane_bps": 1440000000000,
"channels": {
"lag1": {
"port-channel1": {
"kind": "switch",
"port": "lag1",
"port": "port-channel1",
"rate": 200000000000,
"uid": "sw-1"
},
"lag2": {
"port-channel2": {
"kind": "server",
"port": "lag2",
"port": "port-channel2",
"rate": 50000000000,
"uid": "srv-data"
},
"lag3": {
"port-channel3": {
"kind": "switch",
"port": "lag3",
"port": "port-channel3",
"rate": 20000000000,
"uid": "vss-inria"
}
......@@ -114,12 +114,12 @@
{
"kind": "channel",
"snmp_name": "1/1/35",
"uid": "lag2"
"uid": "port-channel2"
},
{
"kind": "channel",
"snmp_name": "1/1/36",
"uid": "lag2"
"uid": "port-channel2"
},
{
},
......@@ -153,25 +153,25 @@
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/47",
"uid": "lag3"
"uid": "port-channel3"
},
{
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/48",
"uid": "lag3"
"uid": "port-channel3"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "lag1"
"uid": "port-channel1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
"uid": "lag1"
"uid": "port-channel1"
}
],
"rate": 25000000000,
......
{
"backplane_bps": 1440000000000,
"channels": {
"lag1": {
"port-channel1": {
"kind": "switch",
"port": "lag1",
"port": "port-channel1",
"rate": 200000000000,
"uid": "gw"
}
......@@ -118,13 +118,13 @@
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "lag1"
"uid": "port-channel1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
"uid": "lag1"
"uid": "port-channel1"
}
],
"rate": 25000000000,
......
......@@ -4,7 +4,7 @@
{
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
"kavlan_pattern": "Eth%LINECARD%/%PORT%",
"kind": "node",
"ports": [
{
......@@ -58,16 +58,8 @@
{
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet1/25",
"uid": "abacus25-1"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet1/26",
"uid": "abacus25-2"
},
{
},
......@@ -110,8 +102,16 @@
{
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Eth1/47",
"uid": "abacus25-1"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Eth1/48",
"uid": "abacus25-2"
},
{
},
......@@ -2014,21 +2014,21 @@
{
},
{
"kind": "router",
"port": "lag3",
"snmp_name": "Ethernet1/999",
"uid": "gw"
"kind": "switch",
"port": 999,
"snmp_name": "Eth1/999",
"uid": "vss-inria"
}
],
"rate": 10000000000,
"snmp_pattern": "Ethernet%LINECARD%/%PORT%"
"snmp_pattern": "Eth%LINECARD%/%PORT%"
}
],
"managed_by_us": false,
"model": "Unknown",
"model": "Nexus 2000 FEX",
"site": "rennes",
"snmp_community": "none",
"type": "network_equipment",
"uid": "mc-fake-sw",
"uid": "swdc-a035-02-rba",
"warranty": "N/A"
}
\ No newline at end of file
This diff is collapsed.
......@@ -79,10 +79,10 @@ gw:
uid: srv-3
kind: server
35:
uid: lag2
uid: port-channel2
kind: channel
36:
uid: lag2
uid: port-channel2
kind: channel
45:
uid: parasilo-sw-1
......@@ -93,34 +93,34 @@ gw:
kind: backbone
rate: 10000000000
47:
uid: lag3
uid: port-channel3
kind: channel
rate: 10000000000
48:
uid: lag3
uid: port-channel3
kind: channel
rate: 10000000000
49:
uid: lag1
uid: port-channel1
kind: channel
rate: 100000000000
50:
uid: lag1
uid: port-channel1
kind: channel
rate: 100000000000
channels:
lag1:
port-channel1:
kind: switch
rate: 200000000000
uid: sw-1
port: lag1
lag2:
port: port-channel1
port-channel2:
kind: server
rate: 50000000000
uid: srv-data
port: lag2
lag3:
port: port-channel2
port-channel3:
kind: switch
rate: 20000000000
uid: vss-inria
port: lag3
port: port-channel3
......@@ -15,16 +15,16 @@ sw-1:
rate: 25000000000
ports:
49:
uid: lag1
uid: port-channel1
kind: channel
rate: 100000000000
50:
uid: lag1
uid: port-channel1
kind: channel
rate: 100000000000
channels:
lag1:
port-channel1:
kind: switch
rate: 200000000000
uid: gw
port: lag1
port: port-channel1
---
mc-fake-sw:
model: Unknown
swdc-a035-02-rba:
model: Nexus 2000 FEX
warranty: N/A
kind: switch
managed_by_us: false
......@@ -8,16 +8,16 @@ mc-fake-sw:
site: rennes
linecards:
1:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
snmp_pattern: "Eth%LINECARD%/%PORT%"
kavlan_pattern: "Eth%LINECARD%/%PORT%"
rate: 10000000000
kind: node
ports:
25:
47:
uid: abacus25-1
26:
48:
uid: abacus25-2
999:
uid: gw
kind: router
port: lag3
uid: vss-inria
kind: switch
port: 999
---
vss-inria:
model: Nexus 5596
warranty: N/A
kind: switch
managed_by_us: false
snmp_community: none
site: rennes
linecards:
1:
snmp_pattern: "Eth%LINECARD%/%PORT%"
kavlan_pattern: "Eth%LINECARD%/%PORT%"
rate: 10000000000
kind: node
ports:
997:
uid: port-channel3
kind: channel
998:
uid: port-channel3
kind: channel
999:
uid: swdc-a035-02-rba
kind: switch
port: 999
channels:
port-channel3:
uid: gw
kind: router
port: port-channel3
rate: 20000000000
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment