Azure · maddieclayton · Jan 5, 2018 · Dec 22, 2017 · Dec 27, 2017 · Dec 28, 2017
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1
@@ -31,7 +31,8 @@ function Test-AvailabilitySet
         $nonDefaultUD = 2;
         $nonDefaultFD = 3;
 
-        New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic';
+        $job = New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic' -AsJob
+		$job | Wait-Job
 
         $asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
         Assert-NotNull $asets;
@@ -45,7 +46,8 @@ function Test-AvailabilitySet
         Assert-False {$aset.Managed};
         Assert-AreEqual 'Classic' $aset.Sku;
 
-        $aset | Update-AzureRmAvailabilitySet -Managed;
+        $job = $aset | Update-AzureRmAvailabilitySet -Managed -AsJob
+		$job | Wait-Job
         $aset = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
 
         Assert-NotNull $aset;
@@ -63,7 +65,8 @@ function Test-AvailabilitySet
         Assert-AreEqual $nonDefaultFD $aset.PlatformFaultDomainCount;
         Assert-AreEqual 'Aligned' $aset.Sku;
 
-        Remove-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force;
+        $job = Remove-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force -AsJob
+		$job | Wait-Job
 
         $asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
         Assert-AreEqual $asets $null;

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1
@@ -57,10 +57,12 @@ function Test-ContainerService
             "oe6IQTw7zJF7xuBIzTYwjOCM197GKW7xc4GU4JZIN+faZ7njl/fxfUNdlqvgZUUn" +
             "kfdrzU3PZPl0w9NuncgEje/PZ+YtZvIsnH7MLSPeIGNQwW6V2kc8";
 
-        $container = New-AzureRmContainerServiceConfig -Location $loc -OrchestratorType $orchestratorType `
+        $job = New-AzureRmContainerServiceConfig -Location $loc -OrchestratorType $orchestratorType `
             -MasterDnsPrefix $masterDnsPrefixName -AdminUsername $adminUserName -SshPublicKey $sshPublicKey `
         | Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName -VmSize $vmSize -DnsPrefix $agentPoolDnsPrefixName -Count 1 `
-        | New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
+        | New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -AsJob
+		$job | Wait-Job
+		$container = $job | Receive-Job
 
         $cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
         $output = $cs | Out-String;
@@ -70,7 +72,9 @@ function Test-ContainerService
         $output = $cslist | Out-String;
         Assert-False { $output.Contains("AgentPoolProfiles") };
 
