Skip to content

Commit 2373fcf

Browse files
authored
Definition fixes (#296)
1 parent 4e69386 commit 2373fcf

16 files changed

+81
-69
lines changed

docs/resources/evpn_evi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ resource "iosxr_evpn_evi" "example" {
3232
assigned_number = 1
3333
}
3434
]
35-
bgp_route_policy_import = "ROUTE_POLICY_1"
36-
bgp_route_policy_export = "ROUTE_POLICY_1"
35+
bgp_route_policy_import = "EVI_POLICY_1"
36+
bgp_route_policy_export = "EVI_POLICY_1"
3737
advertise_mac = true
3838
unknown_unicast_suppression = true
3939
control_word_disable = true

docs/resources/segment_routing_v6.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@ resource "iosxr_segment_routing_v6" "example" {
2727
]
2828
formats = [
2929
{
30-
name = "usid-f3216"
31-
format_enable = true
32-
usid_local_id_block_ranges_lib_start = 57344
33-
usid_local_id_block_ranges_explict_lib_start = 65024
34-
usid_wide_local_id_block_explicit_range = 65527
30+
name = "usid-f3216"
31+
format_enable = true
3532
}
3633
]
3734
}

examples/resources/iosxr_evpn_evi/resource.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ resource "iosxr_evpn_evi" "example" {
1717
assigned_number = 1
1818
}
1919
]
20-
bgp_route_policy_import = "ROUTE_POLICY_1"
21-
bgp_route_policy_export = "ROUTE_POLICY_1"
20+
bgp_route_policy_import = "EVI_POLICY_1"
21+
bgp_route_policy_export = "EVI_POLICY_1"
2222
advertise_mac = true
2323
unknown_unicast_suppression = true
2424
control_word_disable = true

examples/resources/iosxr_segment_routing_v6/resource.tf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ resource "iosxr_segment_routing_v6" "example" {
1212
]
1313
formats = [
1414
{
15-
name = "usid-f3216"
16-
format_enable = true
17-
usid_local_id_block_ranges_lib_start = 57344
18-
usid_local_id_block_ranges_explict_lib_start = 65024
19-
usid_wide_local_id_block_explicit_range = 65527
15+
name = "usid-f3216"
16+
format_enable = true
2017
}
2118
]
2219
}

gen/definitions/evpn_evi.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ attributes:
102102
id: true
103103
example: 1
104104
- yang_name: bgp/route-policy/import
105-
example: ROUTE_POLICY_1
105+
example: EVI_POLICY_1
106106
- yang_name: bgp/route-policy/export
107-
example: ROUTE_POLICY_1
107+
example: EVI_POLICY_1
108108
- yang_name: advertise-mac
109109
example: true
110110
- yang_name: unknown-unicast-suppression
@@ -119,10 +119,10 @@ attributes:
119119
example: true
120120

121121
test_prerequisites:
122-
- path: Cisco-IOS-XR-um-route-policy-cfg:/routing-policy/route-policies/route-policy[route-policy-name=ROUTE_POLICY_1]
122+
- path: Cisco-IOS-XR-um-route-policy-cfg:/routing-policy/route-policies/route-policy[route-policy-name=EVI_POLICY_1]
123123
attributes:
124124
- name: route-policy-name
125-
value: ROUTE_POLICY_1
125+
value: EVI_POLICY_1
126126
- name: rpl-route-policy
127-
value: "route-policy ROUTE_POLICY_1\\n pass\\nend-policy\\n"
127+
value: "route-policy EVI_POLICY_1\\n pass\\nend-policy\\n"
128128
- path: Cisco-IOS-XR-um-l2vpn-cfg:/evpn

gen/definitions/interface.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,27 @@ attributes:
114114
delete_parent: true
115115
example: ACL1
116116
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/ingress/hardware-count
117+
delete_parent: true
117118
example: true
118119
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/ingress/interface-statistics
120+
delete_parent: true
119121
example: true
120122
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/ingress/compress
123+
delete_parent: true
121124
example: 0
122125
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/access-list-name/name
123126
tf_name: ipv4_access_group_egress_acl
124127
optional: true
125128
delete_parent: true
126129
example: ACL1
127130
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/hardware-count
131+
delete_parent: true
128132
example: true
129133
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/interface-statistics
134+
delete_parent: true
130135
example: true
131136
- yang_name: ipv4/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/compress
137+
delete_parent: true
132138
example: 0
133139
- yang_name: ipv6/Cisco-IOS-XR-um-if-ipv6-cfg:verify/unicast/source/reachable-via/type
134140
optional: true
@@ -148,17 +154,21 @@ attributes:
148154
delete_parent: true
149155
example: ACL2
150156
- yang_name: ipv6/Cisco-IOS-XR-um-if-access-group-cfg:access-group/ingress/interface-statistics
157+
delete_parent: true
151158
example: true
152159
- yang_name: ipv6/Cisco-IOS-XR-um-if-access-group-cfg:access-group/ingress/compress
160+
delete_parent: true
153161
example: 0
154162
- yang_name: ipv6/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/access-list-name/name
155163
tf_name: ipv6_access_group_egress_acl
156164
optional: true
157165
delete_parent: true
158166
example: ACL2
159167
- yang_name: ipv6/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/interface-statistics
168+
delete_parent: true
160169
example: true
161170
- yang_name: ipv6/Cisco-IOS-XR-um-if-access-group-cfg:access-group/egress/compress
171+
delete_parent: true
162172
example: 0
163173
- yang_name: ipv6/Cisco-IOS-XR-um-if-ip-address-cfg:addresses/link-local-address/address
164174
tf_name: ipv6_link_local_address

gen/definitions/router_bgp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,5 @@ test_prerequisites:
208208
- attributes:
209209
- name: neighbor-group-name
210210
value: GROUP1
211+
- name: remote-as
212+
value: 65002

gen/definitions/segment_routing_v6.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ attributes:
3434
- yang_name: format-enable
3535
example: true
3636
- yang_name: usid/local-id-block-ranges/lib-start
37+
exclude_test: true
3738
example: 57344
3839
- yang_name: usid/local-id-block-ranges/explict-lib-start
40+
exclude_test: true
3941
example: 65024
4042
- yang_name: usid/wide-local-id-block-explicit-range
43+
exclude_test: true
4144
example: 65527

internal/provider/data_source_iosxr_evpn_evi_test.go

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

internal/provider/data_source_iosxr_router_bgp_test.go

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

0 commit comments

Comments
 (0)