Skip to content

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

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

Closed
luluRagdoll wants to merge 5 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b9bda
Merge pull request #6903 from cheguv/preview
Aug 28, 2018
c765bcb
Reservations RP 2018-06-01: New CosmosDb type in reserved resource ty…
dorislewisbjtu Sep 4, 2018
89f516d
Reservations RP 2018-06-01: Add CosmosDb in reserved resource enum ty…
dorislewisbjtu Sep 4, 2018
f6e5495
Fix build issue
dorislewisbjtu Sep 5, 2018
a4095c7
Fix build issue
dorislewisbjtu Sep 5, 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 ...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 -Location westus
Foreach ($item in $catalog)
{
Assert-NotNull $item.ResourceType
Assert-NotNull $item.Name
Assert-True { $item.Terms.Count -gt 0 }
Assert-True { $item.Locations.Count -gt 0 }
}
}

<#
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
4 changes: 4 additions & 0 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 @@ -43,6 +43,10 @@ public class PatchReservation : AzureReservationsCmdletBase
[ValidateNotNullOrEmpty]
public string InstanceFlexibility { get; set; }

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

[Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,
Mandatory = true,
ValueFromPipeline = true)]
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
10 changes: 5 additions & 5 deletions ...sourceManager/Reservations/Commands.Reservations/help/Get-AzureRmReservation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Get specific `Reservation` details.
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -70,7 +70,7 @@ Accept wildcard characters: False
Id of the `Reservation` to look at

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -85,7 +85,7 @@ Accept wildcard characters: False
Pipe object parameter for `ReservationOrder`

```yaml
Type: Microsoft.Azure.Commands.Reservations.Models.PSReservationOrder
Type: PSReservationOrder
Parameter Sets: PipeObject
Aliases:

Expand All @@ -100,7 +100,7 @@ Accept wildcard characters: False
Id of the `ReservationOrder` that contains the `Reservation`. Required.

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -115,7 +115,7 @@ Accept wildcard characters: False
Pipe object parameter for `ReservationOrder`

```yaml
Type: Microsoft.Azure.Commands.Reservations.Models.PSReservationOrderPage
Type: PSReservationOrderPage
Parameter Sets: PagePipeObject
Aliases:

Expand Down
8 changes: 4 additions & 4 deletions ...anager/Reservations/Commands.Reservations/help/Get-AzureRmReservationCatalog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Get the SuseLinux catalog for the specified subscription
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Specifies the location of the reserved resources in the catalog

```yaml
Type: System.String
Type: String
Parameter Sets: (All)
Aliases:

Expand All @@ -72,7 +72,7 @@ Accept wildcard characters: False
Specifies the type of the reserved resources in the catalog

```yaml
Type: System.String
Type: String
Parameter Sets: (All)
Aliases:

Expand All @@ -87,7 +87,7 @@ Accept wildcard characters: False
Id of the subscription

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: (All)
Aliases:

Expand Down
8 changes: 4 additions & 4 deletions ...anager/Reservations/Commands.Reservations/help/Get-AzureRmReservationHistory.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Get the revision history of the specific reservation
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Pipe object parameter for `Reservation`s

```yaml
Type: Microsoft.Azure.Commands.Reservations.Models.PSReservation
Type: PSReservation
Parameter Sets: PipeObject
Aliases:

Expand All @@ -72,7 +72,7 @@ Accept wildcard characters: False
ReservationId of the `Reservation` of which history is to be shown

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -87,7 +87,7 @@ Accept wildcard characters: False
ReservationOrderId for the `ReservationOrder` that contains the `Reservation`

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand Down
4 changes: 2 additions & 2 deletions ...eManager/Reservations/Commands.Reservations/help/Get-AzureRmReservationOrder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Get `ReservationOrder` with the specified ReservationOrderId
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Id of the specific ReservationOrder that user wants to see

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: (All)
Aliases:

Expand Down
4 changes: 2 additions & 2 deletions ...anager/Reservations/Commands.Reservations/help/Get-AzureRmReservationOrderId.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Get applied `ReservationOrder` for specified subscription
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Id of the subscription to get the applied `ReservationOrder`s

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: (All)
Aliases:

Expand Down
12 changes: 6 additions & 6 deletions ...urceManager/Reservations/Commands.Reservations/help/Merge-AzureRmReservation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Merge the two specified `Reservation`s into one `Reservation`
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Comma-separated strings of two ReservationIds to merge

```yaml
Type: Microsoft.Azure.Commands.Reservations.Models.PSReservation[]
Type: PSReservation[]
Parameter Sets: PipeObject
Aliases:

Expand All @@ -72,7 +72,7 @@ Accept wildcard characters: False
ReservationOrderId for the `ReservationOrder` that contains the two `Reservation`s

```yaml
Type: System.Guid[]
Type: Guid[]
Parameter Sets: CommandLine
Aliases:

Expand All @@ -87,7 +87,7 @@ Accept wildcard characters: False
{{Fill ReservationOrderId Description}}

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -102,7 +102,7 @@ Accept wildcard characters: False
Prompts you for confirmation before running the cmdlet.

```yaml
Type: System.Management.Automation.SwitchParameter
Type: SwitchParameter
Parameter Sets: (All)
Aliases: cf

Expand All @@ -117,7 +117,7 @@ Accept wildcard characters: False
Shows what would happen if the cmdlet runs. The cmdlet is not run.

```yaml
Type: System.Management.Automation.SwitchParameter
Type: SwitchParameter
Parameter Sets: (All)
Aliases: wi

Expand Down
14 changes: 7 additions & 7 deletions ...urceManager/Reservations/Commands.Reservations/help/Split-AzureRmReservation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Split the specified `Reservation` into two `Reservation`s with the corresponding
The credentials, account, tenant, and subscription used for communication with Azure.

```yaml
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
Type: IAzureContextContainer
Parameter Sets: (All)
Aliases: AzureRmContext, AzureCredential

Expand All @@ -57,7 +57,7 @@ Accept wildcard characters: False
Comma-separated integers for quantity field of the two `Reservation`s

```yaml
Type: System.Int32[]
Type: Int32[]
Parameter Sets: (All)
Aliases:

Expand All @@ -72,7 +72,7 @@ Accept wildcard characters: False
Pipe object parameter for `Reservation`

```yaml
Type: Microsoft.Azure.Commands.Reservations.Models.PSReservation
Type: PSReservation
Parameter Sets: PipeObject
Aliases:

Expand All @@ -87,7 +87,7 @@ Accept wildcard characters: False
Id of the `Reservation` to split

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -102,7 +102,7 @@ Accept wildcard characters: False
Id of the `ReservationOrder` that contains the `Reservation` that user wants to split

```yaml
Type: System.Guid
Type: Guid
Parameter Sets: CommandLine
Aliases:

Expand All @@ -117,7 +117,7 @@ Accept wildcard characters: False
Prompts you for confirmation before running the cmdlet.

```yaml
Type: System.Management.Automation.SwitchParameter
Type: SwitchParameter
Parameter Sets: (All)
Aliases: cf

Expand All @@ -132,7 +132,7 @@ Accept wildcard characters: False
Shows what would happen if the cmdlet runs. The cmdlet is not run.

```yaml
Type: System.Management.Automation.SwitchParameter
Type: SwitchParameter
Parameter Sets: (All)
Aliases: wi

Expand Down
Loading