Merge pull request #5264 from corquiri/ReservedInstance

Reserved instance auto register provider

Author: markcowl

src/ResourceManager/Reservations/ChangeLog.md

@@ -1,4 +1,5 @@
-<!--
+
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -33,4 +34,8 @@
 * New Cmdlet Get-AzureRmReservationOrderId
     - cmdlet to retrieve list of reservation order ids that are applicable to subscription.
 * New Cmdlet Get-AzureRmReservationCatalog
-    - cmdlet to retrieve available reservation catalog for the subscription.
+    - cmdlet to retrieve available reservation catalog for the subscription.
+* Enable subscription Auto-Registration for the reservations provider
+
+## Version 0.1.0
+* Initial Release of Resrvations cmdlets

src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/PatchReservation.cs

@@ -6,6 +6,12 @@
 using System.Management.Automation;
 using Newtonsoft.Json;
 using Microsoft.Azure.Management.Reservations;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Management.Internal.Resources;
+using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using Microsoft.Azure.Management.Internal.Resources.Models;
+using Microsoft.Rest.Azure;
 
 namespace Microsoft.Azure.Commands.Reservations.Cmdlets
 {
@@ -53,6 +59,10 @@ public override void ExecuteCmdlet()
                 Patch Patch;
                 if (AppliedScope != null)
                 {
+                    //Pre-register for Microsoft.Compute
+                    string subscriptionId = ValidateAndGetAppliedSubscription();
+                    PreRegister(subscriptionId);
+
                     Patch = new Patch(AppliedScopeType, new List<string>() { AppliedScope });
                 }
                 else
@@ -63,5 +73,69 @@ public override void ExecuteCmdlet()
                 WriteObject(response);
             }
         }
+
+        private void PreRegister(string subscriptionId)
+        {
+            try
+            {
+                IAzureContext context;
+                if (TryGetDefaultContext(out context)
+                    && context.Account != null
+                    && context.Subscription != null)
+                {
+                    var client = new ResourceManagementClient(
+                                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
+                                AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager));
+                    client.SubscriptionId = subscriptionId;
+
+                    string ComputeProviderNamespace = "Microsoft.Compute";
+                    var maxRetryCount = 10;
+
+                    var provider = client.Providers.Get(ComputeProviderNamespace);
+                    if (provider.RegistrationState != RegistrationState.Registered)
+                    {
+                        short retryCount = 0;
+                        do
+                        {
+                            if (retryCount++ > maxRetryCount)
+                            {
+                                throw new TimeoutException();
+                            }
+                            provider = client.Providers.Register(ComputeProviderNamespace);
+                            TestMockSupport.Delay(2000);
+                        } while (provider.RegistrationState != RegistrationState.Registered);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                if (e.Message?.IndexOf("does not have authorization") >= 0 && e.Message?.IndexOf("register/action",
+                        StringComparison.InvariantCultureIgnoreCase) >= 0)
+                {
+                    throw new CloudException(e.Message);
+                }
+            }
+        }
+
+        private string ValidateAndGetAppliedSubscription()
+        {
+            string subscriptionId = AppliedScope;
+            string prefix = "/subscriptions/";
+            if (subscriptionId.IndexOf(prefix, StringComparison.InvariantCultureIgnoreCase) >= 0
+                && subscriptionId.Length > prefix.Length)
+            {
+                subscriptionId = subscriptionId.Substring(prefix.Length);
+            }
+
+            Guid result;
+            if (Guid.TryParse(subscriptionId, out result))
+            {
+                return result.ToString();
+            }
+            else
+            {
+                throw new PSArgumentException("Invalid applied scope provided");
+            }
+        }
     }
 }

src/ResourceManager/Reservations/Commands.Reservations/help/Update-AzureRmReservation.md

@@ -15,13 +15,13 @@ Update a `Reservation`.
 ### CommandLine (Default)
 ```
 Update-AzureRmReservation -ReservationOrderId <String> -ReservationId <String> -AppliedScopeType <String>
- [-AppliedScope <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-AppliedScope <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### PipeObject
 ```
 Update-AzureRmReservation -AppliedScopeType <String> [-AppliedScope <String>] -Reservation <PSReservation>
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -31,7 +31,7 @@ Updates the applied scopes of the `Reservation`.
 
 ### Example 1
 ```
-PS C:\> Update-AzureRmReservation -ReservationOrderId "11111111-1111-1111-1111-1111111111" -ReservationId "00000000-1111-1111-1111-0000000000" -appliedScopeType "Single" -appliedscope "1111aaaa-b1b2-c0c2-d0d2-00000fffff"
+PS C:\> Update-AzureRmReservation -ReservationOrderId "11111111-1111-1111-1111-1111111111" -ReservationId "00000000-1111-1111-1111-0000000000" -appliedScopeType "Single" -appliedscope "/subscriptions/1111aaaa-b1b2-c0c2-d0d2-00000fffff"
 ```
 
 Updates the AppliedScopeType of the specified reservation to Single
@@ -76,6 +76,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with Azure.
+
+```yaml
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Reservation
 Pipe object parameter for `Reservation`