Skip to content

Commit 529bf98

Browse files
author
dragonfly91
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into csp-artemis
2 parents 50d4a05 + 0bfed89 commit 529bf98

File tree

128 files changed

+16884
-35133
lines changed

Some content is hidden

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

128 files changed

+16884
-35133
lines changed

‎ChangeLog.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
2015.06.26 version 0.9.4
1+
2015.07.16 version 0.9.5
2+
* Azure Resource Manager cmdlets
3+
* Fixed formatting of output for Get-UsageAggregates
4+
* Fixed executing Get-UsageAggregates when first cmdlet being called.
5+
6+
2015.06.26 version 0.9.4
27
* Azure Compute cmdlets
38
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
49
* Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.

‎setup/azurecmdfiles.wxi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,9 @@
19711971
<Component Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" Guid="*">
19721972
<File Id="fil6BEF4AE37C0AABC1B6EBEACFDFB23EBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll-help.xml" />
19731973
</Component>
1974+
<Component Id="cmp80B3B24F9A3A790A05C246BA35BC4CBF" Guid="*">
1975+
<File Id="filACE274AC35AA5600A8F61AE49EC78C0B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml" />
1976+
</Component>
19741977
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
19751978
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
19761979
</Component>
@@ -1980,12 +1983,24 @@
19801983
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
19811984
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
19821985
</Component>
1986+
<Component Id="cmpA849272131D48ACDB328AADE88D46F94" Guid="*">
1987+
<File Id="filCB361D3ED09FBADBBCCA61AC7A06F1EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.NetFramework.dll" />
1988+
</Component>
19831989
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
19841990
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
19851991
</Component>
19861992
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
19871993
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
19881994
</Component>
1995+
<Component Id="cmp7EC3065EACCFD185870797E632082CB5" Guid="*">
1996+
<File Id="filF4B52A293DA3B924B307F34291F94688" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.dll" />
1997+
</Component>
1998+
<Component Id="cmpB16C1C39D3052C569FE5F5FB1F82B414" Guid="*">
1999+
<File Id="fil769A7DB3B847B2D79C218B29ED739755" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
2000+
</Component>
2001+
<Component Id="cmp6216B2195FBA80FCFFB97D4A49B87A39" Guid="*">
2002+
<File Id="filC4353646202A99F67A7F9A863618C734" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Threading.Tasks.Extensions.dll" />
2003+
</Component>
19892004
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
19902005
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
19912006
</Component>
@@ -4663,11 +4678,16 @@
46634678
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
46644679
<ComponentRef Id="cmp5A40221EF4E95DD5D56060852B14EE3B" />
46654680
<ComponentRef Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" />
4681+
<ComponentRef Id="cmp80B3B24F9A3A790A05C246BA35BC4CBF" />
46664682
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
46674683
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
46684684
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
4685+
<ComponentRef Id="cmpA849272131D48ACDB328AADE88D46F94" />
46694686
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
46704687
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
4688+
<ComponentRef Id="cmp7EC3065EACCFD185870797E632082CB5" />
4689+
<ComponentRef Id="cmpB16C1C39D3052C569FE5F5FB1F82B414" />
4690+
<ComponentRef Id="cmp6216B2195FBA80FCFFB97D4A49B87A39" />
46714691
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
46724692
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
46734693
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />

‎src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Batch">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.3.0-preview\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.4.0\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.ResourceManager">
7171
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>

‎src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.ps1

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,17 @@ function Test-GetBatchAccountsUnderResourceGroups
138138
$account11 = Get-BatchAccountName
139139
$account12 = Get-BatchAccountName
140140
$account21 = Get-BatchAccountName
141-
$location = Get-BatchAccountProviderLocation
141+
$location1 = Get-BatchAccountProviderLocation
142+
$location2 = Get-BatchAccountProviderLocation 1
143+
$location3 = Get-BatchAccountProviderLocation 2
142144

