PR: naming, script args

Removed underscore from consts Removed unneeded constants Added flag to test-lcow-uvm script to change boot type from vhd to initrd. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
microsoft · Jun 7, 2022 · 250caae · 250caae
1 parent fdba25d
commit 250caae
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/scripts/Test-LCOW-UVM.ps1 b/scripts/Test-LCOW-UVM.ps1
@@ -1,4 +1,4 @@
-#ex:  .\scripts\Test-LCOW-UVM.ps1 -vb -Action Bench  -BootFilesPath C:\ContainerPlat\LinuxBootFiles\ -MountGCSTest -Count 2 -Benchtime '3s'
+#ex: .\scripts\Test-LCOW-UVM.ps1 -vb -Action Bench -BootFilesPath C:\ContainerPlat\LinuxBootFiles\ -MountGCSTest -Count 2 -Benchtime '3s'
 # benchstat via `go install golang.org/x/perf/cmd/benchstat@latest`
 
 [CmdletBinding()]
@@ -35,18 +35,24 @@ param (
  $OutDirectory = '.\test\results',
 
  # uvm parameters
+
  [string]
  $BootFilesPath = 'C:\ContainerPlat\LinuxBootFiles',
 
+ [ValidateSet('vhd', 'initrd')]
+ [string]
+ $BootFSType = 'vhd',
+
  [switch]
  $DisableTimeSync,
 
+ # gcs test/container options
+
  [string]
- $RootfsMount = '/run/rootfs',
+ $ContainerRootFSMount = '/run/rootfs',
 
  [string]
- $RootfsPath = (Join-Path $BootFilesPath 'rootfs.vhd'),
- # $RootfsPath = "C:\ContainerPlatData\root\io.containerd.snapshotter.v1.windows-lcow\snapshots\2\layer.vhd",
+ $ContainerRootFSPath = (Join-Path $BootFilesPath 'rootfs.vhd'),
 
  [string]
  $GCSTestMount = '/run/bin',
@@ -66,7 +72,7 @@ Import-Module ( Join-Path $PSScriptRoot Testing.psm1 ) -Force
 $CodePath = Resolve-Path $CodePath
 $OutDirectory = Resolve-Path $OutDirectory
 $BootFilesPath = Resolve-Path $BootFilesPath
-$RootfsPath = Resolve-Path $RootfsPath
+$ContainerRootFSPath = Resolve-Path $ContainerRootFSPath
 $GCSTestPath = Resolve-Path $GCSTestPath
 
 $shell = ( $Action -eq 'Shell' )
@@ -75,7 +81,7 @@ if ( $shell ) {
  $cmd = 'ash'
 } else {
  $date = Get-Date
- $waitfiles = "$RootfsMount"
+ $waitfiles = "$ContainerRootFSMount"
  $gcspath = 'gcstest'
  if ( $MountGCSTest ) {
  $waitfiles += ",$GCSTestMount"
@@ -106,17 +112,17 @@ if ( $shell ) {
  -Feature $Feature `
  -Verbose:$Verbose
 
- $testcmd += " `'-rootfs-path=$RootfsMount`' "
+ $testcmd += " `'-rootfs-path=$ContainerRootFSMount`' "
  $cmd = $pre + $testcmd
 }
 
 $boot = '.\bin\tools\uvmboot.exe -gcs lcow ' + `
  '-fwd-stdout -fwd-stderr -output-handling stdout ' + `
  "-boot-files-path $BootFilesPath " + `
- '-root-fs-type vhd ' + `
+ "-root-fs-type $BootFSType " + `
  '-kernel-file vmlinux ' + `
  "-security-policy=`"`" " + `
- "-mount `"$RootfsPath,$RootfsMount`" "
+ "-mount `"$ContainerRootFSPath,$ContainerRootFSMount`" "
 
 if ( $MountGCSTest ) {
  $boot += "-share `"$GCSTestPath,$GCSTestMount`" "

diff --git a/test/gcs/helper_conn_test.go b/test/gcs/helper_conn_test.go
@@ -20,11 +20,8 @@ import (
 )
 
 const (
- _network = "unix"
- _sockPathFmt = "/tmp/gcs.%d"
-
- _dialRetries = 4
- _dialWait = 50 * time.Millisecond
+ dialRetries = 4
+ dialWait = 50 * time.Millisecond
 )
 
 // port numbers to assign to connections
@@ -38,12 +35,12 @@ type PipeTransport struct{}
 var _ transport.Transport = &PipeTransport{}
 
 func (t *PipeTransport) Dial(port uint32) (c transport.Connection, err error) {
- for i := 0; i < _dialRetries; i++ {
+ for i := 0; i < dialRetries; i++ {
  c, err = getFakeSocket(port)
 
  switch {
  case errors.Is(err, unix.ENOENT): // socket hasn't been created
- time.Sleep(_dialWait)
+ time.Sleep(dialWait)
  continue
  }
  break