Merge pull request #323 from amarzavery/goli

amarzavery · amarzavery · commit 739819025ebe · 2015-04-07T08:29:44.000-07:00
fixing naveen's pr #315
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj
@@ -131,6 +131,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.WebApp.Test.ScenarioTests.WebAppTests\TestCreatesNewSimpleWebApp.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.WebApp.Test.ScenarioTests.WebAppTests\TestSetNewAppServicePlan.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common.Test\Commands.Common.Test.csproj">
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/Common.ps1
@@ -18,7 +18,6 @@ Gets a website name for testing.
 #>
 function Get-WebsiteName
 {
-# need to remove hardcoding
     return getAssetName
 }
 
@@ -28,7 +27,6 @@ Gets a website name for testing.
 #>
 function Get-WebHostPlanName
 {
-# need to remove hardcoding
     return getAssetName 
 }
 
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.cs b/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.cs
@@ -33,5 +33,12 @@ public void TestCreatesNewAppServicePlan()
         {
             WebsitesController.NewInstance.RunPsTest("Test-CreatesNewAppServicePlan");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSetNewAppServicePlan()
+        {
+            WebsitesController.NewInstance.RunPsTest("Test-SetNewAppServicePlan");
+        }
     }
 }
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.ps1 b/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.ps1
@@ -78,4 +78,47 @@ function Test-CreatesNewAppServicePlan
 		Remove-AzureAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Force
 		Remove-AzureResourceGroup -Name $rgname -Force
     }
+}
+
+<#
+.SYNOPSIS
+Tests creating a new Web Hosting Plan.
+#>
+function Test-SetNewAppServicePlan
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$whpName = Get-WebHostPlanName
+	$location = Get-Location
+
+	try
+	{
+		#Setup
+		New-AzureResourceGroup -Name $rgname -Location $location
+		# Test
+		$actual = New-AzureAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Location  $location 
+		$result = Get-AzureAppServicePlan -ResourceGroupName $rgname -Name  $whpName
+		# Assert
+		Assert-AreEqual $whpName $result.WebHostingPlan.Name
+		Assert-AreEqual 1 $result.WebHostingPlan.Properties.NumberOfWorkers
+		Assert-AreEqual "Standard" $result.WebHostingPlan.Properties.Sku
+		Assert-AreEqual "Small" $result.WebHostingPlan.Properties.WorkerSize
+
+		# Test setting the created service plan
+		$newresult = Set-AzureAppServicePlan  -ResourceGroupName $rgname -Name  $whpName -Location  $location -Sku Premium -NumberofWorkers 12 -WorkerSize Medium
+		# due to a bug Set and New are not returning the appropriate object so need to get.
+		$newresult = Get-AzureAppServicePlan -ResourceGroupName $rgname -Name  $whpName
+
+		# Assert
+		Assert-AreEqual $whpName $result.WebHostingPlan.Name
+		Assert-AreEqual 12 $newresult.WebHostingPlan.Properties.NumberOfWorkers
+		Assert-AreEqual "Premium" $newresult.WebHostingPlan.Properties.Sku
+		Assert-AreEqual "Medium" $newresult.WebHostingPlan.Properties.WorkerSize
+	}
+    finally
+    {
+		# Cleanup
+		Remove-AzureAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Force
+		Remove-AzureResourceGroup -Name $rgname -Force
+    }
 }
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.WebApp.Test.ScenarioTests.WebAppTests/TestSetNewAppServicePlan.json b/src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.WebApp.Test.ScenarioTests.WebAppTests/TestSetNewAppServicePlan.json
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/GetAzureAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/GetAzureAppServicePlan.cs
@@ -56,12 +56,12 @@ public override void ExecuteCmdlet()
 
         private void GetByWebHostingPlan()
         {
-            WriteObject(WebsitesClient.GetWebHostingPlan(ResourceGroupName, Name));
+            WriteObject(WebsitesClient.GetAppServicePlan(ResourceGroupName, Name));
         }
 
         private void GetByResourceGroup()
         {
-            WriteObject(WebsitesClient.ListWebHostingPlan(ResourceGroupName));
+            WriteObject(WebsitesClient.ListAppServicePlan(ResourceGroupName));
         }
     }
 }
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/NewAzureAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/NewAzureAppServicePlan.cs
@@ -116,7 +116,7 @@ public override void ExecuteCmdlet()
                 }
             }
 
