Skip to content

Commit 4e03822

Browse files
huangpfhuangpf
committed
Merge pull request #18 from Azure/build
u
2 parents cab67c9 + a50b729 commit 4e03822

File tree

7 files changed

+779
-469
lines changed

7 files changed

+779
-469
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function Test-VirtualMachineProfile
8080
$custom = "echo 'Hello World'";
8181
$encodedCustom = "ZWNobyAnSGVsbG8gV29ybGQn";
8282

83-
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -CustomData $custom -WinRMHttp -WinRMHttps -WinRMCertUrl $winRMCertUrl -ProvisionVMAgent -EnableAutoUpdate -TimeZone $timeZone;
83+
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -CustomData $custom -WinRMHttp -WinRMHttps -WinRMCertificateUrl $winRMCertUrl -ProvisionVMAgent -EnableAutoUpdate -TimeZone $timeZone;
8484
$p = Set-AzureVMSourceImage -VM $p -Name $img;
8585
$subid = (Get-AzureSubscription -Current).SubscriptionId;
8686

‎src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,7 @@
12841284
• Standard_ZRS (Zone-redundant storage)
12851285
• Standard_GRS (Geo-redundant storage)
12861286
• Standard_RAGRS (Read access geo-redundant storage)
1287+
• Premium_LRS (Premium locally-redundant storage)
12871288
</maml:para>
12881289
</maml:description>
12891290
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -1330,6 +1331,7 @@
13301331
• Standard_ZRS (Zone-redundant storage)
13311332
• Standard_GRS (Geo-redundant storage)
13321333
• Standard_RAGRS (Read access geo-redundant storage)
1334+
• Premium_LRS (Premium locally-redundant storage)
13331335
</maml:para>
13341336
</maml:description>
13351337
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -1390,7 +1392,7 @@
13901392
<maml:introduction>
13911393
<maml:para></maml:para>
13921394
</maml:introduction>
1393-
<dev:code>PS C:\&gt; New-AzureStorageAccount -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -Location &quot;US West&quot; -AccountType &quot;Standard_GRS&quot;</dev:code>
1395+
<dev:code>PS C:\&gt; New-AzureStorageAccount -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -Location &quot;West US&quot; -AccountType &quot;Standard_GRS&quot;</dev:code>
13941396
<dev:remarks>
13951397
<maml:para></maml:para>
13961398
</dev:remarks>
@@ -2687,13 +2689,14 @@ New-AzureStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountName
26872689
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="2">
26882690
<maml:name>Type</maml:name>
26892691
<maml:description>
2690-
<maml:para>Specifies the account type of the storage account. One of four options:
2692+
<maml:para>Specifies the account type of the storage account. One of five options:
26912693
• Standard_LRS (Locally-redundant storage)
26922694
• Standard_GRS (Geo-redundant storage)
26932695
• Standard_RAGRS (Read access geo-redundant storage)
2694-
• Standard_ZRS
2696+
• Standard_ZRS (Zone-redundant storage)
2697+
• Premium_LRS (Premium locally-redundant storage)
26952698

2696-
Note that Standard_ZRS accounts cannot be changed to other account types, and other account types cannot be changed to Standard_ZRS.</maml:para>
2699+
Note that Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and other account types cannot be changed to Standard_ZRS or Premium_LRS.</maml:para>
26972700
</maml:description>
26982701
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
26992702
</command:parameter>
@@ -2782,13 +2785,14 @@ New-AzureStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountName
27822785
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="2">
27832786
<maml:name>Type</maml:name>
27842787
<maml:description>
2785-
<maml:para>Specifies the account type of the storage account. One of four options:
2788+
<maml:para>Specifies the account type of the storage account. One of five options:
27862789
• Standard_LRS (Locally-redundant storage)
27872790
• Standard_GRS (Geo-redundant storage)
27882791
• Standard_RAGRS (Read access geo-redundant storage)
2789-
• Standard_ZRS
2792+
• Standard_ZRS (Zone-redundant storage)
2793+
• Premium_LRS (Premium locally-redundant storage)
27902794

2791-
Note that Standard_ZRS accounts cannot be changed to other account types, and other account types cannot be changed to Standard_ZRS.</maml:para>
2795+
Note that Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and other account types cannot be changed to Standard_ZRS or Premium_LRS.</maml:para>
27922796
</maml:description>
27932797
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
27942798
<dev:type>

‎src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOperatingSystemCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public class SetAzureVMOperatingSystemCommand : AzurePSCmdlet
135135
ValueFromPipelineByPropertyName = true,
136136
HelpMessage = "Url for WinRM certificate")]
137137
[ValidateNotNullOrEmpty]
138-
public Uri WinRMCertUrl { get; set; }
138+
public Uri WinRMCertificateUrl { get; set; }
139139

