Skip to content

Commit 6165840

Browse files
sivakasi-ciscosivakasi-cisco
committed
Intermediate manual corrections
1 parent 39550df commit 6165840

File tree

13 files changed

+49
-109
lines changed

13 files changed

+49
-109
lines changed

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_lo_merge.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
- name: ASSERT - Merge changed & return codes
6868
ansible.builtin.assert:
6969
that:
70-
- merge_result.changed | bool
70+
- merge_result.changed == true
7171
- item.RETURN_CODE == 200
7272
loop: "{{ merge_result.response }}"
7373

@@ -92,9 +92,10 @@
9292
- name: ASSERT - Merge idempotence
9393
ansible.builtin.assert:
9494
that:
95-
- not merge_idem_result.changed
95+
- merge_idem_result.changed == false
9696
- merge_idem_result.response is defined
97-
- merge_idem_result.response | length >= 0
97+
- merge_idem_result.response | length >= 0 # Allow empty response for idempotence
98+
# Don't loop over response items for idempotence check as they may be empty
9899

99100
##############################################
100101
## CLEANUP ##

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_lo_override.yaml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
## SETUP ##
33
##############################################
44

5-
- name: LO OVERRIDE - Test Entry Point - [ndfc_interface]
6-
ansible.builtin.debug:
7-
msg:
8-
- "----------------------------------------------------------------"
9-
- "+ Executing Tests - [ndfc_interface] +"
10-
- "+ LO OVERRIDE Tests +"
11-
- "----------------------------------------------------------------"
12-
135
- name: Remove local log file
146
local_action: command rm -f dcnm_intf.log
157

@@ -70,8 +62,10 @@
7062
- name: ASSERT - Merge changed & return codes
7163
ansible.builtin.assert:
7264
that:
73-
- merge_result.changed | bool
65+
- merge_result.changed == true
7466
- item.RETURN_CODE == 200
67+
fail_msg: "Creation of loopback interfaces failed - {{ result }}"
68+
success_msg: "Creation of loopback interfaces succeeded"
7569
loop: "{{ merge_result.response }}"
7670

7771
- name: QUERY - Get loopback interface state in NDFC (merge)
@@ -81,7 +75,7 @@
8175
config: "{{ dcnm_interface_override_merge_conf }}"
8276
register: merge_verify_result
8377

84-
- name: VALIDITY CHECK - Merge state
78+
- name: VALIDITY CHECK - Verify loopback interface state in NDFC (merge)
8579
cisco.dcnm.tests.integration.ndfc_interface_validate:
8680
config_path: "{{ test_data_interfaces.override_merge_conf_file }}"
8781
ndfc_data: "{{ merge_verify_result }}"
@@ -108,7 +102,7 @@
108102
- name: ASSERT - Override changed & return codes
109103
ansible.builtin.assert:
110104
that:
111-
- override_result.changed | bool
105+
- override_result.changed == true
112106
- item.RETURN_CODE == 200
113107
fail_msg: "Override of loopback interfaces failed - {{ result }}"
114108
success_msg: "Override of loopback interfaces succeeded"
@@ -121,7 +115,7 @@
121115
config: "{{ dcnm_interface_override_conf }}"
122116
register: override_verify_result
123117

124-
- name: VALIDITY CHECK - Override state
118+
- name: VALIDITY CHECK - Verify loopback interface state in NDFC (override)
125119
cisco.dcnm.tests.integration.ndfc_interface_validate:
126120
config_path: "{{ test_data_interfaces.override_conf_file }}"
127121
ndfc_data: "{{ override_verify_result }}"
@@ -132,7 +126,7 @@
132126
cisco.dcnm.dcnm_interface: *lo_override
133127
register: override_idem_result
134128

135-
- name: ASSERT - Override idempotence
129+
- name: ASSERT - Verify loopback interface override idempotence results
136130
ansible.builtin.assert:
137131
that:
138132
- 'result.changed == false'

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_lo_replace.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
- "----------------------------------------------------------------"
1212

1313
- name: Remove local log file
14-
ansible.builtin.command: rm -f dcnm_intf.log
15-
delegate_to: localhost
14+
local_action: command rm -f dcnm_intf.log
1615

