Skip to content

Commit 39550df

Browse files
sivakasi-ciscosivakasi-cisco
committed
Intermediate lint changes with manual correction
1 parent 171240d commit 39550df

27 files changed

+207
-211
lines changed

‎playbooks/roles/dcnm_bootflash/create_files.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
- name: SETUP - Create files on {{ switch1 }}
1010
cisco.nxos.nxos_command:
1111
commands:
12-
- echo 1 > bootflash: /{{ nxos_vars.switch1_file1 }}
13-
- echo 1 > bootflash: /{{ nxos_vars.switch1_file2 }}
14-
- echo 1 > bootflash: /{{ nxos_vars.switch1_file3 }}
15-
- echo 1 > bootflash: /{{ nxos_vars.switch1_file4 }}
12+
- echo 1 > bootflash:/{{ nxos_vars.switch1_file1 }}
13+
- echo 1 > bootflash:/{{ nxos_vars.switch1_file2 }}
14+
- echo 1 > bootflash:/{{ nxos_vars.switch1_file3 }}
15+
- echo 1 > bootflash:/{{ nxos_vars.switch1_file4 }}
1616

1717
- name: Create bootflash files on switch2
1818
gather_facts: false
@@ -24,7 +24,7 @@
2424
- name: SETUP - Create files on {{ switch2 }}
2525
cisco.nxos.nxos_command:
2626
commands:
27-
- echo 1 > bootflash: /{{ nxos_vars.switch2_file1 }}
28-
- echo 1 > bootflash: /{{ nxos_vars.switch2_file2 }}
29-
- echo 1 > bootflash: /{{ nxos_vars.switch2_file3 }}
30-
- echo 1 > bootflash: /{{ nxos_vars.switch2_file4 }}
27+
- echo 1 > bootflash:/{{ nxos_vars.switch2_file1 }}
28+
- echo 1 > bootflash:/{{ nxos_vars.switch2_file2 }}
29+
- echo 1 > bootflash:/{{ nxos_vars.switch2_file3 }}
30+
- echo 1 > bootflash:/{{ nxos_vars.switch2_file4 }}

‎playbooks/roles/dcnm_interface/ansible.cfg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎playbooks/roles/dcnm_network/ansible.cfg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎playbooks/roles/ndfc_interface/ansible.cfg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tests/integration/targets/dcnm_fabric/tests/dcnm_fabric_merged_save_deploy.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,10 @@
383383
# },
384384
# "MESSAGE": "OK",
385385
# "METHOD": "POST",
386-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/fabrics/VXLAN_EVPN_Fabric/"
387-
# "REQUEST_PATH": "config-deploy?forceShowRun=false",
386+
# "REQUEST_PATH": (
387+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/"
388+
# "fabrics/VXLAN_EVPN_Fabric/config-deploy?forceShowRun=false"
389+
# ),
388390
# "RETURN_CODE": 200,
389391
# "sequence_number": 5
390392
# },
@@ -394,8 +396,10 @@
394396
# },
395397
# "MESSAGE": "OK",
396398
# "METHOD": "POST",
397-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/fabrics/LAN_CLASSIC_Fabric/"
398-
# "REQUEST_PATH": "config-deploy?forceShowRun=false",
399+
# "REQUEST_PATH": (
400+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/"
401+
# "fabrics/LAN_CLASSIC_Fabric/config-deploy?forceShowRun=false"
402+
# ),
399403
# "RETURN_CODE": 200,
400404
# "sequence_number": 6
401405
# }

‎tests/integration/targets/dcnm_fabric/tests/dcnm_fabric_replaced_save_deploy.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@
129129
# },
130130
# "MESSAGE": "OK",
131131
# "METHOD": "POST",
132-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/fabrics/VXLAN_EVPN_Fabric/Easy_Fabric",
132+
# "REQUEST_PATH": (
133+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/"
134+
# "fabrics/VXLAN_EVPN_Fabric/Easy_Fabric"
135+
# ),
133136
# "RETURN_CODE": 200,
134137
# "sequence_number": 1
135138
# },
@@ -143,7 +146,10 @@
143146
# },
144147
# "MESSAGE": "OK",
145148
# "METHOD": "POST",
146-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/fabrics/LAN_CLASSIC_Fabric/LAN_Classic",
149+
# "REQUEST_PATH": (
150+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/"
151+
# "fabrics/LAN_CLASSIC_Fabric/LAN_Classic"
152+
# ),
147153
# "RETURN_CODE": 200,
148154
# "sequence_number": 2
149155
# }
@@ -351,8 +357,10 @@
351357
# },
352358
# "MESSAGE": "OK",
353359
# "METHOD": "POST",
354-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/fabrics/VXLAN_EVPN_Fabric/"
355-
# "REQUEST_PATH": "config-deploy?forceShowRun=false",
360+
# "REQUEST_PATH": (
361+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/rest/control/"
362+
# "fabrics/VXLAN_EVPN_Fabric/config-deploy?forceShowRun=false"
363+
# ),
356364
# "RETURN_CODE": 200,
357365
# "sequence_number": 3
358366
# }

‎tests/integration/targets/dcnm_image_upgrade/tests/deleted_1x_switch.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@
143143
# "DATA": "Successfully detach the policy from device.",
144144
# "MESSAGE": "OK",
145145
# "METHOD": "DELETE",
146-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/imagemanagement/rest/policymgnt/",
147-
# "REQUEST_PATH_CONT": "detach-policy?serialNumber=FDO211218GC",
146+
# "REQUEST_PATH": (
147+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/imagemanagement/rest/"
148+
# "policymgnt/detach-policy?serialNumber=FDO211218GC"
149+
# ),
148150
# "RETURN_CODE": 200,
149151
# "sequence_number": 1
150152
# }

