Skip to content

Commit 38e79ff

Browse files
Partial lint-changes
1 parent fc4b98a commit 38e79ff

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

playbooks/roles/dcnm_bootflash/create_files.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
- gather_facts: false
2+
- name: Create bootflash files on switch1
3+
gather_facts: false
34
hosts:
45
- switch1
56
tasks:
@@ -13,7 +14,8 @@
1314
- echo 1 > bootflash: /{{ nxos_vars.switch1_file3 }}
1415
- echo 1 > bootflash: /{{ nxos_vars.switch1_file4 }}
1516

16-
- gather_facts: false
17+
- name: Create bootflash files on switch2
18+
gather_facts: false
1719
hosts:
1820
- switch2
1921
tasks:
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
---
2-
- { include_tasks: dcnm.yaml, tags: ['dcnm'] }
2+
- name: Include dcnm.yaml
3+
ansible.builtin.include_tasks: dcnm.yaml
4+
tags: ['dcnm']

tests/integration/targets/dcnm_network/tasks/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
ansible.builtin.template:
3131
src: "{{ test_data_setup.vrf_conf_template }}"
3232
dest: "{{ test_data_setup.vrf_conf_file }}"
33+
mode: "0644"
3334
delegate_to: localhost
3435
tags: always
3536

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
---
2-
- { ansible.builtin.include_tasks: dcnm.yaml, tags: ['dcnm'] }
2+
- name: Include dcnm.yaml
3+
ansible.builtin.include_tasks: dcnm.yaml
4+
tags: ['dcnm']

tests/integration/targets/dcnm_vrf/tasks/dcnm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
test_items: "{{ test_cases.files | map(attribute='path') | list }}"
1919
tags: sanity
2020

21-
- name: debug
21+
- name: Debug test_items
2222
ansible.builtin.debug:
2323
var: test_items
2424

25-
- name: debug
25+
- name: Debug testcase
2626
ansible.builtin.debug:
2727
var: testcase
2828

tests/integration/targets/prepare_dcnm_intf/tasks/main.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,15 @@
290290
method: POST
291291
path: "{{ vpc_create_path[controller_version] }}"
292292
json_data:
293-
"{{ vpc_vxlan_data | to_json}}"
293+
"{{ vpc_vxlan_data | to_json }}"
294294
register: result
295-
when: (vxlan_vpc_create == True)
295+
when: (vxlan_vpc_create | bool)
296296
ignore_errors: true
297297

298298
- name: Wait for 10 secs
299299
ansible.builtin.wait_for:
300300
timeout: 10
301-
when: (vxlan_vpc_create == True)
301+
when: (vxlan_vpc_create | bool)
302302

303303
##############################################
304304
## CONFIG SAVE ##
@@ -309,7 +309,7 @@
309309
method: POST
310310
path: "{{ vxlan_config_save_path[controller_version] }}"
311311
register: result
312-
when: (vxlan_vpc_create == True)
312+
when: (vxlan_vpc_create | bool)
313313
ignore_errors: true
314314

315315
##############################################
@@ -324,13 +324,13 @@
324324
with_sequence: count=1
325325
loop_control:
326326
pause: 5
327-
when: (vxlan_vpc_deploy == True)
327+
when: (vxlan_vpc_deploy | bool)
328328
ignore_errors: true
329329

330330
- name: Wait for 30 secs
331331
ansible.builtin.wait_for:
332332
timeout: 30
333-
when: (vxlan_vpc_deploy == True)
333+
when: (vxlan_vpc_deploy | bool)
334334

335335
##############################################
336336
## CREATE CXT VPC PAIR ##
@@ -341,15 +341,15 @@
341341
method: POST
342342
path: "{{ vpc_create_path[controller_version] }}"
343343
json_data:
344-
"{{ vpc_cxt_data | to_json}}"
344+
"{{ vpc_cxt_data | to_json }}"
345345
register: result
346-
when: (cxt_vpc_create == True)
346+
when: (cxt_vpc_create | bool)
347347
ignore_errors: true
348348

349349
- name: Wait for 20 secs
350350
ansible.builtin.wait_for:
351351
timeout: 10
352-
when: (cxt_vpc_create == True)
352+
when: (cxt_vpc_create | bool)
353353

354354
##############################################
355355
## CONFIG SAVE ##
@@ -360,7 +360,7 @@
360360
method: POST
361361
path: "{{ cxt_config_save_path[controller_version] }}"
362362
register: result
363-
when: (cxt_vpc_create == True)
363+
when: (cxt_vpc_create | bool)
364364
ignore_errors: true
365365

366366
##############################################
@@ -375,10 +375,10 @@
375375
with_sequence: count=1
376376
loop_control:
377377
pause: 5
378-
when: (cxt_vpc_deploy == True)
378+
when: (cxt_vpc_deploy | bool)
379379
ignore_errors: true
380380

381381
- name: Wait for 30 secs
382382
ansible.builtin.wait_for:
383383
timeout: 30
384-
when: (cxt_vpc_deploy == True)
384+
when: (cxt_vpc_deploy | bool)

tests/integration/targets/prepare_dcnm_policy/tasks/main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
loop: '{{ result.response }}'
5656
tags: sanity
5757

58-
- block:
58+
- name: Create and deploy templates
59+
block:
5960

6061
##############################################
6162
## MERGE ##

0 commit comments

Comments
 (0)