diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeOption.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeOption.cs new file mode 100644 index 0000000000000..0c1db05e48580 --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeOption.cs @@ -0,0 +1,66 @@ +// +// 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; + + /// + /// Describes the alternative option specified by the Publisher for this + /// image when this image is deprecated. + /// + public partial class AlternativeOption + { + /// + /// Initializes a new instance of the AlternativeOption class. + /// + public AlternativeOption() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AlternativeOption class. + /// + /// Describes the type of the alternative option. + /// Possible values include: 'None', 'Offer', 'Plan' + /// Indicates the alternative option value + /// specified by the Publisher. This is the Offer name when the type is + /// Offer or the Plan name when the type is Plan. + public AlternativeOption(string type = default(string), string value = default(string)) + { + Type = type; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets describes the type of the alternative option. Possible + /// values include: 'None', 'Offer', 'Plan' + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets indicates the alternative option value specified by + /// the Publisher. This is the Offer name when the type is Offer or the + /// Plan name when the type is Plan. + /// + [JsonProperty(PropertyName = "value")] + public string Value { get; set; } + + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeType.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeType.cs new file mode 100644 index 0000000000000..ad49f56a51399 --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/AlternativeType.cs @@ -0,0 +1,23 @@ +// +// 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 +{ + + /// + /// Defines values for AlternativeType. + /// + public static class AlternativeType + { + public const string None = "None"; + public const string Offer = "Offer"; + public const string Plan = "Plan"; + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageDeprecationStatus.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageDeprecationStatus.cs new file mode 100644 index 0000000000000..208098b112157 --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageDeprecationStatus.cs @@ -0,0 +1,72 @@ +// +// 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; + + /// + /// Describes image deprecation status properties on the image. + /// + public partial class ImageDeprecationStatus + { + /// + /// Initializes a new instance of the ImageDeprecationStatus class. + /// + public ImageDeprecationStatus() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ImageDeprecationStatus class. + /// + /// Describes the state of the image. Possible + /// values include: 'Active', 'ScheduledForDeprecation', + /// 'Deprecated' + /// The time, in future, at + /// which this image will be marked as deprecated. This scheduled time + /// is chosen by the Publisher. + public ImageDeprecationStatus(string imageState = default(string), System.DateTime? scheduledDeprecationTime = default(System.DateTime?), AlternativeOption alternativeOption = default(AlternativeOption)) + { + ImageState = imageState; + ScheduledDeprecationTime = scheduledDeprecationTime; + AlternativeOption = alternativeOption; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets describes the state of the image. Possible values + /// include: 'Active', 'ScheduledForDeprecation', 'Deprecated' + /// + [JsonProperty(PropertyName = "imageState")] + public string ImageState { get; set; } + + /// + /// Gets or sets the time, in future, at which this image will be + /// marked as deprecated. This scheduled time is chosen by the + /// Publisher. + /// + [JsonProperty(PropertyName = "scheduledDeprecationTime")] + public System.DateTime? ScheduledDeprecationTime { get; set; } + + /// + /// + [JsonProperty(PropertyName = "alternativeOption")] + public AlternativeOption AlternativeOption { get; set; } + + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageState.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageState.cs new file mode 100644 index 0000000000000..7b86d3b4d8a75 --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/ImageState.cs @@ -0,0 +1,23 @@ +// +// 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 +{ + + /// + /// Defines values for ImageState. + /// + public static class ImageState + { + public const string Active = "Active"; + public const string ScheduledForDeprecation = "ScheduledForDeprecation"; + public const string Deprecated = "Deprecated"; + } +} diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineImage.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineImage.cs index 49442b637ffee..ab60c6ad93e29 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineImage.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/Models/VirtualMachineImage.cs @@ -50,7 +50,7 @@ public VirtualMachineImage() /// VirtualMachine created from the image /// Possible values include: 'x64', /// 'Arm64' - public VirtualMachineImage(string name, string location, string id = default(string), IDictionary tags = default(IDictionary), ExtendedLocation extendedLocation = default(ExtendedLocation), PurchasePlan plan = default(PurchasePlan), OSDiskImage osDiskImage = default(OSDiskImage), IList dataDiskImages = default(IList), AutomaticOSUpgradeProperties automaticOSUpgradeProperties = default(AutomaticOSUpgradeProperties), string hyperVGeneration = default(string), DisallowedConfiguration disallowed = default(DisallowedConfiguration), IList features = default(IList), string architecture = default(string)) + public VirtualMachineImage(string name, string location, string id = default(string), IDictionary tags = default(IDictionary), ExtendedLocation extendedLocation = default(ExtendedLocation), PurchasePlan plan = default(PurchasePlan), OSDiskImage osDiskImage = default(OSDiskImage), IList dataDiskImages = default(IList), AutomaticOSUpgradeProperties automaticOSUpgradeProperties = default(AutomaticOSUpgradeProperties), string hyperVGeneration = default(string), DisallowedConfiguration disallowed = default(DisallowedConfiguration), IList features = default(IList), string architecture = default(string), ImageDeprecationStatus imageDeprecationStatus = default(ImageDeprecationStatus)) : base(name, location, id, tags, extendedLocation) { Plan = plan; @@ -61,6 +61,7 @@ public VirtualMachineImage() Disallowed = disallowed; Features = features; Architecture = architecture; + ImageDeprecationStatus = imageDeprecationStatus; CustomInit(); } @@ -113,6 +114,11 @@ public VirtualMachineImage() [JsonProperty(PropertyName = "properties.architecture")] public string Architecture { get; set; } + /// + /// + [JsonProperty(PropertyName = "properties.imageDeprecationStatus")] + public ImageDeprecationStatus ImageDeprecationStatus { get; set; } + /// /// Validate the object. /// diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMImageTests.cs b/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMImageTests.cs index 6fb60a5631bd8..c8531a27e376a 100644 --- a/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMImageTests.cs +++ b/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMImageTests.cs @@ -260,6 +260,56 @@ public void TestVMImageListSkus() Assert.True(skus.Count(sku => sku.Name == "2012-R2-Datacenter") != 0); } } + + [Fact] + public void TestVMImage_ImageDeprecationStatusProperties_ActiveImage() + { + using (MockContext context = MockContext.Start(this.GetType())) + { + ComputeManagementClient _pirClient = ComputeManagementTestUtilities.GetComputeManagementClient(context, + new RecordedDelegatingHandler { StatusCodeToReturn = HttpStatusCode.OK }); + + // Validate if images return correct ImageDeprecationStatus for Active images + string imagePublisher = "MicrosoftWindowsServer"; + string imageOffer = "WindowsServer"; + string imageSku = "2016-Datacenter"; + string imageVersion = "14393.5501.221105"; + var vmimage = _pirClient.VirtualMachineImages.Get( + ComputeManagementTestUtilities.DefaultLocation, imagePublisher, imageOffer, imageSku, imageVersion); + Assert.NotNull(vmimage.ImageDeprecationStatus); + Assert.True(vmimage.ImageDeprecationStatus.ImageState.Equals("Active")); + Assert.Null(vmimage.ImageDeprecationStatus.ScheduledDeprecationTime); + Assert.Null(vmimage.ImageDeprecationStatus.AlternativeOption); + } + } + + [Fact] + public void TestVMImage_ImageDeprecationStatusProperties_ScheduledForDeprecationImage() + { + using (MockContext context = MockContext.Start(this.GetType())) + { + ComputeManagementClient _pirClient = ComputeManagementTestUtilities.GetComputeManagementClient(context, + new RecordedDelegatingHandler { StatusCodeToReturn = HttpStatusCode.OK }); + + // Validate if images return correct ImageDeprecationStatus for ScheduledForDeprecation images + string imagePublisher = "MicrosoftWindowsDesktop"; + string imageOffer = "Windows-10"; + string imageSku = "20h2-pro-g2"; + string imageVersion = "19042.1645.220403"; + var vmimage = _pirClient.VirtualMachineImages.Get( + ComputeManagementTestUtilities.DefaultLocation, imagePublisher, imageOffer, imageSku, imageVersion); + Assert.NotNull(vmimage.ImageDeprecationStatus); + Assert.True(vmimage.ImageDeprecationStatus.ImageState.Equals("ScheduledForDeprecation")); + Assert.NotNull(vmimage.ImageDeprecationStatus.ScheduledDeprecationTime); + + // Currently no public image has this optional field set. + if (vmimage.ImageDeprecationStatus.AlternativeOption != null) + { + Assert.NotNull(vmimage.ImageDeprecationStatus.AlternativeOption.Type); + Assert.NotNull(vmimage.ImageDeprecationStatus.AlternativeOption.Value); + } + } + } } } diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ActiveImage.json b/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ActiveImage.json new file mode 100644 index 0000000000000..bbe5b0c3b4fcd --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ActiveImage.json @@ -0,0 +1,78 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/8af59112-bf94-48a3-830f-67e1b2c82a34/providers/Microsoft.Compute/locations/eastus2/publishers/MicrosoftWindowsServer/artifacttypes/vmimage/offers/WindowsServer/skus/2016-Datacenter/versions/14393.5501.221105?api-version=2022-11-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOGFmNTkxMTItYmY5NC00OGEzLTgzMGYtNjdlMWIyYzgyYTM0L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29tcHV0ZS9sb2NhdGlvbnMvZWFzdHVzMi9wdWJsaXNoZXJzL01pY3Jvc29mdFdpbmRvd3NTZXJ2ZXIvYXJ0aWZhY3R0eXBlcy92bWltYWdlL29mZmVycy9XaW5kb3dzU2VydmVyL3NrdXMvMjAxNi1EYXRhY2VudGVyL3ZlcnNpb25zLzE0MzkzLjU1MDEuMjIxMTA1P2FwaS12ZXJzaW9uPTIwMjItMTEtMDE=", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "235bee75-224e-4882-b0fe-89d876ec680d" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.700.22.51102", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.22621", + "Microsoft.Azure.Management.Compute.ComputeManagementClient/59.0.0" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-resource": [ + "Microsoft.Compute/GetVMImageFromLocation3Min;12999,Microsoft.Compute/GetVMImageFromLocation30Min;73998" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-served-by": [ + "19a6b8e7-2f9b-4b25-aea4-718323f85895_133112991879161918" + ], + "x-ms-request-id": [ + "9ca2960f-f21f-42c9-87d0-a2065ddd43d0" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0", + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "11999" + ], + "x-ms-correlation-request-id": [ + "01dcc35d-e1c0-4881-82da-39964bbf128f" + ], + "x-ms-routing-request-id": [ + "SOUTHINDIA:20221209T082518Z:01dcc35d-e1c0-4881-82da-39964bbf128f" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Fri, 09 Dec 2022 08:25:18 GMT" + ], + "Content-Length": [ + "1073" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"properties\": {\r\n \"hyperVGeneration\": \"V1\",\r\n \"architecture\": \"x64\",\r\n \"replicaType\": \"Unmanaged\",\r\n \"disallowed\": {\r\n \"vmDiskType\": \"None\"\r\n },\r\n \"automaticOSUpgradeProperties\": {\r\n \"automaticOSUpgradeSupported\": true\r\n },\r\n \"imageDeprecationStatus\": {\r\n \"imageState\": \"Active\"\r\n },\r\n \"features\": [\r\n {\r\n \"name\": \"IsAcceleratedNetworkSupported\",\r\n \"value\": \"True\"\r\n },\r\n {\r\n \"name\": \"DiskControllerTypes\",\r\n \"value\": \"SCSI\"\r\n },\r\n {\r\n \"name\": \"IsHibernateSupported\",\r\n \"value\": \"False\"\r\n }\r\n ],\r\n \"osDiskImage\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"sizeInGb\": 128,\r\n \"sizeInBytes\": 136367309312\r\n },\r\n \"dataDiskImages\": []\r\n },\r\n \"location\": \"eastus2\",\r\n \"name\": \"14393.5501.221105\",\r\n \"id\": \"/Subscriptions/8af59112-bf94-48a3-830f-67e1b2c82a34/Providers/Microsoft.Compute/Locations/eastus2/Publishers/MicrosoftWindowsServer/ArtifactTypes/VMImage/Offers/WindowsServer/Skus/2016-Datacenter/Versions/14393.5501.221105\"\r\n}", + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "8af59112-bf94-48a3-830f-67e1b2c82a34" + } +} \ No newline at end of file diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ScheduledForDeprecationImage.json b/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ScheduledForDeprecationImage.json new file mode 100644 index 0000000000000..e9ee03eb9d23d --- /dev/null +++ b/sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMImagesTests/TestVMImage_ImageDeprecationStatusProperties_ScheduledForDeprecationImage.json @@ -0,0 +1,78 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/8af59112-bf94-48a3-830f-67e1b2c82a34/providers/Microsoft.Compute/locations/eastus2/publishers/MicrosoftWindowsDesktop/artifacttypes/vmimage/offers/Windows-10/skus/20h2-pro-g2/versions/19042.1645.220403?api-version=2022-11-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOGFmNTkxMTItYmY5NC00OGEzLTgzMGYtNjdlMWIyYzgyYTM0L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29tcHV0ZS9sb2NhdGlvbnMvZWFzdHVzMi9wdWJsaXNoZXJzL01pY3Jvc29mdFdpbmRvd3NEZXNrdG9wL2FydGlmYWN0dHlwZXMvdm1pbWFnZS9vZmZlcnMvV2luZG93cy0xMC9za3VzLzIwaDItcHJvLWcyL3ZlcnNpb25zLzE5MDQyLjE2NDUuMjIwNDAzP2FwaS12ZXJzaW9uPTIwMjItMTEtMDE=", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "21a11c22-87a6-4cb0-89c3-d324260d5d63" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.700.22.51102", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.22621", + "Microsoft.Azure.Management.Compute.ComputeManagementClient/59.0.0" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-resource": [ + "Microsoft.Compute/GetVMImageFromLocation3Min;12999,Microsoft.Compute/GetVMImageFromLocation30Min;73998" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-served-by": [ + "e24428d7-dd1b-4e47-8485-d3ce0e25f070_133112991876818120" + ], + "x-ms-request-id": [ + "6308f65b-e011-41ae-acd0-cf9882dbee61" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0", + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "11999" + ], + "x-ms-correlation-request-id": [ + "42323cda-220b-45dc-b4f9-2d91550f7fa6" + ], + "x-ms-routing-request-id": [ + "SOUTHINDIA:20221209T082524Z:42323cda-220b-45dc-b4f9-2d91550f7fa6" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Fri, 09 Dec 2022 08:25:24 GMT" + ], + "Content-Length": [ + "1236" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"properties\": {\r\n \"hyperVGeneration\": \"V2\",\r\n \"architecture\": \"x64\",\r\n \"replicaType\": \"Managed\",\r\n \"replicaCount\": 10,\r\n \"disallowed\": {\r\n \"vmDiskType\": \"Unmanaged\"\r\n },\r\n \"automaticOSUpgradeProperties\": {\r\n \"automaticOSUpgradeSupported\": false\r\n },\r\n \"imageDeprecationStatus\": {\r\n \"imageState\": \"ScheduledForDeprecation\",\r\n \"scheduledDeprecationTime\": \"2023-02-20T05:30:00+05:30\"\r\n },\r\n \"features\": [\r\n {\r\n \"name\": \"SecurityType\",\r\n \"value\": \"TrustedLaunchSupported\"\r\n },\r\n {\r\n \"name\": \"IsAcceleratedNetworkSupported\",\r\n \"value\": \"True\"\r\n },\r\n {\r\n \"name\": \"DiskControllerTypes\",\r\n \"value\": \"SCSI\"\r\n },\r\n {\r\n \"name\": \"IsHibernateSupported\",\r\n \"value\": \"False\"\r\n }\r\n ],\r\n \"osDiskImage\": {\r\n \"operatingSystem\": \"Windows\",\r\n \"sizeInGb\": 127\r\n },\r\n \"dataDiskImages\": []\r\n },\r\n \"location\": \"eastus2\",\r\n \"name\": \"19042.1645.220403\",\r\n \"id\": \"/Subscriptions/8af59112-bf94-48a3-830f-67e1b2c82a34/Providers/Microsoft.Compute/Locations/eastus2/Publishers/MicrosoftWindowsDesktop/ArtifactTypes/VMImage/Offers/Windows-10/Skus/20h2-pro-g2/Versions/19042.1645.220403\"\r\n}", + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "8af59112-bf94-48a3-830f-67e1b2c82a34" + } +} \ No newline at end of file