Skip to content

Commit 8dae429

Browse files
sivakasi-ciscosivakasi-cisco
committed
vrf tests files - second round of review changes
1 parent 24b9279 commit 8dae429

File tree

4 files changed

+237
-237
lines changed

4 files changed

+237
-237
lines changed

‎tests/integration/targets/dcnm_vrf/tests/dcnm/deleted.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@
200200
cisco.dcnm.dcnm_vrf: &conf1h
201201
fabric: "{{ fabric_1 }}"
202202
state: deleted
203-
config:
204-
- vrf_name: ansible-vrf-int1
205-
vrf_id: 9008011
206-
vrf_template: Default_VRF_Universal
207-
vrf_extension_template: Default_VRF_Extension_Universal
208-
register: result_1h
203+
config:
204+
- vrf_name: ansible-vrf-int1
205+
vrf_id: 9008011
206+
vrf_template: Default_VRF_Universal
207+
vrf_extension_template: Default_VRF_Extension_Universal
208+
register: result_1h
209209

210210
- name: TEST.1j - DELETED - [debug] print result_1
211211
debug:
@@ -463,4 +463,4 @@
463463

464464
- name: CLEANUP.2 - DELETED - [wait_for] Wait 60 seconds for controller and switch to sync
465465
wait_for:
466-
timeout: 60
466+
timeout: 60

‎tests/integration/targets/dcnm_vrf/tests/dcnm/overridden.yaml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
- 'result_1.diff[1].attach[1].deploy == false'
164164
- 'result_1.diff[1].vrf_name == "ansible-vrf-int1"'
165165
- '"enableL3VniNoVlan\":\"true\"" in result_1a.response[0].parent.vrfTemplateConfig'
166-
- 'result_1a.response[0].parent.vrfStatus == "PENDING"'
166+
- 'result_1a.response[0].parent.vrfStatus == "PENDING"'
167167

168168
- name: TEST.1c - OVERRIDDEN - [overridden] conf1 - Idempotence
169169
cisco.dcnm.dcnm_vrf: *conf1
@@ -197,8 +197,8 @@
197197
attach:
198198
- ip_address: "{{ switch_1 }}"
199199
- ip_address: "{{ switch_2 }}"
200-
deploy: true
201-
register: result_2
200+
deploy: true
201+
register: result_2
202202

203203
- name: TEST.2a - OVERRIDDEN - [debug] print result_2
204204
debug:
@@ -229,19 +229,19 @@
229229
- 'result_2.diff[0].vrf_name == "ansible-vrf-int1"'
230230

231231
- name: TEST.2c - OVERRIDDEN - [overridden] Override existing VRF ansible-vrf-int1 to create new VRF ansible-vrf-int2
232-
cisco.dcnm.dcnm_vrf: &conf2
232+
cisco.dcnm.dcnm_vrf: &conf2
233233
fabric: "{{ fabric_1 }}"
234234
state: overridden
235-
config:
236-
- vrf_name: ansible-vrf-int2
237-
vrf_id: 9008012
238-
vrf_template: Default_VRF_Universal
239-
vrf_extension_template: Default_VRF_Extension_Universal
240-
vlan_id: 500
241-
attach:
242-
- ip_address: "{{ switch_1 }}"
243-
- ip_address: "{{ switch_2 }}"
244-
deploy: true
235+
config:
236+
- vrf_name: ansible-vrf-int2
237+
vrf_id: 9008012
238+
vrf_template: Default_VRF_Universal
239+
vrf_extension_template: Default_VRF_Extension_Universal
240+
vlan_id: 500
241+
attach:
242+
- ip_address: "{{ switch_1 }}"
243+
- ip_address: "{{ switch_2 }}"
244+
deploy: true
245245
register: result_2c
246246

247247
- name: TEST.2d - OVERRIDDEN - [query] Wait for vrfStatus == DEPLOYED
@@ -280,8 +280,8 @@
280280
- 'result_2c.diff[1].vrf_name == "ansible-vrf-int1"'
281281

