Skip to content

Commit ad2c7e5

Browse files
samiibakinross
samiib
authored and
akinross
committed
[ignore] Fix test assertions to check set variables
1 parent e79451b commit ad2c7e5

File tree

3 files changed

+16
-16
lines changed
  • tests/integration/targets
    • ndo_endpoint_ip_tag_policy/tasks
    • ndo_endpoint_mac_tag_policy/tasks
    • ndo_tenant_netflow_record/tasks

3 files changed

+16
-16
lines changed

‎tests/integration/targets/ndo_endpoint_ip_tag_policy/tasks/main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
- cm_create_endpoint_ip_tag_policy.current.vrfRef is defined
163163
- cm_create_endpoint_ip_tag_policy.current.vrfName == 'ansible_vrf'
164164
- cm_create_endpoint_ip_tag_policy.current.vrfSchemaId is defined
165-
- cm_create_endpoint_ip_tag_policy.current.vrfSchemaName == 'ansible_test'
165+
- cm_create_endpoint_ip_tag_policy.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
166166
- cm_create_endpoint_ip_tag_policy.current.vrfTemplateId is defined
167167
- cm_create_endpoint_ip_tag_policy.current.vrfTemplateName == 'ansible_tenant_template'
168168
- cm_create_endpoint_ip_tag_policy.current.uuid is not defined
@@ -183,7 +183,7 @@
183183
- nm_create_endpoint_ip_tag_policy.current.vrfRef is defined
184184
- nm_create_endpoint_ip_tag_policy.current.vrfName == 'ansible_vrf'
185185
- nm_create_endpoint_ip_tag_policy.current.vrfSchemaId is defined
186-
- nm_create_endpoint_ip_tag_policy.current.vrfSchemaName == 'ansible_test'
186+
- nm_create_endpoint_ip_tag_policy.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
187187
- nm_create_endpoint_ip_tag_policy.current.vrfTemplateId is defined
188188
- nm_create_endpoint_ip_tag_policy.current.vrfTemplateName == 'ansible_tenant_template'
189189
- nm_create_endpoint_ip_tag_policy.current.uuid is defined
@@ -200,7 +200,7 @@
200200
- nm_create_endpoint_ip_tag_policy_2.current.vrfRef is defined
201201
- nm_create_endpoint_ip_tag_policy_2.current.vrfName == 'ansible_vrf'
202202
- nm_create_endpoint_ip_tag_policy_2.current.vrfSchemaId is defined
203-
- nm_create_endpoint_ip_tag_policy_2.current.vrfSchemaName == 'ansible_test'
203+
- nm_create_endpoint_ip_tag_policy_2.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
204204
- nm_create_endpoint_ip_tag_policy_2.current.vrfTemplateId is defined
205205
- nm_create_endpoint_ip_tag_policy_2.current.vrfTemplateName == 'ansible_tenant_template'
206206
- nm_create_endpoint_ip_tag_policy_2.current.uuid is defined
@@ -282,7 +282,7 @@
282282
- cm_update_endpoint_ip_tag_policy.current.vrfRef is defined
283283
- cm_update_endpoint_ip_tag_policy.current.vrfName == 'ansible_vrf'
284284
- cm_update_endpoint_ip_tag_policy.current.vrfSchemaId is defined
285-
- cm_update_endpoint_ip_tag_policy.current.vrfSchemaName == 'ansible_test'
285+
- cm_update_endpoint_ip_tag_policy.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
286286
- cm_update_endpoint_ip_tag_policy.current.vrfTemplateId is defined
287287
- cm_update_endpoint_ip_tag_policy.current.vrfTemplateName == 'ansible_tenant_template'
288288
- cm_update_endpoint_ip_tag_policy.current.uuid is defined
@@ -305,7 +305,7 @@
305305
- nm_update_endpoint_ip_tag_policy.current.vrfRef is defined
306306
- nm_update_endpoint_ip_tag_policy.current.vrfName == 'ansible_vrf'
307307
- nm_update_endpoint_ip_tag_policy.current.vrfSchemaId is defined
308-
- nm_update_endpoint_ip_tag_policy.current.vrfSchemaName == 'ansible_test'
308+
- nm_update_endpoint_ip_tag_policy.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
309309
- nm_update_endpoint_ip_tag_policy.current.vrfTemplateId is defined
310310
- nm_update_endpoint_ip_tag_policy.current.vrfTemplateName == 'ansible_tenant_template'
311311
- nm_update_endpoint_ip_tag_policy.current.uuid is defined
@@ -329,7 +329,7 @@
329329
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfRef is defined
330330
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfName == 'ansible_vrf_2'
331331
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfSchemaId is defined
332-
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfSchemaName == 'ansible_test'
332+
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
333333
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfTemplateId is defined
334334
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.vrfTemplateName == 'ansible_tenant_template'
335335
- nm_update_endpoint_ip_tag_policy_ip_vrf.current.uuid is defined
@@ -346,7 +346,7 @@
346346
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfRef is defined
347347
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfName == 'ansible_vrf_2'
348348
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfSchemaId is defined
349-
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfSchemaName == 'ansible_test'
349+
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
350350
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfTemplateId is defined
351351
- nm_update_endpoint_ip_tag_policy_empty_list.current.vrfTemplateName == 'ansible_tenant_template'
352352
- nm_update_endpoint_ip_tag_policy_empty_list.current.uuid is defined