1716
- name: Put the fabric to default state
1817
cisco.dcnm.dcnm_interface:
@@ -67,21 +66,21 @@
6766
config: "{{ dcnm_interface_merged_conf }}"
6867
register: merge_result
6968

70-
- name: ASSERT - Merge changed & return codes
69+
- name: ASSERT - Check changed flag is true and return codes
7170
ansible.builtin.assert:
7271
that:
73-
- merge_result.changed | bool
72+
- merge_result.changed == true
7473
- item.RETURN_CODE == 200
7574
loop: "{{ merge_result.response }}"
7675

77-
- name: QUERY - Get interface state after merge
76+
- name: QUERY - Get interface state in NDFC after merge
7877
cisco.dcnm.dcnm_interface:
7978
state: query
8079
fabric: "{{ test_data_common.fabric }}"
8180
config: "{{ dcnm_interface_merged_conf }}"
8281
register: merge_verify_result
8382

84-
- name: VALIDITY CHECK - Merge state
83+
- name: VALIDITY CHECK - Verify interface state in NDFC after merge
8584
cisco.dcnm.tests.integration.ndfc_interface_validate:
8685
config_path: "{{ test_data_interfaces.merged_conf_file }}"
8786
ndfc_data: "{{ merge_verify_result }}"
@@ -105,10 +104,10 @@
105104
config: "{{ dcnm_interface_replace_conf }}"
106105
register: replace_result
107106

108-
- name: ASSERT - Replace changed & return codes
107+
- name: ASSERT - Check changed flag is true and return codes
109108
ansible.builtin.assert:
110109
that:
111-
- replace_result.changed | bool
110+
- replace_result.changed == true
112111
- item.RETURN_CODE == 200
113112
loop: "{{ replace_result.response }}"
114113

@@ -119,7 +118,7 @@
119118
config: "{{ dcnm_interface_replace_conf }}"
120119
register: replace_verify_result
121120

122-
- name: VALIDITY CHECK - Replace state
121+
- name: VALIDITY CHECK - Verify interface state in NDFC after replace
123122
cisco.dcnm.tests.integration.ndfc_interface_validate:
124123
config_path: "{{ test_data_interfaces.replace_conf_file }}"
125124
ndfc_data: "{{ replace_verify_result }}"
@@ -130,10 +129,10 @@
130129
cisco.dcnm.dcnm_interface: *lo_replace
131130
register: replace_idem_result
132131

133-
- name: ASSERT - Replace idempotence
132+
- name: ASSERT - Check changed flag is false and return codes for idempotence
134133
ansible.builtin.assert:
135134
that:
136-
- not replace_idem_result.changed
135+
- replace_idem_result.changed == false
137136
- replace_idem_result.response is defined
138137
- replace_idem_result.response | length >= 0
139138

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_old_format_pb.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
- name: ASSERT - Verify old format 1 interface creation results
7878
ansible.builtin.assert:
7979
that:
80+
- 'result.failed == false'
8081
- 'result.changed == true'
8182
- 'item["RETURN_CODE"] == 200'
8283
fail_msg: "Creation with old format 1 failed - {{ result }}"

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_pc_merge.yaml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22
## SETUP ##
33
##############################################
44

5-
- name: PC MERGE - Test Entry Point - [ndfc_interface]
6-
ansible.builtin.debug:
7-
msg:
8-
- "----------------------------------------------------------------"
9-
- "+ Executing Tests - [ndfc_interface] +"
10-
- "+ PC MERGE Tests +"
11-
- "----------------------------------------------------------------"
12-
135
- name: Remove local log file
14-
ansible.builtin.command: rm -f dcnm_intf.log
15-
delegate_to: localhost
6+
local_action: command rm -f dcnm_intf.log
167

178
- name: Put the fabric to default state
189
cisco.dcnm.dcnm_interface:
@@ -67,7 +58,7 @@
6758
- name: ASSERT - Merge changed & return codes
6859
ansible.builtin.assert:
6960
that:
70-
- merge_result.changed | bool
61+
- merge_result.changed == true
7162
- item.RETURN_CODE == 200
7263
loop: "{{ merge_result.response }}"
7364

