Skip to content

Commit 5ae1b18

Browse files
committed
Merge branch 'build' of https://github.com/azure/azure-powershell-pr into dev
2 parents 5ce54c9 + fc73486 commit 5ae1b18

File tree

42 files changed

+1592
-805
lines changed

Some content is hidden

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

42 files changed

+1592
-805
lines changed

ChangeLog.txt

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,25 @@
7777
* Remove-AzureBatchVMUser
7878
* Get-AzureBatchRDPFile
7979
* Get-AzureBatchVMFileContents
80+
* StorSimple: New StorSimple commands in AzureServiceManagement mode
81+
* Added cmdlets
82+
* Confirm-AzureStorSimpleLegacyVolumeContainerStatus
83+
* Get-AzureStorSimpleLegacyVolumeContainerConfirmStatus
84+
* Get-AzureStorSimpleLegacyVolumeContainerMigrationPlan
85+
* Get-AzureStorSimpleLegacyVolumeContainerStatus
86+
* Import-AzureStorSimpleLegacyApplianceConfig
87+
* Import-AzureStorSimpleLegacyVolumeContainer
88+
* Start-AzureStorSimpleLegacyVolumeContainerMigrationPlan
89+
* New-AzureStorSimpleVirtualDeviceCommand
90+
* Get-AzureStorSimpleJob
91+
* Stop-AzureStorSimpleJob
92+
* Start-AzureStorSimpleBackupCloneJob
93+
* Get-AzureStorSimpleFailoverVolumeContainers
94+
* Start-AzureStorSimpleDeviceFailoverJob
95+
* New-AzureStorSimpleNetworkConfig
96+
* Set-AzureStorSimpleDevice
97+
* Set-AzureStorSimpleVirtualDevice
98+
8099

81100
2015.03.31 version 0.8.16
82101
* Azure Data Factory:
@@ -148,9 +167,9 @@
148167
* Set-AzureRemoteAppWorkspace
149168
* Unpublish-AzureRemoteAppProgram
150169
* Update-AzureRemoteAppCollection
151-
170+
152171
* Storage: new cmdlets
153-
* Get-AzureStorageContainerStoredAccessPolicy
172+
* Get-AzureStorageContainerStoredAccessPolicy
154173
* Get-AzureStorageQueueStoredAccessPolicy
155174
* Get-AzureStorageTableStoredAccessPolicy
156175
* New-AzureStorageContainerStoredAccessPolicy
@@ -194,7 +213,7 @@
194213
* Start-AzureSiteRecoveryCommitFailoverJob
195214
* Start-AzureSiteRecoveryPlannedFailoverJob
196215
* Start-AzureSiteRecoveryTestFailoverJob
197-
216+
198217
* Azure ExpressRoute cmdlet updates
199218
* Fixed bugs in:
200219
* New-AzureDedicatedCircuit
@@ -207,12 +226,12 @@
207226
* Update-AzureDedicatedCircuitBandwidth
208227

209228
* Azure SQL Database: new cmdlets for managing database dynamic data masking policies:
210-
* Get-AzureSqlDatabaseDataMaskingPolicy
211-
* Set-AzureSqlDatabaseDataMaskingPolicy
212-
* New-AzureSqlDatabaseDataMaskingRule
213-
* Get-AzureSqlDatabaseDataMaskingRule
214-
* Set-AzureSqlDatabaseDataMaskingRule
215-
* Remove-AzureSqlDatabaseDataMaskingRule
229+
* Get-AzureSqlDatabaseDataMaskingPolicy
230+
* Set-AzureSqlDatabaseDataMaskingPolicy
231+
* New-AzureSqlDatabaseDataMaskingRule
232+
* Get-AzureSqlDatabaseDataMaskingRule
233+
* Set-AzureSqlDatabaseDataMaskingRule
234+
* Remove-AzureSqlDatabaseDataMaskingRule
216235

217236
* Azure Batch: new cmdlets:
218237
* Get-AzureBatchPool
@@ -230,22 +249,22 @@
230249
* Update-AzureDisk
231250
* Set-AzureOSDisk
232251
* Set-AzureDataDisk (DiskName parameter is also added along with ResizedSizeInGB)
233-
234-
* AzureProfile:
252+
253+
* AzureProfile:
235254
* New cmdlets to manage in-memory profiles
236255
* New-AzureProfile: Create a new in-memory Profile
237256
* Select-AzureProfile: Select the profile to be used in the current session
238257
* Added -Profile parameter to every cmdlet - the cmdlet will use the passed-in profile to authenticate with Azure
239-
258+
240259
2015.02.12 version 0.8.14
241260
* StorSimple: New StorSimple commands in AzureServiceManagement mode:
242261
* GetAzureStorSimpleAccessControlRecord
243262
* GetAzureStorSimpleStorageAccountCredential
244263
* RemoveAzureStorSimpleAccessControlRecord
245264
* RemoveAzureStorSimpleStorageAccountCredential
246265
* SetAzureStorSimpleAccessControlRecord
247-
* GetAzureStorSimpleDeviceVolume
248-
* RemoveAzureStorSimpleDeviceVolume
266+
* GetAzureStorSimpleDeviceVolume
267+
* RemoveAzureStorSimpleDeviceVolume
249268
* GetAzureStorSimpleDeviceVolumeContainer
250269
* RemoveAzureStorSimpleDeviceVolumeContainer
251270
* GetAzureStorSimpleDevice
@@ -277,19 +296,19 @@
277296
* ClusterType (update): New value (Spark) can be specified as cluster type
278297
* Add-AzureHDInsightConfigValues cmdlet:
279298
* Spark (new): collection of configuration properties can be passed in to customize the Spark service
280-
299+
281300
* Azure Insights cmdlets in AzureResourceManager Mode:
282301
* Get-AzureCrrelationLogId
283302
* Get-AzureResourceGroupLog
284303
* Get-AzureResourceLog
285304
* Get-AzureResourceProviderLog
286305
* Get-AzureSubscriptionIdLog
287-
306+
288307
* Azure VM cmdlets
289308
* Get-AzureVMDscExtentionStatus: Get the DSC Extension status for a cloud service or VM
290-
309+
291310
* Updates and bug fixes for AzureAutomation and AzureDataFactory cmdlets
292-
311+
293312
2015.01.08 version 0.8.13
294313
* Key Vault Service - new cmdlets in AzureResourceManager mode:
295314
* Keys:
@@ -371,7 +390,7 @@
371390
* Remove-AzureSqlDatabaseServerAuditing
372391
* Use-AzureSqlDatabaseServerAuditingPolicy
373392
* Allow users to define which storage account key (Primary or Secondary) to use when defining audit policy, using the “StorageKeyType” parameter.
374-
393+
375394
2014.10.27 Version 0.8.10
376395
* Azure Data Factory cmdlets in AzureResourceManager mode
377396
* New-AzureDataFactory

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Compute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.4.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Compute, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.5.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
71+
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,131 @@ function Retry-IfException
8383

