From cf8f8aa2c47aa764b16317cdd5c04e500325f27b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 27 Oct 2020 12:16:35 -0600 Subject: [PATCH] issue-67: Create storage_lsr sub-directory under module_utils and move size.py there https://github.com/linux-system-roles/storage/issues/67 Have to rename a couple of imports to handle this case. Another issue is that python 2.x does not find the module unless it has an `__init__.py` in the `storage_lsr/` sub-directory. --- library/bsize.py | 2 +- library/find_unused_disk.py | 2 +- module_utils/storage_lsr/__init__.py | 0 module_utils/{ => storage_lsr}/size.py | 0 tests/unit/bsize_test.py | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 module_utils/storage_lsr/__init__.py rename module_utils/{ => storage_lsr}/size.py (100%) diff --git a/library/bsize.py b/library/bsize.py index 7199757b..40442f50 100644 --- a/library/bsize.py +++ b/library/bsize.py @@ -52,7 +52,7 @@ ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.size import Size +from ansible.module_utils.storage_lsr.size import Size def run_module(): # available arguments/parameters that a user can pass diff --git a/library/find_unused_disk.py b/library/find_unused_disk.py index 54ae2c32..a4dcde7b 100644 --- a/library/find_unused_disk.py +++ b/library/find_unused_disk.py @@ -64,7 +64,7 @@ import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.size import Size +from ansible.module_utils.storage_lsr.size import Size SYS_CLASS_BLOCK = "/sys/class/block/" diff --git a/module_utils/storage_lsr/__init__.py b/module_utils/storage_lsr/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/module_utils/size.py b/module_utils/storage_lsr/size.py similarity index 100% rename from module_utils/size.py rename to module_utils/storage_lsr/size.py diff --git a/tests/unit/bsize_test.py b/tests/unit/bsize_test.py index ab2ec241..f88a9c15 100644 --- a/tests/unit/bsize_test.py +++ b/tests/unit/bsize_test.py @@ -1,6 +1,6 @@ import pytest -from size import Size +from storage_lsr.size import Size def test_bsize(): # check failure on incorrect string