Skip to content

Reservations RP 2018-06-01: Add CosmosDb in reserved resource enum type. Add name property in PatchProperties #7164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiYanni merged 13 commits into from
Sep 21, 2018
Merged

Reservations RP 2018-06-01: Add CosmosDb in reserved resource enum type. Add name property in PatchProperties #7164

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e3360fc
Add new CosmosDb in the reserved resource type enum. Add name propert…
dorislewisbjtu Sep 6, 2018
fc60fa6
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
dorislewisbjtu Sep 6, 2018
68a2f63
Add name in Patch Properties
dorislewisbjtu Sep 7, 2018
05c123b
Merge branch 'preview' into reservations
Sep 11, 2018
1c47af1
Address comments
dorislewisbjtu Sep 14, 2018
8f5019e
Merge branch 'reservations' of https://github.com/Azure/azure-powersh…
dorislewisbjtu Sep 14, 2018
fa9b4b7
ReservationsRP update change log
dorislewisbjtu Sep 14, 2018
fd023fa
Update help file to full type name
dorislewisbjtu Sep 14, 2018
93b68af
Modify change log
dorislewisbjtu Sep 14, 2018
cab9f49
Merge branch 'AzureRM.Reservations-preview' into reservations
MiYanni Sep 17, 2018
aee3ade
Fix test error
dorislewisbjtu Sep 20, 2018
1e48834
Add help msg
dorislewisbjtu Sep 20, 2018
fb55009
Manually add name property description
dorislewisbjtu Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...Manager/Reservations/Commands.Reservations.Test/Commands.Reservations.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ResourceManager/Reservations/Commands.Reservations.Test/Commands.Reservations.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions ...esourceManager/Reservations/Commands.Reservations.Test/ScenarioTests/ReservationTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

<#
Expand Down
139 changes: 104 additions & 35 deletions ...osoft.Azure.Commands.Reservations.Test.ScenarioTests.ReservationTests/TestGetCatalog.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/ResourceManager/Reservations/Commands.Reservations/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
- Additional information about change #1
-->
## Current Release
* 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.
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetCatalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
8 changes: 6 additions & 2 deletions src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/PatchReservation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public class PatchReservation : AzureReservationsCmdletBase
[ValidateNotNull]
public PSReservation Reservation { get; set; }

[Parameter(Mandatory = false)]
[ValidateNotNull]
public string Name { get; set; }
Copy link
Contributor

@MiYanni MiYanni Sep 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see updated help documentation for the Name parameter. Also, please provide an example in the help using this parameter.


public override void ExecuteCmdlet()
{
if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Reservations/Commands.Reservations/Commands.Reservations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
21 changes: 18 additions & 3 deletions ...rceManager/Reservations/Commands.Reservations/help/Update-AzureRmReservation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>]
```

Expand Down Expand Up @@ -107,6 +107,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -Name
{{Fill Name Description}}
Copy link
Contributor

@MiYanni MiYanni Sep 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing a description for this parameter.

Copy link
Author

@luluRagdoll luluRagdoll Sep 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Making the change now. :)


```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`

Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Reservations/Commands.Reservations/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>