Skip to content

Commit 90e3d38

Browse files
author
Maddie Clayton
authored
Merge pull request #6963 from selasagi/fixScaleIssue
Fix failure on Update capacity when it is paused
2 parents 9fcb67c + e4ad532 commit 90e3d38

File tree

12 files changed

+1649
-1500
lines changed

12 files changed

+1649
-1500
lines changed

‎src/ResourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Fix failure in Update-AzureRmPowerBIEmbeddedCapacity when trying to scale paused capacity
2122
* Fixed issue with default resource groups not being set.
2223

2324
## Version 4.1.8

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.9.0-preview" />
27+
<PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.10.0-preview" />
2828
<PackageReference Include="Moq" Version="4.2.1510.2205" />
2929
</ItemGroup>
3030

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<RunCodeAnalysis>false</RunCodeAnalysis>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.9.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
47+
<Reference Include="Microsoft.Azure.Management.PowerBIDedicated">
48+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.10.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
4949
</Reference>
5050
</ItemGroup>
5151
<ItemGroup>

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ public PowerBITests(Xunit.Abstractions.ITestOutputHelper output)
2828
XunitTracingInterceptor.AddToContext(_logger);
2929
}
3030

31-
[Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
31+
[Fact]
3232
[Trait(Category.AcceptanceType, Category.CheckIn)]
3333
public void TestPBIECapacity()
3434
{
3535
NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacity");
3636
}
3737

38-
[Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
38+
[Fact]
3939
[Trait(Category.AcceptanceType, Category.CheckIn)]
4040
public void TestPBIECapacityScale()
4141
{
4242
NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacityScale");
4343
}
4444

45-
[Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
45+
[Fact]
4646
[Trait(Category.AcceptanceType, Category.CheckIn)]
4747
public void TestNegativePBIECapacity()
4848
{

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ function Test-PowerBIEmbeddedCapacityScale
157157
$capacityUpdated = Update-AzureRmPowerBIEmbeddedCapacity -Name $capacityName -Sku A2 -PassThru
158158
Assert-AreEqual A2 $capacityUpdated.Sku
159159

160+
$capacityGetItem = Suspend-AzureRmPowerBIEmbeddedCapacity -ResourceGroupName $resourceGroupName -Name $capacityName -PassThru
161+
# this is to ensure backward compatibility compatibility. The servie side would make change to differenciate state and provisioningState in future
162+
Assert-True {$capacityGetItem.State -like "Paused"}
163+
160164
# Scale down A2 -> A1
161165
$capacityUpdated = Update-AzureRmPowerBIEmbeddedCapacity -Name $capacityName -Sku A1 -PassThru
162166
Assert-AreEqual A1 $capacityUpdated.Sku

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/SessionRecords/Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestNegativePBIECapacity.json

Lines changed: 315 additions & 294 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/SessionRecords/Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacity.json

Lines changed: 682 additions & 592 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/SessionRecords/Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacityScale.json

Lines changed: 636 additions & 603 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.9.0-preview" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.10.0-preview" targetFramework="net452" />
99
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.9.0-preview" />
31+
<PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.10.0-preview" />
3232
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3333
</ItemGroup>
3434

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<Prefer32Bit>false</Prefer32Bit>
5353
</PropertyGroup>
5454
<ItemGroup>
55-
<Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.9.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
57+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.10.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
5858
</Reference>
5959
</ItemGroup>
6060
<ItemGroup>

‎src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.9.0-preview" targetFramework="net452" />
3+
<package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.10.0-preview" targetFramework="net452" />
44
</packages>

0 commit comments

Comments
 (0)