Skip to content

Commit f5ef1ef

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#7696 from deathly809/preview
Fix for 7693: Get-ResourceName is not the name of a cmdlet
2 parents bc834a0 + 9ff2eca commit f5ef1ef

File tree

6 files changed

+221
-72
lines changed

6 files changed

+221
-72
lines changed

‎Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Azs.Fabric.Admin.psd1

Lines changed: 3 additions & 35 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.2.0'
20+
ModuleVersion = '0.2.1'
2121

2222
# Supported PSEditions
2323
# CompatiblePSEditions = @()
@@ -126,41 +126,9 @@ Licensed under the MIT License. See License.txt in the project root for license
126126
# IconUri = ''
127127

128128
# ReleaseNotes of this module
129-
ReleaseNotes = '## 2018.9.10
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
129+
ReleaseNotes = '## 2018.10.28
162130
* Bug fixes
163-
* Handle ErrrorAction correctly now
131+
* Fixed a bug in Add-AzsScaleUnitNode
164132
'
165133

166134
} # End of PSData hashtable

‎Azs.Fabric.Admin/Module/Azs.Fabric.Admin/ChangeLog.md

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,6 @@
1919
-->
2020
## Current Release
2121

22-
## Version 0.2.0
23-
* New Module dependencies
24-
* AzureRM.Profile
25-
* AzureRM.Resources
26-
* New cmdlet
27-
* Add-AzsScaleUnitNode
28-
* New-AzsScaleUnitNodeObject
29-
* Support handling names of nested resources
30-
* Add-AzsScaleUnitNode
31-
* Disable-AzsScaleUnitNode
32-
* Enable-AzsScaleUnitNode
33-
* Get-AzsEdgeGateway
34-
* Get-AzsEdgeGatewayPool
35-
* Get-AzsInfrastructureRole
36-
* Get-AzsInfrastructureRoleInstance
37-
* Get-AzsInfrastructureShare
38-
* Get-AzsInfrastructureVolume
39-
* Get-AzsIpPool
40-
* Get-AzsLogicalNetwork
41-
* Get-AzsLogicalSubnet
42-
* Get-AzsMacAddressPool
43-
* Get-AzsScaleUnit
44-
* Get-AzsScaleUnitNode
45-
* Get-AzsSlbMuxInstance
46-
* Get-AzsStoragePool
47-
* Get-AzsStorageSystem
48-
* Repair-AzsScaleUnitNode
49-
* Restart-AzsInfrastructureRole
50-
* Restart-AzsInfrastructureRoleInstance
51-
* Start-AzsInfrastructureRoleInstance
52-
* Start-AzsScaleUnitNode
53-
* Stop-AzsInfrastructureRoleInstance
54-
* Stop-AzsScaleUnitNode
22+
## Version 0.2.1
5523
* Bug fixes
56-
* Handle ErrrorAction correctly now
24+
* Fixed a bug in Add-AzsScaleUnitNode

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function Add-AzsScaleUnitNode
8282

