@@ -309,30 +309,18 @@ private AzureOperationResponse<VirtualMachine> UpdateVmEncryptionSettings(DiskEn
309
309
310
310
AzureOperationResponse < VirtualMachine > updateResult = null ;
311
311
312
- // The 2nd pass. If something goes wrong here, try to revert to encryptionSettingsBackup.
312
+ // The 2nd pass. TODO: If something goes wrong here, try to revert to encryptionSettingsBackup.
313
313
if ( encryptionSettingsBackup . Enabled != true )
314
314
{
315
- try
316
- {
317
- updateResult = this . ComputeClient . ComputeManagementClient . VirtualMachines . CreateOrUpdateWithHttpMessagesAsync (
318
- this . ResourceGroupName ,
319
- vmParameters . Name ,
320
- parameters ) . GetAwaiter ( ) . GetResult ( ) ;
321
- } catch ( Exception e )
322
- {
323
- revertVm ( encryptionSettingsBackup ) ;
324
- throw e ;
325
- }
326
-
327
- if ( ! updateResult . Response . IsSuccessStatusCode )
328
- {
329
- revertVm ( encryptionSettingsBackup ) ;
330
- }
315
+ updateResult = this . ComputeClient . ComputeManagementClient . VirtualMachines . CreateOrUpdateWithHttpMessagesAsync (
316
+ this . ResourceGroupName ,
317
+ vmParameters . Name ,
318
+ parameters ) . GetAwaiter ( ) . GetResult ( ) ;
331
319
}
332
320
else
333
321
{
334
322
335
- // For premium storage VMs, stop-update-start
323
+ // stop-update-start
336
324
// stop vm
337
325
this . ComputeClient . ComputeManagementClient . VirtualMachines
338
326
. DeallocateWithHttpMessagesAsync ( this . ResourceGroupName , this . VMName ) . GetAwaiter ( )
@@ -354,38 +342,15 @@ private AzureOperationResponse<VirtualMachine> UpdateVmEncryptionSettings(DiskEn
354
342
Location = vmParameters . Location ,
355
343
Tags = vmParameters . Tags
356
344
} ;
357
- AzureOperationResponse < Azure . Management . Compute . Models . OperationStatusResponse > startOp = null ;
358
- try
359
- {
360
- updateResult = this . ComputeClient . ComputeManagementClient . VirtualMachines . CreateOrUpdateWithHttpMessagesAsync (
361
- this . ResourceGroupName ,
362
- vmParameters . Name ,
363
- parameters ) . GetAwaiter ( ) . GetResult ( ) ;
364
345
365
- // start vm
366
- startOp = this . ComputeClient . ComputeManagementClient . VirtualMachines
367
- . StartWithHttpMessagesAsync ( ResourceGroupName , this . VMName ) . GetAwaiter ( ) . GetResult ( ) ;
368
- } catch ( Exception e )
369
- {
370
- // in case of error: stop-revert-start
371
- this . ComputeClient . ComputeManagementClient . VirtualMachines
372
- . DeallocateWithHttpMessagesAsync ( this . ResourceGroupName , this . VMName ) . GetAwaiter ( )
373
- . GetResult ( ) ;
374
- revertVm ( encryptionSettingsBackup ) ;
375
- this . ComputeClient . ComputeManagementClient . VirtualMachines
376
- . StartWithHttpMessagesAsync ( this . ResourceGroupName , this . VMName ) . GetAwaiter ( ) . GetResult ( ) ;
377
- throw e ;
378
- }
379
- if ( ! updateResult . Response . IsSuccessStatusCode || ! startOp . Response . IsSuccessStatusCode )
380
- {
381
- // in case of error: stop-revert-start
382
- this . ComputeClient . ComputeManagementClient . VirtualMachines
383
- . DeallocateWithHttpMessagesAsync ( this . ResourceGroupName , this . VMName ) . GetAwaiter ( )
384
- . GetResult ( ) ;
385
- revertVm ( encryptionSettingsBackup ) ;
386
- this . ComputeClient . ComputeManagementClient . VirtualMachines
387
- . StartWithHttpMessagesAsync ( this . ResourceGroupName , this . VMName ) . GetAwaiter ( ) . GetResult ( ) ;
388
- }
346
+ updateResult = this . ComputeClient . ComputeManagementClient . VirtualMachines . CreateOrUpdateWithHttpMessagesAsync (
347
+ this . ResourceGroupName ,
348
+ vmParameters . Name ,
349
+ parameters ) . GetAwaiter ( ) . GetResult ( ) ;
350
+
351
+ // start vm
352
+ this . ComputeClient . ComputeManagementClient . VirtualMachines
353
+ . StartWithHttpMessagesAsync ( ResourceGroupName , this . VMName ) . GetAwaiter ( ) . GetResult ( ) ;
389
354
}
390
355
391
356
return updateResult ;
@@ -551,19 +516,5 @@ public override void ExecuteCmdlet()
551
516
}
552
517
} ) ;
553
518
}
554
-
555
- private AzureOperationResponse < VirtualMachine > revertVm ( DiskEncryptionSettings encryptionSettingsBackup )
556
- {
557
- var vmRevertParameters = ( this . ComputeClient . ComputeManagementClient . VirtualMachines . Get (
558
- this . ResourceGroupName , this . VMName ) ) ;
559
- vmRevertParameters . StorageProfile . OsDisk . EncryptionSettings = encryptionSettingsBackup ;
560
-
561
- return this . ComputeClient . ComputeManagementClient . VirtualMachines
562
- . CreateOrUpdateWithHttpMessagesAsync (
563
- this . ResourceGroupName ,
564
- vmRevertParameters . Name ,
565
- vmRevertParameters ) . GetAwaiter ( ) . GetResult ( ) ;
566
- }
567
-
568
519
}
569
520
}
0 commit comments