@@ -92,7 +83,7 @@
9283
- name: ASSERT - Merge idempotence
9384
ansible.builtin.assert:
9485
that:
95-
- not merge_idem_result.changed
86+
- merge_idem_result.changed == false
9687
- 'result.response is defined'
9788
- 'result.response | length >= 0' # Allow empty response for idempotence
9889
# Don't loop over response items for idempotence check as they may be empty

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_svi_delete.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
config: "{{ dcnm_interface_delete_conf }}"
9494
register: result
9595

96-
- name: ASSERT - Verify delete results
96+
- name: ASSERT - Check changed flag is false and return codes for idempotence (delete)
9797
ansible.builtin.assert:
9898
that:
9999
- 'result.changed == true'
@@ -115,14 +115,12 @@
115115
cisco.dcnm.dcnm_interface: *svi_del
116116
register: result
117117

118-
- name: ASSERT - Verify idempotence delete results
118+
- name: ASSERT - Check changed flag is false and return codes for idempotence (delete)
119119
ansible.builtin.assert:
120120
that:
121121
- 'result.changed == false'
122122
- 'result.response is defined'
123123
- 'result.response | length >= 0'
124-
success_msg: "Idempotence check for delete succeeded"
125-
fail_msg: "Idempotence check for delete failed - {{ result }}"
126124

127125
##############################################
128126
## CLEANUP ##

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_svi_invalid_params.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
config:
4747
- name: vlan3000 # should be of the form vlan<vlan-id>
4848
type: svi # choose from [pc, vpc, sub_int, lo, eth, svi]
49-
switch:
49+
switch: # provide the switch information where the config is to be deployed
5050
- "{{ test_data_common.switch1 }}"
5151
deploy: true # choose from [true, false]
5252
profile:
5353
admin_state: true # Flag to enable/disable Vlan interface
54-
# mode intentionally omitted
54+
# mode : vlan # choose from [int_vlan, int_vlan_admin_state], default is "int_vlan"
5555
ignore_errors: true
5656
register: result
5757

@@ -99,7 +99,7 @@
9999
profile:
100100
admin_state: true # Flag to enable/disable Vlan interaface
101101
mode: vlan # choose from [int_vlan, int_vlan_admin_state], default is "int_vlan"
102-
preempt: true # preempt provided without enable_hsrp
102+
preempt: true # optional, flag to enable/disable overthrow of low priority active routers, optional is "false"
103103
ignore_errors: true
104104
register: result
105105

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_svi_override.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
##############################################
2828
## SETUP VARS ##
2929
##############################################
30-
- name: Interface SVI test workflow
31-
block:
3230
- name: Setup Internal TestCase Variables
3331
ansible.builtin.set_fact:
3432
test_data_interfaces:
@@ -47,10 +45,8 @@
4745
- override
4846
delegate_to: localhost
4947

50-
- block:
51-
5248
##############################################
53-
## SETUP VARS ##
49+
## MERGE ##
5450
##############################################
5551
- name: Load Interface Config File (merged)
5652
ansible.builtin.set_fact:

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_svi_query.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
## SETUP VARS ##
2828
##############################################
2929

30-
- name: SVI query test workflow
31-
block:
3230
- name: Setup Internal TestCase Variables
3331
ansible.builtin.set_fact:
3432
test_data_interfaces:

‎tests/integration/targets/dcnm_interface/tests/dcnm/dcnm_svi_replace.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
##############################################
2929
## SETUP VARS ##
3030
##############################################
31-
- name: SVI replace test workflow
32-
block:
3331
- name: Setup Internal TestCase Variables
3432
ansible.builtin.set_fact:
3533
test_data_interfaces:
@@ -137,7 +135,6 @@
137135
- '(replace_idem.response | length) == 0'
138136
fail_msg: "Idempotence test failed for SVI interfaces - {{ replace_idem }}"
139137
success_msg: "Idempotence test passed for SVI interfaces"
140-
loop: '{{ replace_idem.response }}'
141138
# - '(result["diff"][0]["replaced"] | length) == 0'
142139
# - '(result["diff"][0]["overridden"] | length) == 0'
143140

0 commit comments

Comments
 (0)