update output folder names

Author: arudell

src/SdnDiagnostics.psm1

@@ -854,7 +854,7 @@ function Start-SdnDataCollection {
                     foreach ($node in $sdnFabricDetails[$value.ToString()]) {
                         $array += [PSCustomObject]@{
                             Role = $value
-                            Name = $node
+                            Name = $node.ToLower()
                         }
                     }
 
@@ -1175,7 +1175,7 @@ function Get-SdnLogFile {
 
         foreach ($r in $Global:SdnDiagnostics.Config.Role) {
 
-            $outputDir = Join-Path -Path $OutputDirectory.FullName -ChildPath $r
+            $outputDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "LogFiles\$r"
             Get-SdnDiagnosticLogFile -LogDir $commonConfig.DefaultLogDirectory -OutputDirectory $outputDir -FromDate $FromDate -ToDate $ToDate -ConvertETW $ConvertETW
 
             switch ($r) {

src/modules/SdnDiag.Common.psm1

@@ -501,7 +501,7 @@ function Get-CommonConfigState {
     try {
         "Collect general configuration state details" | Trace-Output -Level:Verbose
 
-        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\Common"
+        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\Common"
         if (-NOT (Initialize-DataCollection -FilePath $outDir -MinimumMB 100)) {
             "Unable to initialize environment for data collection" | Trace-Output -Level:Error
             return
@@ -1603,7 +1603,7 @@ function Get-SdnEventLog {
             $eventLogs = @()
             $eventLogProviders = @()
 
-            [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "$r\EventLogs"
+            [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "EventLogs\$r"
             "Collect event logs between {0} and {1} UTC for {2} role" -f $fromDateUTC, $toDateUTC, $r | Trace-Output
             if (-NOT (Initialize-DataCollection -FilePath $outDir -MinimumMB 100)) {
                 "Unable to initialize environment for data collection" | Trace-Output -Level:Error

src/modules/SdnDiag.Gateway.psm1

@@ -45,13 +45,13 @@ function Get-GatewayConfigState {
         $config = Get-SdnModuleConfiguration -Role 'Gateway'
         "Collect configuration state details for role {0}" -f $config.Name | Trace-Output
 
-        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\Gateway"
+        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\Gateway"
         if (-NOT (Initialize-DataCollection -Role 'Gateway' -FilePath $outDir -MinimumMB 100)) {
             "Unable to initialize environment for data collection" | Trace-Output -Level:Error
             return
         }
 
-        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\Gateway\Registry"
+        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\Gateway\Registry"
         Export-RegistryKeyConfigDetails -Path $config.properties.regKeyPaths -OutputDirectory $regDir
 
         # dump out the role configuration state properties

src/modules/SdnDiag.LoadBalancerMux.psm1

@@ -96,13 +96,13 @@ function Get-SlbMuxConfigState {
 
         "Collect configuration state details for role {0}" -f $config.Name | Trace-Output
 
-        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\LoadBalancerMux"
+        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\LoadBalancerMux"
         if (-NOT (Initialize-DataCollection -Role $config.Name -FilePath $outDir -MinimumMB 20)) {
             "Unable to initialize environment for data collection" | Trace-Output -Level:Error
             return
         }
 
-        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\LoadBalancerMux\Registry"
+        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\LoadBalancerMux\Registry"
         Export-RegistryKeyConfigDetails -Path $config.properties.regKeyPaths -OutputDirectory $regDir.FullName
 
         # output slb configuration and states

src/modules/SdnDiag.NetworkController.FC.psm1

@@ -46,13 +46,13 @@ function Get-NetworkControllerFCConfigState {
         $config = Get-SdnModuleConfiguration -Role 'NetworkController_FC'
         "Collect configuration state details for role {0}" -f $config.Name | Trace-Output
 
-        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\NetworkController"
+        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\NetworkController"
         if (-NOT (Initialize-DataCollection -Role $config.Name -FilePath $outDir -MinimumMB 10)) {
             "Unable to initialize environment for data collection for {0}" -f $config.Name | Trace-Output -Level:Error
             return
         }
 
-        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\NetworkController\Registry"
+        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\NetworkController\Registry"
         Export-RegistryKeyConfigDetails -Path $config.properties.regKeyPaths -OutputDirectory $regDir
     }
     catch {

src/modules/SdnDiag.NetworkController.SF.psm1

@@ -312,7 +312,7 @@ function Get-NetworkControllerSFConfigState {
 
     try {
         $config = Get-SdnModuleConfiguration -Role 'NetworkController_SF'
-        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\NetworkController"
+        [string]$outDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\NetworkController"
 
         "Collect configuration state details for role {0}" -f $config.Name | Trace-Output
         if (-NOT (Initialize-DataCollection -Role $config.Name -FilePath $outDir -MinimumMB 20)) {

src/modules/SdnDiag.NetworkController.psm1

@@ -172,13 +172,13 @@ function Get-NetworkControllerConfigState {
         $config = Get-SdnModuleConfiguration -Role 'NetworkController'
         "Collect configuration state details for role {0}" -f $config.Name | Trace-Output
 
-        [string]$ncAppDir = Join-Path $OutputDirectory.FullName -ChildPath "Config\NetworkController\Application"
+        [string]$ncAppDir = Join-Path $OutputDirectory.FullName -ChildPath "ConfigState\NetworkController\Application"
         if (-NOT (Initialize-DataCollection -Role $config.Name -FilePath $ncAppDir -MinimumMB 20)) {
             "Unable to initialize environment for data collection" | Trace-Output -Level:Error
             return
         }
 
-        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "Config\NetworkController\Registry"
+        [string]$regDir = Join-Path -Path $OutputDirectory.FullName -ChildPath "ConfigState\NetworkController\Registry"
         Export-RegistryKeyConfigDetails -Path $config.properties.regKeyPaths -OutputDirectory $regDir
 
         # enumerate dll binary version for NC application