From f207897f32acf00c9a04e611d251ed40fc3b9313 Mon Sep 17 00:00:00 2001 From: Lindsay Hill Date: Tue, 20 Feb 2018 22:14:18 -0800 Subject: [PATCH] fixed conditional error message (#36476) --- lib/ansible/modules/network/aireos/aireos_command.py | 2 +- lib/ansible/modules/network/aruba/aruba_command.py | 2 +- lib/ansible/modules/network/cloudengine/ce_command.py | 2 +- lib/ansible/modules/network/dellos10/dellos10_command.py | 2 +- lib/ansible/modules/network/dellos6/dellos6_command.py | 2 +- lib/ansible/modules/network/dellos9/dellos9_command.py | 2 +- lib/ansible/modules/network/enos/enos_command.py | 2 +- lib/ansible/modules/network/eos/eos_command.py | 2 +- lib/ansible/modules/network/ios/ios_command.py | 2 +- lib/ansible/modules/network/iosxr/iosxr_command.py | 2 +- lib/ansible/modules/network/ironware/ironware_command.py | 2 +- lib/ansible/modules/network/junos/junos_command.py | 2 +- lib/ansible/modules/network/junos/junos_interface.py | 2 +- lib/ansible/modules/network/nxos/nxos_command.py | 2 +- lib/ansible/modules/network/onyx/onyx_command.py | 2 +- lib/ansible/modules/network/sros/sros_command.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/ansible/modules/network/aireos/aireos_command.py b/lib/ansible/modules/network/aireos/aireos_command.py index dd3fbdf962b..12521be35b0 100644 --- a/lib/ansible/modules/network/aireos/aireos_command.py +++ b/lib/ansible/modules/network/aireos/aireos_command.py @@ -205,7 +205,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/aruba/aruba_command.py b/lib/ansible/modules/network/aruba/aruba_command.py index 68b6e1f8abf..85d11df2a01 100644 --- a/lib/ansible/modules/network/aruba/aruba_command.py +++ b/lib/ansible/modules/network/aruba/aruba_command.py @@ -205,7 +205,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/cloudengine/ce_command.py b/lib/ansible/modules/network/cloudengine/ce_command.py index 15b3ab4dc49..402edd3cbb3 100644 --- a/lib/ansible/modules/network/cloudengine/ce_command.py +++ b/lib/ansible/modules/network/cloudengine/ce_command.py @@ -248,7 +248,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/dellos10/dellos10_command.py b/lib/ansible/modules/network/dellos10/dellos10_command.py index de6b8c80436..8ffae97ebec 100644 --- a/lib/ansible/modules/network/dellos10/dellos10_command.py +++ b/lib/ansible/modules/network/dellos10/dellos10_command.py @@ -214,7 +214,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/dellos6/dellos6_command.py b/lib/ansible/modules/network/dellos6/dellos6_command.py index 1c0d5a7c7e0..8f7b2050191 100644 --- a/lib/ansible/modules/network/dellos6/dellos6_command.py +++ b/lib/ansible/modules/network/dellos6/dellos6_command.py @@ -213,7 +213,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/dellos9/dellos9_command.py b/lib/ansible/modules/network/dellos9/dellos9_command.py index 5087381ea91..b7a67154580 100644 --- a/lib/ansible/modules/network/dellos9/dellos9_command.py +++ b/lib/ansible/modules/network/dellos9/dellos9_command.py @@ -222,7 +222,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/enos/enos_command.py b/lib/ansible/modules/network/enos/enos_command.py index e79b145bb80..9f11f6950c0 100644 --- a/lib/ansible/modules/network/enos/enos_command.py +++ b/lib/ansible/modules/network/enos/enos_command.py @@ -208,7 +208,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/eos/eos_command.py b/lib/ansible/modules/network/eos/eos_command.py index 312a8e09bec..540f45f3877 100644 --- a/lib/ansible/modules/network/eos/eos_command.py +++ b/lib/ansible/modules/network/eos/eos_command.py @@ -263,7 +263,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/ios/ios_command.py b/lib/ansible/modules/network/ios/ios_command.py index e1ead254432..dc606e0cb89 100644 --- a/lib/ansible/modules/network/ios/ios_command.py +++ b/lib/ansible/modules/network/ios/ios_command.py @@ -230,7 +230,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/iosxr/iosxr_command.py b/lib/ansible/modules/network/iosxr/iosxr_command.py index fea39f9ef70..d9f546ec9ef 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_command.py +++ b/lib/ansible/modules/network/iosxr/iosxr_command.py @@ -209,7 +209,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result = { diff --git a/lib/ansible/modules/network/ironware/ironware_command.py b/lib/ansible/modules/network/ironware/ironware_command.py index eb50e2e3248..22892f7ea5b 100644 --- a/lib/ansible/modules/network/ironware/ironware_command.py +++ b/lib/ansible/modules/network/ironware/ironware_command.py @@ -161,7 +161,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/junos/junos_command.py b/lib/ansible/modules/network/junos/junos_command.py index a3d1a4ca567..3a026fa0610 100644 --- a/lib/ansible/modules/network/junos/junos_command.py +++ b/lib/ansible/modules/network/junos/junos_command.py @@ -434,7 +434,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result = { diff --git a/lib/ansible/modules/network/junos/junos_interface.py b/lib/ansible/modules/network/junos/junos_interface.py index 40dccd96bbb..7baa46a700b 100644 --- a/lib/ansible/modules/network/junos/junos_interface.py +++ b/lib/ansible/modules/network/junos/junos_interface.py @@ -371,7 +371,7 @@ def main(): if port and port not in have_port: failed_conditions.append('port ' + port) if failed_conditions: - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) module.exit_json(**result) diff --git a/lib/ansible/modules/network/nxos/nxos_command.py b/lib/ansible/modules/network/nxos/nxos_command.py index afd95bee459..2f09716c2ce 100644 --- a/lib/ansible/modules/network/nxos/nxos_command.py +++ b/lib/ansible/modules/network/nxos/nxos_command.py @@ -233,7 +233,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/onyx/onyx_command.py b/lib/ansible/modules/network/onyx/onyx_command.py index 134e8a5dd7f..9fb7d145970 100644 --- a/lib/ansible/modules/network/onyx/onyx_command.py +++ b/lib/ansible/modules/network/onyx/onyx_command.py @@ -199,7 +199,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result.update({ diff --git a/lib/ansible/modules/network/sros/sros_command.py b/lib/ansible/modules/network/sros/sros_command.py index 1a24fd29a8a..05883d9cd13 100644 --- a/lib/ansible/modules/network/sros/sros_command.py +++ b/lib/ansible/modules/network/sros/sros_command.py @@ -220,7 +220,7 @@ def main(): if conditionals: failed_conditions = [item.raw for item in conditionals] - msg = 'One or more conditional statements have not be satisfied' + msg = 'One or more conditional statements have not been satisfied' module.fail_json(msg=msg, failed_conditions=failed_conditions) result = {