diff --git a/eng/mgmt/mgmtmetadata/compute_resource-manager.txt b/eng/mgmt/mgmtmetadata/compute_resource-manager.txt index 560c440bddbea..1edb80f513130 100644 --- a/eng/mgmt/mgmtmetadata/compute_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/compute_resource-manager.txt @@ -3,12 +3,12 @@ AutoRest installed successfully. Commencing code generation Generating CSharp code Executing AutoRest command -cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\hylee-sdk\july2\sdk -2019-07-18 00:16:54 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=G:\Code\azure-sdk-for-net\sdk +2019-08-02 00:04:37 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 6b6a445819212313e466b2f77f8b3e6d4f9d18fb +Commit: ab88105b1fd4d8b982869c43b1fbf365f24fc0af AutoRest information Requested version: latest Bootstrapper version: autorest@2.0.4283 diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/AzSdk.RP.props b/sdk/compute/Microsoft.Azure.Management.Compute/AzSdk.RP.props index 3d2b4e3b39d71..ef440086fa071 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/AzSdk.RP.props +++ b/sdk/compute/Microsoft.Azure.Management.Compute/AzSdk.RP.props @@ -1,7 +1,7 @@  - Compute_2019-03-01;Compute_2018-09-30;Compute_2019-04-01;ContainerService_2017-01-31; + Compute_2019-03-01;Compute_2018-09-30;Compute_2019-07-01;Compute_2019-04-01;ContainerService_2017-01-31; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetVMsOperations.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetVMsOperations.cs index de5198b96027f..0a097818c99ad 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetVMsOperations.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetVMsOperations.cs @@ -180,6 +180,10 @@ public partial interface IVirtualMachineScaleSetVMsOperations /// /// The instance ID of the virtual machine. /// + /// + /// The expand expression to apply on the operation. Possible values + /// include: 'instanceView' + /// /// /// The headers that will be added to request. /// @@ -195,7 +199,7 @@ public partial interface IVirtualMachineScaleSetVMsOperations /// /// Thrown when a required parameter is null /// - Task> GetWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, string instanceId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, string instanceId, InstanceViewTypes? expand = default(InstanceViewTypes?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets the status of a virtual machine from a VM scale set. /// diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroup.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroup.cs index 6957ea29c92c5..a97fa45e9c92e 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroup.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroup.cs @@ -47,8 +47,8 @@ public DedicatedHostGroup() /// Resource tags /// A list of references to all dedicated hosts in /// the dedicated host group. - /// Availability Zone to use for this host group � - /// only single zone is supported. The zone can be assigned only during + /// Availability Zone to use for this host group. + /// Only single zone is supported. The zone can be assigned only during /// creation. If not provided, the group supports all zones in the /// region. If provided, enforces each host in the group to be in the /// same zone. @@ -80,7 +80,7 @@ public DedicatedHostGroup() public IList Hosts { get; private set; } /// - /// Gets or sets availability Zone to use for this host group � only + /// Gets or sets availability Zone to use for this host group. Only /// single zone is supported. The zone can be assigned only during /// creation. If not provided, the group supports all zones in the /// region. If provided, enforces each host in the group to be in the diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroupUpdate.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroupUpdate.cs index 46800c5fea9f8..333098c832416 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroupUpdate.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/DedicatedHostGroupUpdate.cs @@ -40,8 +40,8 @@ public DedicatedHostGroupUpdate() /// Resource tags /// A list of references to all dedicated hosts in /// the dedicated host group. - /// Availability Zone to use for this host group � - /// only single zone is supported. The zone can be assigned only during + /// Availability Zone to use for this host group. + /// Only single zone is supported. The zone can be assigned only during /// creation. If not provided, the group supports all zones in the /// region. If provided, enforces each host in the group to be in the /// same zone. @@ -73,7 +73,7 @@ public DedicatedHostGroupUpdate() public IList Hosts { get; private set; } /// - /// Gets or sets availability Zone to use for this host group � only + /// Gets or sets availability Zone to use for this host group. Only /// single zone is supported. The zone can be assigned only during /// creation. If not provided, the group supports all zones in the /// region. If provided, enforces each host in the group to be in the diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ScheduledEventsProfile.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ScheduledEventsProfile.cs new file mode 100644 index 0000000000000..adb596896ddba --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ScheduledEventsProfile.cs @@ -0,0 +1,50 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Compute.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class ScheduledEventsProfile + { + /// + /// Initializes a new instance of the ScheduledEventsProfile class. + /// + public ScheduledEventsProfile() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ScheduledEventsProfile class. + /// + /// Specifies Terminate + /// Scheduled Event related configurations. + public ScheduledEventsProfile(TerminateNotificationProfile terminateNotificationProfile = default(TerminateNotificationProfile)) + { + TerminateNotificationProfile = terminateNotificationProfile; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies Terminate Scheduled Event related + /// configurations. + /// + [JsonProperty(PropertyName = "terminateNotificationProfile")] + public TerminateNotificationProfile TerminateNotificationProfile { get; set; } + + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/TerminateNotificationProfile.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/TerminateNotificationProfile.cs new file mode 100644 index 0000000000000..734e97adc35ad --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/TerminateNotificationProfile.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Compute.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class TerminateNotificationProfile + { + /// + /// Initializes a new instance of the TerminateNotificationProfile + /// class. + /// + public TerminateNotificationProfile() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the TerminateNotificationProfile + /// class. + /// + /// Configurable length of time a + /// Virtual Machine being deleted will have to potentially approve the + /// Terminate Scheduled Event before the event is auto approved (timed + /// out). The configuration must be specified in ISO 8601 format, the + /// default value is 5 minutes (PT5M) + /// Specifies whether the Terminate Scheduled + /// event is enabled or disabled. + public TerminateNotificationProfile(string notBeforeTimeout = default(string), bool? enable = default(bool?)) + { + NotBeforeTimeout = notBeforeTimeout; + Enable = enable; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets configurable length of time a Virtual Machine being + /// deleted will have to potentially approve the Terminate Scheduled + /// Event before the event is auto approved (timed out). The + /// configuration must be specified in ISO 8601 format, the default + /// value is 5 minutes (PT5M) + /// + [JsonProperty(PropertyName = "notBeforeTimeout")] + public string NotBeforeTimeout { get; set; } + + /// + /// Gets or sets specifies whether the Terminate Scheduled event is + /// enabled or disabled. + /// + [JsonProperty(PropertyName = "enable")] + public bool? Enable { get; set; } + + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetUpdateVMProfile.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetUpdateVMProfile.cs index d9588e910b729..67a85ffa14d9b 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetUpdateVMProfile.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetUpdateVMProfile.cs @@ -43,7 +43,9 @@ public VirtualMachineScaleSetUpdateVMProfile() /// extension profile. /// The license type, which is for bring your /// own license scenario. - public VirtualMachineScaleSetUpdateVMProfile(VirtualMachineScaleSetUpdateOSProfile osProfile = default(VirtualMachineScaleSetUpdateOSProfile), VirtualMachineScaleSetUpdateStorageProfile storageProfile = default(VirtualMachineScaleSetUpdateStorageProfile), VirtualMachineScaleSetUpdateNetworkProfile networkProfile = default(VirtualMachineScaleSetUpdateNetworkProfile), DiagnosticsProfile diagnosticsProfile = default(DiagnosticsProfile), VirtualMachineScaleSetExtensionProfile extensionProfile = default(VirtualMachineScaleSetExtensionProfile), string licenseType = default(string)) + /// Specifies Scheduled Event + /// related configurations. + public VirtualMachineScaleSetUpdateVMProfile(VirtualMachineScaleSetUpdateOSProfile osProfile = default(VirtualMachineScaleSetUpdateOSProfile), VirtualMachineScaleSetUpdateStorageProfile storageProfile = default(VirtualMachineScaleSetUpdateStorageProfile), VirtualMachineScaleSetUpdateNetworkProfile networkProfile = default(VirtualMachineScaleSetUpdateNetworkProfile), DiagnosticsProfile diagnosticsProfile = default(DiagnosticsProfile), VirtualMachineScaleSetExtensionProfile extensionProfile = default(VirtualMachineScaleSetExtensionProfile), string licenseType = default(string), ScheduledEventsProfile scheduledEventsProfile = default(ScheduledEventsProfile)) { OsProfile = osProfile; StorageProfile = storageProfile; @@ -51,6 +53,7 @@ public VirtualMachineScaleSetUpdateVMProfile() DiagnosticsProfile = diagnosticsProfile; ExtensionProfile = extensionProfile; LicenseType = licenseType; + ScheduledEventsProfile = scheduledEventsProfile; CustomInit(); } @@ -96,5 +99,11 @@ public VirtualMachineScaleSetUpdateVMProfile() [JsonProperty(PropertyName = "licenseType")] public string LicenseType { get; set; } + /// + /// Gets or sets specifies Scheduled Event related configurations. + /// + [JsonProperty(PropertyName = "scheduledEventsProfile")] + public ScheduledEventsProfile ScheduledEventsProfile { get; set; } + } } diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetVMProfile.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetVMProfile.cs index 682bdb4ee2add..6ba79e85671ba 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetVMProfile.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineScaleSetVMProfile.cs @@ -62,7 +62,9 @@ public VirtualMachineScaleSetVMProfile() /// virtual machines in a low priority scale set. /// <br><br>Minimum api-version: 2017-10-30-preview. /// Possible values include: 'Deallocate', 'Delete' - public VirtualMachineScaleSetVMProfile(VirtualMachineScaleSetOSProfile osProfile = default(VirtualMachineScaleSetOSProfile), VirtualMachineScaleSetStorageProfile storageProfile = default(VirtualMachineScaleSetStorageProfile), VirtualMachineScaleSetNetworkProfile networkProfile = default(VirtualMachineScaleSetNetworkProfile), DiagnosticsProfile diagnosticsProfile = default(DiagnosticsProfile), VirtualMachineScaleSetExtensionProfile extensionProfile = default(VirtualMachineScaleSetExtensionProfile), string licenseType = default(string), string priority = default(string), string evictionPolicy = default(string)) + /// Specifies Scheduled Event + /// related configurations. + public VirtualMachineScaleSetVMProfile(VirtualMachineScaleSetOSProfile osProfile = default(VirtualMachineScaleSetOSProfile), VirtualMachineScaleSetStorageProfile storageProfile = default(VirtualMachineScaleSetStorageProfile), VirtualMachineScaleSetNetworkProfile networkProfile = default(VirtualMachineScaleSetNetworkProfile), DiagnosticsProfile diagnosticsProfile = default(DiagnosticsProfile), VirtualMachineScaleSetExtensionProfile extensionProfile = default(VirtualMachineScaleSetExtensionProfile), string licenseType = default(string), string priority = default(string), string evictionPolicy = default(string), ScheduledEventsProfile scheduledEventsProfile = default(ScheduledEventsProfile)) { OsProfile = osProfile; StorageProfile = storageProfile; @@ -72,6 +74,7 @@ public VirtualMachineScaleSetVMProfile() LicenseType = licenseType; Priority = priority; EvictionPolicy = evictionPolicy; + ScheduledEventsProfile = scheduledEventsProfile; CustomInit(); } @@ -151,6 +154,12 @@ public VirtualMachineScaleSetVMProfile() [JsonProperty(PropertyName = "evictionPolicy")] public string EvictionPolicy { get; set; } + /// + /// Gets or sets specifies Scheduled Event related configurations. + /// + [JsonProperty(PropertyName = "scheduledEventsProfile")] + public ScheduledEventsProfile ScheduledEventsProfile { get; set; } + /// /// Validate the object. /// diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs index c053c7e8c782f..f3c2557f651f2 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs @@ -50,10 +50,10 @@ public static IEnumerable> ApiInfo_ComputeManageme // BEGIN: Code Generation Metadata Section public static readonly String AutoRestVersion = "latest"; public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\\hylee-sdk\\july2\\sdk"; + public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=G:\\Code\\azure-sdk-for-net\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "6b6a445819212313e466b2f77f8b3e6d4f9d18fb"; + public static readonly String GithubCommidId = "ab88105b1fd4d8b982869c43b1fbf365f24fc0af"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs index 144a3c47eed0e..3eb7d47becc5b 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs @@ -202,6 +202,10 @@ internal VirtualMachineScaleSetVMsOperations(ComputeManagementClient client) /// /// The instance ID of the virtual machine. /// + /// + /// The expand expression to apply on the operation. Possible values include: + /// 'instanceView' + /// /// /// Headers that will be added to request. /// @@ -223,7 +227,7 @@ internal VirtualMachineScaleSetVMsOperations(ComputeManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, string instanceId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, string instanceId, InstanceViewTypes? expand = default(InstanceViewTypes?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -252,6 +256,7 @@ internal VirtualMachineScaleSetVMsOperations(ComputeManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vmScaleSetName", vmScaleSetName); tracingParameters.Add("instanceId", instanceId); + tracingParameters.Add("expand", expand); tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); @@ -264,6 +269,10 @@ internal VirtualMachineScaleSetVMsOperations(ComputeManagementClient client) _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); + if (expand != null) + { + _queryParameters.Add(string.Format("$expand={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(expand, Client.SerializationSettings).Trim('"')))); + } if (apiVersion != null) { _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperationsExtensions.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperationsExtensions.cs index 16f27dc33505e..70648d15dff03 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperationsExtensions.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetVMsOperationsExtensions.cs @@ -283,9 +283,13 @@ public static void Delete(this IVirtualMachineScaleSetVMsOperations operations, /// /// The instance ID of the virtual machine. /// - public static VirtualMachineScaleSetVM Get(this IVirtualMachineScaleSetVMsOperations operations, string resourceGroupName, string vmScaleSetName, string instanceId) + /// + /// The expand expression to apply on the operation. Possible values include: + /// 'instanceView' + /// + public static VirtualMachineScaleSetVM Get(this IVirtualMachineScaleSetVMsOperations operations, string resourceGroupName, string vmScaleSetName, string instanceId, InstanceViewTypes? expand = default(InstanceViewTypes?)) { - return operations.GetAsync(resourceGroupName, vmScaleSetName, instanceId).GetAwaiter().GetResult(); + return operations.GetAsync(resourceGroupName, vmScaleSetName, instanceId, expand).GetAwaiter().GetResult(); } /// @@ -303,12 +307,16 @@ public static VirtualMachineScaleSetVM Get(this IVirtualMachineScaleSetVMsOperat /// /// The instance ID of the virtual machine. /// + /// + /// The expand expression to apply on the operation. Possible values include: + /// 'instanceView' + /// /// /// The cancellation token. /// - public static async Task GetAsync(this IVirtualMachineScaleSetVMsOperations operations, string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAsync(this IVirtualMachineScaleSetVMsOperations operations, string resourceGroupName, string vmScaleSetName, string instanceId, InstanceViewTypes? expand = default(InstanceViewTypes?), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, vmScaleSetName, instanceId, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, vmScaleSetName, instanceId, expand, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; }