‎tests/integration/targets/dcnm_image_upgrade/tests/query.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@
197197
# "DATA": "Successfully detach the policy from device.",
198198
# "MESSAGE": "OK",
199199
# "METHOD": "DELETE",
200-
# "REQUEST_PATH": "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/imagemanagement/rest/policymgnt/",
201-
# "REQUEST_PATH_CONT": "detach-policy?serialNumber=FDO211218GC,FDO211218HH",
200+
# "REQUEST_PATH": (
201+
# "https://172.22.150.244:443/appcenter/cisco/ndfc/api/v1/imagemanagement/rest/"
202+
# "policymgnt/detach-policy?serialNumber=FDO211218GC,FDO211218HH"
203+
# ),
202204
# "RETURN_CODE": 200,
203205
# "sequence_number": 1
204206
# }

‎tests/integration/targets/dcnm_image_upload/tests/dcnm/dcnm_image_upload_delete.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
cisco.dcnm.dcnm_image_upload:
2727
state: merged # choose from [merged, deleted, overridden, query]; default is merged
2828
files:
29-
- path: "{{ IMAGE_3_PATH }}"
30-
source: local
29+
- path: "{{ IMAGE_3_PATH }}" # Full path to the image on local server
30+
source: local # choose from [local, scp, sftp]; default is local
3131
register: result
3232

3333
- name: ASSERT - Upload result structure
@@ -52,7 +52,7 @@
5252
cisco.dcnm.dcnm_image_upload:
5353
state: deleted # choose from [merged, deleted, overridden, query]; default is merged
5454
files:
55-
- name: "{{ IMAGE_3_NAME }}"
55+
- name: "{{ IMAGE_3_NAME }}" # Name of the image on the controller
5656
register: result
5757

5858
- name: ASSERT - Delete result structure
@@ -92,8 +92,8 @@
9292
- name: Upload images to controller (re-upload)
9393
cisco.dcnm.dcnm_image_upload:
9494
files:
95-
- path: "{{ IMAGE_3_PATH }}"
96-
source: local
95+
- path: "{{ IMAGE_3_PATH }}" # Full path to the image on local server
96+
source: local # choose from [local, scp, sftp]; default is local
9797
register: result
9898

9999
- name: ASSERT - Re-upload result structure
@@ -190,7 +190,7 @@
190190
cisco.dcnm.dcnm_image_upload:
191191
state: deleted # choose from [merged, deleted, overridden, query]; default is merged
192192
files:
193-
- name: "{{ IMAGE_3_NAME }}"
193+
- name: "{{ IMAGE_3_NAME }}" # Name of the image on the controller
194194
register: result
195195

196196
- name: ASSERT - Delete one image structure
@@ -232,8 +232,8 @@
232232
cisco.dcnm.dcnm_image_upload:
233233
state: deleted # choose from [merged, deleted, overridden, query]; default is merged
234234
files:
235-
- name: "{{ IMAGE_2_NAME }}"
236-
- name: no-such-image.bin
235+
- name: "{{ IMAGE_2_NAME }}" # Name of the image on the controller
236+
- name: no-such-image.bin # Name of an image that does not exist on controller
237237
register: result
238238

239239
- name: ASSERT - Delete existing + non-existing structure

‎tests/integration/targets/dcnm_image_upload/tests/dcnm/dcnm_image_upload_override.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,18 @@
160160
cisco.dcnm.dcnm_image_upload:
161161
state: overridden # choose from [merged, deleted, overridden, query]; default is merged
162162
files:
163-
- path: "{{ IMAGE_2_PATH }}"
164-
source: sftp
165-
remote_server: "{{ SERVER_IP }}"
166-
username: "{{ USERNAME }}"
167-
password: "{{ PASSWORD }}"
168-
- path: "{{ IMAGE_3_PATH }}"
169-
source: local
170-
- path: "{{ IMAGE_1_PATH }}"
171-
source: scp
172-
remote_server: "{{ SERVER_IP }}"
173-
username: "{{ USERNAME }}"
174-
password: "{{ PASSWORD }}"
163+
- path: "{{ IMAGE_2_PATH }}" # Full path to the image on the server
164+
source: sftp # choose from [local, scp, sftp]; default is local
165+
remote_server: "{{ SERVER_IP }}" # mandatory when the source is scp or sftp
166+
username: "{{ USERNAME }}" # mandatory when source is scp or sftp
167+
password: "{{ PASSWORD }}" # mandatory when source is scp or sftp
168+
- path: "{{ IMAGE_3_PATH }}" # Full path to the image on local server
169+
source: local # choose from [local, scp, sftp]; default is local
170+
- path: "{{ IMAGE_1_PATH }}" # Full path to the image on the server
171+
source: scp # choose from [local, scp, sftp]; default is local
172+
remote_server: "{{ SERVER_IP }}" # mandatory when the source is scp or sftp
173+
username: "{{ USERNAME }}" # mandatory when source is scp or sftp
174+
password: "{{ PASSWORD }}" # mandatory when source is scp or sftp
175175
register: result
176176

177177
- name: ASSERT - Override mixed images structure

0 commit comments

Comments
 (0)