Skip to content

Commit dbafd77

Browse files
authored
[Anycast] Fixed failing UTs for Host (#208)
1 parent ac25d2a commit dbafd77

1 file changed

Lines changed: 23 additions & 25 deletions

File tree

internal/service/anycast/api_anycast_host_resource_test.go

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func TestAccAnycastHostResource_basic(t *testing.T) {
2020
var resourceName = "bloxone_anycast_host.test"
2121
var v anycast.OnpremHost
2222
var anycastConfigName = acctest.RandomNameWithPrefix("anycast")
23-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
2423
anycastIP := acctest.RandomIP()
2524

2625
resource.Test(t, resource.TestCase{
@@ -29,7 +28,7 @@ func TestAccAnycastHostResource_basic(t *testing.T) {
2928
Steps: []resource.TestStep{
3029
// Create and Read
3130
{
32-
Config: testAccAnycastHostBasicConfig(anycastHostname, anycastConfigName, anycastIP),
31+
Config: testAccAnycastHostBasicConfig("TF_TEST_HOST_01", anycastConfigName, anycastIP),
3332
Check: resource.ComposeTestCheckFunc(
3433
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
3534
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -48,15 +47,14 @@ func TestAccAnycastHostResource_disappears(t *testing.T) {
4847
var v anycast.OnpremHost
4948
var anycastConfigName = acctest.RandomNameWithPrefix("anycast")
5049
var anycastIP = acctest.RandomIP()
51-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
5250

5351
resource.Test(t, resource.TestCase{
5452
PreCheck: func() { acctest.PreCheck(t) },
5553
ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
5654
CheckDestroy: testAccCheckAnycastHostDestroy(context.Background(), &v),
5755
Steps: []resource.TestStep{
5856
{
59-
Config: testAccAnycastHostBasicConfig(anycastHostname, anycastConfigName, anycastIP),
57+
Config: testAccAnycastHostBasicConfig("TF_TEST_HOST_01", anycastConfigName, anycastIP),
6058
Check: resource.ComposeTestCheckFunc(
6159
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
6260
testAccCheckAnycastHostDisappears(context.Background(), &v),
@@ -70,15 +68,14 @@ func TestAccAnycastHostResource_disappears(t *testing.T) {
7068
func TestAccAnycastHostResource_AnycastConfigRefs(t *testing.T) {
7169
var resourceName = "bloxone_anycast_host.test"
7270
var v anycast.OnpremHost
73-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
7471

7572
resource.Test(t, resource.TestCase{
7673
PreCheck: func() { acctest.PreCheck(t) },
7774
ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
7875
Steps: []resource.TestStep{
7976
// Create and Read
8077
{
81-
Config: testAccAnycastHostAnycastConfigRefs(anycastHostname, map[string]string{
78+
Config: testAccAnycastHostAnycastConfigRefs("TF_TEST_HOST_01", map[string]string{
8279
acctest.RandomNameWithPrefix("anycast"): acctest.RandomIP(),
8380
acctest.RandomNameWithPrefix("anycast"): acctest.RandomIP(),
8481
}),
@@ -97,15 +94,14 @@ func TestAccAnycastHostResource_enableRouting(t *testing.T) {
9794
var v anycast.OnpremHost
9895
var anycastConfigName = acctest.RandomNameWithPrefix("anycast")
9996
var anycastIP = acctest.RandomIP()
100-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
10197

10298
resource.Test(t, resource.TestCase{
10399
PreCheck: func() { acctest.PreCheck(t) },
104100
ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
105101
Steps: []resource.TestStep{
106102
// Create and Read
107103
{
108-
Config: testAccAnycastHostEnableRoutingBGP("BGP", anycastHostname, anycastConfigName, anycastIP),
104+
Config: testAccAnycastHostEnableRoutingBGP("BGP", "TF_TEST_HOST_01", anycastConfigName, anycastIP),
109105
Check: resource.ComposeTestCheckFunc(
110106
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
111107
resource.TestCheckResourceAttr(resourceName, "config_bgp.asn", "6500"),
@@ -116,7 +112,7 @@ func TestAccAnycastHostResource_enableRouting(t *testing.T) {
116112
},
117113
// Update and Read
118114
{
119-
Config: testAccAnycastHostEnableRoutingOSPF("OSPF", anycastHostname, anycastConfigName, anycastIP),
115+
Config: testAccAnycastHostEnableRoutingOSPF("OSPF", "TF_TEST_HOST_01", anycastConfigName, anycastIP),
120116
Check: resource.ComposeTestCheckFunc(
121117
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
122118
resource.TestCheckResourceAttr(resourceName, "config_ospf.area_type", "STANDARD"),
@@ -137,15 +133,14 @@ func TestAccAnycastHostResource_BGP(t *testing.T) {
137133
var v anycast.OnpremHost
138134
var anycastConfigName = acctest.RandomNameWithPrefix("anycast")
139135
var anycastIP = acctest.RandomIP()
140-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
141136

142137
resource.Test(t, resource.TestCase{
143138
PreCheck: func() { acctest.PreCheck(t) },
144139
ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
145140
Steps: []resource.TestStep{
146141
// Create and Read
147142
{
148-
Config: testAccAnycastHostBGP("BGP", anycastHostname, anycastConfigName, anycastIP, 6500, 180),
143+
Config: testAccAnycastHostBGP("BGP", "TF_TEST_HOST_01", anycastConfigName, anycastIP, 6500, 180),
149144
Check: resource.ComposeTestCheckFunc(
150145
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
151146
resource.TestCheckResourceAttr(resourceName, "config_bgp.asn", "6500"),
@@ -154,7 +149,7 @@ func TestAccAnycastHostResource_BGP(t *testing.T) {
154149
},
155150
// Update and Read
156151
{
157-
Config: testAccAnycastHostBGP("BGP", anycastHostname, anycastConfigName, anycastIP, 6601, 200),
152+
Config: testAccAnycastHostBGP("BGP", "TF_TEST_HOST_01", anycastConfigName, anycastIP, 6601, 200),
158153
Check: resource.ComposeTestCheckFunc(
159154
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
160155
resource.TestCheckResourceAttr(resourceName, "config_bgp.asn", "6601"),
@@ -171,15 +166,14 @@ func TestAccAnycastHostResource_OSPF(t *testing.T) {
171166
var v anycast.OnpremHost
172167
var anycastConfigName = acctest.RandomNameWithPrefix("anycast")
173168
var anycastIP = acctest.RandomIP()
174-
var anycastHostname = acctest.RandomNameWithPrefix("anycast_host")
175169

176170
resource.Test(t, resource.TestCase{
177171
PreCheck: func() { acctest.PreCheck(t) },
178172
ProtoV6ProviderFactories: acctest.ProtoV6ProviderFactories,
179173
Steps: []resource.TestStep{
180174
// Create and Read
181175
{
182-
Config: testAccAnycastHostOSPF("OSPF", "STANDARD", "10.10.0.1", "Clear", "eth0", anycastHostname, anycastConfigName, anycastIP, 10, 40, 5, 1),
176+
Config: testAccAnycastHostOSPF("OSPF", "STANDARD", "10.10.0.1", "Clear", "eth0", "TF_TEST_HOST_01", anycastConfigName, anycastIP, 10, 40, 5, 1),
183177
Check: resource.ComposeTestCheckFunc(
184178
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
185179
resource.TestCheckResourceAttr(resourceName, "config_ospf.area_type", "STANDARD"),
@@ -195,7 +189,7 @@ func TestAccAnycastHostResource_OSPF(t *testing.T) {
195189
},
196190
// Update and Read
197191
{
198-
Config: testAccAnycastHostOSPF("OSPF", "NSSA", "10.10.0.2", "MD5", "ens160", anycastHostname, anycastConfigName, anycastIP, 20, 50, 10, 2),
192+
Config: testAccAnycastHostOSPF("OSPF", "NSSA", "10.10.0.2", "MD5", "ens160", "TF_TEST_HOST_01", anycastConfigName, anycastIP, 20, 50, 10, 2),
199193
Check: resource.ComposeTestCheckFunc(
200194
testAccCheckAnycastHostExists(context.Background(), resourceName, &v),
201195
resource.TestCheckResourceAttr(resourceName, "config_ospf.area_type", "NSSA"),
@@ -274,8 +268,10 @@ func testAccCheckAnycastHostDisappears(ctx context.Context, v *anycast.OnpremHos
274268

275269
func testAccBaseWithAnycastConfig(hostName, name, anycastIpAddress string) string {
276270
return fmt.Sprintf(`
277-
resource "bloxone_infra_host" "test_host" {
278-
display_name = %q
271+
data "bloxone_infra_hosts" "test_host" {
272+
filters = {
273+
display_name = %q
274+
}
279275
}
280276
281277
resource "bloxone_anycast_config" "test_onprem_hosts" {
@@ -290,7 +286,7 @@ resource "bloxone_anycast_config" "test_onprem_hosts" {
290286
func testAccAnycastHostBasicConfig(hostName, anycastConfigName, anycastIP string) string {
291287
config := `
292288
resource "bloxone_anycast_host" "test" {
293-
id = bloxone_infra_host.test_host.legacy_id
289+
id = data.bloxone_infra_hosts.test_host.results.0.legacy_id
294290
295291
anycast_config_refs = [
296292
{
@@ -306,8 +302,10 @@ func testAccAnycastHostAnycastConfigRefs(hostName string, anycastIPs map[string]
306302
var configs []string
307303

308304
configs = append(configs, fmt.Sprintf(`
309-
resource "bloxone_infra_host" "test" {
310-
display_name = %q
305+
data "bloxone_infra_hosts" "test" {
306+
filters = {
307+
display_name = %q
308+
}
311309
}
312310
`, hostName))
313311

@@ -330,7 +328,7 @@ resource "bloxone_anycast_config" %[1]q {
330328

331329
configs = append(configs, fmt.Sprintf(`
332330
resource "bloxone_anycast_host" "test" {
333-
id = bloxone_infra_host.test.legacy_id
331+
id = data.bloxone_infra_hosts.test.results.0.legacy_id
334332
anycast_config_refs = [
335333
%[1]s
336334
]
@@ -342,7 +340,7 @@ resource "bloxone_anycast_host" "test" {
342340
func testAccAnycastHostEnableRoutingBGP(routingProtocols, hostName, anycastConfigName, anycastIP string) string {
343341
config := fmt.Sprintf(`
344342
resource "bloxone_anycast_host" "test" {
345-
id = bloxone_infra_host.test_host.legacy_id
343+
id = data.bloxone_infra_hosts.test_host.results.0.legacy_id
346344
347345
anycast_config_refs = [
348346
{
@@ -369,7 +367,7 @@ resource "bloxone_anycast_host" "test" {
369367
func testAccAnycastHostEnableRoutingOSPF(routing_protocols, hostName, anycastConfigName, anycastIP string) string {
370368
config := fmt.Sprintf(`
371369
resource "bloxone_anycast_host" "test" {
372-
id = bloxone_infra_host.test_host.legacy_id
370+
id = data.bloxone_infra_hosts.test_host.results.0.legacy_id
373371
374372
anycast_config_refs = [
375373
{
@@ -397,7 +395,7 @@ resource "bloxone_anycast_host" "test" {
397395
func testAccAnycastHostBGP(routingProtocols, hostName, anycastConfigName, anycastIP string, asn, holddown_secs int64) string {
398396
config := fmt.Sprintf(`
399397
resource "bloxone_anycast_host" "test" {
400-
id = bloxone_infra_host.test_host.legacy_id
398+
id = data.bloxone_infra_hosts.test_host.results.0.legacy_id
401399
402400
anycast_config_refs = [
403401
{
@@ -424,7 +422,7 @@ resource "bloxone_anycast_host" "test" {
424422
func testAccAnycastHostOSPF(routing_protocols, area_type, area, authentication_type, ospfInterface, hostName, anycastConfigName, anycastIP string, hello_interval, dead_interval, retransmit_interval, transmit_delay int64) string {
425423
config := fmt.Sprintf(`
426424
resource "bloxone_anycast_host" "test" {
427-
id = bloxone_infra_host.test_host.legacy_id
425+
id = data.bloxone_infra_hosts.test_host.results.0.legacy_id
428426
429427
anycast_config_refs = [
430428
{

0 commit comments

Comments
 (0)