Skip to content

Add Public Key #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amao9098 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Add Public Key #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ecd64e5
add more connections
Oct 2, 2024
8034ee1
add container
Oct 4, 2024
467eadb
add fragmentation config
Oct 16, 2024
beeed0f
merge
Oct 16, 2024
6138737
add tcp to frag
Oct 17, 2024
20b5e85
merge
Oct 17, 2024
e7c1426
remove validate on config name
Oct 22, 2024
b1dd067
Merge remote-tracking branch 'upstream/master' into container
Oct 22, 2024
ba73dc2
remove tcp
Oct 22, 2024
f88bae7
adding key even if file exists
Oct 24, 2024
d2192b5
add new line
Oct 24, 2024
5dcbf71
add to check passkey
Nov 13, 2024
d534235
edit str
Nov 13, 2024
fd7622b
reduce iterations and add udp/tcp profiles
Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion PERFTEST.PS1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Copy link
Copy Markdown
Contributor

@MarSamMS MarSamMS Oct 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to remove this line?

Copy link
Copy Markdown
Collaborator Author

@amao9098 amao9098 Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this prevents adding new configs for one off tests.

[parameter(Mandatory=$false)] [string] $Config = "Default",
[parameter(Mandatory=$false)] [Array] $ToolList = @("ntttcp", "latte", "l4ping", "cps", "ctstraffic", "ncps", "secnetperf"),
[parameter(Mandatory=$false)] [switch] $SamePort = $false
Expand Down
9 changes: 2 additions & 7 deletions SetupTearDown.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,11 @@ param(
Write-Host "`nSSHD default config files already exist"
}

if (-NOT (Test-Path "$env:ProgramData\ssh\administrators_authorized_keys"))
{
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 "$authorizedKey"
Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey"
Copy link
Copy Markdown
Contributor

@MarSamMS MarSamMS Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need the `n? I think Add-Content will add a new line by default.

Copy link
Copy Markdown
Contributor

@MarSamMS MarSamMS Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the `n is still here.

icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"
}
else
{
Write-Host "`nTrusted admin keys already exist"
}

if (-NOT (Test-Path "$env:ProgramFiles\PowerShell\7\"))
{
Expand Down
2 changes: 1 addition & 1 deletion l4ping/l4ping.Config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

"L4pingContainer":
{
"Iterations" : 5,
"Iterations" : 3,
"StartPort" : 50000,
"ClientSendSize" : 4,
"ClientReceiveSize" : 4,
Expand Down
20 changes: 14 additions & 6 deletions ntttcp/ntttcp.Config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,25 @@
},

"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"
},
"Warmup" : 2,
"Cooldown" : 2,
"Runtime" : 90
},

"NtttcpFrag": {
"NtttcpTcp": {
"Iterations" : 5,
"StartPort" : 50000,
"tcp" : {
Expand All @@ -108,8 +107,17 @@
"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"
Expand Down
2 changes: 1 addition & 1 deletion secnetperf/secnetperf.Config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}
},
"SecnetperfContainer": {
"Iterations": 5,
"Iterations": 3,
"StartPort": 50000,
"TestType" : {
"Latency": {
Expand Down