Skip to content

Commit eb94f90

Browse files
uibmuibm
committed
updated tests
1 parent cebe98e commit eb94f90

6 files changed

+153
-522
lines changed

‎ibm/service/vpc/data_source_ibm_is_virtual_network_interface_floating_ip_test.go‎

Lines changed: 12 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -14,110 +14,35 @@ import (
1414
)
1515

1616
func TestAccIBMIsVirtualNetworkInterfaceFloatingIPDataSourceBasic(t *testing.T) {
17+
vpcname := fmt.Sprintf("tfp-vpc-%d", acctest.RandIntRange(10, 100))
18+
subnetname := fmt.Sprintf("tfp-subnet-%d", acctest.RandIntRange(10, 100))
19+
vniname := fmt.Sprintf("tfp-createname-%d", acctest.RandIntRange(10, 100))
20+
floatingipname := fmt.Sprintf("tfp-reservedip-%d", acctest.RandIntRange(10, 100))
1721
resource.Test(t, resource.TestCase{
1822
PreCheck: func() { acc.TestAccPreCheck(t) },
1923
Providers: acc.TestAccProviders,
2024
Steps: []resource.TestStep{
2125
resource.TestStep{
22-
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfigBasic(),
26+
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfigBasic(vpcname, subnetname, vniname, floatingipname),
2327
Check: resource.ComposeTestCheckFunc(
24-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "id"),
25-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "instance_id"),
26-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "network_interface_id"),
27-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "id"),
28-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "address"),
29-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "created_at"),
30-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "crn"),
31-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "href"),
32-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "name"),
33-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "resource_group.#"),
34-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "status"),
35-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "zone.#"),
36-
),
37-
},
38-
},
39-
})
40-
}
41-
42-
func TestAccIBMIsVirtualNetworkInterfaceFloatingIPDataSourceAllArgs(t *testing.T) {
43-
floatingIPName := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
44-
45-
resource.Test(t, resource.TestCase{
46-
PreCheck: func() { acc.TestAccPreCheck(t) },
47-
Providers: acc.TestAccProviders,
48-
Steps: []resource.TestStep{
49-
resource.TestStep{
50-
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfig(floatingIPName),
51-
Check: resource.ComposeTestCheckFunc(
52-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "id"),
53-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "instance_id"),
54-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "network_interface_id"),
55-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "id"),
5628
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "address"),
57-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "created_at"),
5829
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "crn"),
30+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "floating_ip"),
5931
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "href"),
32+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "id"),
6033
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "name"),
61-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "resource_group.#"),
62-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "status"),
63-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "target.#"),
64-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "zone.#"),
34+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ip.is_floating_ip", "virtual_network_interface"),
6535
),
6636
},
6737
},
6838
})
6939
}
7040

