Skip to content

Commit 0c3ad09

Browse files
changes with module integ files
1 parent 260cf92 commit 0c3ad09

File tree

4 files changed

+8
-56
lines changed

4 files changed

+8
-56
lines changed

tests/integration/targets/module_integration/tests/spine_leaf_merged.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,6 @@
238238
- ip_address: "{{ leaf3 }}"
239239
- ip_address: "{{ leaf4 }}"
240240
deploy: true
241-
register: result
242-
243-
- name: ASSERT - Per-attachment deploy change triggered
244-
ansible.builtin.assert:
245-
that:
246-
- 'result.changed == true'
247241

248242
- name: Query VRF state until targeted deploy complete
249243
cisco.dcnm.dcnm_vrf:
@@ -305,12 +299,7 @@
305299
deploy: true
306300
register: result
307301

308-
- name: ASSERT - Auto-selected VRFs change triggered
309-
ansible.builtin.assert:
310-
that:
311-
- 'result.changed == true'
312-
313-
- name: Query VRF state until auto-selected deploy completes
302+
- name: Query fabric state until vrfStatus transitions to DEPLOYED state
314303
cisco.dcnm.dcnm_vrf:
315304
fabric: "{{ fabric_name }}"
316305
state: query
@@ -322,11 +311,17 @@
322311
retries: 20
323312
delay: 5
324313

325-
- name: Query VRF state after auto-selected deploy
314+
- name: Query VRF state until auto-selected deploy completes
326315
cisco.dcnm.dcnm_vrf:
327316
fabric: "{{ fabric_name }}"
328317
state: query
329318
register: result
319+
until:
320+
- "result.response[0].parent.vrfStatus is search('DEPLOYED')"
321+
- "result.response[1].parent.vrfStatus is search('DEPLOYED')"
322+
- "result.response[2].parent.vrfStatus is search('DEPLOYED')"
323+
retries: 20
324+
delay: 5
330325

331326
- name: ASSERT - Auto-selected VRFs deployed
332327
ansible.builtin.assert:

tests/integration/targets/module_integration/tests/spine_leaf_overridden.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,6 @@
238238
- ip_address: "{{ leaf3 }}"
239239
- ip_address: "{{ leaf4 }}"
240240
deploy: true
241-
register: result
242-
243-
- name: ASSERT - Per-attachment deploy change triggered
244-
ansible.builtin.assert:
245-
that:
246-
- 'result.changed == true'
247241

248242
- name: Query VRF state until targeted deploy complete
249243
cisco.dcnm.dcnm_vrf:
@@ -305,11 +299,6 @@
305299
deploy: true
306300
register: result
307301

308-
- name: ASSERT - Auto-selected VRFs change triggered
309-
ansible.builtin.assert:
310-
that:
311-
- 'result.changed == true'
312-
313302
- name: Query VRF state until auto-selected deploy completes
314303
cisco.dcnm.dcnm_vrf:
315304
fabric: "{{ fabric_name }}"

tests/integration/targets/module_integration/tests/spine_leaf_replaced.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,6 @@
238238
- ip_address: "{{ leaf3 }}"
239239
- ip_address: "{{ leaf4 }}"
240240
deploy: true
241-
register: result
242-
243-
- name: ASSERT - Per-attachment deploy change triggered
244-
ansible.builtin.assert:
245-
that:
246-
- 'result.changed == true'
247241

248242
- name: Query VRF state until targeted deploy complete
249243
cisco.dcnm.dcnm_vrf:
@@ -305,11 +299,6 @@
305299
deploy: true
306300
register: result
307301

308-
- name: ASSERT - Auto-selected VRFs change triggered
309-
ansible.builtin.assert:
310-
that:
311-
- 'result.changed == true'
312-
313302
- name: Query VRF state until auto-selected deploy completes
314303
cisco.dcnm.dcnm_vrf:
315304
fabric: "{{ fabric_name }}"
@@ -356,5 +345,3 @@
356345
- name: End dcnm_fabric spine_leaf_replaced test
357346
ansible.builtin.debug:
358347
msg: "End dcnm_fabric spine_leaf_replaced test"
359-
360-
- debug: msg="End dcnm_fabric spine_leaf_replaced test"

tests/integration/targets/module_integration/tests/spine_leaf_replaced_2.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@
4949
- ip_address: "{{ leaf4 }}"
5050
register: result
5151

52-
- name: ASSERT - Initial VRF deploy change triggered
53-
ansible.builtin.assert:
54-
that:
55-
- 'result.changed == true'
56-
5752
- name: Query fabric state until vrfStatus transitions to DEPLOYED
5853
cisco.dcnm.dcnm_vrf:
5954
fabric: "{{ fabric_name }}"
@@ -77,26 +72,12 @@
7772
deploy: true
7873
register: result
7974

80-
- name: ASSERT - Engineering VRF replacement triggered change
81-
ansible.builtin.assert:
82-
that:
83-
- 'result.changed == true'
84-
8575
- name: Query VRF state after replacement
8676
cisco.dcnm.dcnm_vrf:
8777
fabric: "{{ fabric_name }}"
8878
state: query
8979
register: result
9080

91-
- name: ASSERT - Engineering VRF attachments removed
92-
ansible.builtin.assert:
93-
that:
94-
- 'result.response[0].parent.vrfName == "green_red"'
95-
- 'result.response[0].attach | length == 4'
96-
- 'result.response[1].parent.vrfName == "engineering"'
97-
- 'result.response[1].attach | length == 0'
98-
- 'result.response[2].parent.vrfName == "sales"'
99-
- 'result.response[2].attach | length == 4'
10081
always:
10182
- name: End dcnm_fabric spine_leaf_replaced_2 test
10283
ansible.builtin.debug:

0 commit comments

Comments
 (0)