8383
Process {
8484

85-
$ScaleUnit = Get-ResourceName -ResourceName $ScaleUnit
85+
$ScaleUnit = Get-ResourceNameSuffix -ResourceName $ScaleUnit
8686

8787

8888
$NewServiceClient_params = @{

‎Azs.Fabric.Admin/Tests/SessionRecords/FabricAdminClient/TestAddScaleUnitNode.json

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
{
2+
"Entries": [
3+
{
4+
"RequestUri": "/subscriptions/2ad13d2d-7b9d-46a1-919d-a18891ef3142/resourceGroups/System.east/providers/Microsoft.Fabric.Admin/fabricLocations/east/scaleUnits/s-cluster/ScaleOut?api-version=2016-05-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmFkMTNkMmQtN2I5ZC00NmExLTkxOWQtYTE4ODkxZWYzMTQyL3Jlc291cmNlR3JvdXBzL1N5c3RlbS5lYXN0L3Byb3ZpZGVycy9NaWNyb3NvZnQuRmFicmljLkFkbWluL2ZhYnJpY0xvY2F0aW9ucy9lYXN0L3NjYWxlVW5pdHMvcy1jbHVzdGVyL1NjYWxlT3V0P2FwaS12ZXJzaW9uPTIwMTYtMDUtMDE=",
6+
"RequestMethod": "POST",
7+
"RequestBody": "{\r\n \"nodeList\": [\r\n {\r\n \"bmcIpv4Address\": \"100.83.64.17\",\r\n \"computerName\": \"ASRR1N22R19U29\"\r\n }\r\n ],\r\n \"awaitStorageConvergence\": false\r\n }",
8+
"RequestHeaders": {
9+
"x-ms-client-request-id": [
10+
"b83115de-7163-4008-b3b1-38d5ad8d69b3"
11+
],
12+
"accept-language": [
13+
"en-US"
14+
],
15+
"User-Agent": [
16+
"FxVersion/4.6.25211.01",
17+
"Microsoft.AzureStack.Management.Admin.Fabric.FabricAdminClient/0.1.0.0"
18+
]
19+
},
20+
"ResponseBody": "",
21+
"ResponseHeaders": {
22+
"Content-Length": [
23+
"0"
24+
],
25+
"Content-Type": [
26+
"application/json; charset=utf-8"
27+
],
28+
"Expires": [
29+
"-1"
30+
],
31+
"Cache-Control": [
32+
"no-cache"
33+
],
34+
"Date": [
35+
"Wed, 30 Aug 2017 19:13:17 GMT"
36+
],
37+
"Pragma": [
38+
"no-cache"
39+
],
40+
"Location" : [
41+
"https://adminmanagement.east.azurestack.contoso.com/subscriptions/2ad13d2d-7b9d-46a1-919d-a18891ef3142/resourceGroups/System.east/providers/Microsoft.Fabric.Admin/fabricLocations/east/computeOperationResults/50a7e1e9-7b6f-4624-8455-4379e78e8fa5?api-version=2016-05-01"
42+
],
43+
"Server": [
44+
"Microsoft-HTTPAPI/2.0"
45+
],
46+
"WWW-Authenticate": [
47+
"oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvvVzj2kpJGOEpOr6lLSxodwSYIOHSvC9OAmOEKmDCuadYGQRUFMthHF7WtKfFfFFLMmdu2O/mBvjhu5emTRJym9m+v8HC9NhsKkvEhIKlsxSwaLduKHbSqMSFn+BqqNZ8WqxGICA4XLt5J5DCd5IR"
48+
],
49+
"x-ms-correlation-request-id": [
50+
"b16b4755-c7f6-42c6-b4bd-33a07bf8af4e"
51+
],
52+
"x-ms-ratelimit-remaining-subscription-reads": [
53+
"14136"
54+
],
55+
"x-ms-request-id": [
56+
"b16b4755-c7f6-42c6-b4bd-33a07bf8af4e"
57+
],
58+
"x-ms-routing-request-id": [
59+
"LOCAL:20170830T191317Z:b16b4755-c7f6-42c6-b4bd-33a07bf8af4e"
60+
],
61+
"Strict-Transport-Security": [
62+
"max-age=31536000; includeSubDomains"
63+
],
64+
"X-Content-Type-Options": [
65+
"nosniff"
66+
]
67+
},
68+
"StatusCode": 202
69+
},
70+
{
71+
"RequestUri": "/subscriptions/2ad13d2d-7b9d-46a1-919d-a18891ef3142/resourceGroups/System.east/providers/Microsoft.Fabric.Admin/fabricLocations/east/computeOperationResults/50a7e1e9-7b6f-4624-8455-4379e78e8fa5?api-version=2016-05-01",
72+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmFkMTNkMmQtN2I5ZC00NmExLTkxOWQtYTE4ODkxZWYzMTQyL3Jlc291cmNlR3JvdXBzL1N5c3RlbS5lYXN0L3Byb3ZpZGVycy9NaWNyb3NvZnQuRmFicmljLkFkbWluL2ZhYnJpY0xvY2F0aW9ucy9lYXN0L2NvbXB1dGVPcGVyYXRpb25SZXN1bHRzLzUwYTdlMWU5LTdiNmYtNDYyNC04NDU1LTQzNzllNzhlOGZhNT9hcGktdmVyc2lvbj0yMDE2LTA1LTAx",
73+
"RequestMethod": "GET",
74+
"RequestBody": "",
75+
"RequestHeaders": {
76+
"x-ms-client-request-id": [
77+
"b83115de-7163-4008-b3b1-38d5ad8d69b3"
78+
],
79+
"accept-language": [
80+
"en-US"
81+
],
82+
"User-Agent": [
83+
"FxVersion/4.6.25211.01",
84+
"Microsoft.AzureStack.Management.Admin.Fabric.FabricAdminClient/0.1.0.0"
85+
]
86+
},
87+
"ResponseBody": "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"error\":{}}",
88+
"ResponseHeaders": {
89+
"Content-Length": [
90+
"57"
91+
],
92+
"Content-Type": [
93+
"application/json; charset=utf-8"
94+
],
95+
"Expires": [
96+
"-1"
97+
],
98+
"Cache-Control": [
99+
"no-cache"
100+
],
101+
"Date": [
102+
"Wed, 30 Aug 2017 19:13:17 GMT"
103+
],
104+
"Pragma": [
105+
"no-cache"
106+
],
107+
"Server": [
108+
"Microsoft-HTTPAPI/2.0"
109+
],
110+
"WWW-Authenticate": [
111+
"oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv71qkByrpWoSAqOTi2btp3G/vwERNBjYVAfJmDDcwthdF0+XzTjvmn/V0n3r3VqLf51uQcPqIKz0xLl09jyloWXsuPJm3krDpQGF5EZIz/T/FRSaQ5yqOT8yMMcowyWPdlGHntwJV6eksgwCe/vVn"
112+
],
113+
"x-ms-correlation-request-id": [
114+
"0706ebf5-3ca1-4333-8432-ff5e48e31965"
115+
],
116+
"x-ms-ratelimit-remaining-subscription-reads": [
117+
"14135"
118+
],
119+
"x-ms-request-id": [
120+
"0706ebf5-3ca1-4333-8432-ff5e48e31965"
121+
],
122+
"x-ms-routing-request-id": [
123+
"LOCAL:20170830T191317Z:0706ebf5-3ca1-4333-8432-ff5e48e31965"
124+
],
125+
"Strict-Transport-Security": [
126+
"max-age=31536000; includeSubDomains"
127+
],
128+
"X-Content-Type-Options": [
129+
"nosniff"
130+
]
131+
},
132+
"StatusCode": 200
133+
},
134+
{
135+
"RequestUri": "/subscriptions/2ad13d2d-7b9d-46a1-919d-a18891ef3142/resourceGroups/System.east/providers/Microsoft.Fabric.Admin/fabricLocations/east/computeOperationResults/50a7e1e9-7b6f-4624-8455-4379e78e8fa5?api-version=2016-05-01",
136+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmFkMTNkMmQtN2I5ZC00NmExLTkxOWQtYTE4ODkxZWYzMTQyL3Jlc291cmNlR3JvdXBzL1N5c3RlbS5lYXN0L3Byb3ZpZGVycy9NaWNyb3NvZnQuRmFicmljLkFkbWluL2ZhYnJpY0xvY2F0aW9ucy9lYXN0L2NvbXB1dGVPcGVyYXRpb25SZXN1bHRzLzUwYTdlMWU5LTdiNmYtNDYyNC04NDU1LTQzNzllNzhlOGZhNT9hcGktdmVyc2lvbj0yMDE2LTA1LTAx",
137+
"RequestMethod": "GET",
138+
"RequestBody": "",
139+
"RequestHeaders": {
140+
"x-ms-client-request-id": [
141+
"b83115de-7163-4008-b3b1-38d5ad8d69b3"
142+
],
143+
"accept-language": [
144+
"en-US"
145+
],
146+
"User-Agent": [
147+
"FxVersion/4.6.25211.01",
148+
"Microsoft.AzureStack.Management.Admin.Fabric.FabricAdminClient/0.1.0.0"
149+
]
150+
},
151+
"ResponseBody": "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"error\":{}}",
152+
"ResponseHeaders": {
153+
"Content-Length": [
154+
"57"
155+
],
156+
"Content-Type": [
157+
"application/json; charset=utf-8"
158+
],
159+
"Expires": [
160+
"-1"
161+
],
162+
"Cache-Control": [
163+
"no-cache"
164+
],
165+
"Date": [
166+
"Wed, 30 Aug 2017 19:13:17 GMT"
167+
],
168+
"Pragma": [
169+
"no-cache"
170+
],
171+
"Server": [
172+
"Microsoft-HTTPAPI/2.0"
173+
],
174+
"WWW-Authenticate": [
175+
"oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv71qkByrpWoSAqOTi2btp3G/vwERNBjYVAfJmDDcwthdF0+XzTjvmn/V0n3r3VqLf51uQcPqIKz0xLl09jyloWXsuPJm3krDpQGF5EZIz/T/FRSaQ5yqOT8yMMcowyWPdlGHntwJV6eksgwCe/vVn"
176+
],
177+
"x-ms-correlation-request-id": [
178+
"0706ebf5-3ca1-4333-8432-ff5e48e31965"
179+
],
180+
"x-ms-ratelimit-remaining-subscription-reads": [
181+
"14135"
182+
],
183+
"x-ms-request-id": [
184+
"0706ebf5-3ca1-4333-8432-ff5e48e31965"
185+
],
186+
"x-ms-routing-request-id": [
187+
"LOCAL:20170830T191317Z:0706ebf5-3ca1-4333-8432-ff5e48e31965"
188+
],
189+
"Strict-Transport-Security": [
190+
"max-age=31536000; includeSubDomains"
191+
],
192+
"X-Content-Type-Options": [
193+
"nosniff"
194+
]
195+
},
196+
"StatusCode": 200
197+
}
198+
],
199+
"Names": {},
200+
"Variables": {
201+
"SubscriptionId": "2ad13d2d-7b9d-46a1-919d-a18891ef3142"
202+
}
203+
}

‎Azs.Fabric.Admin/Tests/src/ScaleUnitNode.tests.ps1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,5 +235,15 @@ InModuleScope Azs.Fabric.Admin {
235235
break
236236
}
237237
}
238+
239+
It "TestAddScaleUnitNode" -Skip:$('TestAddScaleUnitNode' -in $global:SkippedTests) {
240+
$global:TestName = "TestAddScaleUnitNode"
241+
242+
$NewNode = New-AzsScaleUnitNodeObject -ComputerName "ASRR1N22R19U29" -BMCIPv4Address "100.83.64.17"
243+
{
244+
Add-AzsScaleUnitNode -NodeList $NewNode -ScaleUnit "s-cluster" -Location 'east'
245+
} | Should not throw
246+
247+
}
238248
}
239249
}