282282
- name: TEST.2f - OVERRIDDEN - [overridden] conf2 - Idempotence
283-
cisco.dcnm.dcnm_vrf: *conf2
284-
register: result_2f
283+
cisco.dcnm.dcnm_vrf: *conf2
284+
register: result_2f
285285

286286
- name: TEST.2g - OVERRIDDEN - [debug] print result_2f
287287
debug:
@@ -298,23 +298,23 @@
298298
state: merged
299299
config:
300300
- vrf_name: ansible-vrf-int2
301-
vrf_id: 9008012
302-
vrf_template: Default_VRF_Universal
303-
vrf_extension_template: Default_VRF_Extension_Universal
304-
vlan_id: 1500
305-
attach:
306-
- ip_address: "{{ switch_1 }}"
307-
- ip_address: "{{ switch_2 }}"
308-
vrf_lite:
309-
- peer_vrf: ansible-vrf-int2 # optional
310-
interface: "{{ interface_2a }}" # mandatory
311-
ipv4_addr: 10.33.0.1/24 # optional
312-
neighbor_ipv4: 10.33.0.0 # optional
313-
ipv6_addr: 2010::10:34:0:7/64 # optional
314-
neighbor_ipv6: 2010::10:34:0:3 # optional
315-
dot1q: 2 # optional controller can provide
316-
deploy: true
317-
register: result_3
301+
vrf_id: 9008012
302+
vrf_template: Default_VRF_Universal
303+
vrf_extension_template: Default_VRF_Extension_Universal
304+
vlan_id: 1500
305+
attach:
306+
- ip_address: "{{ switch_1 }}"
307+
- ip_address: "{{ switch_2 }}"
308+
vrf_lite:
309+
- peer_vrf: ansible-vrf-int2 # optional
310+
interface: "{{ interface_2a }}" # mandatory
311+
ipv4_addr: 10.33.0.1/24 # optional
312+
neighbor_ipv4: 10.33.0.0 # optional
313+
ipv6_addr: 2010::10:34:0:7/64 # optional
314+
neighbor_ipv6: 2010::10:34:0:3 # optional
315+
dot1q: 2 # optional controller can provide
316+
deploy: true
317+
register: result_3
318318

319319
- name: TEST.3a - OVERRIDDEN - [wait_for] Wait 60 seconds for controller and switch to sync
320320
# The vrf lite profile removal returns ok for deployment, but the switch
@@ -353,28 +353,28 @@
353353
- 'result_3.diff[0].vrf_name == "ansible-vrf-int2"'
354354

355355
- name: TEST.4 - OVERRIDDEN - [overridden] Override vrf_lite extension with new dot1q value
356-
cisco.dcnm.dcnm_vrf: &conf4
356+
cisco.dcnm.dcnm_vrf: &conf4
357357
fabric: "{{ fabric_1 }}"
358358
state: overridden
359-
config:
360-
- vrf_name: ansible-vrf-int2
361-
vrf_id: 9008012
362-
vrf_template: Default_VRF_Universal
363-
vrf_extension_template: Default_VRF_Extension_Universal
364-
vlan_id: 1500
365-
attach:
366-
- ip_address: "{{ switch_1 }}"
367-
- ip_address: "{{ switch_2 }}"
368-
vrf_lite:
369-
- peer_vrf: ansible-vrf-int2 # optional
370-
interface: "{{ interface_2a }}" # mandatory
371-
ipv4_addr: 10.33.0.1/24 # optional
372-
neighbor_ipv4: 10.33.0.0 # optional
373-
ipv6_addr: 2010::10:34:0:7/64 # optional
374-
neighbor_ipv6: 2010::10:34:0:3 # optional
375-
dot1q: 21 # optional controller can provide
376-
deploy: true
377-
register: result_4
359+
config:
360+
- vrf_name: ansible-vrf-int2
361+
vrf_id: 9008012
362+
vrf_template: Default_VRF_Universal
363+
vrf_extension_template: Default_VRF_Extension_Universal
364+
vlan_id: 1500
365+
attach:
366+
- ip_address: "{{ switch_1 }}"
367+
- ip_address: "{{ switch_2 }}"
368+
vrf_lite:
369+
- peer_vrf: ansible-vrf-int2 # optional
370+
interface: "{{ interface_2a }}" # mandatory
371+
ipv4_addr: 10.33.0.1/24 # optional
372+
neighbor_ipv4: 10.33.0.0 # optional
373+
ipv6_addr: 2010::10:34:0:7/64 # optional
374+
neighbor_ipv6: 2010::10:34:0:3 # optional
375+
dot1q: 21 # optional controller can provide
376+
deploy: true
377+
register: result_4
378378

