Skip to content

Commit 111d646

Browse files
BethanyZhouBethanyZhou
authored
Sync DiskPool from generation to main (Azure#15286)
* Sync DiskPool from generation to main * add change log * suppress signature issues * change verb in changelog to its past tense
1 parent 5edae7d commit 111d646

Some content is hidden

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

46 files changed

+1238
-682
lines changed

‎src/DiskPool/Az.DiskPool.format.ps1xml

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,39 @@
8282
</ViewSelectedBy>
8383
<TableControl>
8484
<TableHeaders>
85+
<TableColumnHeader>
86+
<Label>Name</Label>
87+
</TableColumnHeader>
8588
<TableColumnHeader>
8689
<Label>Location</Label>
8790
</TableColumnHeader>
8891
<TableColumnHeader>
89-
<Label>Name</Label>
92+
<Label>Status</Label>
9093
</TableColumnHeader>
9194
<TableColumnHeader>
92-
<Label>Type</Label>
95+
<Label>ProvisioningState</Label>
96+
</TableColumnHeader>
97+
<TableColumnHeader>
98+
<Label>AvailabilityZone</Label>
9399
</TableColumnHeader>
94100
</TableHeaders>
95101
<TableRowEntries>
96102
<TableRowEntry>
97103
<TableColumnItems>
104+
<TableColumnItem>
105+
<PropertyName>Name</PropertyName>
106+
</TableColumnItem>
98107
<TableColumnItem>
99108
<PropertyName>Location</PropertyName>
100109
</TableColumnItem>
101110
<TableColumnItem>
102-
<PropertyName>Name</PropertyName>
111+
<PropertyName>Status</PropertyName>
103112
</TableColumnItem>
104113
<TableColumnItem>
105-
<PropertyName>Type</PropertyName>
114+
<PropertyName>ProvisioningState</PropertyName>
115+
</TableColumnItem>
116+
<TableColumnItem>
117+
<PropertyName>AvailabilityZone</PropertyName>
106118
</TableColumnItem>
107119
</TableColumnItems>
108120
</TableRowEntry>
@@ -297,21 +309,33 @@
297309
<TableControl>
298310
<TableHeaders>
299311
<TableColumnHeader>
300-
<Label>AdditionalCapability</Label>
312+
<Label>SkuName</Label>
313+
</TableColumnHeader>
314+
<TableColumnHeader>
315+
<Label>SkuTier</Label>
301316
</TableColumnHeader>
302317
<TableColumnHeader>
303318
<Label>AvailabilityZone</Label>
304319
</TableColumnHeader>
320+
<TableColumnHeader>
321+
<Label>AdditionalCapability</Label>
322+
</TableColumnHeader>
305323
</TableHeaders>
306324
<TableRowEntries>
307325
<TableRowEntry>
308326
<TableColumnItems>
309327
<TableColumnItem>
310-
<PropertyName>AdditionalCapability</PropertyName>
328+
<PropertyName>SkuName</PropertyName>
329+
</TableColumnItem>
330+
<TableColumnItem>
331+
<PropertyName>SkuTier</PropertyName>
311332
</TableColumnItem>
312333
<TableColumnItem>
313334
<PropertyName>AvailabilityZone</PropertyName>
314335
</TableColumnItem>
336+
<TableColumnItem>
337+
<PropertyName>AdditionalCapability</PropertyName>
338+
</TableColumnItem>
315339
</TableColumnItems>
316340
</TableRowEntry>
317341
</TableRowEntries>
@@ -687,13 +711,19 @@
687711
<TableColumnHeader>
688712
<Label>Category</Label>
689713
</TableColumnHeader>
714+
<TableColumnHeader>
715+
<Label>Endpoint</Label>
716+
</TableColumnHeader>
690717
</TableHeaders>
691718
<TableRowEntries>
692719
<TableRowEntry>
693720
<TableColumnItems>
694721
<TableColumnItem>
695722
<PropertyName>Category</PropertyName>
696723
</TableColumnItem>
724+
<TableColumnItem>
725+
<PropertyName>Endpoint</PropertyName>
726+
</TableColumnItem>
697727
</TableColumnItems>
698728
</TableRowEntry>
699729
</TableRowEntries>

‎src/DiskPool/Az.DiskPool.psd1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 6/7/2021
6+
# Generated on: 6/16/2021
77
#
88

99
@{
@@ -69,11 +69,13 @@ FormatsToProcess = './Az.DiskPool.format.ps1xml'
6969
# NestedModules = @()
7070

7171
# 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 = 'Get-AzDiskPool', 'Get-AzDiskPoolIscsiTarget', 'New-AzDiskPool',
73-
'New-AzDiskPoolAclObject', 'New-AzDiskPoolIscsiLunObject',
74-
'New-AzDiskPoolIscsiTarget', 'Remove-AzDiskPool',
75-
'Remove-AzDiskPoolIscsiTarget', 'Start-AzDiskPool', 'Stop-AzDiskPool',
76-
'Update-AzDiskPool', 'Update-AzDiskPoolIscsiTarget'
72+
FunctionsToExport = 'Get-AzDiskPool', 'Get-AzDiskPoolIscsiTarget',
73+
'Get-AzDiskPoolOutboundNetworkDependencyEndpoint',
74+
'Get-AzDiskPoolZone', 'New-AzDiskPool', 'New-AzDiskPoolAclObject',
75+
'New-AzDiskPoolIscsiLunObject', 'New-AzDiskPoolIscsiTarget',
76+
'Remove-AzDiskPool', 'Remove-AzDiskPoolIscsiTarget',
77+
'Start-AzDiskPool', 'Stop-AzDiskPool', 'Update-AzDiskPool',
78+
'Update-AzDiskPoolIscsiTarget'
7779

7880
# 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.
7981
CmdletsToExport = @()
@@ -111,7 +113,7 @@ PrivateData = @{
111113
# IconUri = ''
112114

113115
# ReleaseNotes of this module
114-
ReleaseNotes = '* Hotfix for the issue on windows powershell'
116+
# ReleaseNotes = ''
115117

116118
# Prerelease string of this module
117119
# Prerelease = ''

‎src/DiskPool/Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added additional info in the output table of New/Update/Remove-Az.DiskPool [#15236]
22+
* Added cmdlet Get-AzDiskPoolOutboundNetworkDependencyEndpoint and Get-AzDiskPoolZone [#15237]
2123

2224
## Version 0.1.1
2325
* Hotfix for the issue on windows powershell

‎src/DiskPool/build-module.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ $null = New-Item -ItemType Directory -Force -Path $examplesFolder
122122

123123
Write-Host -ForegroundColor Green 'Creating cmdlets for specified models...'
124124
$modelCmdlets = @('Acl', 'IscsiLun')
125-
pwsh (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1') -Models $modelCmdlets
125+
if ($modelCmdlets.Count -gt 0) {
126+
. (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1')
127+
CreateModelCmdlet($modelCmdlets)
128+
}
126129

127130
if($NoDocs) {
128131
Write-Host -ForegroundColor Green 'Creating exports...'

0 commit comments

Comments
 (0)