Skip to content

Commit 9da2de9

Browse files
committed
Merge pull request #454 from NaveenGoli/dev
bug fix and test case for slot issue
2 parents d92b7b0 + 6b070c4 commit 9da2de9

File tree

3 files changed

+436
-185
lines changed

3 files changed

+436
-185
lines changed

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function Test-CreatesNewSimpleWebApp
2525
$whpName = Get-WebHostPlanName
2626
$apiversion = "2014-04-01"
2727
$resourceType = "Microsoft.Web/sites"
28+
$slotName = $wname + "(Dev)"
2829
try
2930
{
3031
#Setup
@@ -34,10 +35,13 @@ function Test-CreatesNewSimpleWebApp
3435
# Test
3536
$actual = New-AzureWebApp -ResourceGroupName $rgname -Name $wname -Location $location -AppServicePlan $whpName
3637
$result = Get-AzureWebApp -ResourceGroupName $rgname -Name $wname
38+
$slotCreate = New-AzureWebApp -ResourceGroupName $rgname -Name $wname -Location $location -AppServicePlan $whpName -SlotName Dev
39+
3740

3841
# Assert
3942
Assert-AreEqual $wname $result.Name
4043
Assert-AreEqual $whpName $result.Properties.ServerFarm
44+
Assert-AreEqual $slotName $slotCreate.Name
4145
}
4246
finally
4347
{

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.WebApp.Test.ScenarioTests.WebAppTests/TestCreatesNewSimpleWebApp.json

Lines changed: 424 additions & 184 deletions
Large diffs are not rendered by default.

src/ResourceManager/Websites/Commands.Websites/Utilities/WebsitesClient.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,20 @@ public WebSiteManagementClient WrappedWebsitesClient
4747

4848
public WebSite CreateWebsite(string resourceGroupName, string webSiteName, string slotName, string location, string webHostingPlan)
4949
{
50+
string webSiteSlotName = webSiteName;
51+
if (string.IsNullOrEmpty(slotName) == false)
52+
{
53+
webSiteSlotName = string.Concat(webSiteName, "/", slotName);
54+
55+
}
56+
5057
var createdWebSite = WrappedWebsitesClient.WebSites.CreateOrUpdate(
5158
resourceGroupName, webSiteName, slotName,
5259
new WebSiteCreateOrUpdateParameters
5360
{
5461
WebSite = new WebSiteBase
5562
{
56-
Name = webSiteName,
63+
Name = webSiteSlotName,
5764
Location = location,
5865
Properties = new WebSiteBaseProperties(webHostingPlan)
5966
}

0 commit comments

Comments
 (0)