379379
- name: TEST.4a - OVERRIDDEN - [wait_for] Wait 60 seconds for controller and switch to sync
380380
# The vrf lite profile removal returns ok for deployment, but the switch
@@ -427,8 +427,8 @@
427427
- 'result_4.diff[0].vrf_name == "ansible-vrf-int2"'
428428

429429
- name: TEST.4f - OVERRIDDEN - [overridden] conf4 - Idempotence
430-
cisco.dcnm.dcnm_vrf: *conf4
431-
register: result_4f
430+
cisco.dcnm.dcnm_vrf: *conf4
431+
register: result_4f
432432

433433
- name: TEST.4g - OVERRIDDEN - [debug] print result_4f
434434
debug:
@@ -440,28 +440,28 @@
440440
- 'result_4f.response|length == 0'
441441

442442
- name: TEST.5 - OVERRIDDEN - [overridden] Override ansible-vrf-int2 to create ansible-vrf-int1 with LITE Extension
443-
cisco.dcnm.dcnm_vrf: &conf5
443+
cisco.dcnm.dcnm_vrf: &conf5
444444
fabric: "{{ fabric_1 }}"
445445
state: overridden
446-
config:
447-
- vrf_name: ansible-vrf-int1
448-
vrf_id: 9008011
449-
vrf_template: Default_VRF_Universal
450-
vrf_extension_template: Default_VRF_Extension_Universal
451-
vlan_id: 500
452-
attach:
453-
- ip_address: "{{ switch_1 }}"
454-
- ip_address: "{{ switch_2 }}"
455-
vrf_lite:
456-
- peer_vrf: ansible-vrf-int1 # optional
457-
interface: "{{ interface_2a }}" # mandatory
458-
ipv4_addr: 10.33.0.1/24 # optional
459-
neighbor_ipv4: 10.33.0.0 # optional
460-
ipv6_addr: 2010::10:34:0:1/64 # optional
461-
neighbor_ipv6: 2010::10:34:0:2 # optional
462-
dot1q: 31 # optional controller can provide
463-
deploy: true
464-
register: result_5
446+
config:
447+
- vrf_name: ansible-vrf-int1
448+
vrf_id: 9008011
449+
vrf_template: Default_VRF_Universal
450+
vrf_extension_template: Default_VRF_Extension_Universal
451+
vlan_id: 500
452+
attach:
453+
- ip_address: "{{ switch_1 }}"
454+
- ip_address: "{{ switch_2 }}"
455+
vrf_lite:
456+
- peer_vrf: ansible-vrf-int1 # optional
457+
interface: "{{ interface_2a }}" # mandatory
458+
ipv4_addr: 10.33.0.1/24 # optional
459+
neighbor_ipv4: 10.33.0.0 # optional
460+
ipv6_addr: 2010::10:34:0:1/64 # optional
461+
neighbor_ipv6: 2010::10:34:0:2 # optional
462+
dot1q: 31 # optional controller can provide
463+
deploy: true
464+
register: result_5
465465

466466
- name: TEST.5a - OVERRIDDEN - [wait_for] Wait 60 seconds for controller and switch to sync
467467
# The vrf lite profile removal returns ok for deployment, but the switch
@@ -508,8 +508,8 @@
508508
- 'result_5.diff[1].vrf_name == "ansible-vrf-int2"'
509509

510510
- name: TEST.5d - OVERRIDDEN - [overridden] conf5 - Idempotence
511-
cisco.dcnm.dcnm_vrf: *conf5
512-
register: result_5d
511+
cisco.dcnm.dcnm_vrf: *conf5
512+
register: result_5d
513513

514514
- name: TEST.5e - OVERRIDDEN - [debug] print result_5d
515515
debug:

0 commit comments

Comments
 (0)