Skip to content

Commit d0bf0bf

Browse files
gmicollhercot
gmicol
authored and
lhercot
committed
[ignore] Add logic in generator and templates to add custom test dependency to test file using test_constants.
1 parent 9a374d0 commit d0bf0bf

File tree

8 files changed

+90
-47
lines changed

8 files changed

+90
-47
lines changed

‎gen/definitions/properties.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,12 +2733,13 @@ vnsLDevIf:
27332733
logical_device: "aci_l4_l7_device.example_in_another_tenant.id"
27342734
test_values:
27352735
default:
2736-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
2736+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
27372737
resource_required:
2738-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
2738+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
27392739
all:
2740-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
2740+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
27412741
datasource_non_existing:
2742-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
2742+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
27432743
datasource_required:
2744-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
2744+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
2745+
custom_test_dependency_name: "ImportedVnsLDevVipWithFvTenant"

‎gen/generator.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ var templateFuncs = template.FuncMap{
151151
"getLegacyBlockTestValue": GetBlockTestValue,
152152
"getDeprecatedExplanation": GetDeprecatedExplanation,
153153
"getIgnoredExplanation": GetIgnoredExplanation,
154+
"getCustomTestDependency": GetCustomTestDependency,
154155
}
155156

156157
func GetDeprecatedExplanation(attributeName, replacedByAttributeName string) string {
@@ -3436,3 +3437,14 @@ func HasCustomTypeDocs(classPkgName, propertyName string, definitions Definition
34363437
}
34373438
return true
34383439
}
3440+
3441+
func GetCustomTestDependency(classPkgName string, definitions Definitions) string {
3442+
if classDetails, ok := definitions.Properties[classPkgName]; ok {
3443+
for key, value := range classDetails.(map[interface{}]interface{}) {
3444+
if key.(string) == "custom_test_dependency_name" {
3445+
return value.(string)
3446+
}
3447+
}
3448+
}
3449+
return ""
3450+
}

