Skip to content

release -> master for azurerm.reservations preview #5083

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.

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
merged 19 commits into from
Dec 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions TestMappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
"src/ResourceManager/Resources/": [
".\\src\\ResourceManager\\Resources\\Commands.Resources.Test\\bin\\Debug\\Microsoft.Azure.Commands.Resources.Test.dll"
],
"src/ResourceManager/Reservations/": [
".\\src\\ResourceManager\\Reservations\\Commands.Reservations.Test\\bin\\Debug\\Microsoft.Azure.Commands.Reservations.Test.dll"
],
"src/ResourceManager/Scheduler/": [
".\\src\\ResourceManager\\Scheduler\\Commands.Scheduler.Test\\bin\\Debug\\Microsoft.Azure.Commands.Scheduler.Test.dll"
],
Expand Down
22 changes: 22 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,23 @@
<File Id="filB73F5ED8179D616137D39B3CD8961B58" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Relay\Microsoft.Azure.Management.Relay.dll" />
</Component>
</Directory>
<Directory Id="dirB083EC6D83AC4367D33EB257B3A8A832" Name="AzureRM.Reservations">
<Component Id="cmp325C5D7E7BFCC111B2335A376E2779D4" Guid="*">
<File Id="filB827DC440AC145244BDA78F4A4494806" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\AzureRM.Reservations.psd1" />
</Component>
<Component Id="cmpD57BA51EBACD7EA7C4CCB584D227077A" Guid="*">
<File Id="filB28A54014A9277B47377BA89580685BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\AzureRM.Reservations.psm1" />
</Component>
<Component Id="cmp6DF24F4A515BA29743DBC75F1085247F" Guid="*">
<File Id="filE1E5B68E35D0B658BCB8A5473C6113C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.dll" />
</Component>
<Component Id="cmp12D613E47A5C3F6A9FC1D1755563A38B" Guid="*">
<File Id="filEF613C086E8C46888B119F7DB456AEC2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.dll-Help.xml" />
</Component>
<Component Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" Guid="*">
<File Id="filE6A2C1B054ED9FED58AF9D9DA18D5E32" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.Format.ps1xml" />
</Component>
</Directory>
<Directory Id="dir5A96CDDC32336B058D325B4B67756080" Name="AzureRM.Resources">
<Component Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" Guid="*">
<File Id="fil18CFCEC425A013C7495F980DCB8E0C9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1" />
Expand Down Expand Up @@ -3519,6 +3536,11 @@
<ComponentRef Id="cmp0B1DAE7F253E744037B651E0433683D2" />
<ComponentRef Id="cmpFFBB02236C61457EE8C736240AF8CC47" />
<ComponentRef Id="cmpFF97CB337911CDA95213B09CB6142CF4" />
<ComponentRef Id="cmp325C5D7E7BFCC111B2335A376E2779D4" />
<ComponentRef Id="cmpD57BA51EBACD7EA7C4CCB584D227077A" />
<ComponentRef Id="cmp6DF24F4A515BA29743DBC75F1085247F" />
<ComponentRef Id="cmp12D613E47A5C3F6A9FC1D1755563A38B" />
<ComponentRef Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" />
<ComponentRef Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" />
<ComponentRef Id="cmpBCC7216D701A02748FD196474BCFFE21" />
<ComponentRef Id="cmp0C4C37E15F9F4671DEFA34F55D2FC9A8" />
Expand Down
122 changes: 122 additions & 0 deletions src/ResourceManager/Reservations/AzureRM.Reservations.psd1
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
#
# Module manifest for module 'AzureRM.Reservations'
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/17/2017
#

@{

# Script module or binary module file associated with this manifest.
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.1.0'

# Supported PSEditions
# CompatiblePSEditions = @()

# ID used to uniquely identify this module
GUID = '43d3b085-6323-4ac4-a7c3-81d75ea036e5'

# Author of this module
Author = 'Microsoft Corporation'

# Company or vendor of this module
CompanyName = 'Microsoft Corporation'

# Copyright statement for this module
Copyright = '(c) 2017 Microsoft Corporation. All rights reserved.'

# Description of the functionality provided by this module
Description = 'Microsoft Azure PowerShell - Reservations service cmdlets for Azure Resource Manager. Manages Reservations, Reservation Orders, and related resources in Azure Resource Manager'

# Minimum version of the Windows PowerShell engine required by this module
PowerShellVersion = '3.0'

# Name of the Windows PowerShell host required by this module
# PowerShellHostName = ''

# Minimum version of the Windows PowerShell host required by this module
# PowerShellHostVersion = ''

# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
DotNetFrameworkVersion = '4.5.2'

# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
# CLRVersion = '4.9'

# Processor architecture (None, X86, Amd64) required by this module
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.Reservations.dll'

# Script files (.ps1) that are run in the caller's environment prior to importing this module.
# ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
# TypesToProcess = @()

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = '.\Microsoft.Azure.Commands.Reservations.Format.ps1xml'

# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
NestedModules = @('.\Microsoft.Azure.Commands.Reservations.dll')

# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
FunctionsToExport = @()

# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
CmdletsToExport = 'Get-AzureRmReservationOrder', 'Get-AzureRmReservation', 'Get-AzureRmReservationHistory', 'Update-AzureRmReservation', 'Merge-AzureRmReservation', 'Split-AzureRmReservation', 'Get-AzureRmReservationOrderId', 'Get-AzureRmReservationCatalog'

# Variables to export from this module
VariablesToExport = @()

# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
AliasesToExport = @()

# DSC resources to export from this module
# DscResourcesToExport = @()

# List of all modules packaged with this module
# ModuleList = @()

# List of all files packaged with this module
# FileList = @()

# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
PrivateData = @{

PSData = @{

# Tags applied to this module. These help with module discovery in online galleries.
Tags = 'Azure','ResourceManager','ARM','Compute','IAAS','VM','VirtualMachine'

# A URL to the license for this module.
LicenseUri = 'https://aka.ms/azps-license'

# A URL to the main website for this project.
ProjectUri = 'https://github.com/Azure/azure-powershell'

# A URL to an icon representing this module.
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = 'Initial Release of Reservations cmdlets'

} # End of PSData hashtable

} # End of PrivateData hashtable

# HelpInfo URI of this module
# HelpInfoURI = ''

# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
# DefaultCommandPrefix = ''

}
36 changes: 36 additions & 0 deletions src/ResourceManager/Reservations/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!--
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:

## Current Release
* Overview of change #1
- Additional information about change #1
* Overview of change #2
- Additional information about change #2
- Additional information about change #2
* Overview of change #3
* Overview of change #4
- Additional information about change #4

## YYYY.MM.DD - Version X.Y.Z (Previous Release)
* Overview of change #1
- Additional information about change #1
-->
## Current Release
* New Cmdlet Get-AzureRmReservationOrder
- cmdlet to retrieve azure reservation order.
* New Cmdlet Get-AzureRmReservation
- cmdlet to retrieve azure reservation within specified reservation order.
* New Cmdlet Get-AzureRmReservationHistory
- cmdlet to retrieve revision history of a reservation.
* New Cmdlet Update-AzureRmReservation
- cmdlet to update applied scope of a reservation.
* New Cmdlet Merge-AzureRmReservation
- cmdlet to merge two reservations into one reservation.
* New Cmdlet Split-AzureRmReservation
- cmdlet to split a reservation into two reservations with specified quantity.
* 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.
Loading