Skip to content

Commit 40eba0b

Browse files
tomillo-cytomillo-cy
committed
Merge branch 'dev' into 'master'
Release v. 1.1.3 See merge request fozzy-winadmins/SCVMReliableMigration!8
2 parents 87b30c4 + 272d18e commit 40eba0b

7 files changed

Lines changed: 56 additions & 35 deletions

‎Private/Get-SCVMHVNetworkAdapterExtendedAcl.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ function Get-SCVirtualMachineHVNetworkAdapterExtendedAcl {
99
)
1010

1111
$ErrorActionPreference = 'Stop'
12-
12+
1313
Write-Debug -Message ('ENTER {0}' -f $MyInvocation.MyCommand.Name)
14-
14+
1515
try {
1616
Write-Debug -Message ('ENTER TRY {0}' -f $MyInvocation.MyCommand.Name)
1717

‎Private/Get-SCVirtualMachineMigrationJob.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ function Get-SCVirtualMachineMigrationJob {
99
)
1010

1111
$ErrorActionPreference = 'Stop'
12-
12+
1313
Write-Debug -Message ('ENTER {0}' -f $MyInvocation.MyCommand.Name)
14-
14+
1515
try {
1616
Write-Debug -Message ('ENTER TRY {0}' -f $MyInvocation.MyCommand.Name)
1717

‎Private/Test-SCVirtualMachineBackingUpStatus.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ function Test-SCVirtualMachineBackingUpStatus {
1010
)
1111

1212
$ErrorActionPreference = 'Stop'
13-
13+
1414
Write-Debug -Message ('ENTER {0}' -f $MyInvocation.MyCommand.Name)
15-
15+
1616
try {
1717
Write-Debug -Message ('ENTER TRY {0}' -f $MyInvocation.MyCommand.Name)
18-
18+
1919
Write-Debug -Message ('$VM: ''{0}''' -f $VM.Name)
20-
20+
2121
Write-Debug -Message '$VMHost = $VM.VMHost'
2222
$VMHost = $VM.VMHost
2323
Write-Debug -Message ('$VMHost: ''{0}''' -f [string]$VMHost)

‎Private/Test-SCVirtualMachineLiveMigrationEligibility.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ function Test-SCVirtualMachineLiveMigrationEligibility {
1212
)
1313

1414
$ErrorActionPreference = 'Stop'
15-
15+
1616
Write-Debug -Message ('ENTER {0}' -f $MyInvocation.MyCommand.Name)
17-
17+
1818
try {
1919
Write-Debug -Message ('ENTER TRY {0}' -f $MyInvocation.MyCommand.Name)
20-
20+
2121
Write-Debug -Message ('$VM: ''{0}''' -f $VM.Name)
2222
Write-Debug -Message ('$VMHost: ''{0}''' -f [string]$VMHost)
2323

‎Public/Move-SCPoweredDownVirtualMachine.ps1‎

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,50 @@ function Move-SCPoweredDownVirtualMachine {
4949
Write-Debug -Message '$JobGroupId = ([guid]::NewGuid()).Guid'
5050
$JobGroupId = ([guid]::NewGuid()).Guid
5151
Write-Debug -Message ('$JobGroupId = ''{0}''' -f $JobGroupId)
52+
53+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments = @{{VirtualNetworkAdapter = $VMNetworkAdapter, JobGroup = ''{0}''}}' -f $JobGroupId)
54+
$SetSCVirtualNetworkAdapterArguments = @{
55+
VirtualNetworkAdapter = $VMNetworkAdapter
56+
JobGroup = $JobGroupId
57+
}
58+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments: ''{0}''' -f ($SetSCVirtualNetworkAdapterArguments | Out-String))
59+
5260
Write-Debug -Message ('$VMNetworkAdapter.VLanEnabled: ''{0}''' -f [string]$VMNetworkAdapter.VLanEnabled)
5361
Write-Debug -Message 'if ($VMNetworkAdapter.VLanEnabled)'
5462
if ($VMNetworkAdapter.VLanEnabled) {
5563
Write-Debug -Message '$VLanID = $VMNetworkAdapter.VLanID'
5664
$VLanID = $VMNetworkAdapter.VLanID
5765
Write-Debug -Message ('$VLanID = {0}' -f [string]$VLanID)
58-
Write-Debug -Message 'if ($VMNetwork)'
59-
if ($VMNetwork) {
60-
Write-Debug -Message ('$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VMNetwork $VMNetwork -VLanEnabled $true -VLanID ''{0}'' -JobGroup ''{1}''' -f $VLanID, $JobGroupId)
61-
$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VMNetwork $VMNetwork -VLanEnabled $true -VLanID $VLanID -JobGroup $JobGroupId
62-
}
63-
else {
64-
Write-Debug -Message ('$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VLanEnabled $true -VLanID {0} -JobGroup ''{1}''' -f $VLanID, $JobGroupId)
65-
$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VLanEnabled $true -VLanID $VLanID -JobGroup $JobGroupId
66-
}
66+
67+
Write-Debug -Message '$SetSCVirtualNetworkAdapterArguments.Add(''VLanEnabled'', $true)'
68+
$SetSCVirtualNetworkAdapterArguments.Add('VLanEnabled', $true)
69+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments.Add(''VLanID'', {0})' -f $VLanID)
70+
$SetSCVirtualNetworkAdapterArguments.Add('VLanID', $VLanID)
6771
}
68-
elseif ($VMNetwork) {
69-
Write-Debug -Message ('$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VMNetwork $VMNetwork -JobGroup ''{0}''' -f $JobGroupId)
70-
$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -VMNetwork $VMNetwork -JobGroup $JobGroupId
72+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments: ''{0}''' -f ($SetSCVirtualNetworkAdapterArguments | Out-String))
73+
74+
Write-Debug -Message ('$VMNetwork: ''{0}''' -f [string]$VMNetwork)
75+
Write-Debug -Message ('$VMNetwork.Name: ''{0}''' -f $VMNetwork.Name)
76+
Write-Debug -Message ('$VMNetwork.ID: ''{0}''' -f $VMNetwork.ID)
77+
Write-Debug -Message 'if ($VMNetwork)'
78+
if ($VMNetwork) {
79+
Write-Debug -Message '$SetSCVirtualNetworkAdapterArguments.Add(''VMNetwork'', $VMNetwork)'
80+
$SetSCVirtualNetworkAdapterArguments.Add('VMNetwork', $VMNetwork)
7181
}
72-
else {
73-
Write-Debug -Message ('$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -JobGroup ''{0}''' -f $JobGroupId)
74-
$null = Set-SCVirtualNetworkAdapter -VirtualNetworkAdapter $VMNetworkAdapter -JobGroup $JobGroupId
82+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments: ''{0}''' -f ($SetSCVirtualNetworkAdapterArguments | Out-String))
83+
84+
Write-Debug -Message '$VirtualNetwork = $VMNetworkAdapter.VirtualNetwork'
85+
$VirtualNetwork = $VMNetworkAdapter.VirtualNetwork
86+
Write-Debug -Message ('$VirtualNetwork = ''{0}''' -f $VirtualNetwork)
87+
Write-Debug -Message 'if ($VirtualNetwork)'
88+
if ($VirtualNetwork) {
89+
Write-Debug -Message '$SetSCVirtualNetworkAdapterArguments.Add(''VirtualNetwork'', $VirtualNetwork)'
90+
$SetSCVirtualNetworkAdapterArguments.Add('VirtualNetwork', $VirtualNetwork)
7591
}
92+
Write-Debug -Message ('$SetSCVirtualNetworkAdapterArguments: ''{0}''' -f ($SetSCVirtualNetworkAdapterArguments | Out-String))
93+
94+
Write-Debug -Message '$null = Set-SCVirtualNetworkAdapter @SetSCVirtualNetworkAdapterArguments'
95+
$null = Set-SCVirtualNetworkAdapter @SetSCVirtualNetworkAdapterArguments
7696
}
7797

7898
Write-Debug -Message 'Read-SCVMHosts -VMHost ($SourceVMHost, $DestinationVMHost)'
@@ -103,8 +123,8 @@ function Move-SCPoweredDownVirtualMachine {
103123
Write-Debug -Message ('$MovedHVACL.Count: {0}' -f $MovedHVACL.Count)
104124
foreach ($ACL in $HVACL) {
105125
Write-Debug -Message ('ACL: Action={0}, Direction={1}, LocalIPAddress={2}, RemoteIPAddress={3}, LocalPort={4}, RemotePort={5}, Protocol={6}, Weight={7}, Stateful={8}, IsolationID={9}, IdleSessionTimeout={10}' -f $ACL.Action, $ACL.Direction, $ACL.LocalIPAddress, $ACL.RemoteIPAddress, $ACL.LocalPort, $ACL.RemotePort, $ACL.Protocol, $ACL.Weight, $ACL.Stateful, $ACL.IsolationID, $ACL.IdleSessionTimeout)
106-
107-
Write-Debug -Message ('$MovedHVACL: ''{0}''' -f [string]$MovedHVACL)
126+
127+
Write-Debug -Message ('$MovedHVACL: ''{0}''' -f [string]$MovedHVACL)
108128
Write-Debug -Message 'if ($MovedHVACL -notcontains $ACL)'
109129
if ($MovedHVACL -notcontains $ACL) {
110130
Write-Debug -Message ('$AddVMNetworkAdapterExtendedAclSplat = @{{VMName=''{0}''; Action=''{1}''; Direction=''{2}''; LocalIPAddress=''{3}''; RemoteIPAddress=''{4}''; LocalPort=''{5}''; RemotePort=''{6}''; Protocol=''{7}''; Weight=''{8}''; Stateful=''{9}''; IsolationID=''{10}''}}' -f $VM.Name, $ACL.Action, $ACL.Direction, $ACL.LocalIPAddress, $ACL.RemoteIPAddress, $ACL.LocalPort, $ACL.RemotePort, $ACL.Protocol, $ACL.Weight, $ACL.Stateful, $ACL.IsolationID)
@@ -144,7 +164,7 @@ function Move-SCPoweredDownVirtualMachine {
144164
$Message = 'Source ({0}) and destination ({1}) servers are the same' -f $SourceVMHost, $DestinationVMHost
145165
$PSCmdlet.ThrowTerminatingError((New-Object -TypeName 'System.Management.Automation.ErrorRecord' -ArgumentList ((New-Object -TypeName 'System.ArgumentException' -ArgumentList $Message), 'ArgumentException', [System.Management.Automation.ErrorCategory]::InvalidArgument, $null)))
146166
}
147-
167+
148168
Write-Debug -Message ('EXIT TRY {0}' -f $MyInvocation.MyCommand.Name)
149169
}
150170
catch {

‎Public/Move-SCVirtualMachineReliably.ps1‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ function Move-SCVirtualMachineReliably {
155155

156156
Write-Debug -Message 'Read-SCVMHosts -VMHost ($SourceVMHost, $DestinationVMHost)'
157157
Read-SCVMHosts -VMHost ($SourceVMHost, $DestinationVMHost)
158-
158+
159+
Write-Debug -Message '$SourceSCVMs = Get-SCVirtualMachine -VMHost $SourceVMHost | Where-Object -FilterScript'
159160
$SourceSCVMs = Get-SCVirtualMachine -VMHost $SourceVMHost | Where-Object -FilterScript $Filter # Getting those VMs of which we care about
160161
Write-Debug -Message ('$SourceSCVMs: ''{0}''' -f [string]$SourceSCVMs.Name)
161162
Write-Debug -Message 'if ($SourceSCVMs)'
@@ -180,7 +181,7 @@ function Move-SCVirtualMachineReliably {
180181
Write-Debug -Message '$SourceVMsToMigrate = $SourceSCVMsNotMigrating'
181182
$SourceVMsToMigrate = $SourceSCVMsNotMigrating
182183
}
183-
184+
184185
Write-Debug -Message '$FirstVM = $true'
185186
$FirstVM = $true
186187
Write-Debug -Message ('$FirstVM: ''{0}''' -f [string]$FirstVM)
@@ -213,7 +214,7 @@ function Move-SCVirtualMachineReliably {
213214
Write-Debug -Message '$SourceVMHostVMs = Get-SCVirtualMachine -VMHost $DestinationVMHost'
214215
$DestinationVMHostVMs = Get-SCVirtualMachine -VMHost $DestinationVMHost
215216
Write-Debug -Message ('$DestinationVMHostVMs: ''{0}''' -f [string]$SourceSCVMsNotMigratingRunning.Name)
216-
217+
217218
Write-Debug -Message '$SourceVMHostMigratingVMs = $SourceVMHostVMs | Where-Object -FilterScript {$_.Status -in $SCVMStatesMigrating}'
218219
$SourceVMHostMigratingVMs = $SourceVMHostVMs | Where-Object -FilterScript {$_.Status -in $SCVMStatesMigrating}
219220
Write-Debug -Message ('$SourceVMHostMigratingVMs: ''{0}''' -f [string]$SourceVMHostMigratingVMs.Name)
@@ -259,7 +260,7 @@ function Move-SCVirtualMachineReliably {
259260
$SCVirtualMachineLiveMigrationEligibility = Test-SCVirtualMachineLiveMigrationEligibility -VM $SCVM -VMHost $DestinationVMHost
260261
Write-Debug -Message ('$SCVirtualMachineLiveMigrationEligibility.Result: ''{0}''' -f $SCVirtualMachineLiveMigrationEligibility.Result)
261262
Write-Debug -Message ('$SCVirtualMachineLiveMigrationEligibility.Reason: ''{0}''' -f $SCVirtualMachineLiveMigrationEligibility.Reason)
262-
263+
263264
Write-Debug -Message 'if ($SCVirtualMachineLiveMigrationEligibility.Status -eq [Microsoft.VirtualManager.Utils.VMComputerSystemState]::IncompleteVMConfig)'
264265
if ($SCVirtualMachineLiveMigrationEligibility.Status -eq [Microsoft.VirtualManager.Utils.VMComputerSystemState]::IncompleteVMConfig) {
265266
Write-Debug -Message '$null = Read-SCVirtualMachine -VM $SCVM'
@@ -269,7 +270,7 @@ function Move-SCVirtualMachineReliably {
269270
Write-Debug -Message 'Continue'
270271
Continue
271272
}
272-
273+
273274
Write-Debug -Message 'if ($SCVirtualMachineLiveMigrationEligibility.Result -or $SCVirtualMachineLiveMigrationEligibility.Reason -eq ''NotRunning'')'
274275
if ($SCVirtualMachineLiveMigrationEligibility.Result -or $SCVirtualMachineLiveMigrationEligibility.Reason -eq 'NotRunning') {
275276
$VMMigrationRetryInfoCount = ($VMMigrationRetryInfo | Where-Object -FilterScript {$_ -eq $SCVM}).Count

‎SCVMReliableMigration.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@{
22
RootModule = 'SCVMReliableMigration.psm1'
3-
ModuleVersion = '1.1.2'
3+
ModuleVersion = '1.1.3'
44
GUID = '71e06da4-4888-4f09-9af0-f92d52cc1cda'
55
Author = 'Kirill Nikolaev'
66
CompanyName = 'Fozzy Inc.'

0 commit comments

Comments
 (0)