From dd53de658228065e08363d316c4cdb954432ff88 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 19:38:04 -0600
Subject: [PATCH 01/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 0006ad3..2040abe 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1942,7 +1942,8 @@ function Get-SddcDiagnosticInfo
                                 'Get-NetTcpSetting -CimSession _C_',
                                 'Get-ScheduledTask -CimSession _C_ | Get-ScheduledTaskInfo -CimSession _C_',
                                 'Get-SmbServerNetworkInterface -CimSession _C_',
-                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_'
+                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_',
+				'Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
 
                 # These commands are specific to optional modules, add only if present
                 #   - DcbQos: RoCE environments primarily

From d36c6099b9a62ec414dd239e707fff988ccde242 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 20:22:56 -0600
Subject: [PATCH 02/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 .../PrivateCloud.DiagnosticInfo.psm1                        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 2040abe..928c8c1 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1905,7 +1905,9 @@ function Get-SddcDiagnosticInfo
                 # Text-only conventional commands
                 #
                 # Gather SYSTEMINFO.EXE output for a given node
-                SystemInfo.exe /S $using:NodeName > (Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
+                #SystemInfo.exe /S $using:NodeName > (Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
+		$SysInfoOut=(Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
+		Start-Process -FilePath "$env:comspec" -ArgumentList "/c SystemInfo.exe /S $using:NodeName > $SysInfoOut" -WindowStyle Hidden -Wait
 
                 # Cmdlets to drop in TXT and XML forms
                 #
@@ -1943,7 +1945,7 @@ function Get-SddcDiagnosticInfo
                                 'Get-ScheduledTask -CimSession _C_ | Get-ScheduledTaskInfo -CimSession _C_',
                                 'Get-SmbServerNetworkInterface -CimSession _C_',
                                 'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_',
-				'Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
+				'"spacePort" ;Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
 
                 # These commands are specific to optional modules, add only if present
                 #   - DcbQos: RoCE environments primarily

From 8b4b1951e99892eaad4b252d222fc0d847f49b90 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 20:52:14 -0600
Subject: [PATCH 03/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 .../PrivateCloud.DiagnosticInfo.psm1          | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 928c8c1..44efd97 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -5,7 +5,7 @@
  ##################################################>
 
 $Module = 'PrivateCloud.DiagnosticInfo'
-
+get-i	
 <############################################################
 #  Common helper functions/modules for main/child sessions  #
 ############################################################>
@@ -1905,10 +1905,29 @@ function Get-SddcDiagnosticInfo
                 # Text-only conventional commands
                 #
                 # Gather SYSTEMINFO.EXE output for a given node
-                #SystemInfo.exe /S $using:NodeName > (Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
-		$SysInfoOut=(Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
-		Start-Process -FilePath "$env:comspec" -ArgumentList "/c SystemInfo.exe /S $using:NodeName > $SysInfoOut" -WindowStyle Hidden -Wait
-
+			$SysInfoOut=(Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
+			Start-Process -FilePath "$env:comspec" -ArgumentList "/c SystemInfo.exe /S $using:NodeName > $SysInfoOut" -WindowStyle Hidden -Wait
+		
+		# Gather Registery Keys
+			$RegsToLog ='spacePort;HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
+
+			ForEach($Reg in $RegsToLog){
+				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
+				$Reg2Find = ($Reg -split ";")[1]	
+				try {
+					$regout = Invoke-Command -ComputerName $Node -ScriptBlock{Get-ItemProperty -Path $useing:$Reg2Find}'
+
+					If($regout){
+						$regout | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt" -Force
+						$regout | Export-Clixml -Path "$LocalFile.xml" -Force
+					}
+			    	}
+				catch {
+					Show-Warning "'$Reg2Find' failed for node $Node ($($_.Exception.Message))"
+			      	}
+			}
+			#'Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
+		
                 # Cmdlets to drop in TXT and XML forms
                 #
                 # cmd is of the form "cmd arbitraryConstantArgs -argForComputerOrSessionSpecification"
@@ -1944,8 +1963,8 @@ function Get-SddcDiagnosticInfo
                                 'Get-NetTcpSetting -CimSession _C_',
                                 'Get-ScheduledTask -CimSession _C_ | Get-ScheduledTaskInfo -CimSession _C_',
                                 'Get-SmbServerNetworkInterface -CimSession _C_',
-                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_',
-				'"spacePort" ;Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
+                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_'
+				
 
                 # These commands are specific to optional modules, add only if present
                 #   - DcbQos: RoCE environments primarily

From e40a5922a43c1cea5f01b8cf0177516ad65dcd42 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 20:54:55 -0600
Subject: [PATCH 04/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 44efd97..a98311a 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1915,7 +1915,7 @@ function Get-SddcDiagnosticInfo
 				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
 				$Reg2Find = ($Reg -split ";")[1]	
 				try {
-					$regout = Invoke-Command -ComputerName $Node -ScriptBlock{Get-ItemProperty -Path $useing:$Reg2Find}'
+					$regout = Invoke-Command -ComputerName $Node -ScriptBlock {Get-ItemProperty -Path $useing:$Reg2Find}
 
 					If($regout){
 						$regout | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt" -Force

From ea5999e68e12b5e98e13275f7e023611011fbfd0 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 20:57:13 -0600
Subject: [PATCH 05/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index a98311a..c2dddc9 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1915,7 +1915,7 @@ function Get-SddcDiagnosticInfo
 				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
 				$Reg2Find = ($Reg -split ";")[1]	
 				try {
-					$regout = Invoke-Command -ComputerName $Node -ScriptBlock {Get-ItemProperty -Path $useing:$Reg2Find}
+					$regout = Invoke-Command -ComputerName $Node -ScriptBlock {Get-ItemProperty -Path $useing:Reg2Find}
 
 					If($regout){
 						$regout | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt" -Force

From 611c2b23a8ba96b0527c2da56ca5cd321ffc8100 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 20:58:25 -0600
Subject: [PATCH 06/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index c2dddc9..973f276 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -5,7 +5,7 @@
  ##################################################>
 
 $Module = 'PrivateCloud.DiagnosticInfo'
-get-i	
+	
 <############################################################
 #  Common helper functions/modules for main/child sessions  #
 ############################################################>

From cce639c20ec4a70f3ca7b8db7ef664c17d086c69 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 21:06:12 -0600
Subject: [PATCH 07/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 973f276..e46c3e5 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1915,7 +1915,7 @@ function Get-SddcDiagnosticInfo
 				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
 				$Reg2Find = ($Reg -split ";")[1]	
 				try {
-					$regout = Invoke-Command -ComputerName $Node -ScriptBlock {Get-ItemProperty -Path $useing:Reg2Find}
+					$regout = Invoke-Command -ComputerName $Node -ConfigurationName $using:SessionConfigurationName {Get-ItemProperty -Path $useing:Reg2Find}
 
 					If($regout){
 						$regout | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt" -Force

From 5bb2d67c84492e6beb8f43781edf4305fa9dbbe6 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 21:13:50 -0600
Subject: [PATCH 08/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index e46c3e5..5b5e66e 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1915,10 +1915,10 @@ function Get-SddcDiagnosticInfo
 				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
 				$Reg2Find = ($Reg -split ";")[1]	
 				try {
-					$regout = Invoke-Command -ComputerName $Node -ConfigurationName $using:SessionConfigurationName {Get-ItemProperty -Path $useing:Reg2Find}
+					$regout = Invoke-Command -ComputerName $Node {Get-ItemProperty -Path $useing:Reg2Find}
 
 					If($regout){
-						$regout | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt" -Force
+						$regout | Out-File -FilePath "$LocalFile.txt" -Force
 						$regout | Export-Clixml -Path "$LocalFile.xml" -Force
 					}
 			    	}

From dff73f735be2c49f044eb37d1a19019e1b809981 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Wed, 10 Feb 2021 22:49:10 -0600
Subject: [PATCH 09/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 .../PrivateCloud.DiagnosticInfo.psm1                   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 5b5e66e..a144411 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1957,13 +1957,14 @@ function Get-SddcDiagnosticInfo
                                 'Get-NetPrefixPolicy -CimSession _C_',
                                 'Get-NetQosPolicy -CimSession _C_',
                                 'Get-NetRoute -CimSession _C_',
-                                'Get-ComputerInfo -CimSession _C_',
-								'Get-Disk -CimSession _C_',
+                                'Invoke-Command -ComputerName _C_ {Get-ComputerInfo}',
+				'Get-Disk -CimSession _C_',
                                 'Get-NetTcpConnection -CimSession _C_',
                                 'Get-NetTcpSetting -CimSession _C_',
                                 'Get-ScheduledTask -CimSession _C_ | Get-ScheduledTaskInfo -CimSession _C_',
                                 'Get-SmbServerNetworkInterface -CimSession _C_',
-                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_'
+                                'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_',
+				'Invoke-Command -ComputerName _C_ {Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters}'
 				
 
                 # These commands are specific to optional modules, add only if present
@@ -1982,9 +1983,8 @@ function Get-SddcDiagnosticInfo
                 }
 
                 foreach ($cmd in $CmdsToLog) {
-
                     # truncate cmd string to the cmd itself
-                    $LocalFile = (Join-Path $LocalNodeDir (($cmd.split(' '))[0] -replace "-",""))
+                    	$LocalFile = (Join-Path $LocalNodeDir ([regex]::match(($cmd.split() | Where-Object {$_ -imatch 'Get-'}),'Get-[a-zA-Z0-9]*').value -replace "-",""))
                     try {
 
                         $cmdex = $cmd -replace '_C_',$using:NodeName -replace '_N_',$using:NodeName -replace '_A_',$using:AccessNode

From 7c9d5fd3a6ccad8f71e95bc3200185c2dc93f655 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Thu, 11 Feb 2021 08:20:08 -0600
Subject: [PATCH 10/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 .../PrivateCloud.DiagnosticInfo.psm1          | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index a144411..1c04567 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1908,26 +1908,6 @@ function Get-SddcDiagnosticInfo
 			$SysInfoOut=(Join-Path (Get-NodePath $using:Path $using:NodeName) "SystemInfo.TXT")
 			Start-Process -FilePath "$env:comspec" -ArgumentList "/c SystemInfo.exe /S $using:NodeName > $SysInfoOut" -WindowStyle Hidden -Wait
 		
-		# Gather Registery Keys
-			$RegsToLog ='spacePort;HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
-
-			ForEach($Reg in $RegsToLog){
-				$LocalFile = (Join-Path $LocalNodeDir ($Reg -split ";")[0])
-				$Reg2Find = ($Reg -split ";")[1]	
-				try {
-					$regout = Invoke-Command -ComputerName $Node {Get-ItemProperty -Path $useing:Reg2Find}
-
-					If($regout){
-						$regout | Out-File -FilePath "$LocalFile.txt" -Force
-						$regout | Export-Clixml -Path "$LocalFile.xml" -Force
-					}
-			    	}
-				catch {
-					Show-Warning "'$Reg2Find' failed for node $Node ($($_.Exception.Message))"
-			      	}
-			}
-			#'Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters'
-		
                 # Cmdlets to drop in TXT and XML forms
                 #
                 # cmd is of the form "cmd arbitraryConstantArgs -argForComputerOrSessionSpecification"
@@ -1957,13 +1937,16 @@ function Get-SddcDiagnosticInfo
                                 'Get-NetPrefixPolicy -CimSession _C_',
                                 'Get-NetQosPolicy -CimSession _C_',
                                 'Get-NetRoute -CimSession _C_',
-                                'Invoke-Command -ComputerName _C_ {Get-ComputerInfo}',
 				'Get-Disk -CimSession _C_',
                                 'Get-NetTcpConnection -CimSession _C_',
                                 'Get-NetTcpSetting -CimSession _C_',
                                 'Get-ScheduledTask -CimSession _C_ | Get-ScheduledTaskInfo -CimSession _C_',
                                 'Get-SmbServerNetworkInterface -CimSession _C_',
                                 'Get-StorageFaultDomain -CimSession _A_ -Type StorageScaleUnit |? FriendlyName -eq _N_ | Get-StorageFaultDomain -CimSession _A_',
+				'Get-NetFirewallProfile -CimSession _C_',
+				'Get-NetFirewallRule -CimSession _C_',
+				'Get-NetConnectionProfile -CimSession _C_',
+				'Invoke-Command -ComputerName _C_ {Get-ComputerInfo}',
 				'Invoke-Command -ComputerName _C_ {Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters}'
 				
 
@@ -1979,7 +1962,11 @@ function Get-SddcDiagnosticInfo
                 if (Get-Module Hyper-V -ErrorAction SilentlyContinue) {
                     $CmdsToLog += 'Get-VM -CimSession _C_ -ErrorAction SilentlyContinue',
                                     'Get-VMNetworkAdapter -All -CimSession _C_ -ErrorAction SilentlyContinue',
-                                    'Get-VMSwitch -CimSession _C_ -ErrorAction SilentlyContinue'
+                                    'Get-VMSwitch -CimSession _C_ -ErrorAction SilentlyContinue',
+				    'Get-VMSwitchTeam -CimSession _C_ -SwitchName ((Get-VMSwitch -CimSession _C_ | Where-Object {$_.EmbeddedTeamingEnabled -eq $true}).Name) -ErrorAction SilentlyContinue',
+				    'Get-VMHost -CimSession _C_ -ErrorAction SilentlyContinue',
+                                    'Get-VMNetworkAdapterVlan -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue',
+                                    'Get-VMNetworkAdapterTeamMapping -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue'
                 }
 
                 foreach ($cmd in $CmdsToLog) {
@@ -1988,7 +1975,7 @@ function Get-SddcDiagnosticInfo
                     try {
 
                         $cmdex = $cmd -replace '_C_',$using:NodeName -replace '_N_',$using:NodeName -replace '_A_',$using:AccessNode
-                        $out = iex $cmdex
+                        $out = Invoke-Expression $cmdex
 
                         # capture as txt and xml for quick analysis according to taste
                         $out | ft -AutoSize | Out-File -Width 9999 -Encoding ascii -FilePath "$LocalFile.txt"

From e7d82e06a29be641c9bb3c9589ebc2b116761a64 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Thu, 11 Feb 2021 08:26:07 -0600
Subject: [PATCH 11/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 1c04567..5ce91e9 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1967,6 +1967,7 @@ function Get-SddcDiagnosticInfo
 				    'Get-VMHost -CimSession _C_ -ErrorAction SilentlyContinue',
                                     'Get-VMNetworkAdapterVlan -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue',
                                     'Get-VMNetworkAdapterTeamMapping -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue'
+				    'Get-SmbMultichannelConnection -CimSession _C_ -SmbInstance SBL'
                 }
 
                 foreach ($cmd in $CmdsToLog) {

From 2efa788e7e295892baf5cd0d0e4828f09c16634e Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Thu, 11 Feb 2021 08:33:15 -0600
Subject: [PATCH 12/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 5ce91e9..39c7192 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1946,6 +1946,7 @@ function Get-SddcDiagnosticInfo
 				'Get-NetFirewallProfile -CimSession _C_',
 				'Get-NetFirewallRule -CimSession _C_',
 				'Get-NetConnectionProfile -CimSession _C_',
+				'Get-SmbMultichannelConnection -CimSession _C_ -SmbInstance SBL',
 				'Invoke-Command -ComputerName _C_ {Get-ComputerInfo}',
 				'Invoke-Command -ComputerName _C_ {Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters}'
 				
@@ -1967,7 +1968,6 @@ function Get-SddcDiagnosticInfo
 				    'Get-VMHost -CimSession _C_ -ErrorAction SilentlyContinue',
                                     'Get-VMNetworkAdapterVlan -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue',
                                     'Get-VMNetworkAdapterTeamMapping -CimSession _C_ -ManagementOS -ErrorAction SilentlyContinue'
-				    'Get-SmbMultichannelConnection -CimSession _C_ -SmbInstance SBL'
                 }
 
                 foreach ($cmd in $CmdsToLog) {

From e192c313bedf893e0642873aa719e5e344eb394e Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Thu, 11 Feb 2021 08:52:25 -0600
Subject: [PATCH 13/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 39c7192..59eebbb 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -1947,6 +1947,8 @@ function Get-SddcDiagnosticInfo
 				'Get-NetFirewallRule -CimSession _C_',
 				'Get-NetConnectionProfile -CimSession _C_',
 				'Get-SmbMultichannelConnection -CimSession _C_ -SmbInstance SBL',
+				'Get-SmbClientConfiguration -CimSession _C_',
+				'Get-SmbServerConfiguration -CimSession _C_',
 				'Invoke-Command -ComputerName _C_ {Get-ComputerInfo}',
 				'Invoke-Command -ComputerName _C_ {Get-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Services\spacePort\Parameters}'
 				

From cec1b616f4e90329410ea1f06c1ba9580b32cf89 Mon Sep 17 00:00:00 2001
From: Jim Gandy <jlgandy2@yahoo.com>
Date: Thu, 11 Feb 2021 08:54:59 -0600
Subject: [PATCH 14/14] Update PrivateCloud.DiagnosticInfo.psm1

---
 .../PrivateCloud.DiagnosticInfo.psm1                       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1 b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
index 59eebbb..fc9f274 100644
--- a/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
+++ b/PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
@@ -2283,7 +2283,14 @@ function Get-SddcDiagnosticInfo
         }
 
         Show-Update "Storage Pool & Tiers"
+        
+	# Storage Node information
 
+        try {
+            Get-StorageNode -CimSession $AccessNode |
+                Export-Clixml ($Path + "GetStorageNode.XML") }
+        catch { Show-Warning("Unable to get Storage Nodes. `nError="+$_.Exception.Message) }
+	
         # Storage tier information
 
         try {