Skip to content

Commit 7909ef0

Browse files
authored
Merge pull request Azure#5083 from Azure/release-5.1.0
release -> master for azurerm.reservations preview
2 parents e3810d4 + 6f4e2c5 commit 7909ef0

File tree

58 files changed

+4296
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4296
-27
lines changed

TestMappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@
101101
"src/ResourceManager/Resources/": [
102102
".\\src\\ResourceManager\\Resources\\Commands.Resources.Test\\bin\\Debug\\Microsoft.Azure.Commands.Resources.Test.dll"
103103
],
104+
"src/ResourceManager/Reservations/": [
105+
".\\src\\ResourceManager\\Reservations\\Commands.Reservations.Test\\bin\\Debug\\Microsoft.Azure.Commands.Reservations.Test.dll"
106+
],
104107
"src/ResourceManager/Scheduler/": [
105108
".\\src\\ResourceManager\\Scheduler\\Commands.Scheduler.Test\\bin\\Debug\\Microsoft.Azure.Commands.Scheduler.Test.dll"
106109
],

setup/azurecmdfiles.wxi

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,23 @@
11531153
<File Id="filB73F5ED8179D616137D39B3CD8961B58" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Relay\Microsoft.Azure.Management.Relay.dll" />
11541154
</Component>
11551155
</Directory>
1156+
<Directory Id="dirB083EC6D83AC4367D33EB257B3A8A832" Name="AzureRM.Reservations">
1157+
<Component Id="cmp325C5D7E7BFCC111B2335A376E2779D4" Guid="*">
1158+
<File Id="filB827DC440AC145244BDA78F4A4494806" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\AzureRM.Reservations.psd1" />
1159+
</Component>
1160+
<Component Id="cmpD57BA51EBACD7EA7C4CCB584D227077A" Guid="*">
1161+
<File Id="filB28A54014A9277B47377BA89580685BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\AzureRM.Reservations.psm1" />
1162+
</Component>
1163+
<Component Id="cmp6DF24F4A515BA29743DBC75F1085247F" Guid="*">
1164+
<File Id="filE1E5B68E35D0B658BCB8A5473C6113C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.dll" />
1165+
</Component>
1166+
<Component Id="cmp12D613E47A5C3F6A9FC1D1755563A38B" Guid="*">
1167+
<File Id="filEF613C086E8C46888B119F7DB456AEC2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.dll-Help.xml" />
1168+
</Component>
1169+
<Component Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" Guid="*">
1170+
<File Id="filE6A2C1B054ED9FED58AF9D9DA18D5E32" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Reservations\Microsoft.Azure.Commands.Reservations.Format.ps1xml" />
1171+
</Component>
1172+
</Directory>
11561173
<Directory Id="dir5A96CDDC32336B058D325B4B67756080" Name="AzureRM.Resources">
11571174
<Component Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" Guid="*">
11581175
<File Id="fil18CFCEC425A013C7495F980DCB8E0C9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1" />
@@ -3519,6 +3536,11 @@
35193536
<ComponentRef Id="cmp0B1DAE7F253E744037B651E0433683D2" />
35203537
<ComponentRef Id="cmpFFBB02236C61457EE8C736240AF8CC47" />
35213538
<ComponentRef Id="cmpFF97CB337911CDA95213B09CB6142CF4" />
3539+
<ComponentRef Id="cmp325C5D7E7BFCC111B2335A376E2779D4" />
3540+
<ComponentRef Id="cmpD57BA51EBACD7EA7C4CCB584D227077A" />
3541+
<ComponentRef Id="cmp6DF24F4A515BA29743DBC75F1085247F" />
3542+
<ComponentRef Id="cmp12D613E47A5C3F6A9FC1D1755563A38B" />
3543+
<ComponentRef Id="cmp2BF9194ED6E6DCFD7C6CB50346039D80" />
35223544
<ComponentRef Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" />
35233545
<ComponentRef Id="cmpBCC7216D701A02748FD196474BCFFE21" />
35243546
<ComponentRef Id="cmp0C4C37E15F9F4671DEFA34F55D2FC9A8" />
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
#
2+
# Module manifest for module 'AzureRM.Reservations'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 7/17/2017
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.1.0'
16+
17+
# Supported PSEditions
18+
# CompatiblePSEditions = @()
19+
20+
# ID used to uniquely identify this module
21+
GUID = '43d3b085-6323-4ac4-a7c3-81d75ea036e5'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = '(c) 2017 Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = 'Microsoft Azure PowerShell - Reservations service cmdlets for Azure Resource Manager. Manages Reservations, Reservation Orders, and related resources in Azure Resource Manager'
34+
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
PowerShellVersion = '3.0'
37+
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
40+
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
43+
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
DotNetFrameworkVersion = '4.5.2'
46+
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
# CLRVersion = '4.9'
49+
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
52+
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
55+
56+
# Assemblies that must be loaded prior to importing this module
57+
RequiredAssemblies = '.\Microsoft.Azure.Management.Reservations.dll'
58+
59+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60+
# ScriptsToProcess = @()
61+
62+
# Type files (.ps1xml) to be loaded when importing this module
63+
# TypesToProcess = @()
64+
65+
# Format files (.ps1xml) to be loaded when importing this module
66+
FormatsToProcess = '.\Microsoft.Azure.Commands.Reservations.Format.ps1xml'
67+
68+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69+
NestedModules = @('.\Microsoft.Azure.Commands.Reservations.dll')
70+
71+
# 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.
72+
FunctionsToExport = @()
73+
74+
# 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.
75+
CmdletsToExport = 'Get-AzureRmReservationOrder', 'Get-AzureRmReservation', 'Get-AzureRmReservationHistory', 'Update-AzureRmReservation', 'Merge-AzureRmReservation', 'Split-AzureRmReservation', 'Get-AzureRmReservationOrderId', 'Get-AzureRmReservationCatalog'
76+
77+
# Variables to export from this module
78+
VariablesToExport = @()
79+
80+
# 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.
81+
AliasesToExport = @()
82+
83+
# DSC resources to export from this module
84+
# DscResourcesToExport = @()
85+
86+
# List of all modules packaged with this module
87+
# ModuleList = @()
88+
89+
# List of all files packaged with this module
90+
# FileList = @()
91+
92+
# 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.
93+
PrivateData = @{
94+
95+
PSData = @{
96+
97+
# Tags applied to this module. These help with module discovery in online galleries.
98+
Tags = 'Azure','ResourceManager','ARM','Compute','IAAS','VM','VirtualMachine'
99+
100+
# A URL to the license for this module.
101+
LicenseUri = 'https://aka.ms/azps-license'
102+
103+
# A URL to the main website for this project.
104+
ProjectUri = 'https://github.com/Azure/azure-powershell'
105+
106+
# A URL to an icon representing this module.
107+
# IconUri = ''
108+
109+
# ReleaseNotes of this module
110+
ReleaseNotes = 'Initial Release of Reservations cmdlets'
111+
112+
} # End of PSData hashtable
113+
114+
} # End of PrivateData hashtable
115+
116+
# HelpInfo URI of this module
117+
# HelpInfoURI = ''
118+
119+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
120+
# DefaultCommandPrefix = ''
121+
122+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<!--
2+
Please leave this section at the top of the change log.
3+
4+
Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
5+
6+
## Current Release
7+
* Overview of change #1
8+
- Additional information about change #1
9+
* Overview of change #2
10+
- Additional information about change #2
11+
- Additional information about change #2
12+
* Overview of change #3
13+
* Overview of change #4
14+
- Additional information about change #4
15+
16+
## YYYY.MM.DD - Version X.Y.Z (Previous Release)
17+
* Overview of change #1
18+
- Additional information about change #1
19+
-->
20+
## Current Release
21+
* New Cmdlet Get-AzureRmReservationOrder
22+
- cmdlet to retrieve azure reservation order.
23+
* New Cmdlet Get-AzureRmReservation
24+
- cmdlet to retrieve azure reservation within specified reservation order.
25+
* New Cmdlet Get-AzureRmReservationHistory
26+
- cmdlet to retrieve revision history of a reservation.
27+
* New Cmdlet Update-AzureRmReservation
28+
- cmdlet to update applied scope of a reservation.
29+
* New Cmdlet Merge-AzureRmReservation
30+
- cmdlet to merge two reservations into one reservation.
31+
* New Cmdlet Split-AzureRmReservation
32+
- cmdlet to split a reservation into two reservations with specified quantity.
33+
* New Cmdlet Get-AzureRmReservationOrderId
34+
- cmdlet to retrieve list of reservation order ids that are applicable to subscription.
35+
* New Cmdlet Get-AzureRmReservationCatalog
36+
- cmdlet to retrieve available reservation catalog for the subscription.

0 commit comments

Comments
 (0)