-            WriteObject(WebsitesClient.CreateWebHostingPlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));
+            WriteObject(WebsitesClient.CreateAppServicePlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));
 
         }
 
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/RemoveAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/RemoveAppServicePlan.cs
@@ -48,10 +48,10 @@ public override void ExecuteCmdlet()
         {
             ConfirmAction(
                     Force.IsPresent,
-                    string.Format(Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingWebHostPlan, Name),
-                    Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingWebHostPlan,
+                    string.Format(Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingAppServicePlan, Name),
+                    Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingAppServicePlan,
                     Name,
-                    () => WebsitesClient.RemoveWebHostingPlan(ResourceGroupName, Name));
+                    () => WebsitesClient.RemoveAppServicePlan(ResourceGroupName, Name));
         }
     }
 }
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/SetAzureAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlan/SetAzureAppServicePlan.cs
@@ -115,7 +115,7 @@ public override void ExecuteCmdlet()
                 }
             }
 
-            WriteObject(WebsitesClient.CreateWebHostingPlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));
+            WriteObject(WebsitesClient.CreateAppServicePlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));
 
         }
 
diff --git a/src/ResourceManager/Websites/Commands.Websites/Properties/Resources.Designer.cs b/src/ResourceManager/Websites/Commands.Websites/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/Websites/Commands.Websites/Properties/Resources.resx b/src/ResourceManager/Websites/Commands.Websites/Properties/Resources.resx
@@ -117,16 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="RemovingWebHostPlan" xml:space="preserve">
-    <value>Are you sure you want to remove web hosting plan '{0}'</value>
+  <data name="RemovingAppServicePlan" xml:space="preserve">
+    <value>Are you sure you want to remove app service plan '{0}'</value>
   </data>
   <data name="RemoveWebsiteMessage" xml:space="preserve">
-    <value>Removing website</value>
+    <value>Removing web app</value>
   </data>
   <data name="RemoveWebsiteWarning" xml:space="preserve">
-    <value>Are you sure you want to remove the website "{0}"</value>
+    <value>Are you sure you want to remove the web app "{0}"</value>
   </data>
   <data name="RemovingWebsite" xml:space="preserve">
-    <value>Are you sure you want to remove website '{0}'</value>
+    <value>Are you sure you want to remove web app '{0}'</value>
   </data>
 </root>
diff --git a/src/ResourceManager/Websites/Commands.Websites/Utilities/WebsitesClient.cs b/src/ResourceManager/Websites/Commands.Websites/Utilities/WebsitesClient.cs
@@ -125,7 +125,7 @@ public WebSiteGetHistoricalUsageMetricsResponse GetWebAppUsageMetrics(string res
             return usageMetrics;
         }
 