140140
// Linux Parameter Sets
141141
[Parameter(
@@ -201,7 +201,7 @@ public override void ExecuteCmdlet()
201201
listenerList.Add(new WinRMListener
202202
{
203203
Protocol = ProtocolTypes.Https,
204-
CertificateUrl = this.WinRMCertUrl,
204+
CertificateUrl = this.WinRMCertificateUrl,
205205
});
206206
}
207207

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15204,11 +15204,12 @@ New-AzureDeployment -ServiceName $cloudSvc -Slot Production -Package $pkg -Confi
1520415204
Standard_ZRS
1520515205
Standard_GRS
1520615206
Standard_RAGRS
15207+
Premium_LRS
1520715208

1520815209
If this parameter is not specified, a default value of Standard_GRS is used
1520915210

1521015211
Note:
15211-
Standard_ZRS accounts cannot be changed to other account types, and vice versa.</maml:para>
15212+
Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and vice versa.</maml:para>
1521215213
</maml:description>
1521315214
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
1521415215
</command:parameter>
@@ -15251,11 +15252,12 @@ New-AzureDeployment -ServiceName $cloudSvc -Slot Production -Package $pkg -Confi
1525115252
Standard_ZRS
1525215253
Standard_GRS
1525315254
Standard_RAGRS
15255+
Premium_LRS
1525415256

1525515257
If this parameter is not specified, a default value of Standard_GRS is used
1525615258

1525715259
Note:
15258-
Standard_ZRS accounts cannot be changed to other account types, and vice versa.</maml:para>
15260+
Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and vice versa.</maml:para>
1525915261
</maml:description>
1526015262
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
1526115263
</command:parameter>
@@ -15318,11 +15320,12 @@ New-AzureDeployment -ServiceName $cloudSvc -Slot Production -Package $pkg -Confi
1531815320
Standard_ZRS
1531915321
Standard_GRS
1532015322
Standard_RAGRS
15323+
Premium_LRS
1532115324

1532215325
If this parameter is not specified, a default value of Standard_GRS is used
1532315326

1532415327
Note:
15325-
Standard_ZRS accounts cannot be changed to other account types, and vice versa.</maml:para>
15328+
Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and vice versa.</maml:para>
1532615329
</maml:description>
1532715330
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
1532815331
<dev:type>
@@ -27538,12 +27541,13 @@ PS C:\&gt; Set-AzureServiceAntimalwareExtension -ServiceName &quot;ContosoServic
2753827541
Standard_ZRS
2753927542
Standard_GRS
2754027543
Standard_RAGRS
27544+
Premium_LRS
2754127545

2754227546
If this parameter is not specified, a default value of Standard_GRS is used
2754327547

2754427548
Note:
2754527549
The GeoReplicationEnabled parameter functionality is the same as specifying Standard_GRS in Type parameter
27546-
Standard_ZRS accounts cannot be changed to other account types, and vice versa.</maml:para>
27550+
Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and vice versa.</maml:para>
2754727551
</maml:description>
2754827552
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
2754927553
</command:parameter>
@@ -27607,12 +27611,13 @@ PS C:\&gt; Set-AzureServiceAntimalwareExtension -ServiceName &quot;ContosoServic
2760727611
Standard_ZRS
2760827612
Standard_GRS
2760927613
Standard_RAGRS
27614+
Premium_LRS
2761027615

2761127616
If this parameter is not specified, a default value of Standard_GRS is used
2761227617

2761327618
Note:
2761427619
The GeoReplicationEnabled parameter functionality is the same as specifying Standard_GRS in Type parameter
27615-
Standard_ZRS accounts cannot be changed to other account types, and vice versa.</maml:para>
27620+
Standard_ZRS or Premium_LRS accounts cannot be changed to other account types, and vice versa.</maml:para>
2761627621
</maml:description>
2761727622
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
2761827623
<dev:type>

‎src/ServiceManagement/Services/Commands.Utilities/Azure.psd1

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ ScriptsToProcess = @()
5757
TypesToProcess = @(
5858
'.\Services\Microsoft.WindowsAzure.Commands.Websites.Types.ps1xml',
5959
'.\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.Types.ps1xml'
60-
'.\Storage\Microsoft.WindowsAzure.Commands.Storage.Types.ps1xml'
60+
'.\Storage\Microsoft.WindowsAzure.Commands.Storage.Types.ps1xml',
61+
'.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.Types.ps1xml'
6162
)
6263

64+
6365
# Format files (.ps1xml) to be loaded when importing this module
6466
FormatsToProcess = @(
6567
'.\Services\Microsoft.WindowsAzure.Commands.Websites.format.ps1xml',
@@ -70,7 +72,8 @@ FormatsToProcess = @(
7072
'.\Services\Microsoft.WindowsAzure.Commands.Scheduler.format.ps1xml',
7173
'.\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.format.ps1xml',
7274
'.\Services\Microsoft.WindowsAzure.Commands.Profile.format.ps1xml',
73-
'.\Network\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.format.ps1xml'
75+
'.\Network\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.format.ps1xml',
76+
'.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml'
7477
)
7578

7679
# Modules to import as nested modules of the module specified in ModuleToProcess
@@ -154,7 +157,55 @@ AliasesToExport = @(
154157
'Wait-AzureHDInsightJob',
155158
'Get-AzureStorageContainerAcl',
156159
'Start-CopyAzureStorageBlob',
157-
'Stop-CopyAzureStorageBlob'
160+
'Stop-CopyAzureStorageBlob',
161+
'Get-SSAccessControlRecord',
162+
'Get-SSDevice',
163+
'Get-SSDeviceBackup',
164+
'Get-SSDeviceBackupPolicy',
165+
'Get-SSDeviceConnectedInitiator',
166+
'Get-SSDeviceVolume',
167+
'Get-SSDeviceVolumeContainer',
168+
'Get-SSFailoverVolumeContainers',
169+
'Get-SSJob',
170+
'Get-SSResource',
171+
'Get-SSResourceContext',
172+
'Get-SSStorageAccountCredential',
173+
'Get-SSTask',
174+
'New-SSAccessControlRecord',
175+
'New-SSDeviceBackupPolicy',
176+
'New-SSDeviceBackupScheduleAddConfig',
177+
'New-SSDeviceBackupScheduleUpdateConfig',
178+
'New-SSDeviceVolume',
179+
'New-SSDeviceVolumeContainer',
180+
'New-SSInlineStorageAccountCredential',
181+
'New-SSNetworkConfig',
182+
'New-SSStorageAccountCredential',
183+
'New-SSVirtualDevice',
184+
'Remove-SSAccessControlRecord',
185+
'Remove-SSDeviceBackup',
186+
'Remove-SSDeviceBackupPolicy',
187+
'Remove-SSDeviceVolume',
188+
'Remove-SSDeviceVolumeContainer',
189+
'Remove-SSStorageAccountCredential',
190+
'Select-SSResource',
191+
'Set-SSAccessControlRecord',
192+
'Set-SSDevice',
193+
'Set-SSDeviceBackupPolicy',
194+
'Set-SSDeviceVolume',
195+
'Set-SSStorageAccountCredential',
196+
'Set-SSVirtualDevice',
197+
'Start-SSBackupCloneJob',
198+
'Start-SSDeviceBackupJob',
199+
'Start-SSDeviceBackupRestoreJob',
200+
'Start-SSDeviceFailoverJob',
201+
'Stop-SSJob',
202+
'Confirm-SSLegacyVolumeContainerStatus',
203+
'Get-SSLegacyVolumeContainerConfirmStatus',
204+
'Get-SSLegacyVolumeContainerMigrationPlan',
205+
'Get-SSLegacyVolumeContainerStatus',
206+
'Import-SSLegacyApplianceConfig',
207+
'Import-SSLegacyVolumeContainer',
208+
'Start-SSLegacyVolumeContainerMigrationPlan'
158209
)
159210

160211
# List of all modules packaged with this module

‎src/ServiceManagement/Services/Commands.Utilities/ServiceManagementStartup.ps1

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,57 @@ $aliases = @{
6060

6161
# HDInsight aliases
6262
"Invoke-Hive" = "Invoke-AzureHDInsightHiveJob";
63-
"hive" = "Invoke-AzureHDInsightHiveJob"
63+
"hive" = "Invoke-AzureHDInsightHiveJob";
64+
65+
#StorSimple aliases
66+
"Get-SSAccessControlRecord" = "Get-AzureStorSimpleAccessControlRecord" ;
67+
"Get-SSDevice"= "Get-AzureStorSimpleDevice" ;
68+
"Get-SSDeviceBackup" = "Get-AzureStorSimpleDeviceBackup" ;
69+
"Get-SSDeviceBackupPolicy" = "Get-AzureStorSimpleDeviceBackupPolicy" ;
70+
"Get-SSDeviceConnectedInitiator" = "Get-AzureStorSimpleDeviceConnectedInitiator" ;
71+
"Get-SSDeviceVolume" = "Get-AzureStorSimpleDeviceVolume" ;
72+
"Get-SSDeviceVolumeContainer" = "Get-AzureStorSimpleDeviceVolumeContainer" ;
73+
"Get-SSFailoverVolumeContainers" = "Get-AzureStorSimpleFailoverVolumeContainers" ;
74+
"Get-SSJob" = "Get-AzureStorSimpleJob" ;
75+
"Get-SSResource" = "Get-AzureStorSimpleResource" ;
76+
"Get-SSResourceContext" = "Get-AzureStorSimpleResourceContext" ;
77+
"Get-SSStorageAccountCredential" = "Get-AzureStorSimpleStorageAccountCredential" ;
78+
"Get-SSTask" = "Get-AzureStorSimpleTask" ;
79+
"New-SSAccessControlRecord" = "New-AzureStorSimpleAccessControlRecord" ;
80+
"New-SSDeviceBackupPolicy" = "New-AzureStorSimpleDeviceBackupPolicy" ;
81+
"New-SSDeviceBackupScheduleAddConfig" = "New-AzureStorSimpleDeviceBackupScheduleAddConfig" ;
82+
"New-SSDeviceBackupScheduleUpdateConfig" = "New-AzureStorSimpleDeviceBackupScheduleUpdateConfig" ;
83+
"New-SSDeviceVolume" = "New-AzureStorSimpleDeviceVolume";
84+
"New-SSDeviceVolumeContainer" = "New-AzureStorSimpleDeviceVolumeContainer" ;
85+
"New-SSInlineStorageAccountCredential" = "New-AzureStorSimpleInlineStorageAccountCredential" ;
86+
"New-SSNetworkConfig" = "New-AzureStorSimpleNetworkConfig";
87+
"New-SSStorageAccountCredential" = "New-AzureStorSimpleStorageAccountCredential";
88+
"New-SSVirtualDevice" = "New-AzureStorSimpleVirtualDevice";
89+
"Remove-SSAccessControlRecord" = "Remove-AzureStorSimpleAccessControlRecord";
90+
"Remove-SSDeviceBackup" = "Remove-AzureStorSimpleDeviceBackup";
91+
"Remove-SSDeviceBackupPolicy" = "Remove-AzureStorSimpleDeviceBackupPolicy";
92+
"Remove-SSDeviceVolume" = "Remove-AzureStorSimpleDeviceVolume";
93+
"Remove-SSDeviceVolumeContainer" = "Remove-AzureStorSimpleDeviceVolumeContainer";
94+
"Remove-SSStorageAccountCredential" = "Remove-AzureStorSimpleStorageAccountCredential";
95+
"Select-SSResource" = "Select-AzureStorSimpleResource";
96+
"Set-SSAccessControlRecord" = "Set-AzureStorSimpleAccessControlRecord";
97+
"Set-SSDevice" = "Set-AzureStorSimpleDevice";
98+
"Set-SSDeviceBackupPolicy" = "Set-AzureStorSimpleDeviceBackupPolicy";
99+
"Set-SSDeviceVolume" = "Set-AzureStorSimpleDeviceVolume";
100+
"Set-SSStorageAccountCredential" = "Set-AzureStorSimpleStorageAccountCredential";
101+
"Set-SSVirtualDevice" = "Set-AzureStorSimpleVirtualDevice";
102+
"Start-SSBackupCloneJob" = "Start-AzureStorSimpleBackupCloneJob";
103+
"Start-SSDeviceBackupJob" = "Start-AzureStorSimpleDeviceBackupJob";
104+
"Start-SSDeviceBackupRestoreJob" = "Start-AzureStorSimpleDeviceBackupRestoreJob";
105+
"Start-SSDeviceFailoverJob" = "Start-AzureStorSimpleDeviceFailoverJob";
106+
"Stop-SSJob" = "Stop-AzureStorSimpleJob";
107+
"Confirm-SSLegacyVolumeContainerStatus" = "Confirm-AzureStorSimpleLegacyVolumeContainerStatus";
108+
"Get-SSLegacyVolumeContainerConfirmStatus" = "Get-AzureStorSimpleLegacyVolumeContainerConfirmStatus";
109+
"Get-SSLegacyVolumeContainerMigrationPlan" = "Get-AzureStorSimpleLegacyVolumeContainerMigrationPlan";
110+
"Get-SSLegacyVolumeContainerStatus" = "Get-AzureStorSimpleLegacyVolumeContainerStatus";
111+
"Import-SSLegacyApplianceConfig" = "Import-AzureStorSimpleLegacyApplianceConfig";
112+
"Import-SSLegacyVolumeContainer" = "Import-AzureStorSimpleLegacyVolumeContainer";
113+
"Start-SSLegacyVolumeContainerMigrationPlan" = "Start-AzureStorSimpleLegacyVolumeContainerMigrationPlan";
64114
}
65115

66116
$aliases.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.dll-help.xml

Lines changed: 650 additions & 450 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)