issue-67: Create storage_lsr sub-directory under module_utils and mov…

…e size.py there #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.
linux-system-roles · Oct 27, 2020 · cf8f8aa · cf8f8aa
1 parent 00a6803
commit cf8f8aa
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
diff --git a/module_utils/size.py → module_utils/storage_lsr/size.py b/module_utils/size.py → module_utils/storage_lsr/size.py
diff --git 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