Skip to content

Commit

Permalink
Updated squashed PR with new testbed config details
Browse files Browse the repository at this point in the history 
* Updated testbed files and Network interfaces files

Signed-off-by: hubogee <hubogee@gmail.com>

* Optimize VPort Addition, Protocol Timing (dentproject#386)

Signed-off-by: fkwilken <fkwilken@gmail.com>

* Pr fix dockerfile (dentproject#10) (dentproject#388)

* Fix Password Policy for CI (dentproject#384)



Fix Dockerfile Run Naming



* Fix Docker Container Naming



---------

Signed-off-by: fkwilken <fkwilken@gmail.com>

* Added testbed device details: PDU, Mac, cpu architecture

Signed-off-by: hubogee <hubogee@gmail.com>

---------

Signed-off-by: hubogee <hubogee@gmail.com>
Signed-off-by: fkwilken <fkwilken@gmail.com>
Co-authored-by: Francisco <74398368+fkwilken@users.noreply.github.com>
  • Loading branch information
@hubogee @fkwilken
hubogee and fkwilken authored Aug 22, 2023
1 parent 27a9e21 commit a0d54a7
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 11 deletions.
8 changes: 8 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:38:02",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7005,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 5,
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand Down
8 changes: 8 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:2A:4C",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7008,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 8,
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand Down
8 changes: 8 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:26:BE",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7006,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 6,
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"fiber",
Expand Down
10 changes: 9 additions & 1 deletion DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "90:3C:B3:8B:EF:32",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7003,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 3,
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"links" : [
Expand All @@ -25,7 +33,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
8 changes: 8 additions & 0 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "18:BE:92:13:64:80",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7011,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": "12",
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"mediaMode":"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
81 changes: 71 additions & 10 deletions DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,24 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "90:3C:B3:8B:EF:32",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7003,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 3,
"serialDev":"/dev/ttyUSB0",
"baudrate": 115200,
"links" : [
["swp49", "agg1:swp47"],
["swp50", "agg2:swp47"],
["swp51", "infra2:swp51"],
["swp52", "infra2:swp52"]
["swp52", "infra2:swp52"],
["swp5", "infra1:swp6"],
["swp7", "infra1:swp8"],
["swp9", "infra1:swp10"]
]
},
{
Expand All @@ -31,37 +42,59 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "18:BE:92:13:64:80",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7011,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": "4",
"serialDev":"/dev/ttyUSB1",
"baudrate": 115200,
"links" : [
["swp49", "agg1:swp48"],
["swp50", "agg2:swp48"],
["swp51", "infra2:swp51"],
["swp52", "infra2:swp52"]
["swp52", "infra2:swp52"],
["swp5", "infra2:swp6"],
["swp7", "infra2:swp8"],
["swp9", "infra2:swp10"]
]
},
{
"friendlyName":"Dent agg1",
"os":"dentos",
"os": "dentos",
"type" : "AGGREGATION_ROUTER",
"hostName": "agg1",
"model": "arm64-accton-as5114-48x-r0",
"ip": "10.36.118.44",
"login":{
"userName":"root",
"password":"onl"
},
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:38:02",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7005,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 5,
"serialDev":"/dev/ttyUSB2",
"baudrate": 115200,
"links" : [
["swp13", "dist1:swp13"],
["swp47", "infra1:swp49"],
["swp48", "infra2:swp49"]
["swp48", "infra2:swp49"],
["swp5", "agg1:swp6"],
["swp7", "agg1:swp8"],
["swp9", "agg1:swp10"]
]
},
{
"friendlyName":"Dent agg2",
"os":"dentos",
"os": "dentos",
"type" : "AGGREGATION_ROUTER",
"hostName": "agg2",
"model": "arm64-accton-as5114-48x-r0",
Expand All @@ -70,12 +103,23 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:2A:4C",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7008,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 8,
"serialDev":"/dev/ttyUSB3",
"baudrate": 115200,
"links" : [
["swp14", "dist1:swp14"],
["swp47", "infra1:swp50"],
["swp48", "infra2:swp50"]
["swp48", "infra2:swp50"],
["swp5", "agg2:swp6"],
["swp7", "agg2:swp8"],
["swp9", "agg2:swp10"]
]
},
{
Expand All @@ -89,11 +133,22 @@
"userName":"root",
"password":"onl"
},
"cpuArchitecture": "arm",
"macAddress": "34:EF:B6:EC:26:BE",
"serialConsoleIp": "10.36.118.200",
"serialConsolePort": 7006,
"pduIp": "10.36.118.201",
"pduLogin": "dent",
"pduPassword": "dent123!",
"pduNumber": 6,
"serialDev":"/dev/ttyUSB3",
"baudrate": 115200,
"links" : [
["swp13", "agg1:swp13"],
["swp14", "agg2:swp14"]
["swp14", "agg2:swp14"],
["swp5", "dist1:swp6"],
["swp7", "dist1:swp8"],
["swp9", "dist1:swp10"]
]
},
{
Expand All @@ -102,7 +157,7 @@
"type" : "TRAFFIC_GENERATOR",
"hostName": "ixia",
"model": "Novus10G",
"ip": "10.36.118.214",
"ip": "10.36.118.111",
"login":{
"userName":"admin",
"password":"admin"
Expand All @@ -113,14 +168,20 @@
"links" : [
["10.36.118.199:1:1", "dist1:swp1", "fiber"],
["10.36.118.199:1:2", "dist1:swp2", "fiber"],
["10.36.118.199:1:3", "dist1:swp3", "fiber"],
["10.36.118.199:1:4", "dist1:swp4", "fiber"],
["10.36.118.199:1:5", "agg1:swp1", "fiber"],
["10.36.118.199:1:6", "agg1:swp2", "fiber"],
["10.36.118.199:1:7", "agg1:swp3", "fiber"],
["10.36.118.199:1:8", "agg1:swp4", "fiber"],
["10.36.118.199:1:9", "agg2:swp1", "fiber"],
["10.36.118.199:1:10", "agg2:swp2", "fiber"],
["10.36.118.199:1:11", "infra1:swp3", "copper"],
["10.36.118.199:1:12", "infra1:swp4", "copper"],
["10.36.118.199:1:13", "infra2:swp1", "copper"],
["10.36.118.199:1:14", "infra2:swp2", "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

0 comments on commit a0d54a7

Please sign in to comment.