Skip to content

Commit 24b9279

Browse files
sivakasi-ciscosivakasi-cisco
committed
Recheck failures address
1 parent 0c3ad09 commit 24b9279

File tree

63 files changed

+11061
-7982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+11061
-7982
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"python.testing.pytestArgs": ["tests"],
33
"python.testing.unittestEnabled": false,
4-
"python.testing.pytestEnabled": true
4+
"python.testing.pytestEnabled": true,
5+
"files.trimTrailingWhitespace": true,
56
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
delegate_to: localhost
217217

218218
- name: Put Parent Interface for Sub-Interface into routed mode
219-
cisco.dcnm.dcnm_interface: &delete_diff_merge3
219+
cisco.dcnm.dcnm_interface:
220220
check_deploy: false
221221
fabric: "{{ test_data_common.fabric }}"
222222
state: merged # only choose form [merged, replaced, deleted, overridden, query]
@@ -232,7 +232,7 @@
232232
description: "Parent Interface for Sub-Interface test"
233233

234234
- name: Create all interfaces to check delete form 3
235-
cisco.dcnm.dcnm_interface:
235+
cisco.dcnm.dcnm_interface: &delete_diff_merge3
236236
check_deploy: false
237237
fabric: "{{ test_data_common.fabric }}"
238238
state: merged # only choose form [merged, replaced, deleted, overridden, query]

‎tests/integration/targets/dcnm_links/tests/dcnm/dcnm_links_inter_ipv6_delete.yaml‎

Lines changed: 48 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@
6363
neighbor_ip: 193.168.1.2 # IP address of the interface in dst fabric
6464
src_asn: "{{ ansible_ipv6_asn }}" # BGP ASN in source fabric
6565
dst_asn: "{{ ansible_unnum_asn }}" # BGP ASN in destination fabric
66+
mtu: 9216 #
67+
auto_deploy: false # optional, default is false
68+
# Flag that controls auto generation of neighbor VRF Lite configuration
69+
peer1_description: "Description of source" # optional, default is ""
70+
peer2_description: "Description of dest" # optional, default is ""
71+
peer1_cmds: # Freeform config for source interface
72+
- no shutdown # optional, default is ""
73+
peer2_cmds: # Freeform config for destination interface
74+
- no shutdown # optional, default is ""
6675
register: merge_basic_result
6776

6877
- name: ASSERT - Basic merge diff counters
@@ -75,37 +84,13 @@
7584
- '(merge_basic_result.diff[0].query | length) == 0'
7685
- '(merge_basic_result["diff"][0]["deploy"][0][ "{{ ansible_unnum_fabric }}" ] | length) == 1'
7786
- '(merge_basic_result["diff"][0]["deploy"][0][ "{{ ansible_ipv6_fabric }}" ] | length) == 1'
78-
failed_when: merge_basic_result.diff is not defined
7987

8088
- name: ASSERT - Basic merge return codes
8189
ansible.builtin.assert:
8290
that:
8391
- 'item["RETURN_CODE"] == 200'
8492
loop: '{{ merge_basic_result.response }}'
8593

86-
##############################################
87-
## BASIC MERGE - IDEMPOTENCE ##
88-
##############################################
89-
90-
- name: Merge - Idempotence (basic link)
91-
cisco.dcnm.dcnm_links: *links_merge_basic
92-
register: merge_basic_idem
93-
94-
- name: ASSERT - Basic merge idempotence diff counters
95-
ansible.builtin.assert:
96-
that:
97-
- '(merge_basic_idem.diff[0].merged | length) == 0'
98-
- '(merge_basic_idem.diff[0].modified | length) == 0'
99-
- '(merge_basic_idem.diff[0].deleted | length) == 0'
100-
- '(merge_basic_idem.diff[0].query | length) == 0'
101-
failed_when: merge_basic_idem.diff is not defined
102-
103-
- name: ASSERT - Basic merge idempotence return codes
104-
ansible.builtin.assert:
105-
that:
106-
- 'item["RETURN_CODE"] == 200'
107-
loop: '{{ merge_basic_idem.response }}'
108-
10994
##############################################
11095
## BASIC DELETE ##
11196
##############################################
@@ -117,11 +102,13 @@
117102
- name: ASSERT - Basic delete diff counters
118103
ansible.builtin.assert:
119104
that:
105+
- '(delete_basic_result.changed == true'
120106
- '(delete_basic_result.diff[0].merged | length) == 0'
121107
- '(delete_basic_result.diff[0].modified | length) == 0'
122108
- '(delete_basic_result.diff[0].deleted | length) == 1'
123109
- '(delete_basic_result.diff[0].query | length) == 0'
124-
failed_when: delete_basic_result.diff is not defined
110+
- '(delete_basic_result["diff"][0]["deploy"][0][ "{{ ansible_unnum_fabric }}" ] | length) == 1'
111+
- '(delete_basic_result["diff"][0]["deploy"][0][ "{{ ansible_ipv6_fabric }}" ] | length) == 1'
125112