-        $st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force;
+        $job = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force -AsJob
+		$job | Wait-Job
+		$st = $job | Receive-Job
     }
     finally
     {
@@ -142,7 +146,7 @@ function Test-ContainerServiceUpdate
             -VmSize $vmSize `
             -DnsPrefix $agentPoolDnsPrefixName `
             -Count 2 `
-        | Update-AzureRmContainerService;
+        | Update-AzureRmContainerService
 
         $st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService -Force;
     }

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiskRPTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiskRPTests.ps1
@@ -56,7 +56,8 @@ function Test-Disk
         Assert-AreEqual "1" $diskconfig.Zones
         $diskconfig.Zones = $null
 
-        New-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig;
+        $job = New-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig -AsJob
+		$job | Wait-Job
 
         # Get disk test
         $disk = Get-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname;
@@ -73,10 +74,12 @@ function Test-Disk
 
         # Config update test
         $updateconfig = New-AzureRmDiskUpdateConfig -DiskSizeGB 10 -AccountType PremiumLRS -OsType Windows;
-        Update-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -DiskUpdate $updateconfig;
+        $job = Update-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -DiskUpdate $updateconfig -AsJob
+		$job | Wait-Job
 
         # Remove test
-        Remove-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Force;
+        $job = Remove-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Force -AsJob
+		$job | Wait-Job
     }
     finally
     {
@@ -122,7 +125,8 @@ function Test-Snapshot
         $snapshotconfig.EncryptionSettings.DiskEncryptionKey = $null;
         $snapshotconfig.EncryptionSettings.KeyEncryptionKey = $null;
         $snapshotconfig.CreationData.ImageReference = $null;
-        New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig;
+        $job = New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig -AsJob
+		$job | Wait-Job
 
         # Get snapshot test
         $snapshot = Get-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname;
@@ -138,10 +142,12 @@ function Test-Snapshot
 
         # Config update test
         $updateconfig = New-AzureRmSnapshotUpdateConfig -DiskSizeGB 10 -AccountType PremiumLRS -OsType Windows;
-        Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig;
+        $job = Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig -AsJob
+		$job | Wait-Job
 
         # Remove test
-        Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force;
+        $job = Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force -AsJob
+		$job | Wait-Job
     }
     finally
     {

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ImageTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ImageTests.ps1
@@ -103,7 +103,9 @@ function Test-Image
         $imageConfig = Remove-AzureRmImageDataDisk -Image $imageConfig -Lun 3;
         Assert-AreEqual 2 $imageConfig.StorageProfile.DataDisks.Count;
 
-        $createdImage = New-AzureRmImage -Image $imageConfig -ImageName $imageName -ResourceGroupName $rgname;
+        $job = New-AzureRmImage -Image $imageConfig -ImageName $imageName -ResourceGroupName $rgname -AsJob
+		$job | Wait-Job
+		$createdImage = $job | Receive-Job
 
         # Verify Image properties
         Assert-NotNull $createdImage.Id;
@@ -119,7 +121,8 @@ function Test-Image
         $images = Get-AzureRmImage -ResourceGroupName $rgname;
         Assert-AreEqual 1 $images.Count;
 
-        Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force;
+        $job = Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force -AsJob
+		$job | Wait-Job
         $images = Get-AzureRmImage -ResourceGroupName $rgname;
         Assert-AreEqual 0 $images.Count;
 

diff --git a/...ourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 b/...ourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1
@@ -118,7 +118,8 @@ function Test-VirtualMachineExtension
         # Set extension settings by raw strings
         $settingstr = '{"fileUris":[],"commandToExecute":"powershell Get-Process"}';
         $protectedsettingstr = '{"storageAccountName":"' + $stoname + '","storageAccountKey":"' + $stokey + '"}';
-        Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr;
+        $job = Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr -AsJob
+		$job | Wait-Job 
 
         # Get VM Extension
         $ext = Get-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;

diff --git a/...urceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineRunCommandTests.ps1 b/...urceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineRunCommandTests.ps1
@@ -107,8 +107,8 @@ function Test-VirtualMachineSetRunCommand
 
         $path = 'ScenarioTests\test.ps1';
 
-        $result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param;
-        $result_output = $result | Out-String;
+        $job = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param -AsJob
+		$job | Wait-Job
 
         # Remove All VMs
         Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -Force;

diff --git a/...ager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetExtensionTests.ps1 b/...ager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetExtensionTests.ps1
@@ -109,7 +109,7 @@ function Test-VirtualMachineScaleSetDiskEncryptionExtension
         Set-AzureRmVmssDiskEncryptionExtension -ResourceGroupName $rgname -VMScaleSetName $vmssName `
                                             -AadClientID $aadClientID -AadClientSecret $aadClientSecret `
                                             -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId `
-                                            -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force;
+                                            -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force
 
         $result = Get-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName;
         $result_string = $result | Out-String;
@@ -306,7 +306,8 @@ function Test-GetVirtualMachineScaleSetDiskEncryptionDataDisk
     Assert-AreEqual "Encrypted" $result.DataVolumesEncrypted;
     $output = $result | Out-String;
 
-    Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
+    $job = Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force -AsJob
+	$job | Wait-Job
 
     $result = Get-AzureRmVmssDiskEncryption -ResourceGroupName $rgname;
     $output = $result | Out-String;

diff --git a/...sourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 b/...sourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1
@@ -142,7 +142,9 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
         Assert-AreEqual "1" $vmss.Zones
         $vmss.Zones = $null
 
-        $vmss = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;
+        $job = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss -AsJob
+		$job | Wait-Job
+		$vmss = $job | Receive-Job
 
         Assert-AreEqual $loc $vmss.Location;
         Assert-AreEqual 2 $vmss.Sku.Capacity;
@@ -235,13 +237,20 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
         }
 
         $st = $vmssResult | Stop-AzureRmVmss -StayProvision -Force;
