Fix issue with extra objects returning from Hydrate-DC

Michael Bernstein (DPLAT) · Michael Bernstein (DPLAT) · commit f20e9a751ebe · 2024-06-13T16:22:59.000-07:00
diff --git a/Scripts/0_DCHydrate.ps1 b/Scripts/0_DCHydrate.ps1
@@ -626,6 +626,5 @@ function Hydrate-DC {
         $DC | Get-VMNetworkAdapter | Disconnect-VMNetworkAdapter
 
         $dcHydrationEndTime = Get-Date
-        Return $DC
 }
 #endregion
diff --git a/Scripts/2_CreateParentDisks.ps1 b/Scripts/2_CreateParentDisks.ps1
@@ -525,7 +525,8 @@ if (-not $DCFilesExists){
 #region create DC if it does not exist
     if (-not $DCFilesExists) {
         if (-not $LabConfig.NoDehydrateDC){
-            $DC = Hydrate-DC -DCName $DCName -VhdPath $vhdpath -VmPath $VmPath -SwitchName $HydrationSwitchname -TimeZone $TimeZone -DhcpScope $LabConfig.DHCPscope -AdminPassword $AdminPassword
+            Hydrate-DC -DCName $DCName -VhdPath $vhdpath -VmPath $VmPath -SwitchName $Switchname -TimeZone $TimeZone -DhcpScope $LabConfig.DHCPscope -AdminPassword $AdminPassword
+            $DC=Get-VM -Name $DCName
             if ($DC -eq $null){
                 WriteErrorAndExit "DC was not created successfully Press any key to continue ..."
             } else {
diff --git a/Scripts/3_Deploy.ps1 b/Scripts/3_Deploy.ps1
@@ -1207,7 +1207,8 @@ If (-not $isAdmin) {
             $VMPath="$PSScriptRoot\LAB\"
             $HydrationSwitchname="DC_HydrationSwitch_$([guid]::NewGuid())"
 
-            $DC = Hydrate-DC -DCName $DCName -VhdPath $vhdpath -VMPath $VMPath -Switchname $HydrationSwitchname -TimeZone $TimeZone -DHCPScope $LabConfig.DHCPscope -AdminPassword $LabConfig.AdminPassword
+            Hydrate-DC -DCName $DCName -VhdPath $vhdpath -VMPath $VMPath -Switchname $HydrationSwitchname -TimeZone $TimeZone -DHCPScope $LabConfig.DHCPscope -AdminPassword $LabConfig.AdminPassword
+            $DC=Get-VM -Name $DCName
             if ($DC -eq $null){
                 WriteErrorAndExit "DC was not created successfully Press any key to continue ..."
             } else {

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,5 @@ function Hydrate-DC {`
`626`	`626`	`$DC \| Get-VMNetworkAdapter \| Disconnect-VMNetworkAdapter`
`627`	`627`
`628`	`628`	`$dcHydrationEndTime = Get-Date`
`629`		`- Return $DC`
`630`	`629`	`}`
`631`	`630`	`#endregion`