Skip to content

Commit 8397da2

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#7070 from deathly809/Fabric1.5.0
[Azure Stack][Admin] Fabric for Azure Stack 1.5.0
2 parents b6719f7 + 9b93ac7 commit 8397da2

File tree

54 files changed

+419
-313
lines changed

Some content is hidden

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

54 files changed

+419
-313
lines changed

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Azs.Fabric.Admin.psd1

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Licensed under the MIT License. See License.txt in the project root for license
1717
RootModule = 'Azs.Fabric.Admin.psm1'
1818

1919
# Version number of this module.
20-
ModuleVersion = '0.1.2'
20+
ModuleVersion = '0.2.0'
2121

2222
# Supported PSEditions
2323
# CompatiblePSEditions = @()
@@ -38,7 +38,7 @@ Licensed under the MIT License. See License.txt in the project root for license
3838
Description = 'Fabric Admin Client'
3939

4040
# Minimum version of the Windows PowerShell engine required by this module
41-
# PowerShellVersion = ''
41+
PowerShellVersion = '5.0'
4242

4343
# Name of the Windows PowerShell host required by this module
4444
# PowerShellHostName = ''
@@ -56,8 +56,8 @@ Licensed under the MIT License. See License.txt in the project root for license
5656
# ProcessorArchitecture = ''
5757

5858
# Modules that must be imported into the global environment prior to importing this module
59-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '3.4.1'; },
60-
@{ModuleName = 'AzureRM.Resources'; RequiredVersion = '4.4.1'; })
59+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.5.1'; },
60+
@{ModuleName = 'AzureRM.Resources'; ModuleVersion = '6.0.2'; })
6161

