Merge pull request #7422 from Azure/AzureRM.Reservations-preview

Reservations branch to Preview

Author: cormacpayne

src/ResourceManager/Reservations/Commands.Reservations.Test/Commands.Reservations.Test.Netcore.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Reservations" Version="1.8.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Reservations" Version="1.9.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/Reservations/Commands.Reservations.Test/Commands.Reservations.Test.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Azure.Management.Reservations">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Reservations.1.8.0-preview\lib\net452\Microsoft.Azure.Management.Reservations.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Reservations.1.9.0-preview\lib\net452\Microsoft.Azure.Management.Reservations.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

src/ResourceManager/Reservations/Commands.Reservations.Test/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.7")]
+[assembly: AssemblyFileVersion("0.1.7")]

src/ResourceManager/Reservations/Commands.Reservations.Test/ScenarioTests/ReservationTests.ps1

@@ -55,6 +55,16 @@ function Test-GetCatalog
 		Assert-True { $item.Terms.Count -gt 0 }
 		Assert-True { $item.Locations.Count -gt 0 }
 	}
+
+    # Get CosmosDb catalog
+	$catalog = Get-AzureRmReservationCatalog -SubscriptionId $subscriptionId -ReservedResourceType CosmosDb
+	Foreach ($item in $catalog)
+	{
+		Assert-NotNull $item.ResourceType
+		Assert-NotNull $item.Name
+		Assert-True { $item.Terms.Count -gt 0 }
+		Assert-Null $item.Locations
+	}
 }
 
 <#

src/ResourceManager/Reservations/Commands.Reservations.Test/SessionRecords/Microsoft.Azure.Commands.Reservations.Test.ScenarioTests.ReservationTests/TestGetCatalog.json

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.6'
+ModuleVersion = '0.1.7'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.5.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.6.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.5.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Reservations.dll'
@@ -110,10 +110,12 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime.'
+        ReleaseNotes = '* Update to the latest .NET SDK version 1.9.0-preview.
+* Add CosmosDb type in reserved resource enum type.
+* Add name property in PatchProperties.'
 
         # Prerelease string of this module
-        # Prerelease = ''
+        Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update
         # RequireLicenseAcceptance = $false

src/ResourceManager/Reservations/Commands.Reservations/AzureRM.Reservations.psd1

@@ -20,6 +20,11 @@
 -->
 ## Current Release
 
+## Version 0.1.7-preview
+* Update to the latest .NET SDK version 1.9.0-preview.
+* Add CosmosDb type in reserved resource enum type.
+* Add name property in PatchProperties.
+
 ## Version 0.1.6
 * Updated to the latest version of the Azure ClientRuntime.
 

src/ResourceManager/Reservations/Commands.Reservations/ChangeLog.md

@@ -17,7 +17,7 @@ public class GetCatalog : AzureReservationsCmdletBase
         public Guid SubscriptionId { get; set; }
 
         [Parameter(Mandatory = true)]
-        [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux")]
+        [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb")]
         [ValidateNotNullOrEmpty]
         public string ReservedResourceType { get; set; }
 

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

@@ -49,6 +49,10 @@ public class PatchReservation : AzureReservationsCmdletBase
         [ValidateNotNull]
         public PSReservation Reservation { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Name of Reservation")]
+        [ValidateNotNull]
+        public string Name { get; set; }
+
         public override void ExecuteCmdlet()
         {
             if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
@@ -68,11 +72,11 @@ public override void ExecuteCmdlet()
                     string subscriptionId = ValidateAndGetAppliedSubscription();
                     PreRegister(subscriptionId);
 
-                    Patch = new Patch(AppliedScopeType, new List<string>() { AppliedScope }, InstanceFlexibility);
+                    Patch = new Patch(AppliedScopeType, new List<string>() { AppliedScope }, InstanceFlexibility, Name);
                 }
                 else
                 {
-                    Patch = new Patch(AppliedScopeType, instanceFlexibility: InstanceFlexibility);
+                    Patch = new Patch(AppliedScopeType, instanceFlexibility: InstanceFlexibility, name: Name);
                 }
                 var response = new PSReservation(AzureReservationAPIClient.Reservation.Update(ReservationOrderId.ToString(), ReservationId.ToString(), Patch));
                 WriteObject(response);

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

@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Reservations" Version="1.8.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Reservations" Version="1.9.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj

@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Azure.Management.Reservations">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Reservations.1.8.0-preview\lib\net452\Microsoft.Azure.Management.Reservations.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Reservations.1.9.0-preview\lib\net452\Microsoft.Azure.Management.Reservations.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />

src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.csproj

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.6")]
-[assembly: AssemblyFileVersion("0.1.6")]
+[assembly: AssemblyVersion("0.1.7")]
+[assembly: AssemblyFileVersion("0.1.7")]

src/ResourceManager/Reservations/Commands.Reservations/Properties/AssemblyInfo.cs

@@ -15,14 +15,14 @@ Update a `Reservation`.
 ### CommandLine (Default)
 ```
 Update-AzureRmReservation -ReservationOrderId <Guid> -ReservationId <Guid> -AppliedScopeType <String>
- [-AppliedScope <String>] [-InstanceFlexibility <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-AppliedScope <String>] [-InstanceFlexibility <String>] [-Name <String>]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### PipeObject
 ```
 Update-AzureRmReservation -AppliedScopeType <String> [-AppliedScope <String>] [-InstanceFlexibility <String>]
- -Reservation <PSReservation> [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ -Reservation <PSReservation> [-Name <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
@@ -107,6 +107,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Name
+Name of Reservation
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Reservation
 Pipe object parameter for `Reservation`
 

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Microsoft.Azure.Management.Reservations" version="1.8.0-preview" targetFramework="net452" />
+    <package id="Microsoft.Azure.Management.Reservations" version="1.9.0-preview" targetFramework="net452" />
 </packages>