Skip to content

Commit 3dc8a40

Browse files
committed
Common().get_want(): Improve error messages, more
1. dcnm_bootflash.py - Common().get_want(): Improve error messages. - main(): Add TypeError to except tuple when instantiating Log()
1 parent b767f00 commit 3dc8a40

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

plugins/modules/dcnm_bootflash.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,23 +356,25 @@ def raise_type_error(msg):
356356
for switch in self.switches:
357357
if switch.get("ip_address", None) is None:
358358
msg = "Expected ip_address in switch dict. "
359-
msg += f"Got {switch}"
359+
msg += f"Got {switch}."
360360
raise_value_error(msg)
361361

362362
if switch.get("targets", None) is None:
363363
switch["targets"] = self.targets
364364
if not isinstance(switch["targets"], list):
365365
msg = "Expected list of dictionaries for switch['targets']. "
366-
msg += f"Got {type(switch['targets']).__name__}"
366+
msg += f"Got {type(switch['targets']).__name__}."
367367
raise_type_error(msg)
368368

369369
for target in switch["targets"]:
370370
if target.get("filepath", None) is None:
371371
msg = "Expected filepath in target dict. "
372-
msg += f"Got {target}"
372+
msg += f"Got {target}."
373373
raise_value_error(msg)
374374
if target.get("supervisor", None) is None:
375-
target["supervisor"] = "active"
375+
msg = "Expected supervisor in target dict. "
376+
msg += f"Got {target}."
377+
raise_value_error(msg)
376378
self.want.append(switch)
377379

378380

@@ -657,7 +659,7 @@ def main():
657659
try:
658660
log = Log()
659661
log.commit()
660-
except ValueError as error:
662+
except (TypeError, ValueError) as error:
661663
ansible_module.fail_json(str(error))
662664

663665
sender = Sender()

0 commit comments

Comments
 (0)