From 95be8b82764f300a7a31782817727b0dd344f1aa Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Mon, 5 Dec 2016 16:22:51 +0000 Subject: [PATCH] Make `main()` calls conditional - network (#3649) --- lib/ansible/modules/extras/network/citrix/netscaler.py | 4 +++- lib/ansible/modules/extras/network/dnsimple.py | 3 ++- lib/ansible/modules/extras/network/dnsmadeeasy.py | 3 ++- lib/ansible/modules/extras/network/haproxy.py | 4 ++-- lib/ansible/modules/extras/network/illumos/dladm_etherstub.py | 4 +++- lib/ansible/modules/extras/network/illumos/dladm_vnic.py | 4 +++- lib/ansible/modules/extras/network/illumos/flowadm.py | 4 +++- lib/ansible/modules/extras/network/illumos/ipadm_if.py | 4 +++- lib/ansible/modules/extras/network/illumos/ipadm_prop.py | 4 +++- lib/ansible/modules/extras/network/lldp.py | 3 ++- lib/ansible/modules/extras/network/nmcli.py | 3 ++- lib/ansible/modules/extras/network/openvswitch_bridge.py | 4 +++- lib/ansible/modules/extras/network/openvswitch_db.py | 4 +++- lib/ansible/modules/extras/network/openvswitch_port.py | 4 +++- lib/ansible/modules/extras/network/snmp_facts.py | 3 ++- 15 files changed, 39 insertions(+), 16 deletions(-) diff --git a/lib/ansible/modules/extras/network/citrix/netscaler.py b/lib/ansible/modules/extras/network/citrix/netscaler.py index b746526742..c84cf740bd 100644 --- a/lib/ansible/modules/extras/network/citrix/netscaler.py +++ b/lib/ansible/modules/extras/network/citrix/netscaler.py @@ -201,4 +201,6 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * from ansible.module_utils.pycompat24 import get_exception -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/dnsimple.py b/lib/ansible/modules/extras/network/dnsimple.py index a356529ffc..a11f2a3f5e 100644 --- a/lib/ansible/modules/extras/network/dnsimple.py +++ b/lib/ansible/modules/extras/network/dnsimple.py @@ -335,4 +335,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.pycompat24 import get_exception -main() +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/dnsmadeeasy.py b/lib/ansible/modules/extras/network/dnsmadeeasy.py index eac0859c1f..c4007542a6 100644 --- a/lib/ansible/modules/extras/network/dnsmadeeasy.py +++ b/lib/ansible/modules/extras/network/dnsmadeeasy.py @@ -393,4 +393,5 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * -main() +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/haproxy.py b/lib/ansible/modules/extras/network/haproxy.py index d1502de6f3..4cfc812867 100644 --- a/lib/ansible/modules/extras/network/haproxy.py +++ b/lib/ansible/modules/extras/network/haproxy.py @@ -386,5 +386,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() - +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/illumos/dladm_etherstub.py b/lib/ansible/modules/extras/network/illumos/dladm_etherstub.py index 9e2bf2b173..3107f8e843 100644 --- a/lib/ansible/modules/extras/network/illumos/dladm_etherstub.py +++ b/lib/ansible/modules/extras/network/illumos/dladm_etherstub.py @@ -172,4 +172,6 @@ def main(): module.exit_json(**result) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/illumos/dladm_vnic.py b/lib/ansible/modules/extras/network/illumos/dladm_vnic.py index 8cf81e23a2..c9d10a083e 100644 --- a/lib/ansible/modules/extras/network/illumos/dladm_vnic.py +++ b/lib/ansible/modules/extras/network/illumos/dladm_vnic.py @@ -265,4 +265,6 @@ def main(): module.exit_json(**result) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/illumos/flowadm.py b/lib/ansible/modules/extras/network/illumos/flowadm.py index ec93d6a0f6..82e0250b70 100644 --- a/lib/ansible/modules/extras/network/illumos/flowadm.py +++ b/lib/ansible/modules/extras/network/illumos/flowadm.py @@ -514,4 +514,6 @@ def main(): from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/illumos/ipadm_if.py b/lib/ansible/modules/extras/network/illumos/ipadm_if.py index d2bff90e3b..06db3b6a65 100644 --- a/lib/ansible/modules/extras/network/illumos/ipadm_if.py +++ b/lib/ansible/modules/extras/network/illumos/ipadm_if.py @@ -223,4 +223,6 @@ def main(): module.exit_json(**result) from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/illumos/ipadm_prop.py b/lib/ansible/modules/extras/network/illumos/ipadm_prop.py index 5399189ad3..15410eb5e0 100644 --- a/lib/ansible/modules/extras/network/illumos/ipadm_prop.py +++ b/lib/ansible/modules/extras/network/illumos/ipadm_prop.py @@ -261,4 +261,6 @@ def main(): from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/lldp.py b/lib/ansible/modules/extras/network/lldp.py index 6624420404..42915d70c9 100644 --- a/lib/ansible/modules/extras/network/lldp.py +++ b/lib/ansible/modules/extras/network/lldp.py @@ -83,5 +83,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/nmcli.py b/lib/ansible/modules/extras/network/nmcli.py index 1b5d9b310b..97bea2e255 100644 --- a/lib/ansible/modules/extras/network/nmcli.py +++ b/lib/ansible/modules/extras/network/nmcli.py @@ -1190,4 +1190,5 @@ def main(): module.exit_json(**result) -main() +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/extras/network/openvswitch_bridge.py index 0cbf3096b2..1b9a7f7abf 100644 --- a/lib/ansible/modules/extras/network/openvswitch_bridge.py +++ b/lib/ansible/modules/extras/network/openvswitch_bridge.py @@ -308,4 +308,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.pycompat24 import get_exception -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/openvswitch_db.py b/lib/ansible/modules/extras/network/openvswitch_db.py index 8c2a290a91..39f27649cf 100644 --- a/lib/ansible/modules/extras/network/openvswitch_db.py +++ b/lib/ansible/modules/extras/network/openvswitch_db.py @@ -137,4 +137,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/openvswitch_port.py b/lib/ansible/modules/extras/network/openvswitch_port.py index b0e0fe477e..0939a71341 100644 --- a/lib/ansible/modules/extras/network/openvswitch_port.py +++ b/lib/ansible/modules/extras/network/openvswitch_port.py @@ -285,4 +285,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.pycompat24 import get_exception -main() + +if __name__ == '__main__': + main() diff --git a/lib/ansible/modules/extras/network/snmp_facts.py b/lib/ansible/modules/extras/network/snmp_facts.py index b8ae753770..eee7a4690b 100644 --- a/lib/ansible/modules/extras/network/snmp_facts.py +++ b/lib/ansible/modules/extras/network/snmp_facts.py @@ -367,4 +367,5 @@ def main(): module.exit_json(ansible_facts=results) -main() +if __name__ == '__main__': + main()