71-
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfigBasic() string {
72-
return fmt.Sprintf(`
73-
resource "ibm_is_floating_ip" "is_floating_ip_instance" {
74-
}
75-
41+
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfigBasic(vpcname, subnetname, vniname, floatingipname string) string {
42+
return testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPConfigBasic(vpcname, subnetname, vniname, floatingipname) + fmt.Sprintf(`
7643
data "ibm_is_virtual_network_interface_floating_ip" "is_floating_ip_instance" {
77-
virtual_network_interface = "virtual_network_interface_id"
78-
floating_ip = "floating_ip_id"
44+
virtual_network_interface = ibm_is_virtual_network_interface_floating_ip.testacc_vni_floatingip.virtual_network_interface
45+
floating_ip = ibm_is_virtual_network_interface_floating_ip.testacc_vni_floatingip.floating_ip
7946
}
8047
`)
8148
}
82-
83-
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDataSourceConfig(floatingIPName string) string {
84-
return fmt.Sprintf(`
85-
resource "ibm_is_floating_ip" "is_floating_ip_instance" {
86-
name = "%s"
87-
resource_group {
88-
href = "https://resource-controller.cloud.ibm.com/v2/resource_groups/fee82deba12e4c0fb69c3b09d1f12345"
89-
id = "fee82deba12e4c0fb69c3b09d1f12345"
90-
name = "my-resource-group"
91-
}
92-
target {
93-
deleted {
94-
more_info = "https://cloud.ibm.com/apidocs/vpc#deleted-resources"
95-
}
96-
href = "https://us-south.iaas.cloud.ibm.com/v1/instances/1e09281b-f177-46fb-baf1-bc152b2e391a/network_interfaces/10c02d81-0ecb-4dc5-897d-28392913b81e"
97-
id = "10c02d81-0ecb-4dc5-897d-28392913b81e"
98-
name = "my-instance-network-interface"
99-
primary_ip {
100-
address = "192.168.3.4"
101-
deleted {
102-
more_info = "https://cloud.ibm.com/apidocs/vpc#deleted-resources"
103-
}
104-
href = "https://us-south.iaas.cloud.ibm.com/v1/subnets/7ec86020-1c6e-4889-b3f0-a15f2e50f87e/reserved_ips/6d353a0f-aeb1-4ae1-832e-1110d10981bb"
105-
id = "6d353a0f-aeb1-4ae1-832e-1110d10981bb"
106-
name = "my-reserved-ip"
107-
resource_type = "subnet_reserved_ip"
108-
}
109-
resource_type = "network_interface"
110-
}
111-
zone {
112-
href = "https://us-south.iaas.cloud.ibm.com/v1/regions/us-south/zones/us-south-1"
113-
name = "us-south-1"
114-
}
115-
}
116-
117-
data "ibm_is_floating_ip" "is_floating_ip_instance" {
118-
instance_id = "instance_id"
119-
network_interface_id = "network_interface_id"
120-
id = "id"
121-
}
122-
`, floatingIPName)
123-
}

‎ibm/service/vpc/data_source_ibm_is_virtual_network_interface_floating_ips_test.go‎

Lines changed: 14 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -14,111 +14,32 @@ import (
1414
)
1515

1616
func TestAccIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceBasic(t *testing.T) {
17+
vpcname := fmt.Sprintf("tfp-vpc-%d", acctest.RandIntRange(10, 100))
18+
subnetname := fmt.Sprintf("tfp-subnet-%d", acctest.RandIntRange(10, 100))
19+
vniname := fmt.Sprintf("tfp-createname-%d", acctest.RandIntRange(10, 100))
20+
floatingipname := fmt.Sprintf("tfp-reservedip-%d", acctest.RandIntRange(10, 100))
1721
resource.Test(t, resource.TestCase{
1822
PreCheck: func() { acc.TestAccPreCheck(t) },
1923
Providers: acc.TestAccProviders,
2024
Steps: []resource.TestStep{
2125
resource.TestStep{
22-
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfigBasic(),
26+
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfigBasic(vpcname, subnetname, vniname, floatingipname),
2327
Check: resource.ComposeTestCheckFunc(
24-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "id"),
25-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "instance_id"),
26-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "network_interface_id"),
27-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "id"),
28-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "address"),
29-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "created_at"),
30-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "crn"),
31-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "href"),
32-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "name"),
33-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "resource_group.#"),
34-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "status"),
35-
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.0", "zone.#"),
28+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "address"),
29+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "crn"),
30+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "href"),
31+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "id"),
32+
resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "name"),
3633
),
3734
},
3835
},
3936
})
4037
}
4138

42-
func TestAccIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceAllArgs(t *testing.T) {
43-
floatingIPName := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
44-
45-
resource.Test(t, resource.TestCase{
46-
PreCheck: func() { acc.TestAccPreCheck(t) },
47-
Providers: acc.TestAccProviders,
48-
Steps: []resource.TestStep{
49-
resource.TestStep{
50-
Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfig(floatingIPName),
51-
Check: resource.ComposeTestCheckFunc(
52-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "id"),
53-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "instance_id"),
54-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "network_interface_id"),
55-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "id"),
56-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "address"),
57-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "created_at"),
58-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "crn"),
59-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "href"),
60-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "name"),
61-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "resource_group.#"),
62-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "status"),
63-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "target.#"),
64-
resource.TestCheckResourceAttrSet("data.ibm_is_floating_ip.is_floating_ip", "zone.#"),
65-
),
66-
},
67-
},
68-
})
69-
}
70-
71-
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfigBasic() string {
72-
return fmt.Sprintf(`
73-
resource "ibm_is_floating_ip" "is_floating_ip_instance" {
74-
}
75-
76-
data "ibm_is_floating_ip" "is_floating_ip_instance" {
77-
instance_id = "instance_id"
78-
network_interface_id = "network_interface_id"
79-
id = "id"
39+
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfigBasic(vpcname, subnetname, vniname, floatingipname string) string {
40+
return testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPConfigBasic(vpcname, subnetname, vniname, floatingipname) + fmt.Sprintf(`
41+
data "ibm_is_virtual_network_interface_floating_ips" "is_floating_ips" {
42+
virtual_network_interface = ibm_is_virtual_network_interface_floating_ip.testacc_vni_floatingip.virtual_network_interface
8043
}
8144
`)
8245
}
83-
84-
func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfig(floatingIPName string) string {
85-
return fmt.Sprintf(`
86-
resource "ibm_is_floating_ip" "is_floating_ip_instance" {
87-
name = "%s"
88-
resource_group {
89-
href = "https://resource-controller.cloud.ibm.com/v2/resource_groups/fee82deba12e4c0fb69c3b09d1f12345"
90-
id = "fee82deba12e4c0fb69c3b09d1f12345"
91-
name = "my-resource-group"
92-
}
93-
target {
94-
deleted {
95-
more_info = "https://cloud.ibm.com/apidocs/vpc#deleted-resources"
96-
}
97-
href = "https://us-south.iaas.cloud.ibm.com/v1/instances/1e09281b-f177-46fb-baf1-bc152b2e391a/network_interfaces/10c02d81-0ecb-4dc5-897d-28392913b81e"
98-
id = "10c02d81-0ecb-4dc5-897d-28392913b81e"
99-
name = "my-instance-network-interface"
100-
primary_ip {
101-
address = "192.168.3.4"
102-
deleted {
103-
more_info = "https://cloud.ibm.com/apidocs/vpc#deleted-resources"
104-
}
105-
href = "https://us-south.iaas.cloud.ibm.com/v1/subnets/7ec86020-1c6e-4889-b3f0-a15f2e50f87e/reserved_ips/6d353a0f-aeb1-4ae1-832e-1110d10981bb"
106-
id = "6d353a0f-aeb1-4ae1-832e-1110d10981bb"
107-
name = "my-reserved-ip"
108-
resource_type = "subnet_reserved_ip"
109-
}
110-
resource_type = "network_interface"
111-
}
112-
zone {
113-
href = "https://us-south.iaas.cloud.ibm.com/v1/regions/us-south/zones/us-south-1"
114-
name = "us-south-1"
115-
}
116-
}
117-
118-
data "ibm_is_floating_ip" "is_floating_ip_instance" {
119-
instance_id = "instance_id"
120-
network_interface_id = "network_interface_id"
121-
id = "id"
122-
}
123-
`, floatingIPName)
124-
}

0 commit comments

Comments
 (0)