126113
- name: ASSERT - Basic delete return codes
127114
ansible.builtin.assert:
@@ -140,11 +127,11 @@
140127
- name: ASSERT - Basic delete idempotence diff counters
141128
ansible.builtin.assert:
142129
that:
130+
- '(delete_basic_idem.changed == false'
143131
- '(delete_basic_idem.diff[0].merged | length) == 0'
144132
- '(delete_basic_idem.diff[0].modified | length) == 0'
145133
- '(delete_basic_idem.diff[0].deleted | length) == 0'
146134
- '(delete_basic_idem.diff[0].query | length) == 0'
147-
failed_when: delete_basic_idem.diff is not defined
148135

149136
- name: ASSERT - Basic delete idempotence return codes
150137
ansible.builtin.assert:
@@ -153,7 +140,7 @@
153140
loop: '{{ delete_basic_idem.response }}'
154141

155142
##############################################
156-
## MULTISITE MERGE (CREATION MINIMAL) ##
143+
## MERGE ##
157144
##############################################
158145

159146
- name: Merge - Create multisite underlay + overlay links (minimal)
@@ -172,6 +159,23 @@
172159
neighbor_ip: 193.168.2.2
173160
src_asn: "{{ ansible_ipv6_asn }}"
174161
dst_asn: "{{ ansible_unnum_asn }}"
162+
mtu: 9216 #
163+
deploy_dci_tracking: false # optional, default is false
164+
max_paths: 1 # optional, default is 1
165+
route_tag: 12345 # optional, optional is ""
166+
ebgp_password_enable: true # optional, default is true
167+
ebgp_password: 9BFE3270E19CA112 # optional, required only if ebgp_password_enable flag is true and inherit_from_msd is false
168+
inherit_from_msd: true # optional, required only if ebgp_password_enable flag is true, default is false
169+
ebgp_auth_key_type: 3 # optional, required only if ebpg_password_enable is true and inherit_from_msd
170+
# is false. Default is 3
171+
# choose from [3 - 3DES, 7 - Cisco ]
172+
peer1_description: "Description of source" # optional, default is ""
173+
peer2_description: "Description of dest" # optional, default is ""
174+
peer1_cmds: # Freeform config for source interface
175+
- no shutdown # optional, default is ""
176+
peer2_cmds: # Freeform config for destination interface
177+
- no shutdown # optional, default is ""
178+
175179
- dst_fabric: "{{ ansible_unnum_fabric }}"
176180
src_interface: "{{ intf_1_5 }}"
177181
dst_interface: "{{ intf_1_5 }}"
@@ -183,17 +187,27 @@
183187
neighbor_ip: 193.168.3.2
184188
src_asn: "{{ ansible_ipv6_asn }}"
185189
dst_asn: "{{ ansible_unnum_asn }}"
190+
trm_enabled: false # optional, default is false
191+
bgp_multihop: 5 # optional, default is 5
192+
ebgp_password_enable: true # optional, default is true
193+
ebgp_password: 9BFE3270E19CA112 # optional, required only if ebgp_password_enable flag is true and inherit_from_msd is false
194+
inherit_from_msd: false # optional, required only if ebgp_password_enable flag is true, default is false
195+
ebpg_auth_key_type: 3 # optional, required only if ebpg_password_enable is true and inherit_from_msd
196+
# is false. Default is 3
197+
# choose from [3 - 3DES, 7 - Cisco ]
186198
register: merge_ms_result
187199
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
188200

189201
- name: ASSERT - Multisite merge diff counters (minimal)
190202
ansible.builtin.assert:
191203
that:
204+
- '(merge_ms_result.changed == true'
192205
- '(merge_ms_result.diff[0].merged | length) == 2'
193206
- '(merge_ms_result.diff[0].modified | length) == 0'
194207
- '(merge_ms_result.diff[0].deleted | length) == 0'
195208
- '(merge_ms_result.diff[0].query | length) == 0'
196-
failed_when: merge_ms_result.diff is not defined
209+
- '(merge_ms_result["diff"][0]["deploy"][0][ "{{ ansible_unnum_fabric }}" ] | length) == 1'
210+
- '(merge_ms_result["diff"][0]["deploy"][0][ "{{ ansible_ipv6_fabric }}" ] | length) == 1'
197211
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
198212

