Merge pull request Azure#6963 from selasagi/fixScaleIssue

Fix failure on Update capacity when it is paused
markcowl · Aug 17, 2018 · 90e3d38 · 90e3d38
2 parents 9fcb67c + e4ad532
commit 90e3d38
Show file tree

Hide file tree

Showing 12 changed files with 1,649 additions and 1,500 deletions.
diff --git a/...esourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/ChangeLog.md b/...esourceManager/PowerBIEmbedded/Commands.Management.PowerBIEmbedded/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix failure in Update-AzureRmPowerBIEmbeddedCapacity when trying to scale paused capacity
 * Fixed issue with default resource groups not being set.
 
 ## Version 4.1.8

diff --git a/...esourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj b/...esourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.9.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.10.0-preview" />
     <PackageReference Include="Moq" Version="4.2.1510.2205" />
   </ItemGroup>
 

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.csproj
@@ -44,8 +44,8 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.9.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.PowerBIDedicated">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.10.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.cs b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.cs
@@ -28,21 +28,21 @@ public PowerBITests(Xunit.Abstractions.ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(_logger);
         }
 
-        [Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPBIECapacity()
         {
             NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacity");
         }
 
-        [Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPBIECapacityScale()
         {
             NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacityScale");
         }
 
-        [Fact(Skip = "Now using Internal.Resources.ResourceManagerClient, needs re-recorded")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNegativePBIECapacity()
         {

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.ps1 b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/ScenarioTests/PowerBITests.ps1
@@ -157,6 +157,10 @@ function Test-PowerBIEmbeddedCapacityScale
 		$capacityUpdated = Update-AzureRmPowerBIEmbeddedCapacity -Name $capacityName -Sku A2 -PassThru
 		Assert-AreEqual A2 $capacityUpdated.Sku
 
+		$capacityGetItem = Suspend-AzureRmPowerBIEmbeddedCapacity -ResourceGroupName $resourceGroupName -Name $capacityName -PassThru
+		# this is to ensure backward compatibility compatibility. The servie side would make change to differenciate state and provisioningState in future
+		Assert-True {$capacityGetItem.State -like "Paused"}
+
 		# Scale down A2 -> A1
 		$capacityUpdated = Update-AzureRmPowerBIEmbeddedCapacity -Name $capacityName -Sku A1 -PassThru
 		Assert-AreEqual A1 $capacityUpdated.Sku

diff --git a/...soft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestNegativePBIECapacity.json b/...soft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestNegativePBIECapacity.json
diff --git a/...ds/Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacity.json b/...ds/Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacity.json
diff --git a/...crosoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacityScale.json b/...crosoft.Azure.Commands.PowerBI.Test.ScenarioTests.PowerBITests/TestPBIECapacityScale.json
diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/packages.config b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.9.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.10.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.Netcore.csproj
@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.9.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.10.0-preview" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/Commands.PowerBI.csproj
@@ -52,9 +52,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.PowerBIDedicated, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.9.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.PowerBIDedicated.0.10.0-preview\lib\net452\Microsoft.Azure.Management.PowerBIDedicated.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/packages.config b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.9.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.PowerBIDedicated" version="0.10.0-preview" targetFramework="net452" />
 </packages>