From ecd64e577b9f2b40904e035d420ec81d83dde805 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Wed, 2 Oct 2024 11:20:35 -0700 Subject: [PATCH 01/11] add more connections --- secnetperf/secnetperf.Config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/secnetperf/secnetperf.Config.json b/secnetperf/secnetperf.Config.json index f92fa72..61cb9d9 100644 --- a/secnetperf/secnetperf.Config.json +++ b/secnetperf/secnetperf.Config.json @@ -66,12 +66,12 @@ "Handshakes": { "tcp": { "Runtime" : 60, - "Connections": [1, 64], + "Connections": [16, 32, 64, 128], "Options" : "" }, "quic": { "Runtime" : 60, - "Connections": [1, 64], + "Connections": [16, 32, 64, 128], "Options" : "" } }, @@ -79,13 +79,13 @@ "tcp": { "Runtime" : 60, "BufferLen" : [65536], - "Connections": [64, 128], + "Connections": [16, 32, 64, 128], "Options" : "" }, "quic": { "Runtime" : 60, "BufferLen": [1372], - "Connections": [64, 128], + "Connections": [16, 32, 64, 128], "Options" : "" } } From 8034ee115fb08db3a6d09ef4b69fccf46a179e6e Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Fri, 4 Oct 2024 11:18:12 -0700 Subject: [PATCH 02/11] add container --- latte/latte.Config.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/latte/latte.Config.json b/latte/latte.Config.json index 3df3ace..3bce122 100644 --- a/latte/latte.Config.json +++ b/latte/latte.Config.json @@ -47,5 +47,18 @@ "Default" : "", "Optimized" : "-group 0 -rio -riopoll 100000000000", "Options" : "" + }, + + "LatteContainer": + { + "Iterations" : 20, + "Protocol" : ["tcp", "udp"], + "StartPort" : 50000, + "Time" : 0, + "PingIterations" : 10000, + "SendMethod" : [ "b" ], + "Default" : null, + "Optimized" : "-group 0 -rio -riopoll 100000000000", + "Options" : "" } } \ No newline at end of file From 467eadb7dee5573d5031b4b6c7d54fccd5bbb04d Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Wed, 16 Oct 2024 06:21:49 -0700 Subject: [PATCH 03/11] add fragmentation config --- latte/latte.Config.json | 13 +++++++++++++ ntttcp/ntttcp.Config.json | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/latte/latte.Config.json b/latte/latte.Config.json index 3bce122..001cfc5 100644 --- a/latte/latte.Config.json +++ b/latte/latte.Config.json @@ -50,6 +50,19 @@ }, "LatteContainer": + { + "Iterations" : 20, + "Protocol" : ["tcp", "udp"], + "StartPort" : 50000, + "Time" : 0, + "PingIterations" : 10000, + "SendMethod" : [ "b" ], + "Default" : null, + "Optimized" : "-group 0 -rio -riopoll 100000000000", + "Options" : "" + }, + + "LatteFrag": { "Iterations" : 20, "Protocol" : ["tcp", "udp"], diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json index 5370426..f08b859 100644 --- a/ntttcp/ntttcp.Config.json +++ b/ntttcp/ntttcp.Config.json @@ -97,5 +97,20 @@ "Warmup" : 2, "Cooldown" : 2, "Runtime" : 90 + }, + + "NtttcpFrag": { + "Iterations" : 5, + "StartPort" : 50000, + "tcp" : null, + "udp" : { + "BufferLen" : [512, 1024, 1372], + "Connections" : [64], + "OutstandingIo" : null, + "Options" : "-sp" + }, + "Warmup" : 2, + "Cooldown" : 2, + "Runtime" : 90 } } \ No newline at end of file From 6138737d3a57520eb5b760a04900e3000c467fb0 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Thu, 17 Oct 2024 10:30:28 -0700 Subject: [PATCH 04/11] add tcp to frag --- ntttcp/ntttcp.Config.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json index f08b859..6b47454 100644 --- a/ntttcp/ntttcp.Config.json +++ b/ntttcp/ntttcp.Config.json @@ -102,7 +102,12 @@ "NtttcpFrag": { "Iterations" : 5, "StartPort" : 50000, - "tcp" : null, + "tcp" : { + "BufferLen" : [65536], + "Connections" : [64], + "OutstandingIo" :[16], + "Options": "-sp" + }, "udp" : { "BufferLen" : [512, 1024, 1372], "Connections" : [64], From e7c1426605c4fb7ba0bd9e715de4b54c831aa42b Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Tue, 22 Oct 2024 09:54:36 -0700 Subject: [PATCH 05/11] remove validate on config name --- PERFTEST.PS1 | 1 - ntttcp/ntttcp.Config.json | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/PERFTEST.PS1 b/PERFTEST.PS1 index f3ec77f..cdc9a0f 100644 --- a/PERFTEST.PS1 +++ b/PERFTEST.PS1 @@ -5,7 +5,6 @@ Param( [parameter(Mandatory=$true)] [string] $SrcIp, [parameter(Mandatory=$true)] [string] $DestIp, [parameter(Mandatory=$true)] [ValidateScript({Test-Path $_ -PathType Container})] [String] $OutDir = "", - [ValidateSet("Default", "Azure", "Detail", "Max", "Container")] [parameter(Mandatory=$false)] [string] $Config = "Default", [parameter(Mandatory=$false)] [Array] $ToolList = @("ntttcp", "latte", "l4ping", "cps", "ctstraffic", "ncps", "secnetperf"), [parameter(Mandatory=$false)] [switch] $SamePort = $false diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json index 6b47454..f08b859 100644 --- a/ntttcp/ntttcp.Config.json +++ b/ntttcp/ntttcp.Config.json @@ -102,12 +102,7 @@ "NtttcpFrag": { "Iterations" : 5, "StartPort" : 50000, - "tcp" : { - "BufferLen" : [65536], - "Connections" : [64], - "OutstandingIo" :[16], - "Options": "-sp" - }, + "tcp" : null, "udp" : { "BufferLen" : [512, 1024, 1372], "Connections" : [64], From ba73dc206c0f4211a9be4bdfd522a254abeb5cc8 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Tue, 22 Oct 2024 10:00:32 -0700 Subject: [PATCH 06/11] remove tcp --- ntttcp/ntttcp.Config.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json index 6b47454..f08b859 100644 --- a/ntttcp/ntttcp.Config.json +++ b/ntttcp/ntttcp.Config.json @@ -102,12 +102,7 @@ "NtttcpFrag": { "Iterations" : 5, "StartPort" : 50000, - "tcp" : { - "BufferLen" : [65536], - "Connections" : [64], - "OutstandingIo" :[16], - "Options": "-sp" - }, + "tcp" : null, "udp" : { "BufferLen" : [512, 1024, 1372], "Connections" : [64], From f88bae74cce009453d2d111fb0aa4c1320d15468 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Thu, 24 Oct 2024 14:38:15 -0700 Subject: [PATCH 07/11] adding key even if file exists --- SetupTearDown.ps1 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/SetupTearDown.ps1 b/SetupTearDown.ps1 index 2e062b8..d0299ae 100644 --- a/SetupTearDown.ps1 +++ b/SetupTearDown.ps1 @@ -118,16 +118,9 @@ param( Write-Host "`nSSHD default config files already exist" } - if (-NOT (Test-Path "$env:ProgramData\ssh\administrators_authorized_keys")) - { - Write-Host "`nAdd the AuthorizedKey as a trusted admin key" - Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "$authorizedKey" - icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" - } - else - { - Write-Host "`nTrusted admin keys already exist" - } + Write-Host "`nAdd the AuthorizedKey as a trusted admin key" + Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "$authorizedKey" + icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" if (-NOT (Test-Path "$env:ProgramFiles\PowerShell\7\")) { From d2192b556e036ed30a316aed391d79b94cda4214 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Thu, 24 Oct 2024 14:42:12 -0700 Subject: [PATCH 08/11] add new line --- SetupTearDown.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SetupTearDown.ps1 b/SetupTearDown.ps1 index d0299ae..928e1d0 100644 --- a/SetupTearDown.ps1 +++ b/SetupTearDown.ps1 @@ -119,7 +119,7 @@ param( } Write-Host "`nAdd the AuthorizedKey as a trusted admin key" - Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "$authorizedKey" + Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey" icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" if (-NOT (Test-Path "$env:ProgramFiles\PowerShell\7\")) From 5dcbf713c031a3fe29a7dcd18e5bcd535cbe2c78 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Wed, 13 Nov 2024 10:30:14 -0800 Subject: [PATCH 09/11] add to check passkey --- SetupTearDown.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SetupTearDown.ps1 b/SetupTearDown.ps1 index 928e1d0..daa8e77 100644 --- a/SetupTearDown.ps1 +++ b/SetupTearDown.ps1 @@ -118,9 +118,11 @@ param( Write-Host "`nSSHD default config files already exist" } - Write-Host "`nAdd the AuthorizedKey as a trusted admin key" - Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey" - icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" + if (-NOT (Get-Content -Path "$env:ProgramData\ssh\administrators_authorized_keys" | ForEach-Object{$_ -match $authorizedKey})) { + Write-Host "`nAdd the AuthorizedKey as a trusted admin key" + Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey" + icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" + } if (-NOT (Test-Path "$env:ProgramFiles\PowerShell\7\")) { From d5342355cfc30b2ce0b4f5c33a6d6894ed70a335 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Wed, 13 Nov 2024 14:46:05 -0800 Subject: [PATCH 10/11] edit str --- SetupTearDown.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SetupTearDown.ps1 b/SetupTearDown.ps1 index daa8e77..d5744b7 100644 --- a/SetupTearDown.ps1 +++ b/SetupTearDown.ps1 @@ -118,7 +118,7 @@ param( Write-Host "`nSSHD default config files already exist" } - if (-NOT (Get-Content -Path "$env:ProgramData\ssh\administrators_authorized_keys" | ForEach-Object{$_ -match $authorizedKey})) { + if ($null -eq (Select-String -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Pattern $authorizedKey)) { Write-Host "`nAdd the AuthorizedKey as a trusted admin key" Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey" icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F" From fd7622b883bd2616ca99b6ba2f01d0b894ed6402 Mon Sep 17 00:00:00 2001 From: Annie Mao Date: Tue, 21 Jan 2025 11:24:45 -0800 Subject: [PATCH 11/11] reduce iterations and add udp/tcp profiles --- l4ping/l4ping.Config.json | 2 +- ntttcp/ntttcp.Config.json | 25 +++++++++++++++++++------ secnetperf/secnetperf.Config.json | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/l4ping/l4ping.Config.json b/l4ping/l4ping.Config.json index 54a08ef..5a6455d 100644 --- a/l4ping/l4ping.Config.json +++ b/l4ping/l4ping.Config.json @@ -22,7 +22,7 @@ "L4pingContainer": { - "Iterations" : 5, + "Iterations" : 3, "StartPort" : 50000, "ClientSendSize" : 4, "ClientReceiveSize" : 4, diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json index f08b859..035d450 100644 --- a/ntttcp/ntttcp.Config.json +++ b/ntttcp/ntttcp.Config.json @@ -80,17 +80,17 @@ }, "NtttcpContainer": { - "Iterations" : 5, + "Iterations" : 3, "StartPort" : 50000, "tcp" : { "BufferLen" : [65536], - "Connections" : [64, 128], + "Connections" : [64], "OutstandingIo" :[16], "Options": "-ns" }, "udp" : { "BufferLen" : [1372], - "Connections" : [64, 128], + "Connections" : [64], "OutstandingIo" : null, "Options" : "-ns" }, @@ -98,13 +98,26 @@ "Cooldown" : 2, "Runtime" : 90 }, - - "NtttcpFrag": { + "NtttcpTcp": { + "Iterations" : 5, + "StartPort" : 50000, + "tcp" : { + "BufferLen" : [65536], + "Connections" : [64], + "OutstandingIo" :[16], + "Options": "-sp" + }, + "udp" : null, + "Warmup" : 2, + "Cooldown" : 2, + "Runtime" : 90 + }, + "NtttcpUdp": { "Iterations" : 5, "StartPort" : 50000, "tcp" : null, "udp" : { - "BufferLen" : [512, 1024, 1372], + "BufferLen" : [1372], "Connections" : [64], "OutstandingIo" : null, "Options" : "-sp" diff --git a/secnetperf/secnetperf.Config.json b/secnetperf/secnetperf.Config.json index 61cb9d9..462e274 100644 --- a/secnetperf/secnetperf.Config.json +++ b/secnetperf/secnetperf.Config.json @@ -46,7 +46,7 @@ } }, "SecnetperfContainer": { - "Iterations": 5, + "Iterations": 3, "StartPort": 50000, "TestType" : { "Latency": {