199213
- name: ASSERT - Multisite merge return codes (minimal)
@@ -204,7 +218,7 @@
204218
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
205219

206220
##############################################
207-
## MULTISITE MERGE (MINIMAL) - IDEMPOTENCE ##
221+
## DELETE ##
208222
##############################################
209223

210224
- name: Merge - Multisite idempotence (minimal)
@@ -215,11 +229,13 @@
215229
- name: ASSERT - Multisite merge idempotence diff counters (minimal)
216230
ansible.builtin.assert:
217231
that:
232+
- '(merge_ms_idem.changed == true'
218233
- '(merge_ms_idem.diff[0].merged | length) == 0'
219234
- '(merge_ms_idem.diff[0].modified | length) == 0'
220235
- '(merge_ms_idem.diff[0].deleted | length) == 0'
221236
- '(merge_ms_idem.diff[0].query | length) == 0'
222-
failed_when: merge_ms_idem.diff is not defined
237+
- '(merge_ms_idem["diff"][0]["deploy"][0][ "{{ ansible_unnum_fabric }}" ] | length) == 1'
238+
- '(merge_ms_idem["diff"][0]["deploy"][0][ "{{ ansible_ipv6_fabric }}" ] | length) == 1'
223239
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
224240

225241
- name: ASSERT - Multisite merge idempotence return codes (minimal)
@@ -230,7 +246,7 @@
230246
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
231247

232248
##############################################
233-
## MULTISITE DELETE ##
249+
## IDEMPOTENCE ##
234250
##############################################
235251

236252
- name: Delete - Remove multisite links
@@ -241,11 +257,11 @@
241257
- name: ASSERT - Multisite delete diff counters
242258
ansible.builtin.assert:
243259
that:
260+
- '(delete_ms_result.changed == false'
244261
- '(delete_ms_result.diff[0].merged | length) == 0'
245262
- '(delete_ms_result.diff[0].modified | length) == 0'
246263
- '(delete_ms_result.diff[0].deleted | length) == 2'
247264
- '(delete_ms_result.diff[0].query | length) == 0'
248-
failed_when: delete_ms_result.diff is not defined
249265
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
250266

251267
- name: ASSERT - Multisite delete return codes
@@ -254,46 +270,3 @@
254270
- 'item["RETURN_CODE"] == 200'
255271
loop: '{{ delete_ms_result.response }}'
256272
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
257-
258-
##############################################
259-
## MULTISITE DELETE - IDEMPOTENCE ##
260-
##############################################
261-
262-
- name: Delete - Multisite idempotence
263-
cisco.dcnm.dcnm_links: *links_delete
264-
register: delete_ms_idem
265-
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
266-
267-
- name: ASSERT - Multisite delete idempotence diff counters
268-
ansible.builtin.assert:
269-
that:
270-
- '(delete_ms_idem.diff[0].merged | length) == 0'
271-
- '(delete_ms_idem.diff[0].modified | length) == 0'
272-
- '(delete_ms_idem.diff[0].deleted | length) == 0'
273-
- '(delete_ms_idem.diff[0].query | length) == 0'
274-
failed_when: delete_ms_idem.diff is not defined
275-
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
276-
277-
- name: ASSERT - Multisite delete idempotence return codes
278-
ansible.builtin.assert:
279-
that:
280-
- 'item["RETURN_CODE"] == 200'
281-
loop: '{{ delete_ms_idem.response }}'
282-
when: (ansible_ipv6_fabric in ms_fabric_list or ansible_unnum_fabric in ms_fabric_list)
283-
284-
##############################################
285-
## CLEANUP ##
286-
##############################################
287-
288-
always:
289-
- name: Cleanup - Final delete to ensure no leftover links
290-
cisco.dcnm.dcnm_links: *links_delete
291-
register: cleanup_result
292-
when: it_context is not defined
293-
294-
- name: ASSERT - Cleanup return codes
295-
ansible.builtin.assert:
296-
that:
297-
- 'item["RETURN_CODE"] == 200'
298-
loop: '{{ cleanup_result.response }}'
299-
when: it_context is not defined

0 commit comments

Comments
 (0)