143145
try
144146
{
145-
New-AzureResourceGroup -Name $resourceGroup1 -Location $location
146-
New-AzureResourceGroup -Name $resourceGroup2 -Location $location
147-
New-AzureBatchAccount -Name $account11 -ResourceGroupName $resourceGroup1 -Location $location
148-
New-AzureBatchAccount -Name $account12 -ResourceGroupName $resourceGroup1 -Location $location
149-
New-AzureBatchAccount -Name $account21 -ResourceGroupName $resourceGroup2 -Location $location
147+
New-AzureResourceGroup -Name $resourceGroup1 -Location $location1
148+
New-AzureResourceGroup -Name $resourceGroup2 -Location $location1
149+
New-AzureBatchAccount -Name $account11 -ResourceGroupName $resourceGroup1 -Location $location1
150+
New-AzureBatchAccount -Name $account12 -ResourceGroupName $resourceGroup1 -Location $location2
151+
New-AzureBatchAccount -Name $account21 -ResourceGroupName $resourceGroup2 -Location $location3
150152

151153
# Test
152154
$allAccounts = Get-AzureBatchAccount | Where-Object {$_.ResourceGroupName -eq $resourceGroup1 -or $_.ResourceGroupName -eq $resourceGroup2}
@@ -177,15 +179,16 @@ function Test-CreateAndRemoveBatchAccountViaPiping
177179
$account1 = Get-BatchAccountName
178180
$account2 = Get-BatchAccountName
179181
$resourceGroup = Get-ResourceGroupName
180-
$location = Get-BatchAccountProviderLocation
182+
$location1 = Get-BatchAccountProviderLocation
183+
$location2 = Get-BatchAccountProviderLocation 1
181184

182185
try
183186
{
184-
New-AzureResourceGroup -Name $resourceGroup -Location $location
187+
New-AzureResourceGroup -Name $resourceGroup -Location $location1
185188

186189
# Test
187-
New-AzureBatchAccount -Name $account1 -ResourceGroupName $resourceGroup -Location $location
188-
New-AzureBatchAccount -Name $account2 -ResourceGroupName $resourceGroup -Location $location
190+
New-AzureBatchAccount -Name $account1 -ResourceGroupName $resourceGroup -Location $location1
191+
New-AzureBatchAccount -Name $account2 -ResourceGroupName $resourceGroup -Location $location2
189192
Get-AzureBatchAccount | where {$_.AccountName -eq $account1 -or $_.AccountName -eq $account2} | Remove-AzureBatchAccount -Force
190193

191194
# Assert

‎src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/Common.ps1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function Get-ResourceGroupName
3434
.SYNOPSIS
3535
Gets the location for the Batch account provider. Default to West US if none found.
3636
#>
37-
function Get-BatchAccountProviderLocation
37+
function Get-BatchAccountProviderLocation($index)
3838
{
3939
$location = Get-AzureLocation | where {$_.Name -eq "Microsoft.Batch/batchAccounts"}
4040
if ($location -eq $null)
@@ -43,7 +43,14 @@ function Get-BatchAccountProviderLocation
4343
}
4444
else
4545
{
46-
$location.Locations[0]
46+
if ($index -eq $null)
47+
{
48+
$location.Locations[0]
49+
}
50+
else
51+
{
52+
$location.Locations[$index]
53+
}
4754
}
4855
}
4956

‎src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/FileTests.cs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,11 @@ namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
2828
{
2929
public class FileTests
3030
{
31-
// NOTE: To save time on VM allocation when recording, these tests assume the following:
32-
// - A Batch account named 'filetests' exists under the subscription being used for recording.
33-
// - The following commands were run to create a pool, and all 3 VMs are allocated:
34-
// $context = Get-AzureBatchAccountKeys "filetests"
35-
// $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
36-
// $startTask.CommandLine = "cmd /c echo hello"
37-
// New-AzureBatchPool -Name "testPool" -VMSize "small" -OSFamily "4" -TargetOSVersion "*" -TargetDedicated 3 -StartTask $startTask -BatchContext $context
38-
39-
private const string accountName = "filetests";
40-
private const string poolName = "testPool";
41-
private const string vmName = "tvm-1900272697_1-20150331t200107z"; // Use the following command to get a VM name: (Get-AzureBatchVM -PoolName "testPool" -BatchContext $context)[0].Name
42-
private const string startTaskStdOutName = "startup\\stdout.txt";
43-
private const string startTaskStdOutContent = "hello";
31+
private const string accountName = ScenarioTestHelpers.SharedAccount;
32+
private const string poolName = ScenarioTestHelpers.SharedPool;
33+
private const string vmName = ScenarioTestHelpers.SharedPoolVM;
34+
private const string startTaskStdOutName = ScenarioTestHelpers.SharedPoolStartTaskStdOut;
35+
private const string startTaskStdOutContent = ScenarioTestHelpers.SharedPoolStartTaskStdOutContent;
4436

4537
[Fact]
4638
[Trait(Category.AcceptanceType, Category.CheckIn)]

0 commit comments

Comments
 (0)