library: use exit_module from ca_common

pr #6054 got merged but could have been updated to use `ca_common` for
`exit_module()`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/library/ceph_volume_simple_activate.py b/library/ceph_volume_simple_activate.py
index 43efd9704d09cfbbe47abbae24f367f4bb1ae7a6..4825f0c822ae8c99d503edf3a48a741f285da1c5 100644 (file)
--- a/library/ceph_volume_simple_activate.py
+++ b/library/ceph_volume_simple_activate.py
@@ -16,6 +16,10 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
+try:
+    from ansible.module_utils.ca_common import exit_module
+except ImportError:
+    from module_utils.ca_common import exit_module
 import datetime
 import os
 
@@ -93,23 +97,6 @@ EXAMPLES = '''
 RETURN = '''#  '''
 
 
-def exit_module(module, out, rc, cmd, err, startd, changed=False):
-    endd = datetime.datetime.now()
-    delta = endd - startd
-
-    result = dict(
-        cmd=cmd,
-        start=str(startd),
-        end=str(endd),
-        delta=str(delta),
-        rc=rc,
-        stdout=out.rstrip("\r\n"),
-        stderr=err.rstrip("\r\n"),
-        changed=changed,
-    )
-    module.exit_json(**result)
-
-
 def main():
     module = AnsibleModule(
         argument_spec=dict(

diff --git a/library/ceph_volume_simple_scan.py b/library/ceph_volume_simple_scan.py
index 5087d9aa5386ffaa15ac3ecdc6ad9bfea6e1d678..e76f279a068a77edf3426d3ec35865e0ec9adbd5 100644 (file)
--- a/library/ceph_volume_simple_scan.py
+++ b/library/ceph_volume_simple_scan.py
@@ -16,6 +16,10 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
+try:
+    from ansible.module_utils.ca_common import exit_module
+except ImportError:
+    from module_utils.ca_common import exit_module
 import datetime
 import os
 
@@ -85,23 +89,6 @@ EXAMPLES = '''
 RETURN = '''#  '''
 
 
-def exit_module(module, out, rc, cmd, err, startd, changed=False):
-    endd = datetime.datetime.now()
-    delta = endd - startd
-
-    result = dict(
-        cmd=cmd,
-        start=str(startd),
-        end=str(endd),
-        delta=str(delta),
-        rc=rc,
-        stdout=out.rstrip("\r\n"),
-        stderr=err.rstrip("\r\n"),
-        changed=changed,
-    )
-    module.exit_json(**result)
-
-
 def main():
     module = AnsibleModule(
         argument_spec=dict(

diff --git a/tests/library/test_ceph_volume_simple_activate.py b/tests/library/test_ceph_volume_simple_activate.py
index 99fc62bb87580238af659776bcdff577a6ca47c8..6f8a5ea3bf440a0486f9cc0d5a57fab9c1180be8 100644 (file)
--- a/tests/library/test_ceph_volume_simple_activate.py
+++ b/tests/library/test_ceph_volume_simple_activate.py
@@ -4,9 +4,7 @@ from ansible.module_utils._text import to_bytes
 import json
 import os
 import pytest
-import sys
-sys.path.append('./library')
-import ceph_volume_simple_activate  # noqa : E402
+import ceph_volume_simple_activate
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'

diff --git a/tests/library/test_ceph_volume_simple_scan.py b/tests/library/test_ceph_volume_simple_scan.py
index 0dd8e9793467a46c6e4fb0e33d2f5a6489360ae6..3dba9da13329a7a1152a3853b4a1e9271e135221 100644 (file)
--- a/tests/library/test_ceph_volume_simple_scan.py
+++ b/tests/library/test_ceph_volume_simple_scan.py
@@ -4,9 +4,7 @@ from ansible.module_utils._text import to_bytes
 import json
 import os
 import pytest
-import sys
-sys.path.append('./library')
-import ceph_volume_simple_scan  # noqa : E402
+import ceph_volume_simple_scan
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'