‎tests/integration/targets/ndo_endpoint_mac_tag_policy/tasks/main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
- cm_create_endpoint_mac_tag_policy.current.bdRef is defined
165165
- cm_create_endpoint_mac_tag_policy.current.bdName == 'ansible_bd'
166166
- cm_create_endpoint_mac_tag_policy.current.bdSchemaId is defined
167-
- cm_create_endpoint_mac_tag_policy.current.bdSchemaName == 'ansible_test'
167+
- cm_create_endpoint_mac_tag_policy.current.bdSchemaName == '{{ ansible_schema | default("ansible_test") }}'
168168
- cm_create_endpoint_mac_tag_policy.current.bdTemplateId is defined
169169
- cm_create_endpoint_mac_tag_policy.current.bdTemplateName == 'ansible_tenant_template'
170170
- cm_create_endpoint_mac_tag_policy.current.uuid is not defined
@@ -185,7 +185,7 @@
185185
- nm_create_endpoint_mac_tag_policy.current.bdRef is defined
186186
- nm_create_endpoint_mac_tag_policy.current.bdName == 'ansible_bd'
187187
- nm_create_endpoint_mac_tag_policy.current.bdSchemaId is defined
188-
- nm_create_endpoint_mac_tag_policy.current.bdSchemaName == 'ansible_test'
188+
- nm_create_endpoint_mac_tag_policy.current.bdSchemaName == '{{ ansible_schema | default("ansible_test") }}'
189189
- nm_create_endpoint_mac_tag_policy.current.bdTemplateId is defined
190190
- nm_create_endpoint_mac_tag_policy.current.bdTemplateName == 'ansible_tenant_template'
191191
- nm_create_endpoint_mac_tag_policy.current.vrfRef == ''
@@ -203,7 +203,7 @@
203203
- nm_create_endpoint_mac_tag_policy_2.current.bdRef is defined
204204
- nm_create_endpoint_mac_tag_policy_2.current.bdName == 'ansible_bd'
205205
- nm_create_endpoint_mac_tag_policy_2.current.bdSchemaId is defined
206-
- nm_create_endpoint_mac_tag_policy_2.current.bdSchemaName == 'ansible_test'
206+
- nm_create_endpoint_mac_tag_policy_2.current.bdSchemaName == '{{ ansible_schema | default("ansible_test") }}'
207207
- nm_create_endpoint_mac_tag_policy_2.current.bdTemplateId is defined
208208
- nm_create_endpoint_mac_tag_policy_2.current.bdTemplateName == 'ansible_tenant_template'
209209
- nm_create_endpoint_mac_tag_policy_2.current.vrfRef == ''
@@ -286,7 +286,7 @@
286286
- cm_update_endpoint_mac_tag_policy.current.bdRef is defined
287287
- cm_update_endpoint_mac_tag_policy.current.bdName == 'ansible_bd'
288288
- cm_update_endpoint_mac_tag_policy.current.bdSchemaId is defined
289-
- cm_update_endpoint_mac_tag_policy.current.bdSchemaName == 'ansible_test'
289+
- cm_update_endpoint_mac_tag_policy.current.bdSchemaName == '{{ ansible_schema | default("ansible_test") }}'
290290
- cm_update_endpoint_mac_tag_policy.current.bdTemplateId is defined
291291
- cm_update_endpoint_mac_tag_policy.current.bdTemplateName == 'ansible_tenant_template'
292292
- cm_update_endpoint_mac_tag_policy.current.uuid is defined
@@ -309,7 +309,7 @@
309309
- nm_update_endpoint_mac_tag_policy.current.bdRef is defined
310310
- nm_update_endpoint_mac_tag_policy.current.bdName == 'ansible_bd'
311311
- nm_update_endpoint_mac_tag_policy.current.bdSchemaId is defined
312-
- nm_update_endpoint_mac_tag_policy.current.bdSchemaName == 'ansible_test'
312+
- nm_update_endpoint_mac_tag_policy.current.bdSchemaName == '{{ ansible_schema | default("ansible_test") }}'
313313
- nm_update_endpoint_mac_tag_policy.current.bdTemplateId is defined
314314
- nm_update_endpoint_mac_tag_policy.current.bdTemplateName == 'ansible_tenant_template'
315315
- nm_update_endpoint_mac_tag_policy.current.vrfRef == ''
@@ -334,7 +334,7 @@
334334
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfRef is defined
335335
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfName == 'ansible_vrf'
336336
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfSchemaId is defined
337-
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfSchemaName == 'ansible_test'
337+
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
338338
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfTemplateId is defined
339339
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.vrfTemplateName == 'ansible_tenant_template'
340340
- nm_update_endpoint_mac_tag_policy_mac_vrf.current.uuid is defined
@@ -351,7 +351,7 @@
351351
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfRef is defined
352352
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfName == 'ansible_vrf'
353353
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfSchemaId is defined
354-
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfSchemaName == 'ansible_test'
354+
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfSchemaName == '{{ ansible_schema | default("ansible_test") }}'
355355
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfTemplateId is defined
356356
- nm_update_endpoint_mac_tag_policy_empty_list.current.vrfTemplateName == 'ansible_tenant_template'
357357
- nm_update_endpoint_mac_tag_policy_empty_list.current.uuid is defined

‎tests/integration/targets/ndo_tenant_netflow_record/tasks/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
- name: Ensure ansible_test exist
3535
cisco.mso.mso_tenant:
3636
<<: *mso_info
37-
name: ansible_test
37+
name: '{{ ansible_tenant | default("ansible_test") }}'
3838
state: present
3939

4040
- name: Ensure templates do not exist
4141
cisco.mso.ndo_template: &template_absent
4242
<<: *mso_info
4343
name: ansible_tenant_template
4444
template_type: tenant
45-
tenant: ansible_test
45+
tenant: '{{ ansible_tenant | default("ansible_test") }}'
4646
state: absent
4747

4848
- name: Ensure templates exist

0 commit comments

Comments
 (0)