Fixed test broken by removal of TemplateFile parameter from New-AzureRmResourceGroup cmdlet

stankovski · stankovski · commit fd3793d8e153 · 2015-10-02T16:07:56.000-07:00
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1
@@ -61,7 +61,8 @@ Creates the test environment needed to perform the Sql auditing tests
 #>
 function Create-TestEnvironmentWithParams ($params)
 {
-	New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force
+	New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -Force
+	New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force
 	New-AzureRmStorageAccount -Name $params.storageAccount -Location "West US" -ResourceGroupName $params.rgname -Type "Standard_GRS"
 }
 
@@ -72,7 +73,8 @@ Creates the test environment needed to perform the Sql auditing tests, while usi
 function Create-TestEnvironmentWithStorageV2 ($testSuffix)
 {
 	$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
-	New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force
+	New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -Force
+	New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force
 	New-AzureRmStorageAccount -Name $params.storageAccount -Location "West US" -ResourceGroupName $params.rgname -Type "Standard_GRS"
 }
 
@@ -83,7 +85,8 @@ Creates the test environment needed to perform the Sql data masking tests
 function Create-DataMaskingTestEnvironment ($testSuffix)
 {
 	$params = Get-SqlDataMaskingTestEnvironmentParameters $testSuffix
-	New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -TemplateFile ".\Templates\sql-ddm-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
+	New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -Force
+	New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
 	$fullServerName = $params.serverName + ".database.windows.net"
 	
 	$uid = $params.userName

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ Creates the test environment needed to perform the Sql auditing tests`
`61`	`61`	`#>`
`62`	`62`	`function Create-TestEnvironmentWithParams ($params)`
`63`	`63`	`{`
`64`		`- New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force`
	`64`	`+ New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -Force`
	`65`	`+ New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force`
`65`	`66`	`New-AzureRmStorageAccount -Name $params.storageAccount -Location "West US" -ResourceGroupName $params.rgname -Type "Standard_GRS"`
`66`	`67`	`}`
`67`	`68`
`@@ -72,7 +73,8 @@ Creates the test environment needed to perform the Sql auditing tests, while usi`
`72`	`73`	`function Create-TestEnvironmentWithStorageV2 ($testSuffix)`
`73`	`74`	`{`
`74`	`75`	`$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix`
`75`		`- New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force`
	`76`	`+ New-AzureRmResourceGroup -Name $params.rgname -Location "West US" -Force`
	`77`	`+ New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -Force`
`76`	`78`	`New-AzureRmStorageAccount -Name $params.storageAccount -Location "West US" -ResourceGroupName $params.rgname -Type "Standard_GRS"`
`77`	`79`	`}`
`78`	`80`
`@@ -83,7 +85,8 @@ Creates the test environment needed to perform the Sql data masking tests`
`83`	`85`	`function Create-DataMaskingTestEnvironment ($testSuffix)`
`84`	`86`	`{`
`85`	`87`	`$params = Get-SqlDataMaskingTestEnvironmentParameters $testSuffix`
`86`		`- New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -TemplateFile ".\Templates\sql-ddm-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force`
	`88`	`+ New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -Force`
	`89`	`+ New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force`
`87`	`90`	`$fullServerName = $params.serverName + ".database.windows.net"`
`88`	`91`
`89`	`92`	`$uid = $params.userName`