6262
# Assemblies that must be loaded prior to importing this module
6363
# RequiredAssemblies = @()
@@ -114,19 +114,54 @@ Licensed under the MIT License. See License.txt in the project root for license
114114
PSData = @{
115115

116116
# Tags applied to this module. These help with module discovery in online galleries.
117-
# Tags = @()
117+
Tags = @('AzureStack', 'Fabric', 'Admin', 'Azure Stack Fabric', 'Infrastructure', 'Scale Unit', 'FRP')
118118

119119
# A URL to the license for this module.
120-
# LicenseUri = ''
120+
LicenseUri = 'https://aka.ms/azps-license'
121121

122122
# A URL to the main website for this project.
123-
# ProjectUri = ''
123+
ProjectUri = 'https://github.com/Azure/azure-powershell'
124124

125125
# A URL to an icon representing this module.
126126
# IconUri = ''
127127

128128
# ReleaseNotes of this module
129-
# ReleaseNotes = ''
129+
ReleaseNotes = '## 2018.8.12
130+
* New Module dependencies
131+
* AzureRM.Profile
132+
* AzureRM.Resources
133+
* New cmdlet
134+
* Add-AzsScaleUnitNode
135+
* New-AzsScaleUnitNodeObject
136+
* Support handling names of nested resources
137+
* Add-AzsScaleUnitNode
138+
* Disable-AzsScaleUnitNode
139+
* Enable-AzsScaleUnitNode
140+
* Get-AzsEdgeGateway
141+
* Get-AzsEdgeGatewayPool
142+
* Get-AzsInfrastructureRole
143+
* Get-AzsInfrastructureRoleInstance
144+
* Get-AzsInfrastructureShare
145+
* Get-AzsInfrastructureVolume
146+
* Get-AzsIpPool
147+
* Get-AzsLogicalNetwork
148+
* Get-AzsLogicalSubnet
149+
* Get-AzsMacAddressPool
150+
* Get-AzsScaleUnit
151+
* Get-AzsScaleUnitNode
152+
* Get-AzsSlbMuxInstance
153+
* Get-AzsStoragePool
154+
* Get-AzsStorageSystem
155+
* Repair-AzsScaleUnitNode
156+
* Restart-AzsInfrastructureRole
157+
* Restart-AzsInfrastructureRoleInstance
158+
* Start-AzsInfrastructureRoleInstance
159+
* Start-AzsScaleUnitNode
160+
* Stop-AzsInfrastructureRoleInstance
161+
* Stop-AzsScaleUnitNode
162+
* Bug fixes
163+
* Handle ErrrorAction correctly now
164+
'
130165

131166
} # End of PSData hashtable
132167

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Azs.Fabric.Admin.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ if (Test-Path -Path $ClrPath -PathType Container) {
2929
. (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ApplicableFilters.ps1')
3030
. (Join-Path -Path $PSScriptRoot -ChildPath 'Test-FilteredResult.ps1')
3131
. (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ArmResourceIdParameterValue.ps1')
32+
. (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ResourceNameSuffix.ps1')
3233
$allPs1FilesPath = Join-Path -Path $PSScriptRoot -ChildPath 'Generated.PowerShell.Commands' | Join-Path -ChildPath '*.ps1'
3334
Get-ChildItem -Path $allPs1FilesPath -Recurse -File | ForEach-Object { . $_.FullName}

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Add-AzsScaleUnitNode.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ function Add-AzsScaleUnitNode
7070

7171
Process {
7272

73+
$ScaleUnit = Get-ResourceName -ResourceName $ScaleUnit
7374

7475

7576
$NewServiceClient_params = @{

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Disable-AzsInfrastructureRoleInstance.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ function Suspend-AzsInfrastructureRoleInstance {
9393
$ResourceGroupName = $ArmResourceIdParameterValues['resourceGroupName']
9494
$Location = $ArmResourceIdParameterValues['location']
9595
$Name = $ArmResourceIdParameterValues['infraRoleInstance']
96+
} else {
97+
$Name = Get-ResourceNameSuffix -ResourceName $Name
9698
}
9799

98100
if ($PSCmdlet.ShouldProcess("$Name" , "Disable infrastructure role instance")) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Disable-AzsScaleUnitNode.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ function Disable-AzsScaleUnitNode {
8080

8181
Process {
8282

83-
84-
8583
if ('ResourceId' -eq $PsCmdlet.ParameterSetName) {
8684
$GetArmResourceIdParameterValue_params = @{
8785
IdTemplate = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnitNodes/{scaleUnitNode}'
@@ -93,6 +91,8 @@ function Disable-AzsScaleUnitNode {
9391
$ResourceGroupName = $ArmResourceIdParameterValues['resourceGroupName']
9492
$Location = $ArmResourceIdParameterValues['location']
9593
$Name = $ArmResourceIdParameterValues['scaleUnitNode']
94+
} else {
95+
$Name = Get-ResourceNameSuffix -ResourceName $Name
9696
}
9797

9898
if ($PSCmdlet.ShouldProcess("$Name" , "Disable scale unit node")) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Enable-AzsScaleUnitNode.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ function Enable-AzsScaleUnitNode {
8080

8181
Process {
8282

83-
8483
if ('ResourceId' -eq $PsCmdlet.ParameterSetName) {
8584
$GetArmResourceIdParameterValue_params = @{
8685
IdTemplate = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnitNodes/{scaleUnitNode}'
@@ -92,6 +91,8 @@ function Enable-AzsScaleUnitNode {
9291
$ResourceGroupName = $ArmResourceIdParameterValues['resourceGroupName']
9392
$Location = $ArmResourceIdParameterValues['location']
9493
$Name = $ArmResourceIdParameterValues['scaleUnitNode']
94+
} else {
95+
$Name = Get-ResourceNameSuffix -ResourceName $Name
9596
}
9697

9798
if ($PSCmdlet.ShouldProcess("$Name" , "Enable scale unit node")) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsEdgeGateway.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ function Get-AzsEdgeGateway {
9696

9797
Process {
9898

99-
100-
10199
$NewServiceClient_params = @{
102100
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
103101
}
@@ -166,7 +164,9 @@ function Get-AzsEdgeGateway {
166164
}
167165
return
168166
}
167+
169168
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
169+
$Name = Get-ResourceNameSuffix -ResourceName $Name
170170
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
171171
$TaskResult = $FabricAdminClient.EdgeGateways.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
172172
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsEdgeGatewayPool.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ function Get-AzsEdgeGatewayPool {
170170
return
171171
}
172172
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
173+
$Name = Get-ResourceNameSuffix -ResourceName $Name
173174
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
174175
$TaskResult = $FabricAdminClient.EdgeGatewayPools.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
175176
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsInfrastructureRole.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ function Get-AzsInfrastructureRole {
168168
return
169169
}
170170
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
171+
$Name = Get-ResourceNameSuffix -ResourceName $Name
171172
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
172173
$TaskResult = $FabricAdminClient.InfraRoles.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
173174
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsInfrastructureRoleInstance.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ function Get-AzsInfrastructureRoleInstance {
9696

9797
Process {
9898

99-
100-
10199
$NewServiceClient_params = @{
102100
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
103101
}
@@ -169,6 +167,7 @@ function Get-AzsInfrastructureRoleInstance {
169167
return
170168
}
171169
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
170+
$Name = Get-ResourceNameSuffix -ResourceName $Name
172171
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
173172
$TaskResult = $FabricAdminClient.InfraRoleInstances.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
174173
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsInfrastructureShare.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ function Get-AzsInfrastructureShare {
8181

8282
Process {
8383

84-
85-
8684
$NewServiceClient_params = @{
8785
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
8886
}
@@ -153,6 +151,7 @@ function Get-AzsInfrastructureShare {
153151
return
154152
}
155153
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
154+
$Name = Get-ResourceNameSuffix -ResourceName $Name
156155
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
157156
$TaskResult = $FabricAdminClient.FileShares.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
158157
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsInfrastructureVolume.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ function Get-AzsInfrastructureVolume {
114114

115115
Process {
116116

117-
117+
$StoragePool = Get-ResourceNameSuffix -ResourceName $StoragePool
118+
$StorageSystem = Get-ResourceNameSuffix -ResourceName $StorageSystem
118119

119120
$NewServiceClient_params = @{
120121
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
@@ -130,8 +131,6 @@ function Get-AzsInfrastructureVolume {
130131

131132
$FabricAdminClient = New-ServiceClient @NewServiceClient_params
132133

133-
134-
135134
$oDataQuery = ""
136135
if ($Filter) {
137136
$oDataQuery += "&`$Filter=$Filter"
@@ -190,6 +189,7 @@ function Get-AzsInfrastructureVolume {
190189
return
191190
}
192191
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
192+
$Name = Get-ResourceNameSuffix -ResourceName $Name
193193
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
194194
$TaskResult = $FabricAdminClient.Volumes.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $StorageSystem, $StoragePool, $Name)
195195
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsIpPool.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ function Get-AzsIpPool {
170170
return
171171
}
172172
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
173+
$Name = Get-ResourceNameSuffix -ResourceName $Name
173174
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
174175
$TaskResult = $FabricAdminClient.IpPools.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
175176
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsLogicalNetwork.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ function Get-AzsLogicalNetwork {
168168
return
169169
}
170170
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
171+
$Name = Get-ResourceNameSuffix -ResourceName $Name
171172
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
172173
$TaskResult = $FabricAdminClient.LogicalNetworks.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
173174
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsLogicalSubnet.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ function Get-AzsLogicalSubnet {
105105

106106
Process {
107107

108-
109-
110108
$NewServiceClient_params = @{
111109
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
112110
}
@@ -140,6 +138,9 @@ function Get-AzsLogicalSubnet {
140138
$logicalNetwork = $ArmResourceIdParameterValues['logicalNetwork']
141139
$Name = $ArmResourceIdParameterValues['logicalSubnet']
142140
} else {
141+
142+
$LogicalNetwork = Get-ResourceNameSuffix -ResourceName $LogicalNetwork
143+
143144
if ([System.String]::IsNullOrEmpty($Location)) {
144145
$Location = (Get-AzureRMLocation).Location
145146
}
@@ -178,6 +179,7 @@ function Get-AzsLogicalSubnet {
178179
return
179180
}
180181
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
182+
$Name = Get-ResourceNameSuffix -ResourceName $Name
181183
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
182184
$TaskResult = $FabricAdminClient.LogicalSubnets.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $LogicalNetwork, $Name)
183185
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsMacAddressPool.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ function Get-AzsMacAddressPool {
168168
return
169169
}
170170
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
171+
$Name = Get-ResourceNameSuffix -ResourceName $Name
171172
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
172173
$TaskResult = $FabricAdminClient.MacAddressPools.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
173174
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsScaleUnit.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ function Get-AzsScaleUnit {
9696

9797
Process {
9898

99-
100-
10199
$NewServiceClient_params = @{
102100
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
103101
}
@@ -168,6 +166,7 @@ function Get-AzsScaleUnit {
168166
return
169167
}
170168
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
169+
$Name = Get-ResourceNameSuffix -ResourceName $Name
171170
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
172171
$TaskResult = $FabricAdminClient.ScaleUnits.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
173172
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsScaleUnitNode.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ function Get-AzsScaleUnitNode {
9696

9797
Process {
9898

99-
100-
10199
$NewServiceClient_params = @{
102100
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
103101
}
@@ -169,6 +167,7 @@ function Get-AzsScaleUnitNode {
169167
return
170168
}
171169
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
170+
$Name = Get-ResourceNameSuffix -ResourceName $Name
172171
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
173172
$TaskResult = $FabricAdminClient.ScaleUnitNodes.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
174173
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsSlbMuxInstance.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ function Get-AzsSlbMuxInstance {
171171
return
172172
}
173173
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
174+
$Name = Get-ResourceNameSuffix -ResourceName $Name
174175
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
175176
$TaskResult = $FabricAdminClient.SlbMuxInstances.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
176177
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsStoragePool.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ function Get-AzsStoragePool {
106106

107107
Process {
108108

109-
110-
111109
$NewServiceClient_params = @{
112110
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
113111
}
@@ -141,6 +139,9 @@ function Get-AzsStoragePool {
141139
$StorageSystem = $ArmResourceIdParameterValues['storageSubSystem']
142140
$Name = $ArmResourceIdParameterValues['storagePool']
143141
} else {
142+
143+
$StorageSystem = Get-ResourceNameSuffix -ResourceName $StorageSystem
144+
144145
if ([System.String]::IsNullOrEmpty($Location)) {
145146
$Location = (Get-AzureRMLocation).Location
146147
}
@@ -179,6 +180,7 @@ function Get-AzsStoragePool {
179180
return
180181
}
181182
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
183+
$Name = Get-ResourceNameSuffix -ResourceName $Name
182184
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
183185
$TaskResult = $FabricAdminClient.StoragePools.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $StorageSystem, $Name)
184186
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsStorageSystem.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ function Get-AzsStorageSystem {
9797

9898
Process {
9999

100-
101-
102100
$NewServiceClient_params = @{
103101
FullClientTypeName = 'Microsoft.AzureStack.Management.Fabric.Admin.FabricAdminClient'
104102
}
@@ -169,6 +167,7 @@ function Get-AzsStorageSystem {
169167
return
170168
}
171169
if ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
170+
$Name = Get-ResourceNameSuffix -ResourceName $Name
172171
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $FabricAdminClient.'
173172
$TaskResult = $FabricAdminClient.StorageSystems.GetWithHttpMessagesAsync($ResourceGroupName, $Location, $Name)
174173
} elseif ('List' -eq $PsCmdlet.ParameterSetName) {

0 commit comments

Comments
 (0)