update

hashicorp · Mar 3, 2020 · a787c8f · a787c8f
1 parent 8599ec2
commit a787c8f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/azurerm/internal/services/batch/resource_arm_batch_pool.go b/azurerm/internal/services/batch/resource_arm_batch_pool.go
@@ -744,6 +744,7 @@ func resourceArmBatchPoolRead(d *schema.ResourceData, meta interface{}) error {
 
  if props := resp.PoolProperties; props != nil {
  d.Set("vm_size", props.VMSize)
+ d.Set("max_tasks_per_node", props.MaxTasksPerNode)
 
  if scaleSettings := props.ScaleSettings; scaleSettings != nil {
  if err := d.Set("auto_scale", azure.FlattenBatchPoolAutoScaleSettings(scaleSettings.AutoScale)); err != nil {

diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go
@@ -392,9 +392,23 @@ func TestAccAzureRMBatchPool_networkConfig(t *testing.T) {
  Config: testaccAzureRMBatchPool_networkConfig(data),
  Check: resource.ComposeTestCheckFunc(
  testCheckAzureRMBatchPoolExists(data.ResourceName),
- resource.TestCheckResourceAttr(data.ResourceName, "vm_size", "Standard_A1"),
+ resource.TestCheckResourceAttr(data.ResourceName, "vm_size", "STANDARD_A1"),
+ resource.TestCheckResourceAttr(data.ResourceName, "node_agent_sku_id", "batch.node.ubuntu 18.04"),
+ resource.TestCheckResourceAttr(data.ResourceName, "account_name", fmt.Sprintf("testaccbatch%s", data.RandomString)),
+ resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.#", "1"),
+ resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.publisher", "Canonical"),
+ resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.sku", "18.04-LTS"),
+ resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.offer", "UbuntuServer"),
+ resource.TestCheckResourceAttr(data.ResourceName, "auto_scale.#", "0"),
+ resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.#", "1"),
+ resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.0.target_dedicated_nodes", "2"),
+ resource.TestCheckResourceAttr(data.ResourceName, "start_task.#", "0"),
+ resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.#", "1"),
+ resource.TestCheckResourceAttrSet(data.ResourceName, "network_configuration.0.subnet_id"),
+ resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.0.public_ips.#", "1"),
  ),
  },
+ data.ImportStep("stop_pending_resize_operation"),
  },
  })
 }
@@ -1210,14 +1224,15 @@ resource "azurerm_public_ip" "test" {
  location = azurerm_resource_group.test.location
  resource_group_name = azurerm_resource_group.test.name
  allocation_method = "Static"
+ sku = "Standard"
+ domain_name_label = "acctest-publicip"
 }
 
 resource "azurerm_batch_pool" "test" {
  name = "testaccpool%s"
  resource_group_name = "${azurerm_resource_group.test.name}"
  account_name = "${azurerm_batch_account.test.name}"
- display_name = "Test Acc Pool"
- vm_size = "STANDARD_D4"
+ vm_size = "Standard_A1"
  node_agent_sku_id = "batch.node.ubuntu 18.04"
 
  fixed_scale {
@@ -1232,7 +1247,7 @@ resource "azurerm_batch_pool" "test" {
  storage_image_reference {
  publisher = "Canonical"
  offer = "UbuntuServer"
- sku = "16.04.0-LTS"
+ sku = "18.04-LTS"
  version = "latest"
  }
 }