Skip to content

Commit 46681c0

Browse files
mdmohanmdmohan
committed
Fixed broken cases - AT
1 parent 0520300 commit 46681c0

File tree

12 files changed

+61
-62
lines changed

12 files changed

+61
-62
lines changed

‎generator/defs/interface_vlan.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ resource:
182182
validator: Between(0, 255)
183183
description: HSRP group number
184184
handle_empty: true
185+
default_value: 1
185186
- model_name: HSRP_VIP
186187
ndfc_nested: [nvPairs]
187188
tf_name: hsrp_vip

‎internal/provider/networks_resource_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestAccNetworksResourceCRUD(t *testing.T) {
5151
domain = "example.com"
5252
insecure = true
5353
}
54-
resource ndfc_vrf_bulk "net_test" {
54+
resource ndfc_vrfs "net_test" {
5555
fabric_name = "dummy"
5656
}`
5757

@@ -263,10 +263,10 @@ func TestAccNetworksResourceAttachmentCRUD(t *testing.T) {
263263
*stepCount++
264264
tName := fmt.Sprintf("%s_%d", t.Name(), *stepCount)
265265
helper.NetAttachmentsMod(&networkRsc, 1, 1, helper.GetConfig("network").NDFC.Switches, helper.GetConfig("network").NDFC.Switches[2], map[string]interface{}{
266-
"switch_ports": types.CSVString{"Ethernet1/1", "Ethernet1/2"},
266+
"switch_ports": types.CSVString{"Ethernet1/10", "Ethernet1/12"},
267267
})
268268
helper.NetAttachmentsMod(&networkRsc, 10, 10, helper.GetConfig("network").NDFC.Switches, helper.GetConfig("network").NDFC.Switches[2], map[string]interface{}{
269-
"switch_ports": types.CSVString{"Ethernet1/1", "Ethernet1/2"},
269+
"switch_ports": types.CSVString{"Ethernet1/10", "Ethernet1/12"},
270270
})
271271
helper.GetTFConfigWithSingleResource(tName, *x, []interface{}{vrfRsc, networkRsc}, &tf_config)
272272
return *tf_config
@@ -280,10 +280,10 @@ func TestAccNetworksResourceAttachmentCRUD(t *testing.T) {
280280
*stepCount++
281281
tName := fmt.Sprintf("%s_%d", t.Name(), *stepCount)
282282
helper.NetAttachmentsMod(&networkRsc, 1, 1, helper.GetConfig("network").NDFC.Switches, helper.GetConfig("network").NDFC.Switches[2], map[string]interface{}{
283-
"switch_ports": types.CSVString{"Ethernet1/2"},
283+
"switch_ports": types.CSVString{"Ethernet1/12"},
284284
})
285285
helper.NetAttachmentsMod(&networkRsc, 10, 10, helper.GetConfig("network").NDFC.Switches, helper.GetConfig("network").NDFC.Switches[2], map[string]interface{}{
286-
"switch_ports": types.CSVString{"Ethernet1/2", "Ethernet1/3"},
286+
"switch_ports": types.CSVString{"Ethernet1/12", "Ethernet1/13"},
287287
})
288288
helper.GetTFConfigWithSingleResource(tName, *x, []interface{}{vrfRsc, networkRsc}, &tf_config)
289289
return *tf_config
@@ -311,7 +311,7 @@ func TestAccNetworksResourceGlobalDeploy(t *testing.T) {
311311
domain = "example.com"
312312
insecure = true
313313
}
314-
resource ndfc_vrf_bulk "net_test" {
314+
resource ndfc_vrfs "net_test" {
315315
fabric_name = "dummy"
316316
}`
317317

@@ -362,7 +362,7 @@ func TestAccNetworksResourceAttachmentDeployNetLevel(t *testing.T) {
362362
domain = "example.com"
363363
insecure = true
364364
}
365-
resource ndfc_vrf_bulk "net_test" {
365+
resource ndfc_vrfs "net_test" {
366366
fabric_name = "dummy"
367367
}`
368368

@@ -413,7 +413,7 @@ func TestAccNetworksResourceAttachmentDeployAttachments(t *testing.T) {
413413
domain = "example.com"
414414
insecure = true
415415
}
416-
resource ndfc_vrf_bulk "net_test" {
416+
resource ndfc_vrfs "net_test" {
417417
fabric_name = "dummy"
418418
}`
419419

@@ -464,7 +464,7 @@ func TestAccNetworksResourceRscUpdateAndGlobalDeploy(t *testing.T) {
464464
domain = "example.com"
465465
insecure = true
466466
}
467-
resource ndfc_vrf_bulk "net_test" {
467+
resource ndfc_vrfs "net_test" {
468468
fabric_name = "dummy"
469469
}`
470470

@@ -540,7 +540,7 @@ func TestAccNetwotksResourceGlobalDeployWithChanges(t *testing.T) {
540540
insecure = true
541541
}
542542
543-
resource "ndfc_vrf_bulk" "test_resource_vrf_bulk_1" {
543+
resource "ndfc_vrfs" "test_resource_vrf_bulk_1" {
544544
fabric_name = "CML"
545545
deploy_all_attachments = true
546546
vrfs = {
@@ -557,7 +557,7 @@ func TestAccNetwotksResourceGlobalDeployWithChanges(t *testing.T) {
557557
}
558558
559559
resource "ndfc_networks" "test_resource_networks_1" {
560-
depends_on = [ndfc_vrf_bulk.test_resource_vrf_bulk_1]
560+
depends_on = [ndfc_vrfs.test_resource_vrf_bulk_1]
561561
fabric_name = "CML"
562562
deploy_all_attachments = true
563563
networks = {

‎internal/provider/resources/resource_interface_vlan/interface_vlan_resource_gen.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/provider/test_utils_interface_vlan_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ func InterfaceVlanInterfacesValueHelperStateCheck(RscName string, c resource_int
102102
}
103103
if c.NvPairs.HsrpGroup != nil {
104104
ret = append(ret, resource.TestCheckResourceAttr(RscName, attrPath.AtName("hsrp_group").String(), strconv.Itoa(int(*c.NvPairs.HsrpGroup))))
105+
} else {
106+
ret = append(ret, resource.TestCheckResourceAttr(RscName, attrPath.AtName("hsrp_group").String(), "1"))
105107
}
106108
if c.NvPairs.HsrpVip != "" {
107109
ret = append(ret, resource.TestCheckResourceAttr(RscName, attrPath.AtName("hsrp_vip").String(), c.NvPairs.HsrpVip))

‎internal/provider/testing/config_scale.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ resource "ndfc_{{.RscType}}" "{{.RscName}}" {
8787

8888
{{define "NDFC_NETWORK_RESOURCE"}}
8989
resource "ndfc_{{.RscType}}" "{{.RscName}}" {
90-
depends_on = [resource.ndfc_vrf_bulk.{{.VrfRscName}}]
90+
depends_on = [resource.ndfc_vrfs.{{.VrfRscName}}]
9191
{{with .Network}}
9292
fabric_name = "{{.FabricName}}"
9393
deploy_all_attachments = {{.DeployAllAttachments}}

‎internal/provider/testing/init.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type NDFCConfig struct {
2929
Switches []string `yaml:"switches"`
3030
VrfPrefix string `yaml:"vrf_prefix"`
3131
NetPrefix string `yaml:"net_prefix"`
32+
VpcPair []string `yaml:"vpc_pair"`
3233
mockPort int
3334
mockServerStarted bool
3435
mockConfigFile string

‎internal/provider/testing/ndfc_config.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ ndfc:
99
- "9FE076D8EJL"
1010
- "9TQYTJSZ1VJ"
1111
- "9QBCTIN0FMY"
12-
vrf_prefix: "vrf_acc_test_"
13-
net_prefix: "net_acc_test_"
12+
vrf_prefix: "vrf_a_test_"
13+
net_prefix: "net_a_test_"
14+
vpc_pair:
15+
- "9TQYTJSZ1VJ"
16+
- "9Q34PHYLDB5"

‎internal/provider/testing/ndfc_config_175.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
ndfc:
3+
url: "https://172.25.74.175"
4+
user: admin
5+
pwd: "admin!@#"
6+
insecure: true
7+
fabric: CML
8+
switches:
9+
- "9SSXXLEGO3J"
10+
- "9XAE2OCJD8B"
11+
- "9B18T9Z8VLS"
12+
vrf_prefix: "vrf_a_test_"
13+
net_prefix: "net_a_test_"
14+
vpc_pair:
15+
- "9KQAM6STEBY"
16+
- "9B18T9Z8VLS"
17+
integration_test:
18+
fabric: at_test_vxlan
19+
switches:
20+
- ""
21+
- ""
22+
- ""

‎internal/provider/testing/vpc_pair.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ import (
1212
"terraform-provider-ndfc/internal/provider/resources/resource_vpc_pair"
1313
)
1414

15-
func GenerateVpcPairResource(VpcPairObj **resource_vpc_pair.NDFCVpcPairModel, serials []string, VirtualPeerLink bool) {
16-
vpcPair := *VpcPairObj
17-
vpcPair.SerialNumbers = serials[:2]
18-
*vpcPair.UseVirtualPeerlink = VirtualPeerLink
19-
}
20-
func GenerateVpcPairResourceWithMoreSerials(VpcPairObj **resource_vpc_pair.NDFCVpcPairModel, serials []string, VirtualPeerLink bool) {
15+
func GenerateVpcPairResource(VpcPairObj **resource_vpc_pair.NDFCVpcPairModel, serials []string, VirtualPeerLink bool, deploy bool) {
2116
vpcPair := *VpcPairObj
2217
vpcPair.SerialNumbers = serials
2318
*vpcPair.UseVirtualPeerlink = VirtualPeerLink
19+
vpcPair.Deploy = deploy
2420
}
21+

‎internal/provider/testing/vpc_pair.gotmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resource "ndfc_{{.RscType}}" "{{.RscName}}" {
77
{{- end}}
88
]
99
use_virtual_peerlink = {{deref_bool .UseVirtualPeerlink}}
10+
deploy = {{.Deploy}}
1011
{{end}}
1112
}
1213
{{end}}

0 commit comments

Comments
 (0)