From b6d606d6d5d48a1f670a3560c24eb5e886229bba Mon Sep 17 00:00:00 2001 From: Hubert Gee Date: Tue, 22 Aug 2023 10:09:14 -0700 Subject: [PATCH 1/4] Updated squashed PR with new testbed config details * Updated testbed files and Network interfaces files Signed-off-by: hubogee * Optimize VPort Addition, Protocol Timing (#386) Signed-off-by: fkwilken * Pr fix dockerfile (#10) (#388) * Fix Password Policy for CI (#384) Fix Dockerfile Run Naming * Fix Docker Container Naming --------- Signed-off-by: fkwilken * Added testbed device details: PDU, Mac, cpu architecture Signed-off-by: hubogee --------- Signed-off-by: hubogee Signed-off-by: fkwilken Co-authored-by: Francisco <74398368+fkwilken@users.noreply.github.com> Signed-off-by: hubogee --- .../testbed_config/basic_agg1/testbed.json | 8 ++ .../testbed_config/basic_agg2/testbed.json | 8 ++ .../testbed_config/basic_dist1/testbed.json | 8 ++ .../testbed_config/basic_infra1/testbed.json | 10 ++- .../testbed_config/basic_infra2/testbed.json | 8 ++ .../sit/agg1/NETWORK_INTERFACES | 10 +++ .../sit/dist1/NETWORK_INTERFACES | 10 +++ .../sit/infra2/NETWORK_INTERFACES | 12 +++ .../testbed_config/sit/testbed.json | 81 ++++++++++++++++--- 9 files changed, 144 insertions(+), 11 deletions(-) diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json index 9fe1ddb60..52e1c41ed 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json @@ -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", diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json index 10312caeb..9def2c752 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json @@ -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", diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json index bbb670419..8deb99cfd 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json @@ -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", diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json index 0902cd232..d7b4b6f65 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json @@ -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" : [ @@ -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" diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json index 5cb7afbe7..5a182ef33 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json @@ -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", diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/agg1/NETWORK_INTERFACES b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/agg1/NETWORK_INTERFACES index 3f0a7e0a4..b22c9fbdd 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/agg1/NETWORK_INTERFACES +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/agg1/NETWORK_INTERFACES @@ -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 diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/dist1/NETWORK_INTERFACES b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/dist1/NETWORK_INTERFACES index 98464c67d..7c80f4547 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/dist1/NETWORK_INTERFACES +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/dist1/NETWORK_INTERFACES @@ -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 diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/infra2/NETWORK_INTERFACES b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/infra2/NETWORK_INTERFACES index 86db1e9ba..fb7d242cc 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/infra2/NETWORK_INTERFACES +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/infra2/NETWORK_INTERFACES @@ -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 diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json index 476e480cd..bcb40ac87 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json @@ -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"] ] }, { @@ -31,18 +42,29 @@ "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", @@ -50,18 +72,29 @@ "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", @@ -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"] ] }, { @@ -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"] ] }, { @@ -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" @@ -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"] ] } ], From d3089fd83552ebeb5bfd13debb5be033af4bdb21 Mon Sep 17 00:00:00 2001 From: fkwilken Date: Mon, 21 Aug 2023 19:04:02 +0000 Subject: [PATCH 2/4] Stop traffic before testing loss percentage Signed-off-by: fkwilken --- .../test_suite/functional/lacp/test_lacp_routing_over_bridge.py | 2 ++ .../test_suite/functional/lacp/test_lacp_routing_over_lacp.py | 2 +- .../functional/lacp/test_lacp_routing_over_vlan_device.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_bridge.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_bridge.py index 5cbea357f..5ba045d26 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_bridge.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_bridge.py @@ -14,6 +14,7 @@ tgen_utils_setup_streams, tgen_utils_get_loss, tgen_utils_start_traffic, + tgen_utils_stop_traffic, tgen_utils_get_swp_info, ) pytestmark = [pytest.mark.suite_functional_lacp, @@ -142,6 +143,7 @@ async def test_lacp_routing_over_bridge(testbed): raise # will re-raise the AssertionError await tgen_utils_start_traffic(tgen_dev) await asyncio.sleep(25) + await tgen_utils_stop_traffic(tgen_dev) # 9. Verify traffic received on bridge stats = await tgen_utils_get_traffic_stats(tgen_dev, 'Traffic Item Statistics') diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_lacp.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_lacp.py index 5139b88cb..a35ab02c3 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_lacp.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_lacp.py @@ -136,10 +136,10 @@ async def test_lacp_routing_over_lacp(testbed): raise # will re-raise the AssertionError await tgen_utils_start_traffic(tgen_dev) await asyncio.sleep(25) + await tgen_utils_stop_traffic(tgen_dev) # 9. Verify no traffic loss stats = await tgen_utils_get_traffic_stats(tgen_dev, 'Traffic Item Statistics') for row in stats.Rows: err_msg = f"Expected 0.00 loss, actual {float(row['Loss %'])}" assert isclose(tgen_utils_get_loss(row), 0.00, abs_tol=0.1), err_msg - await tgen_utils_stop_traffic(tgen_dev) diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_vlan_device.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_vlan_device.py index 58c0d3cbf..49d76c9a3 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_vlan_device.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/lacp/test_lacp_routing_over_vlan_device.py @@ -15,6 +15,7 @@ tgen_utils_get_traffic_stats, tgen_utils_setup_streams, tgen_utils_start_traffic, + tgen_utils_stop_traffic, tgen_utils_get_swp_info, tgen_utils_get_loss, ) @@ -164,6 +165,7 @@ async def test_lacp_routing_over_vlan_device(testbed): raise # will re-raise the AssertionError await tgen_utils_start_traffic(tgen_dev) await asyncio.sleep(25) + await tgen_utils_stop_traffic(tgen_dev) # 9. Verify no traffic loss stats = await tgen_utils_get_traffic_stats(tgen_dev, 'Traffic Item Statistics') From 2bd77a8c29d5e06a29c9202a99740255cf54e280 Mon Sep 17 00:00:00 2001 From: hubogee Date: Fri, 25 Aug 2023 18:48:36 +0000 Subject: [PATCH 3/4] Fixed all testbeds friendlyName consistant with sit testbed. Grouped testbeds with serial console and pdu devices Signed-off-by: hubogee --- .../testbed_config/basic_agg1/testbed.json | 20 +++-- .../testbed_config/basic_agg2/testbed.json | 20 +++-- .../testbed_config/basic_dist1/testbed.json | 20 +++-- .../testbed_config/basic_infra1/testbed.json | 26 +++--- .../testbed_config/basic_infra2/testbed.json | 26 +++--- .../testbed_config/sit/testbed.json | 82 ++++++++++++------- 6 files changed, 117 insertions(+), 77 deletions(-) diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json index 52e1c41ed..c7fb7d70b 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg1/testbed.json @@ -1,7 +1,7 @@ { "devices": [ { - "friendlyName":"DENT aggregation 1", + "friendlyName":"Dent agg1", "os":"dentos", "type" : "INFRA_SWITCH", "hostName": "agg1", @@ -13,12 +13,16 @@ }, "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, + "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", @@ -34,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" diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json index 9def2c752..dddef3b00 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_agg2/testbed.json @@ -1,7 +1,7 @@ { "devices": [ { - "friendlyName":"DENT aggregation 2", + "friendlyName":"Dent agg2", "os":"dentos", "type" : "INFRA_SWITCH", "hostName": "agg2", @@ -13,12 +13,16 @@ }, "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, + "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", @@ -34,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" diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json index 8deb99cfd..06ecfafef 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_dist1/testbed.json @@ -1,7 +1,7 @@ { "devices": [ { - "friendlyName":"DENT distribution 1", + "friendlyName":"Dent dist1", "os":"dentos", "type" : "INFRA_SWITCH", "hostName": "dist1", @@ -13,12 +13,16 @@ }, "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, + "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", @@ -34,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" diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json index d7b4b6f65..9bb09b31e 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra1/testbed.json @@ -1,7 +1,7 @@ { "devices": [ { - "friendlyName":"DENT infrastructure 1", + "friendlyName": "Dent infra1", "os":"dentos", "type" : "INFRA_SWITCH", "hostName": "infra1", @@ -13,12 +13,16 @@ }, "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, + "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" : [ @@ -42,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"] ] } ], diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json index 5a182ef33..791f9bd05 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/basic_infra2/testbed.json @@ -1,7 +1,7 @@ { "devices": [ { - "friendlyName":"DENT infrastructure 2", + "friendlyName":"Dent infra2", "os":"dentos", "type" : "INFRA_SWITCH", "hostName": "infra2", @@ -13,12 +13,16 @@ }, "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", + "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", @@ -43,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"] ] } ], diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json index bcb40ac87..a9133e02f 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json @@ -13,12 +13,16 @@ }, "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, + "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" : [ @@ -44,12 +48,16 @@ }, "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", + "serialConsole": { + "ip": "10.36.118.200", + "port": 7011 + }, + "pdu": { + "ip": "10.36.118.201", + "login": "dent", + "password": "dent123!", + "number": "4" + }, "serialDev":"/dev/ttyUSB1", "baudrate": 115200, "links" : [ @@ -75,12 +83,16 @@ }, "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, + "serialConsole": { + "ip": "10.36.118.200", + "port": 7005 + }, + "pdu": { + "ip": "10.36.118.201", + "login": "dent", + "password": "dent123!", + "number": 5 + }, "serialDev":"/dev/ttyUSB2", "baudrate": 115200, "links" : [ @@ -105,13 +117,17 @@ }, "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", + "serialConsole": { + "ip": "10.36.118.200", + "port": 7008 + }, + "pdu": { + "ip": "10.36.118.201", + "login": "dent", + "password": "dent123!", + "number": 8 + }, + "serialDev":"/dev/ttyUSB3", "baudrate": 115200, "links" : [ ["swp14", "dist1:swp14"], @@ -135,12 +151,16 @@ }, "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, + "serialConsole": { + "ip": "10.36.118.200", + "port": 7006 + }, + "pdu": { + "ip": "10.36.118.201", + "login": "dent", + "password": "dent123!", + "number": 6 + }, "serialDev":"/dev/ttyUSB3", "baudrate": 115200, "links" : [ From 43eba32854c04963e5dacef772b93d94989babac Mon Sep 17 00:00:00 2001 From: hubogee Date: Fri, 25 Aug 2023 19:29:44 +0000 Subject: [PATCH 4/4] Remove comma in json file Signed-off-by: hubogee --- .../DentOsTestbed/configuration/testbed_config/sit/testbed.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json index a9133e02f..e4cb9cdad 100644 --- a/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json +++ b/DentOS_Framework/DentOsTestbed/configuration/testbed_config/sit/testbed.json @@ -15,7 +15,7 @@ "macAddress": "90:3C:B3:8B:EF:32", "serialConsole": { "ip": "10.36.118.200", - "port": 7003, + "port": 7003 }, "pdu": { "ip": "10.36.118.201",