8484
$ErrorActionPreference = $oldErrorActionPreferenceValue;
8585
}
86+
87+
<#
88+
.SYNOPSIS
89+
Gets random resource name
90+
#>
91+
function Get-RandomItemName
92+
{
93+
param([string] $prefix = "pslibtest")
94+
95+
if ($prefix -eq $null -or $prefix -eq '')
96+
{
97+
$prefix = "pslibtest";
98+
}
99+
100+
$str = $prefix + ((Get-Random) % 10000);
101+
return $str;
102+
}
103+
104+
<#
105+
.SYNOPSIS
106+
Gets default VM size string
107+
#>
108+
function Get-DefaultVMSize
109+
{
110+
param([string] $location = "eastasia")
111+
112+
$vmSizes = Get-AzureVMSize -Location $location | where { $_.NumberOfCores -ge 4 -and $_.MaxDataDiskCount -ge 8 };
113+
114+
foreach ($sz in $vmSizes)
115+
{
116+
if ($sz.Name -eq 'Standard_A3')
117+
{
118+
return $sz.Name;
119+
}
120+
}
121+
122+
return $vmSizes[0].Name;
123+
}
124+
125+
<#
126+
.SYNOPSIS
127+
Gets default RDFE Image
128+
#>
129+
function Get-DefaultRDFEImage
130+
{
131+
param([string] $loca = "East Asia", [string] $query = '*Windows*Data*Center*')
132+
133+
$d = (Azure\Get-AzureVMImage | where {$_.ImageName -like $query -and ($_.Location -like "*;$loca;*" -or $_.Location -like "$loca;*" -or $_.Location -like "*;$loca" -or $_.Location -eq "$loca")});
134+
135+
if ($d -eq $null)
136+
{
137+
return $null;
138+
}
139+
else
140+
{
141+
return $d[-1].ImageName;
142+
}
143+
}
144+
145+
<#
146+
.SYNOPSIS
147+
Gets default RDFE Image
148+
#>
149+
function Get-DefaultCRPImage
150+
{
151+
param([string] $loca = "eastasia", [string] $query = '*Microsoft*Windows*Server')
152+
153+
$result = (Get-AzureVMImagePublisher -Location $loc).Resources | select -ExpandProperty Name | where { $_ -like $query };
154+
if ($result.Count -eq 1)
155+
{
156+
$defaultPublisher = $result;
157+
}
158+
else
159+
{
160+
$defaultPublisher = $result[0];
161+
}
162+
163+
$result = (Get-AzureVMImageOffer -Location $loc -PublisherName $defaultPublisher).Resources | select -ExpandProperty Name | where { $_ -like '*Windows*' };
164+
if ($result.Count -eq 1)
165+
{
166+
$defaultOffer = $result;
167+
}
168+
else
169+
{
170+
$defaultOffer = $result[0];
171+
}
172+
173+
$result = (Get-AzureVMImageSku -Location $loc -PublisherName $defaultPublisher -Offer $defaultOffer).Resources | select -ExpandProperty Name;
174+
if ($result.Count -eq 1)
175+
{
176+
$defaultSku = $result;
177+
}
178+
else
179+
{
180+
$defaultSku = $result[0];
181+
}
182+
183+
$result = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku).Resources | select -ExpandProperty Name;
184+
if ($result.Count -eq 1)
185+
{
186+
$defaultVersion = $result;
187+
}
188+
else
189+
{
190+
$defaultVersion = $result[0];
191+
}
192+
193+
$vmimg = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion).VirtualMachineImage;
194+
195+
return $vmimg;
196+
}
197+
198+
<#
199+
.SYNOPSIS
200+
Gets default VM config object
201+
#>
202+
function Get-DefaultVMConfig
203+
{
204+
param([string] $location = "eastasia")
205+
206+
# VM Profile & Hardware
207+
$vmsize = Get-DefaultVMSize $location;
208+
$vmname = Get-RandomItemName 'pstestvm';
209+
210+
$vm = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
211+
212+
return $vm;
213+
}

0 commit comments

Comments
 (0)