Skip to content

updates for usageaggregates cmdlet #574

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
ogail merged 9 commits into from
Jul 9, 2015
Merged

updates for usageaggregates cmdlet #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7477593
initial update
Matt-Westphal Jun 30, 2015
4040050
fixed error with quantity
Matt-Westphal Jun 30, 2015
1581015
updated help file and deployment for UsageAggregates
Matt-Westphal Jul 1, 2015
04e14ea
Update the project file to include missing references needed at runti…
Matt-Westphal Jul 1, 2015
eb136ad
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
Matt-Westphal Jul 8, 2015
8e1fd4d
Added changelog info for usageaggregates changes
Matt-Westphal Jul 8, 2015
a6da683
removed added line from .gitignore
Matt-Westphal Jul 9, 2015
3db09a3
update packages for UsageAggregates
Matt-Westphal Jul 9, 2015
5eb73a8
project file updates for UsageAggregates
Matt-Westphal Jul 9, 2015
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
7 changes: 6 additions & 1 deletion ChangeLog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
2015.06.26 version 0.9.4
2015.07.16 version 0.9.5
* Azure Resource Manager cmdlets
* Fixed formatting of output for Get-UsageAggregates
* Fixed executing Get-UsageAggregates when first cmdlet being called.

2015.06.26 version 0.9.4
* Azure Compute cmdlets
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
* Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.
Expand Down
20 changes: 20 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,9 @@
<Component Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" Guid="*">
<File Id="fil6BEF4AE37C0AABC1B6EBEACFDFB23EBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll-help.xml" />
</Component>
<Component Id="cmp80B3B24F9A3A790A05C246BA35BC4CBF" Guid="*">
<File Id="filACE274AC35AA5600A8F61AE49EC78C0B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml" />
</Component>
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
</Component>
Expand All @@ -1903,12 +1906,24 @@
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmpA849272131D48ACDB328AADE88D46F94" Guid="*">
<File Id="filCB361D3ED09FBADBBCCA61AC7A06F1EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmp7EC3065EACCFD185870797E632082CB5" Guid="*">
<File Id="filF4B52A293DA3B924B307F34291F94688" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.dll" />
</Component>
<Component Id="cmpB16C1C39D3052C569FE5F5FB1F82B414" Guid="*">
<File Id="fil769A7DB3B847B2D79C218B29ED739755" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
</Component>
<Component Id="cmp6216B2195FBA80FCFFB97D4A49B87A39" Guid="*">
<File Id="filC4353646202A99F67A7F9A863618C734" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.Extensions.dll" />
</Component>
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
Expand Down Expand Up @@ -4549,11 +4564,16 @@
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
<ComponentRef Id="cmp5A40221EF4E95DD5D56060852B14EE3B" />
<ComponentRef Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" />
<ComponentRef Id="cmp80B3B24F9A3A790A05C246BA35BC4CBF" />
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
<ComponentRef Id="cmpA849272131D48ACDB328AADE88D46F94" />
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
<ComponentRef Id="cmp7EC3065EACCFD185870797E632082CB5" />
<ComponentRef Id="cmpB16C1C39D3052C569FE5F5FB1F82B414" />
<ComponentRef Id="cmp6216B2195FBA80FCFFB97D4A49B87A39" />
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />
Expand Down
2 changes: 1 addition & 1 deletion ...sourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commerce.UsageAggregates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
Expand Down
17 changes: 16 additions & 1 deletion src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commerce.UsageAggregates">
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -52,6 +52,9 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<Private>True</Private>
Expand All @@ -60,6 +63,15 @@
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions">
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
Expand All @@ -86,6 +98,9 @@
</ItemGroup>
<ItemGroup>
<None Include="Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1" />
<Content Include="Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="TestTheCmdLet.ps1" />
Expand Down
60 changes: 60 additions & 0 deletions .../Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8" ?>
<Configuration>
<ViewDefinitions>
<View>
<Name>Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregationGetResponse</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregationGetResponse</TypeName>
</ViewSelectedBy>
<ListControl>
<ListEntries>
<ListEntry>
<ListItems>
<ListItem>
<Label>Usage</Label>
<ScriptBlock>$_.UsageAggregations | Format-Table | Out-String</ScriptBlock>
</ListItem>
</ListItems>
</ListEntry>
</ListEntries>
</ListControl>
</View>
<View>
<Name>Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregation</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregation</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>MeterCategory</Label>
<Alignment>Left</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>MeterName</Label>
<Alignment>Left</Alignment>
</TableColumnHeader>
<TableColumnHeader>
<Label>Quantity</Label>
<Alignment>Left</Alignment>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<ScriptBlock>$_.Properties.MeterCategory</ScriptBlock>
</TableColumnItem>
<TableColumnItem>
<ScriptBlock>$_.Properties.MeterName</ScriptBlock>
</TableColumnItem>
<TableColumnItem>
<ScriptBlock>$_.Properties.Quantity.ToString() + ' ' + $_.Properties.Unit</ScriptBlock>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
</ViewDefinitions>
</Configuration>
9 changes: 5 additions & 4 deletions ...r/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso
<maml:description/>
</dev:type>
<maml:description>
<maml:para />
<maml:para>
</maml:para>
</maml:description>
</command:inputType>
</command:inputTypes>
Expand All @@ -162,7 +163,8 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso
<maml:description/>
</dev:type>
<maml:description>
<maml:para />
<maml:para>
</maml:para>
</maml:description>
</command:returnValue>
</command:returnValues>
Expand All @@ -180,8 +182,7 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>PS C:\&gt;Set-AzureSubscription -SubscriptionId $subscription
PS C:\&gt;Get-UsageAggregates -ReportedStartTime &quot;5/2/2015&quot; -ReportedEndTime &quot;5/5/2015&quot;</dev:code>
<dev:code>PS C:\&gt;Get-UsageAggregates -ReportedStartTime &quot;5/2/2015&quot; -ReportedEndTime &quot;5/5/2015&quot;</dev:code>
<dev:remarks>
<maml:para>The final command retrieves the usage data for the subscription for the specificed dates of 5/2/2015 and 5/5/2015.</maml:para>
<maml:para />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
Expand Down