ceph_key: drop unused result parameter

This parameter is not used anywhere in this function, so we can drop it.

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

diff --git a/library/ceph_key.py b/library/ceph_key.py
index 4f64a4133a6699160c2c7fd0e6e7fd7c39e6514d..a0ca3b2a0f3608daef9ca964e5fed11f1da10648 100644 (file)
--- a/library/ceph_key.py
+++ b/library/ceph_key.py
@@ -284,7 +284,16 @@ def generate_ceph_authtool_cmd(cluster, name, secret, caps, dest, container_imag
     return cmd
 
 
-def create_key(module, result, cluster, user, user_key, name, secret, caps, import_key, dest, container_image=None):  # noqa: E501
+def create_key(module,
+               cluster,
+               user,
+               user_key,
+               name,
+               secret,
+               caps,
+               import_key,
+               dest,
+               container_image=None):
     '''
     Create a CephX key
     '''
@@ -597,7 +606,7 @@ def run_module():
                 module.exit_json(**result)
         if (key_exist == 0 and (secret != _secret or caps != _caps)) or key_exist != 0:  # noqa: E501
             rc, cmd, out, err = exec_commands(module, create_key(
-                module, result, cluster, user, user_key_path, name, secret, caps, import_key, file_path, container_image))  # noqa: E501
+                module, cluster, user, user_key_path, name, secret, caps, import_key, file_path, container_image))  # noqa: E501
             if rc != 0:
                 result["stdout"] = "Couldn't create or update {0}".format(name)
                 result["stderr"] = err

diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py
index 9a86340239266df05f7f97004b6a17dd74c7e2c1..4b19754651668e9ce3f7ac775d2322fd977481d6 100644 (file)
--- a/tests/library/test_ceph_key.py
+++ b/tests/library/test_ceph_key.py
@@ -173,7 +173,6 @@ class TestCephKeyModule(object):
         fake_module = "fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_result = " fake"
         fake_cluster = "fake"
         fake_name = "client.fake"
         fake_secret = "super-secret"
@@ -191,15 +190,15 @@ class TestCephKeyModule(object):
             ['ceph', '-n', fake_user, '-k', fake_user_key, '--cluster', fake_cluster, 'auth',
                 'import', '-i', fake_file_destination],
         ]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_user, fake_user_key,
-                                     fake_name, fake_secret, fake_caps, fake_import_key, fake_file_destination)
+        result = ceph_key.create_key(fake_module, fake_cluster, fake_user, fake_user_key,
+                                     fake_name, fake_secret, fake_caps, fake_import_key,
+                                     fake_file_destination)
         assert result == expected_command_list
 
     def test_create_key_container(self):
         fake_module = "fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_result = "fake"
         fake_cluster = "fake"
         fake_name = "client.fake"
         fake_secret = "super-secret"
@@ -241,15 +240,15 @@ class TestCephKeyModule(object):
              '--cluster', fake_cluster,
              'auth', 'import',
              '-i', fake_file_destination]]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_user, fake_user_key, fake_name,
-                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)
+        result = ceph_key.create_key(fake_module, fake_cluster, fake_user, fake_user_key, fake_name,
+                                     fake_secret, fake_caps, fake_import_key, fake_file_destination,
+                                     fake_container_image)
         assert result == expected_command_list
 
     def test_create_key_non_container_no_import(self):
         fake_module = "fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_result = "fake"
         fake_cluster = "fake"
         fake_name = "client.fake"
         fake_secret = "super-secret"
@@ -277,15 +276,15 @@ class TestCephKeyModule(object):
             'osd',
             'allow rwx', ]
         ]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_user, fake_user_key,
-                                     fake_name, fake_secret, fake_caps, fake_import_key, fake_file_destination)  # noqa E501
+        result = ceph_key.create_key(fake_module, fake_cluster, fake_user, fake_user_key,
+                                     fake_name, fake_secret, fake_caps, fake_import_key,
+                                     fake_file_destination)  # noqa E501
         assert result == expected_command_list
 
     def test_create_key_container_no_import(self):
         fake_module = "fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_result = "fake"
         fake_cluster = "fake"
         fake_name = "client.fake"
         fake_secret = "super-secret"
@@ -320,8 +319,9 @@ class TestCephKeyModule(object):
                                   '--cap',
                                   'osd',
                                   'allow rwx']]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_user, fake_user_key, fake_name,
-                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)
+        result = ceph_key.create_key(fake_module, fake_cluster, fake_user, fake_user_key, fake_name,
+                                     fake_secret, fake_caps, fake_import_key, fake_file_destination,
+                                     fake_container_image)
         assert result == expected_command_list
 
     def test_delete_key_non_container(self):