Skip to content

Commit

Permalink
Pr updated testbed config (#3) (#397)
Browse files Browse the repository at this point in the history 
Fixed all testbeds friendlyName to be consistent with sit testbed. Grouped testbeds with serial console and pdu devices

Signed-off-by: hubogee <[email protected]>
  • Loading branch information
@hubogee
hubogee authored Sep 1, 2023
1 parent 2fee1c0 commit d1cbb80
Show file tree
Hide file tree
Showing 9 changed files with 201 additions and 28 deletions.
16 changes: 14 additions & 2 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devices": [
{
"friendlyName":"DENT aggregation 1",
"friendlyName":"Dent agg1",
"os":"dentos",
"type" : "INFRA_SWITCH",
"hostName": "agg1",
Expand All @@ -11,6 +11,18 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:38:02",
"serialConsole": {
"ip": "10.36.118.200",
"port": 7005
},
"pdu": {
"ip": "10.36.118.201",
"login": "dent",
"password": "dent123!",
"number": 5
},
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand All @@ -26,7 +38,7 @@
"type" : "TRAFFIC_GENERATOR",
"hostName": "ixia",
"model": "Novus10G",
"ip": "10.36.118.213",
"ip": "10.36.118.111",
"login":{
"userName":"admin",
"password":"admin"
Expand Down
16 changes: 14 additions & 2 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devices": [
{
"friendlyName":"DENT aggregation 2",
"friendlyName":"Dent agg2",
"os":"dentos",
"type" : "INFRA_SWITCH",
"hostName": "agg2",
Expand All @@ -11,6 +11,18 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:2A:4C",
"serialConsole": {
"ip": "10.36.118.200",
"port": 7008
},
"pdu": {
"ip": "10.36.118.201",
"login": "dent",
"password": "dent123!",
"number": 8
},
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand All @@ -26,7 +38,7 @@
"type" : "TRAFFIC_GENERATOR",
"hostName": "ixia",
"model": "Novus10G",
"ip": "10.36.118.213",
"ip": "10.36.118.111",
"login":{
"userName":"admin",
"password":"admin"
Expand Down
16 changes: 14 additions & 2 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devices": [
{
"friendlyName":"DENT distribution 1",
"friendlyName":"Dent dist1",
"os":"dentos",
"type" : "INFRA_SWITCH",
"hostName": "dist1",
Expand All @@ -11,6 +11,18 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:26:BE",
"serialConsole": {
"ip": "10.36.118.200",
"port": 7006
},
"pdu": {
"ip": "10.36.118.201",
"login": "dent",
"password": "dent123!",
"number": 6
},
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand All @@ -26,7 +38,7 @@
"type" : "TRAFFIC_GENERATOR",
"hostName": "ixia",
"model": "Novus10G",
"ip": "10.36.118.213",
"ip": "10.36.118.111",
"login":{
"userName":"admin",
"password":"admin"
Expand Down
24 changes: 18 additions & 6 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devices": [
{
"friendlyName":"DENT infrastructure 1",
"friendlyName": "Dent infra1",
"os":"dentos",
"type" : "INFRA_SWITCH",
"hostName": "infra1",
Expand All @@ -11,6 +11,18 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "90:3C:B3:8B:EF:32",
"serialConsole": {
"ip": "10.36.118.200",
"port": 7003
},
"pdu": {
"ip": "10.36.118.201",
"login": "dent",
"password": "dent123!",
"number": 3
},
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"links" : [
Expand All @@ -25,7 +37,7 @@
"type" : "TRAFFIC_GENERATOR",
"hostName": "ixia",
"model": "Novus10G",
"ip": "10.36.118.213",
"ip": "10.36.118.111",
"login":{
"userName":"admin",
"password":"admin"
Expand All @@ -34,10 +46,10 @@
"baudrate": 115200,
"mediaMode":"mixed",
"links" : [
["10.36.118.199:2:1", "infra1:swp33", "copper"],
["10.36.118.199:2:2", "infra1:swp34", "copper"],
["10.36.118.199:2:3", "infra1:swp35", "copper"],
["10.36.118.199:2:4", "infra1:swp36", "copper"]
["10.36.118.199:1:9", "infra1:swp1", "copper"],
["10.36.118.199:1:10", "infra1:swp2", "copper"],
["10.36.118.199:1:11", "infra1:swp3", "copper"],
["10.36.118.199:1:12", "infra1:swp4", "copper"]
]
}
],
Expand Down
22 changes: 17 additions & 5 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devices": [
{
"friendlyName":"DENT infrastructure 2",
"friendlyName":"Dent infra2",
"os":"dentos",
"type" : "INFRA_SWITCH",
"hostName": "infra2",
Expand All @@ -11,6 +11,18 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "18:BE:92:13:64:80",
"serialConsole": {
"ip": "10.36.118.200",
"port": 7011
},
"pdu": {
"ip": "10.36.118.201",
"login": "dent",
"password": "dent123!",
"number": "12"
},
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"copper",
Expand All @@ -35,10 +47,10 @@
"baudrate": 115200,
"mediaMode":"mixed",
"links" : [
["10.36.118.199:2:5", "infra2:swp33", "copper"],
["10.36.118.199:2:6", "infra2:swp34", "copper"],
["10.36.118.199:2:7", "infra2:swp35", "copper"],
["10.36.118.199:2:8", "infra2:swp36", "copper"]
["10.36.118.199:1:13", "infra2:swp1", "copper"],
["10.36.118.199:1:14", "infra2:swp2", "copper"],
["10.36.118.199:1:15", "infra2:swp3", "copper"],
["10.36.118.199:1:16", "infra2:swp4", "copper"]
]
}
],
Expand Down
10 changes: 10 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/agg1/NETWORK_INTERFACES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,13 @@ auto swp2
iface swp2 inet static
alias IXIA LINK
address 22.1.10.1/24

auto swp3
iface swp3 inet static
alias IXIA LINK
address 22.1.11.1/24

auto swp4
iface swp4 inet static
alias IXIA LINK
address 22.1.12.1/24
10 changes: 10 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/dist1/NETWORK_INTERFACES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,13 @@ auto swp2
iface swp2 inet static
alias IXIA LINK
address 21.1.10.1/24

auto swp3
iface swp3 inet static
alias IXIA LINK
address 21.1.11.1/24

auto swp4
iface swp4 inet static
alias IXIA LINK
address 21.1.12.1/24
12 changes: 12 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/infra2/NETWORK_INTERFACES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,15 @@ iface swp2
alias IXIA LINK
bridge-pvid 100
bridge-vids 300 400 500 600

auto swp3
iface swp3
alias IXIA LINK
bridge-pvid 100
bridge-vids 300 400 500 600

auto swp4
iface swp4
alias IXIA LINK
bridge-pvid 100
bridge-vids 300 400 500 600
Loading

0 comments on commit d1cbb80

Please sign in to comment.