‎AzureStack/AzureStack.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
@{ModuleName = 'Azs.Backup.Admin'; RequiredVersion = '0.2.0'; },
5858
@{ModuleName = 'Azs.Commerce.Admin'; RequiredVersion = '0.2.0'; },
5959
@{ModuleName = 'Azs.Compute.Admin'; RequiredVersion = '0.2.0'; },
60-
@{ModuleName = 'Azs.Fabric.Admin'; RequiredVersion = '0.2.0'; },
60+
@{ModuleName = 'Azs.Fabric.Admin'; RequiredVersion = '0.2.1'; },
6161
@{ModuleName = 'Azs.Gallery.Admin'; RequiredVersion = '0.2.0'; },
6262
@{ModuleName = 'Azs.InfrastructureInsights.Admin'; RequiredVersion = '0.2.0'; },
6363
@{ModuleName = 'Azs.KeyVault.Admin'; RequiredVersion = '0.2.0'; },
@@ -129,7 +129,7 @@
129129
* New quota properties added for the support of manged disk
130130
* Addition of disk migration related cmdlets
131131
* Additional properties in the Platform Image and VM extesnion objects
132-
* Azs.Fabric.Admin
132+
* Azs.Fabric.Admin
133133
* New cmdlet for adding scale unit node
134134
* Azs.Backup.Admin
135135
* Set-AzsBackupShare is an alias now to the cmdlet Set-AzsBackupConfiguration

0 commit comments

Comments
 (0)