‎gen/templates/resource_test.go.tmpl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ resource "aci_{{$target.target_resource_name}}" "test_{{$target.target_resource_
17661766
{{- if .parents}}
17671767
{{- range .parents}}{{$target_classes := .target_classes}}
17681768
{{ $parentClassName := capitalize .class_name }}
1769-
const testConfig{{$.resourceClassName}}Min{{if .class_name}}DependencyWith{{capitalize .class_name}}{{- end}}AllowExisting = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
1769+
const testConfig{{$.resourceClassName}}Min{{if .class_name}}DependencyWith{{capitalize .class_name}}{{- end}}AllowExisting = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
17701770
resource "aci_{{$.resourceName}}" "allow_test" {
17711771
{{- if ne .parent_dn ""}}
17721772
parent_dn = {{.parent_dn}}
@@ -1858,7 +1858,7 @@ resource "aci_{{$.resourceName}}" "allow_test_2" {
18581858
}
18591859
`
18601860

1861-
const testConfig{{$.resourceClassName}}Min{{if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
1861+
const testConfig{{$.resourceClassName}}Min{{if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
18621862
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
18631863
{{- if ne .parent_dn ""}}
18641864
parent_dn = {{.parent_dn}}
@@ -1905,7 +1905,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
19051905
}
19061906
`
19071907

1908-
const testConfig{{$.resourceClassName}}All{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
1908+
const testConfig{{$.resourceClassName}}All{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
19091909
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
19101910
{{- if ne .parent_dn ""}}
19111911
parent_dn = {{.parent_dn}}
@@ -1981,7 +1981,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
19811981
}
19821982
`
19831983

1984-
const testConfig{{$.resourceClassName}}Reset{{if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
1984+
const testConfig{{$.resourceClassName}}Reset{{if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
19851985
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
19861986
{{- if ne .parent_dn ""}}
19871987
parent_dn = {{.parent_dn}}
@@ -2058,7 +2058,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
20582058
`
20592059

20602060
{{- if $.children}}
2061-
const testConfig{{$.resourceClassName}}Children{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2061+
const testConfig{{$.resourceClassName}}Children{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
20622062
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
20632063
{{- if ne .parent_dn ""}}
20642064
parent_dn = {{.parent_dn}}
@@ -2129,7 +2129,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
21292129
}
21302130
`
21312131

2132-
const testConfig{{$.resourceClassName}}ChildrenRemoveFromConfig{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2132+
const testConfig{{$.resourceClassName}}ChildrenRemoveFromConfig{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
21332133
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
21342134
{{- if ne .parent_dn ""}}
21352135
parent_dn = {{.parent_dn}}
@@ -2176,7 +2176,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
21762176
}
21772177
`
21782178

2179-
const testConfig{{$.resourceClassName}}ChildrenRemoveOne{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2179+
const testConfig{{$.resourceClassName}}ChildrenRemoveOne{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
21802180
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
21812181
{{- if ne .parent_dn ""}}
21822182
parent_dn = {{.parent_dn}}
@@ -2249,7 +2249,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
22492249
}
22502250
`
22512251

2252-
const testConfig{{$.resourceClassName}}ChildrenRemoveAll{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2252+
const testConfig{{$.resourceClassName}}ChildrenRemoveAll{{ if .class_name}}DependencyWith{{capitalize .class_name}}{{end}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
22532253
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
22542254
{{- if ne .parent_dn ""}}
22552255
parent_dn = {{.parent_dn}}
@@ -2303,7 +2303,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
23032303
{{- end}}
23042304

23052305
{{if $.custom_type}}
2306-
const testConfig{{$.resourceClassName}}CustomTypeDependencyWith{{capitalize .class_name}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2306+
const testConfig{{$.resourceClassName}}CustomTypeDependencyWith{{capitalize .class_name}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
23072307
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
23082308
parent_dn = {{.parent_dn}}
23092309
{{- range $key, $value := $.custom_type}}
@@ -2317,7 +2317,7 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
23172317
`
23182318
{{- end}}
23192319
{{- if $.legacy_attributes }}
2320-
const testConfig{{$.resourceClassName}}LegacyAttributesWith{{capitalize .class_name}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
2320+
const testConfig{{$.resourceClassName}}LegacyAttributesWith{{capitalize .class_name}} = {{- if ne $.custom_test_dependency_name nil}} testConfig{{$.custom_test_dependency_name}} + {{- end}} {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }}{{- if $childDependencies }} testChildDependencyConfig{{$.resourceClassName}} + {{- end }} {{if .class_name}}testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + {{- end}} `
23212321
resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
23222322
{{- range $key, $value := $.resource_required}}
23232323
{{$key}} = "{{$value}}"

‎gen/templates/testvars.yaml.tmpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,3 +530,8 @@ version_mismatch: true
530530
{{- if .DataSourceHasNoNameIdentifier }}
531531
data_source_has_no_name_identifier: {{ .DataSourceHasNoNameIdentifier }}
532532
{{- end}}
533+
534+
{{- $customTestDependency := getCustomTestDependency .PkgName $.Definitions }}
535+
{{- if ne $customTestDependency "" }}
536+
custom_test_dependency_name: "{{ $customTestDependency }}"
537+
{{- end}}

‎gen/testvars/vnsLDevIf.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ default:
1010
name_alias: ""
1111

1212
datasource_non_existing:
13-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
13+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
1414

1515
datasource_required:
16-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
16+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
1717

1818
resource_required:
19-
logical_device: "uni/tn-test_tenant/lDevVip-test_imported_device"
19+
logical_device: "uni/tn-test_tenant_imported_device/lDevVip-test_imported_device"
2020

2121
all:
2222
annotation: "annotation"
@@ -46,3 +46,4 @@ parents:
4646
class_in_parent: false
4747
test_type: both
4848
class_version: 1.0(1e)-
49+
custom_test_dependency_name: "ImportedVnsLDevVipWithFvTenant"

‎internal/provider/data_source_aci_imported_logical_device_test.go‎

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

0 commit comments

Comments
 (0)