-        public WebHostingPlanCreateOrUpdateResponse CreateWebHostingPlan(string resourceGroupName, string whpName, string location, string adminSiteName, int numberOfWorkers, SkuOptions sku, WorkerSizeOptions workerSize)
+        public WebHostingPlanCreateOrUpdateResponse CreateAppServicePlan(string resourceGroupName, string whpName, string location, string adminSiteName, int numberOfWorkers, SkuOptions sku, WorkerSizeOptions workerSize)
         {
             WebHostingPlanProperties webHostingPlanProperties = new WebHostingPlanProperties();
             webHostingPlanProperties.Sku = sku;
@@ -143,24 +143,21 @@ public WebHostingPlanCreateOrUpdateResponse CreateWebHostingPlan(string resource
             return createdWHP;
         }
 
-        public AzureOperationResponse RemoveWebHostingPlan(string resourceGroupName, string whpName)
+        public AzureOperationResponse RemoveAppServicePlan(string resourceGroupName, string whpName)
         {
             var response = WrappedWebsitesClient.WebHostingPlans.Delete(resourceGroupName, whpName);
-            //proper return type need to be discussed
             return response;
         }
 
-        public WebHostingPlanGetResponse GetWebHostingPlan(string resourceGroupName, string whpName)
+        public WebHostingPlanGetResponse GetAppServicePlan(string resourceGroupName, string whpName)
         {
             var response = WrappedWebsitesClient.WebHostingPlans.Get(resourceGroupName, whpName);
-            //proper return type need to be discussed
             return response;
         }
 
-        public WebHostingPlanListResponse ListWebHostingPlan(string resourceGroupName)
+        public WebHostingPlanListResponse ListAppServicePlan(string resourceGroupName)
         {       
             var response = WrappedWebsitesClient.WebHostingPlans.List(resourceGroupName);
-            //proper return type need to be discussed
             return response;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ Gets a website name for testing.`
`18`	`18`	`#>`
`19`	`19`	`function Get-WebsiteName`
`20`	`20`	`{`
`21`		`-# need to remove hardcoding`
`22`	`21`	`return getAssetName`
`23`	`22`	`}`
`24`	`23`
`@@ -28,7 +27,6 @@ Gets a website name for testing.`
`28`	`27`	`#>`
`29`	`28`	`function Get-WebHostPlanName`
`30`	`29`	`{`
`31`		`-# need to remove hardcoding`
`32`	`30`	`return getAssetName`
`33`	`31`	`}`
`34`	`32`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,12 @@ public void TestCreatesNewAppServicePlan()`
`33`	`33`	`{`
`34`	`34`	`WebsitesController.NewInstance.RunPsTest("Test-CreatesNewAppServicePlan");`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ [Fact]`
	`38`	`+ [Trait(Category.AcceptanceType, Category.CheckIn)]`
	`39`	`+ public void TestSetNewAppServicePlan()`
	`40`	`+ {`
	`41`	`+ WebsitesController.NewInstance.RunPsTest("Test-SetNewAppServicePlan");`
	`42`	`+ }`
`36`	`43`	`}`
`37`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,12 @@ public override void ExecuteCmdlet()`
`56`	`56`
`57`	`57`	`private void GetByWebHostingPlan()`
`58`	`58`	`{`
`59`		`- WriteObject(WebsitesClient.GetWebHostingPlan(ResourceGroupName, Name));`
	`59`	`+ WriteObject(WebsitesClient.GetAppServicePlan(ResourceGroupName, Name));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private void GetByResourceGroup()`
`63`	`63`	`{`
`64`		`- WriteObject(WebsitesClient.ListWebHostingPlan(ResourceGroupName));`
	`64`	`+ WriteObject(WebsitesClient.ListAppServicePlan(ResourceGroupName));`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public override void ExecuteCmdlet()`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`- WriteObject(WebsitesClient.CreateWebHostingPlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));`
	`119`	`+ WriteObject(WebsitesClient.CreateAppServicePlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));`
`120`	`120`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ public override void ExecuteCmdlet()`
`48`	`48`	`{`
`49`	`49`	`ConfirmAction(`
`50`	`50`	`Force.IsPresent,`
`51`		`- string.Format(Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingWebHostPlan, Name),`
`52`		`- Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingWebHostPlan,`
	`51`	`+ string.Format(Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingAppServicePlan, Name),`
	`52`	`+ Microsoft.Azure.Commands.WebApp.Properties.Resources.RemovingAppServicePlan,`
`53`	`53`	`Name,`
`54`		`- () => WebsitesClient.RemoveWebHostingPlan(ResourceGroupName, Name));`
	`54`	`+ () => WebsitesClient.RemoveAppServicePlan(ResourceGroupName, Name));`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public override void ExecuteCmdlet()`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- WriteObject(WebsitesClient.CreateWebHostingPlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));`
	`118`	`+ WriteObject(WebsitesClient.CreateAppServicePlan(ResourceGroupName, Name, Location, adminSiteName, NumberofWorkers, skuInput, workerSizeInput));`
`119`	`119`
`120`	`120`	`}`
`121`	`121`