@@ -233,6 +233,8 @@ func TestAccTritonMachine_metadata(t *testing.T) {
233233 machineName := fmt .Sprintf ("acctest-%d" , acctest .RandInt ())
234234 basic := fmt .Sprintf (testAccTritonMachine_metadata_1 , machineName )
235235 add_metadata := fmt .Sprintf (testAccTritonMachine_metadata_1 , machineName )
236+ add_metadata_2 := fmt .Sprintf (testAccTritonMachine_metadata_2 , machineName )
237+ add_metadata_3 := fmt .Sprintf (testAccTritonMachine_metadata_3 , machineName )
236238
237239 resource .Test (t , resource.TestCase {
238240 PreCheck : func () { testAccPreCheck (t ) },
@@ -253,18 +255,32 @@ func TestAccTritonMachine_metadata(t *testing.T) {
253255 "triton_machine.test" , "user_data" , "hello" ),
254256 ),
255257 },
258+ resource.TestStep {
259+ Config : add_metadata_2 ,
260+ Check : resource .ComposeTestCheckFunc (
261+ testCheckTritonMachineExists ("triton_machine.test" ),
262+ resource .TestCheckResourceAttr (
263+ "triton_machine.test" ,
264+ "tags.triton.cns.services" , "test-cns-service" ),
265+ ),
266+ },
267+ resource.TestStep {
268+ Config : add_metadata_3 ,
269+ Check : resource .ComposeTestCheckFunc (
270+ testCheckTritonMachineExists ("triton_machine.test" ),
271+ resource .TestCheckResourceAttr (
272+ "triton_machine.test" ,
273+ "tags.triton.cns.services" , "test-cns-service" ),
274+ ),
275+ },
256276 },
257277 })
258278}
259279
260280var testAccTritonMachine_basic = `
261- provider "triton" {
262- url = "https://us-west-1.api.joyentcloud.com"
263- }
264-
265281resource "triton_machine" "test" {
266282 name = "%s"
267- package = "g3-standard-0.25-smartos "
283+ package = "g4-highcpu-128M "
268284 image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
269285
270286 tags = {
@@ -274,40 +290,28 @@ resource "triton_machine" "test" {
274290`
275291
276292var testAccTritonMachine_firewall_0 = `
277- provider "triton" {
278- url = "https://us-west-1.api.joyentcloud.com"
279- }
280-
281293resource "triton_machine" "test" {
282294 name = "%s"
283- package = "g3-standard-0.25-smartos "
295+ package = "g4-highcpu-128M "
284296 image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
285297
286298 firewall_enabled = 0
287299}
288300`
289301var testAccTritonMachine_firewall_1 = `
290- provider "triton" {
291- url = "https://us-west-1.api.joyentcloud.com"
292- }
293-
294302resource "triton_machine" "test" {
295303 name = "%s"
296- package = "g3-standard-0.25-smartos "
304+ package = "g4-highcpu-128M "
297305 image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
298306
299307 firewall_enabled = 1
300308}
301309`
302310
303311var testAccTritonMachine_metadata_1 = `
304- provider "triton" {
305- url = "https://us-west-1.api.joyentcloud.com"
306- }
307-
308312resource "triton_machine" "test" {
309313 name = "%s"
310- package = "g3-standard-0.25-smartos "
314+ package = "g4-highcpu-128M "
311315 image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
312316
313317 user_data = "hello"
@@ -317,7 +321,37 @@ resource "triton_machine" "test" {
317321 }
318322}
319323`
324+ var testAccTritonMachine_metadata_2 = `
325+ variable "tags" {
326+ default = {
327+ test = "hello!"
328+ triton.cns.services = "test-cns-service"
329+ }
330+ }
331+ resource "triton_machine" "test" {
332+ name = "%s"
333+ package = "g4-highcpu-128M"
334+ image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
335+
336+ user_data = "hello"
337+
338+ tags = "${var.tags}"
339+ }
340+ `
341+ var testAccTritonMachine_metadata_3 = `
342+ resource "triton_machine" "test" {
343+ name = "%s"
344+ package = "g4-highcpu-128M"
345+ image = "c20b4b7c-e1a6-11e5-9a4d-ef590901732e"
346+
347+ user_data = "hello"
320348
349+ tags = {
350+ test = "hello!"
351+ triton.cns.services = "test-cns-service"
352+ }
353+ }
354+ `
321355var testAccTritonMachine_withnic = `
322356resource "triton_fabric" "test" {
323357 name = "%s-network"
@@ -334,7 +368,7 @@ resource "triton_fabric" "test" {
334368
335369resource "triton_machine" "test" {
336370 name = "%s"
337- package = "g3-standard-0.25-smartos "
371+ package = "g4-highcpu-128M "
338372 image = "842e6fa6-6e9b-11e5-8402-1b490459e334"
339373
340374 tags = {
@@ -361,7 +395,7 @@ resource "triton_fabric" "test" {
361395
362396resource "triton_machine" "test" {
363397 name = "%s"
364- package = "g3-standard-0.25-smartos "
398+ package = "g4-highcpu-128M "
365399 image = "842e6fa6-6e9b-11e5-8402-1b490459e334"
366400
367401 tags = {
0 commit comments