-        $st = $vmssResult | Stop-AzureRmVmss -Force;
-        $st = $vmssResult | Start-AzureRmVmss;
-        $st = $vmssResult | Restart-AzureRmVmss;
+        $job = $vmssResult | Stop-AzureRmVmss -Force -AsJob
+		$job | Wait-Job
+		$st = $job | Receive-Job
+        $job = $vmssResult | Start-AzureRmVmss -AsJob
+		$job | Wait-Job
+		$st = $job | Receive-Job
+        $job = $vmssResult | Restart-AzureRmVmss -AsJob
+		$job | Wait-Job
+		$st = $job | Receive-Job
 
         if ($IsManaged -eq $true)
         {
-            $st = $vmssResult | Set-AzureRmVmss -ReimageAll;
+            $job = $vmssResult | Set-AzureRmVmss -ReimageAll -AsJob
+			$job | Wait-Job
         }
         $instanceListParam = @();
         for ($i = 0; $i -lt 2; $i++)
@@ -257,13 +266,16 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
         {
             for ($j = 0; $j -lt 2; $j++)
             {
-                $st = Set-AzureRmVmssVM -ReimageAll -ResourceGroupName $rgname  -VMScaleSetName $vmssName -InstanceId $j
+                $job = Set-AzureRmVmssVM -ReimageAll -ResourceGroupName $rgname  -VMScaleSetName $vmssName -InstanceId $j -AsJob
+				$job | Wait-Job
+				$st = $job | Receive-Job
             }
         }
 
         # Remove
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
-        $st = $vmssResult | Remove-AzureRmVmss -Force;
+        $job = $vmssResult | Remove-AzureRmVmss -Force -AsJob
+		$job | Wait-Job
     }
     finally
     {
@@ -368,7 +380,8 @@ function Test-VirtualMachineScaleSetUpdate
             "Cannot specify both Windows and Linux configurations.";
 
         $tags = @{test1 = "testval1"; test2 = "testval2" };
-        Update-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -Tag $tags -SkuCapacity 3;
+        $job = Update-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -Tag $tags -SkuCapacity 3 -AsJob
+		$job | Wait-Job
 
         $vmss = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
         $returned_tags = $vmss.Tags;
@@ -502,7 +515,8 @@ function Test-VirtualMachineScaleSetReimageUpdate
         $vmssVMs = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName
         $id = $vmssVMs[0].InstanceId
 
-        Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id;
+        $job = Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id -AsJob
+		$job | Wait-Job
         $vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
         $vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
         Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -160,9 +160,12 @@ function Test-VirtualMachine
         Assert-AreEqual "BGInfo" $vm1.Extensions[0].VirtualMachineExtensionType
         Assert-AreEqual "Microsoft.Compute" $vm1.Extensions[0].Publisher
 
-        Start-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
-        Restart-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
-        Stop-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force -StayProvisioned;
+        $job = Start-AzureRmVM -Name $vmname -ResourceGroupName $rgname -AsJob
+		$job | Wait-Job
+        $job = Restart-AzureRmVM -Name $vmname -ResourceGroupName $rgname -AsJob
+		$job | Wait-Job
+        $job = Stop-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force -StayProvisioned -AsJob
+		$job | Wait-Job
 
         # Update
         $p.Location = $vm1.Location;
@@ -204,8 +207,9 @@ function Test-VirtualMachine
         Assert-True {$a.Contains("Sku");}
 
         # Remove All VMs
-        Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force;
-        $vms = Get-AzureRmVM -ResourceGroupName $rgname;
+        $job = Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force -AsJob
+        $job | Wait-Job
+		$vms = Get-AzureRmVM -ResourceGroupName $rgname;
         Assert-AreEqual $vms $null;
 
         # Availability Set
@@ -380,7 +384,8 @@ function Test-VirtualMachinePiping
 
         $dest = Get-ComputeTestResourceName;
         $templatePath = "$TestOutputRoot\template.txt";
-        Get-AzureRmVM -ResourceGroupName $rgname | Save-AzureRmVMImage -DestinationContainerName $dest -VHDNamePrefix 'pslib' -Overwrite -Path $templatePath;
+        $job = Get-AzureRmVM -ResourceGroupName $rgname | Save-AzureRmVMImage -DestinationContainerName $dest -VHDNamePrefix 'pslib' -Overwrite -Path $templatePath -AsJob
+		$job | Wait-Job
 
         $template = Get-Content $templatePath;
         Assert-True { $template[1].Contains("$schema"); }
@@ -456,7 +461,8 @@ function Test-VirtualMachineUpdateWithoutNic
              | Set-AzureRmVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
 
         $imgRef = Get-DefaultCRPImage -loc $loc;
-        $imgRef | Set-AzureRmVMSourceImage -VM $p | New-AzureRmVM -ResourceGroupName $rgname -Location $loc;
+        $job = $imgRef | Set-AzureRmVMSourceImage -VM $p | New-AzureRmVM -ResourceGroupName $rgname -Location $loc -AsJob
+		$job | Wait-Job
 
         # Get VM
         $vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
@@ -1314,7 +1320,8 @@ function Test-VirtualMachineDataDisk
         $vm1 = Add-AzureRmVMDataDisk -VM $vm1 -Name $dataDiskName3 -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
 
         # Update
-        Update-AzureRmVM -ResourceGroupName $rgname -VM $vm1;
+        $job = Update-AzureRmVM -ResourceGroupName $rgname -VM $vm1 -AsJob
+		$job | Wait-Job
 
         $vm2 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
         Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces.Count 1;
@@ -2693,7 +2700,8 @@ function Test-VirtualMachineRedeploy
         Assert-NotNull $vm2.Location;
 
         # Redeploy the VM
-        Set-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Redeploy;
+        $job = Set-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Redeploy -AsJob
+		$job | Wait-Job
 
         $vm2 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
 
@@ -2979,7 +2987,8 @@ function Test-VirtualMachineManagedDiskConversion
         Stop-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Force
 
         # Convert VM to managed disks
-        ConvertTo-AzureRmVMManagedDisk -ResourceGroupName $rgname -VMName $vmname
+        $job = ConvertTo-AzureRmVMManagedDisk -ResourceGroupName $rgname -VMName $vmname -AsJob
+		$job | Wait-Job
 
         $vm2 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
 

diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs
@@ -76,6 +76,9 @@ public class SetAzureVMExtensionCommand : SetAzureVMExtensionBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string ProtectedSettingString { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();

diff --git a/...r/Compute/Commands.Compute/Extension/VmssDiskEncryption/DisableAzureVmssDiskEncryption.cs b/...r/Compute/Commands.Compute/Extension/VmssDiskEncryption/DisableAzureVmssDiskEncryption.cs
@@ -78,6 +78,9 @@ public class RemoveAzureVmssDiskEncryptionCommand : VirtualMachineScaleSetExtens
         [ValidateNotNullOrEmpty]
         public SwitchParameter Force { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();

diff --git a/...mpute/Commands.Compute/Generated/ContainerService/ContainerServiceCreateOrUpdateMethod.cs b/...mpute/Commands.Compute/Generated/ContainerService/ContainerServiceCreateOrUpdateMethod.cs
@@ -134,9 +134,6 @@ public override void ExecuteCmdlet()
             });
         }
 
-        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
-        public SwitchParameter AsJob { get; set; }
-
         [Parameter(
             ParameterSetName = "DefaultParameter",
             Position = 1,
@@ -164,6 +161,9 @@ public override void ExecuteCmdlet()
             ValueFromPipeline = true)]
         [AllowNull]
         public PSContainerService ContainerService { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
     }
 
     [Cmdlet(VerbsData.Update, "AzureRmContainerService", DefaultParameterSetName = "DefaultParameter", SupportsShouldProcess = true)]

diff --git a/...nager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceDeleteMethod.cs b/...nager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceDeleteMethod.cs
@@ -118,9 +118,6 @@ public override void ExecuteCmdlet()
             });
         }
 
-        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
-        public SwitchParameter AsJob { get; set; }
-
         [Parameter(
             ParameterSetName = "DefaultParameter",
             Position = 1,
@@ -145,5 +142,8 @@ public override void ExecuteCmdlet()
             Mandatory = false)]
         [AllowNull]
         public SwitchParameter Force { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
     }
 }