diff --git a/src/Compute/Compute.Test/Compute.Test.csproj b/src/Compute/Compute.Test/Compute.Test.csproj
index 4416592578a1..41174e31135a 100644
--- a/src/Compute/Compute.Test/Compute.Test.csproj
+++ b/src/Compute/Compute.Test/Compute.Test.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
index b93f2ba3f372..fa719795331d 100644
--- a/src/Compute/Compute/ChangeLog.md
+++ b/src/Compute/Compute/ChangeLog.md
@@ -30,6 +30,7 @@
- `Remove-AzContainerService`
- `Remove-AzContainerServiceAgentPoolProfile`
- `Update-AzContainerService`
+* Added parameter `-BurstingEnabled` to `New-AzDiskConfig` and `New-AzDiskUpdateConfig`
## Version 4.8.0
* New parameter `VM` in new parameter set `VMParameterSet` added to `Get-AzVMDscExtensionStatus` and `Get-AzVMDscExtension` cmdlets.
diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
index 3263b8796a25..0767590a10b1 100644
--- a/src/Compute/Compute/Compute.csproj
+++ b/src/Compute/Compute/Compute.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskConfigCommand.cs b/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskConfigCommand.cs
index d0597da232bb..3ed18b2cf1a9 100644
--- a/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskConfigCommand.cs
+++ b/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskConfigCommand.cs
@@ -188,6 +188,11 @@ public partial class NewAzureRmDiskConfigCommand : Microsoft.Azure.Commands.Reso
[PSArgumentCompleter("AllowAll", "AllowPrivate", "DenyAll")]
public string NetworkAccessPolicy { get; set; }
+ [Parameter(
+ Mandatory = false,
+ ValueFromPipelineByPropertyName = true)]
+ public bool? BurstingEnabled { get; set; }
+
protected override void ProcessRecord()
{
if (ShouldProcess("Disk", "New"))
@@ -377,7 +382,8 @@ private void Run()
Encryption = vEncryption,
NetworkAccessPolicy = this.IsParameterBound(c => c.NetworkAccessPolicy) ? this.NetworkAccessPolicy : null,
DiskAccessId = this.IsParameterBound(c => c.DiskAccessId) ? this.DiskAccessId : null,
- Tier = this.IsParameterBound(c => c.Tier) ? this.Tier : null
+ Tier = this.IsParameterBound(c => c.Tier) ? this.Tier : null,
+ BurstingEnabled = this.IsParameterBound(c => c.BurstingEnabled) ? this.BurstingEnabled : null,
};
WriteObject(vDisk);
diff --git a/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskUpdateConfigCommand.cs b/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskUpdateConfigCommand.cs
index db0f06bfcec7..fe8408b57786 100644
--- a/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskUpdateConfigCommand.cs
+++ b/src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskUpdateConfigCommand.cs
@@ -127,8 +127,14 @@ public partial class NewAzureRmDiskUpdateConfigCommand : Microsoft.Azure.Command
Mandatory = false,
ValueFromPipelineByPropertyName = true)]
[PSArgumentCompleter("EncryptionAtRestWithPlatformKey", "EncryptionAtRestWithCustomerKey")]
+
public string EncryptionType { get; set; }
+ [Parameter(
+ Mandatory = false,
+ ValueFromPipelineByPropertyName = true)]
+ public bool? BurstingEnabled { get; set; }
+
protected override void ProcessRecord()
{
if (ShouldProcess("DiskUpdate", "New"))
@@ -245,6 +251,7 @@ private void Run()
Encryption = vEncryption,
Sku = vSku,
Tier = this.IsParameterBound(c => c.Tier) ? this.Tier : null,
+ BurstingEnabled = this.IsParameterBound(c => c.BurstingEnabled) ? this.BurstingEnabled : null,
};
WriteObject(vDiskUpdate);
diff --git a/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs b/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs
index d8d1f4b8d295..10f1adb8667b 100644
--- a/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs
+++ b/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs
@@ -147,7 +147,8 @@ private void BuildPatchObject()
}
if (this.DiskEncryptionSetUpdate.ActiveKey == null)
{
- this.DiskEncryptionSetUpdate.ActiveKey = new KeyVaultAndKeyReference();
+ //this.DiskEncryptionSetUpdate.ActiveKey = new KeyVaultAndKeyReference();
+ this.DiskEncryptionSetUpdate.ActiveKey = new KeyForDiskEncryptionSet();
}
this.DiskEncryptionSetUpdate.ActiveKey.KeyUrl = this.KeyUrl;
}
@@ -160,7 +161,8 @@ private void BuildPatchObject()
}
if (this.DiskEncryptionSetUpdate.ActiveKey == null)
{
- this.DiskEncryptionSetUpdate.ActiveKey = new KeyVaultAndKeyReference();
+ //this.DiskEncryptionSetUpdate.ActiveKey = new KeyVaultAndKeyReference();
+ this.DiskEncryptionSetUpdate.ActiveKey = new KeyForDiskEncryptionSet();
}
if (this.DiskEncryptionSetUpdate.ActiveKey.SourceVault == null)
{
diff --git a/src/Compute/Compute/Generated/Models/PSDisk.cs b/src/Compute/Compute/Generated/Models/PSDisk.cs
index 79441d606470..2623065254ce 100644
--- a/src/Compute/Compute/Generated/Models/PSDisk.cs
+++ b/src/Compute/Compute/Generated/Models/PSDisk.cs
@@ -72,5 +72,7 @@ public string ResourceGroupName
public string Tier { get; set; }
+ public bool? BurstingEnabled { get; set; }
+
}
}
diff --git a/src/Compute/Compute/Generated/Models/PSDiskUpdate.cs b/src/Compute/Compute/Generated/Models/PSDiskUpdate.cs
index 8e72dccf495a..5b05dabcb920 100644
--- a/src/Compute/Compute/Generated/Models/PSDiskUpdate.cs
+++ b/src/Compute/Compute/Generated/Models/PSDiskUpdate.cs
@@ -42,6 +42,7 @@ public partial class PSDiskUpdate
public string DiskAccessId { get; set; }
public string Tier { get; set; }
+ public bool? BurstingEnabled { get; set; }
}
}
diff --git a/src/Compute/Compute/help/New-AzDiskConfig.md b/src/Compute/Compute/help/New-AzDiskConfig.md
index 29ca7514f4a5..dfd33ec3a25e 100644
--- a/src/Compute/Compute/help/New-AzDiskConfig.md
+++ b/src/Compute/Compute/help/New-AzDiskConfig.md
@@ -14,15 +14,15 @@ Creates a configurable disk object.
```
New-AzDiskConfig [[-SkuName] ] [-Tier ] [-LogicalSectorSize ]
- [[-OsType] ] [[-DiskSizeGB] ] [[-Location] ] [-Zone ]
- [-HyperVGeneration ] [-DiskIOPSReadWrite ] [-DiskMBpsReadWrite ]
+ [[-OsType] ] [[-DiskSizeGB] ] [[-Location] ]
+ [-Zone ] [-HyperVGeneration ] [-DiskIOPSReadWrite ] [-DiskMBpsReadWrite ]
[-DiskIOPSReadOnly ] [-DiskMBpsReadOnly ] [-MaxSharesCount ] [-Tag ]
[-CreateOption ] [-StorageAccountId ] [-ImageReference ]
[-GalleryImageReference ] [-SourceUri ] [-SourceResourceId ]
[-UploadSizeInBytes ] [-EncryptionSettingsEnabled ]
[-DiskEncryptionKey ] [-KeyEncryptionKey ]
[-DiskEncryptionSetId ] [-EncryptionType ] [-DiskAccessId ]
- [-NetworkAccessPolicy ] [-DefaultProfile ] [-WhatIf] [-Confirm]
+ [-NetworkAccessPolicy ] [-BurstingEnabled ] [-DefaultProfile ] [-WhatIf] [-Confirm]
[]
```
@@ -80,6 +80,21 @@ Create a disk from a Shared Gallery Image Version. Id is the id of the shared g
## PARAMETERS
+### -BurstingEnabled
+Enables bursting beyond the provisioned performance target of the disk. Bursting is disabled by default. Does not apply to Ultra disks.
+
+```yaml
+Type: System.Nullable`1[System.Boolean]
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
### -CreateOption
Specifies whether this cmdlet creates a disk in the virtual machine from a platform or user image,
creates an empty disk, or attaches an existing disk.
diff --git a/src/Compute/Compute/help/New-AzDiskUpdateConfig.md b/src/Compute/Compute/help/New-AzDiskUpdateConfig.md
index 21e64cb4524b..097da0c51b7a 100644
--- a/src/Compute/Compute/help/New-AzDiskUpdateConfig.md
+++ b/src/Compute/Compute/help/New-AzDiskUpdateConfig.md
@@ -18,8 +18,8 @@ New-AzDiskUpdateConfig [[-SkuName] ] [-Tier ] [-DiskIOPSReadOnly
[[-OsType] ] [[-DiskSizeGB] ] [[-Tag] ] [-DiskIOPSReadWrite ]
[-DiskMBpsReadWrite ] [-EncryptionSettingsEnabled ]
[-DiskEncryptionKey ] [-KeyEncryptionKey ]
- [-DiskEncryptionSetId ] [-EncryptionType ] [-DefaultProfile ]
- [-WhatIf] [-Confirm] []
+ [-DiskEncryptionSetId ] [-EncryptionType ] [-BurstingEnabled ]
+ [-DefaultProfile ] [-WhatIf] [-Confirm] []
```
## DESCRIPTION
@@ -54,6 +54,21 @@ This command updates an existing disk with name 'Disk01' in resource group 'Reso
## PARAMETERS
+### -BurstingEnabled
+Enables bursting beyond the provisioned performance target of the disk. Bursting is disabled by default. Does not apply to Ultra disks.
+
+```yaml
+Type: System.Nullable`1[System.Boolean]
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
### -DefaultProfile
The credentials, account, tenant, and subscription used for communication with azure.
diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj
index 1924e706d9f9..cea5a0a553ba 100644
--- a/src/Network/Network.Test/Network.Test.csproj
+++ b/src/Network/Network.Test/Network.Test.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
index 1d7bde7b4a54..d02bbd584170 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
index 937d2f8ad4ca..d5d8890ceb8e 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
index de5e21ffcd0f..1d32358aa001 100644
--- a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
+++ b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
@@ -15,7 +15,7 @@
-
+