badfish 1.0.6__tar.gz → 1.1.0__tar.gz

{badfish-1.0.6 → badfish-1.1.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: badfish
-Version: 1.0.6
+Version: 1.1.0
 Summary: Badfish is a Redfish-based API tool for managing bare-metal systems via the Redfish API
 Home-page: https://github.com/redhat-performance/badfish
 Author: Gonzalo Rafuls
 Author-email: gonza@redhat.com
-License: GPLv3
+License: GPL-3.0-or-later
 Project-URL: Bug Tracker, https://github.com/redhat-performance/badfish/issues
 Project-URL: Documentation, https://github.com/redhat-performance/badfish/blob/master/README.md
 Project-URL: Source Code, https://github.com/redhat-performance/badfish
@@ -24,8 +24,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml>=3.10
-Requires-Dist: aiohttp>=3.7.4
+Requires-Dist: aiohttp>=3.10
 Requires-Dist: setuptools>=39.0
+Requires-Dist: async-lru>=2.0
 Dynamic: license-file
 
 <p align="center">
@@ -753,7 +754,6 @@ With rack, ULocation and blade being optional in a hierarchical fashion otherwis
 
 Please refer to our contributing [guide](CONTRIBUTING.md).
 
-
 * Here is some useful documentation
   - [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
   - [Keeping a cloned fork up to date](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)

{badfish-1.0.6 → badfish-1.1.0}/README.md

@@ -723,7 +723,6 @@ With rack, ULocation and blade being optional in a hierarchical fashion otherwis
 
 Please refer to our contributing [guide](CONTRIBUTING.md).
 
-
 * Here is some useful documentation
   - [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
   - [Keeping a cloned fork up to date](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)

badfish-1.1.0/pyproject.toml

@@ -0,0 +1,13 @@
+[build-system]
+requires = ["setuptools>=39", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 120
+
+[tool.semantic_release]
+version_variables = [
+    "src/badfish/__init__.py:__version__"
+]
+branch = "master"
+build_command = "pip install build && python -m build"

{badfish-1.0.6 → badfish-1.1.0}/setup.cfg

@@ -5,7 +5,7 @@ author_email = gonza@redhat.com
 description = Badfish is a Redfish-based API tool for managing bare-metal systems via the Redfish API
 long_description = file: README.md
 long_description_content_type = text/markdown
-license = GPLv3
+license = GPL-3.0-or-later
 license_file = LICENSE
 platforms = any
 url = https://github.com/redhat-performance/badfish
@@ -30,10 +30,11 @@ packages = find:
 python_requires = >=3.10
 install_requires = 
 	pyyaml>=3.10
-	aiohttp>=3.7.4
+	aiohttp>=3.10
 	setuptools>=39.0
+	async-lru>=2.0
 package_dir = 
-	=src
+	= src
 zip_safe = True
 
 [options.packages.find]

badfish-1.1.0/setup.py

@@ -0,0 +1,18 @@
+import setuptools
+import re
+import os
+
+here = os.path.abspath(os.path.dirname(__file__))
+version_file = os.path.join(here, "src", "badfish", "__init__.py")
+
+with open(version_file, "r", encoding="utf-8") as f:
+    content = f.read()
+    match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", content, re.M)
+    if match:
+        current_version = match.group(1)
+    else:
+        raise RuntimeError("Unable to find version string in src/badfish/__init__.py")
+
+setuptools.setup(
+    version=current_version
+)

badfish-1.1.0/src/badfish/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.0"

{badfish-1.0.6 → badfish-1.1.0}/src/badfish/helpers/http_client.py

@@ -4,8 +4,8 @@ from typing import Any, Dict, Optional
 
 import aiohttp
 
-from src.badfish.helpers.async_lru import alru_cache
-from src.badfish.helpers.exceptions import BadfishException
+from async_lru import alru_cache
+from badfish.helpers.exceptions import BadfishException
 
 
 class HTTPClient:

{badfish-1.0.6 → badfish-1.1.0}/src/badfish/main.py

@@ -13,11 +13,11 @@ import yaml
 import tempfile
 from urllib.parse import urlparse
 
-from src.badfish.helpers import get_now
-from src.badfish.helpers.parser import parse_arguments
-from src.badfish.helpers.logger import BadfishLogger
-from src.badfish.helpers.http_client import HTTPClient
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.helpers import get_now
+from badfish.helpers.parser import parse_arguments
+from badfish.helpers.logger import BadfishLogger
+from badfish.helpers.http_client import HTTPClient
+from badfish.helpers.exceptions import BadfishException
 
 from logging import (
     DEBUG,
@@ -393,7 +393,7 @@ class Badfish:
 
         _uri = "%s%s" % (self.host_uri, session_uri)
         check_response = await self.http_client.get_request(_uri, _continue=True, _get_token=True)
-        if check_response is None:
+        if check_response is None or check_response.status != 200:
             session_uri = "/redfish/v1/SessionService/Sessions"
 
         return session_uri
@@ -2674,7 +2674,11 @@ def main(argv=None):
     output = _args["output"]
     bfl = BadfishLogger(_args["verbose"], multi_host, _args["log"], output)
 
-    loop = asyncio.get_event_loop()
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
     tasks = []
     host_order = {}
     if host_list:

{badfish-1.0.6 → badfish-1.1.0}/src/badfish.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: badfish
-Version: 1.0.6
+Version: 1.1.0
 Summary: Badfish is a Redfish-based API tool for managing bare-metal systems via the Redfish API
 Home-page: https://github.com/redhat-performance/badfish
 Author: Gonzalo Rafuls
 Author-email: gonza@redhat.com
-License: GPLv3
+License: GPL-3.0-or-later
 Project-URL: Bug Tracker, https://github.com/redhat-performance/badfish/issues
 Project-URL: Documentation, https://github.com/redhat-performance/badfish/blob/master/README.md
 Project-URL: Source Code, https://github.com/redhat-performance/badfish
@@ -24,8 +24,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml>=3.10
-Requires-Dist: aiohttp>=3.7.4
+Requires-Dist: aiohttp>=3.10
 Requires-Dist: setuptools>=39.0
+Requires-Dist: async-lru>=2.0
 Dynamic: license-file
 
 <p align="center">
@@ -753,7 +754,6 @@ With rack, ULocation and blade being optional in a hierarchical fashion otherwis
 
 Please refer to our contributing [guide](CONTRIBUTING.md).
 
-
 * Here is some useful documentation
   - [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
   - [Keeping a cloned fork up to date](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)

{badfish-1.0.6 → badfish-1.1.0}/src/badfish.egg-info/SOURCES.txt

@@ -14,11 +14,11 @@ src/badfish.egg-info/requires.txt
 src/badfish.egg-info/top_level.txt
 src/badfish.egg-info/zip-safe
 src/badfish/helpers/__init__.py
-src/badfish/helpers/async_lru.py
 src/badfish/helpers/exceptions.py
 src/badfish/helpers/http_client.py
 src/badfish/helpers/logger.py
 src/badfish/helpers/parser.py
+tests/test_async_loop.py
 tests/test_base.py
 tests/test_bios_attributes.py
 tests/test_bios_password.py

{badfish-1.0.6 → badfish-1.1.0}/src/badfish.egg-info/requires.txt

@@ -1,3 +1,4 @@
 pyyaml>=3.10
-aiohttp>=3.7.4
+aiohttp>=3.10
 setuptools>=39.0
+async-lru>=2.0

badfish-1.1.0/tests/test_async_loop.py

@@ -0,0 +1,60 @@
+import unittest
+from unittest.mock import patch, MagicMock
+from badfish.main import main
+
+
+class TestAsyncioFix(unittest.TestCase):
+    @patch('badfish.main.execute_badfish')
+    @patch('badfish.main.BadfishLogger')
+    @patch('badfish.main.parse_arguments')
+    @patch('asyncio.set_event_loop')
+    @patch('asyncio.new_event_loop')
+    @patch('asyncio.get_event_loop')
+    def test_main_handles_no_event_loop(self, mock_get_loop, mock_new_loop,
+                                        mock_set_loop, mock_parse_args,
+                                        mock_logger, mock_execute):
+        mock_get_loop.side_effect = RuntimeError("No event loop")
+
+        mock_loop_instance = MagicMock()
+        mock_new_loop.return_value = mock_loop_instance
+        mock_loop_instance.run_until_complete.return_value = ("localhost", True)
+
+        mock_parse_args.return_value = {
+            "verbose": False, "host": "localhost", "delta": None,
+            "firmware_inventory": None, "host_list": None, "log": None,
+            "output": None
+        }
+
+        main()
+
+        mock_get_loop.assert_called_once()
+        mock_new_loop.assert_called_once()
+        mock_set_loop.assert_called_once_with(mock_loop_instance)
+        mock_loop_instance.run_until_complete.assert_called()
+
+    @patch('badfish.main.execute_badfish')
+    @patch('badfish.main.BadfishLogger')
+    @patch('badfish.main.parse_arguments')
+    @patch('asyncio.set_event_loop')
+    @patch('asyncio.new_event_loop')
+    @patch('asyncio.get_event_loop')
+    def test_main_uses_existing_loop(self, mock_get_loop, mock_new_loop,
+                                     mock_set_loop, mock_parse_args,
+                                     mock_logger, mock_execute):
+        existing_loop = MagicMock()
+        mock_get_loop.return_value = existing_loop
+        mock_get_loop.side_effect = None
+        existing_loop.run_until_complete.return_value = ("localhost", True)
+
+        mock_parse_args.return_value = {
+            "verbose": False, "host": "localhost", "delta": None,
+            "firmware_inventory": None, "host_list": None, "log": None,
+            "output": None
+        }
+
+        main()
+
+        mock_get_loop.assert_called_once()
+        mock_new_loop.assert_not_called()
+        mock_set_loop.assert_not_called()
+        existing_loop.run_until_complete.assert_called()

{badfish-1.0.6 → badfish-1.1.0}/tests/test_base.py

@@ -5,8 +5,8 @@ import pytest
 from aiohttp import web
 from aiohttp.test_utils import AioHTTPTestCase
 
-from src.badfish.main import main
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.main import main
+from badfish.helpers.exceptions import BadfishException
 from tests import config
 
 

{badfish-1.0.6 → badfish-1.1.0}/tests/test_context_manager.py

@@ -1,7 +1,7 @@
 import pytest
 from unittest.mock import AsyncMock, patch, MagicMock
-from src.badfish.main import Badfish, badfish_factory
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.main import Badfish, badfish_factory
+from badfish.helpers.exceptions import BadfishException
 
 
 class MockLogger:
@@ -386,7 +386,7 @@ class TestExecuteBadfishSessionCleanup:
     @pytest.mark.asyncio
     async def test_execute_badfish_session_cleanup_success(self):
         """Test successful session cleanup in execute_badfish."""
-        from src.badfish.main import execute_badfish
+        from badfish.main import execute_badfish
 
         logger = MockLogger()
         args = {
@@ -451,7 +451,7 @@ class TestExecuteBadfishSessionCleanup:
             "set_nic_attribute": None,
         }
 
-        with patch("src.badfish.main.badfish_factory") as mock_factory:
+        with patch("badfish.main.badfish_factory") as mock_factory:
             # Mock badfish instance
             mock_badfish = MagicMock()
             mock_badfish.session_id = "/redfish/v1/SessionService/Sessions/123"
@@ -469,7 +469,7 @@ class TestExecuteBadfishSessionCleanup:
     @pytest.mark.asyncio
     async def test_execute_badfish_session_cleanup_failure(self):
         """Test session cleanup failure in execute_badfish."""
-        from src.badfish.main import execute_badfish
+        from badfish.main import execute_badfish
 
         logger = MockLogger()
         args = {
@@ -534,7 +534,7 @@ class TestExecuteBadfishSessionCleanup:
             "set_nic_attribute": None,
         }
 
-        with patch("src.badfish.main.badfish_factory") as mock_factory:
+        with patch("badfish.main.badfish_factory") as mock_factory:
             # Mock badfish instance
             mock_badfish = MagicMock()
             mock_badfish.session_id = "/redfish/v1/SessionService/Sessions/123"
@@ -556,7 +556,7 @@ class TestExecuteBadfishSessionCleanup:
     @pytest.mark.asyncio
     async def test_execute_badfish_no_session_cleanup(self):
         """Test execute_badfish when no session exists to clean up."""
-        from src.badfish.main import execute_badfish
+        from badfish.main import execute_badfish
 
         logger = MockLogger()
         args = {
@@ -621,7 +621,7 @@ class TestExecuteBadfishSessionCleanup:
             "set_nic_attribute": None,
         }
 
-        with patch("src.badfish.main.badfish_factory") as mock_factory:
+        with patch("badfish.main.badfish_factory") as mock_factory:
             # Mock badfish instance with no session_id
             mock_badfish = MagicMock()
             mock_badfish.session_id = None
@@ -639,7 +639,7 @@ class TestExecuteBadfishSessionCleanup:
     @pytest.mark.asyncio
     async def test_execute_badfish_no_badfish_instance(self):
         """Test execute_badfish when badfish instance is None."""
-        from src.badfish.main import execute_badfish
+        from badfish.main import execute_badfish
 
         logger = MockLogger()
         args = {
@@ -704,7 +704,7 @@ class TestExecuteBadfishSessionCleanup:
             "set_nic_attribute": None,
         }
 
-        with patch("src.badfish.main.badfish_factory") as mock_factory:
+        with patch("badfish.main.badfish_factory") as mock_factory:
             # Mock badfish_factory to raise an exception
             mock_factory.side_effect = BadfishException("Connection failed")
 

{badfish-1.0.6 → badfish-1.1.0}/tests/test_custom_interfaces.py

@@ -1,6 +1,6 @@
 import pytest
 
-from src.badfish.main import Badfish
+from badfish.main import Badfish
 from tests.config import INTERFACES_PATH
 from tests.test_base import TestBase
 

{badfish-1.0.6 → badfish-1.1.0}/tests/test_execution.py

@@ -1,7 +1,7 @@
 import os
 from unittest.mock import patch
 
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.helpers.exceptions import BadfishException
 from tests.config import (
     HOST_LIST_EXTRAS,
     KEYBOARD_INTERRUPT,
@@ -30,12 +30,12 @@ def raise_badfish_exception_stub(ignore1, ignore2, ignore3, ignore4=None):
 class TestSingleHostExecution(TestBase):
     args = ["--ls-jobs"]
 
-    @patch("src.badfish.main.execute_badfish", raise_keyb_interrupt_stub)
+    @patch("badfish.main.execute_badfish", raise_keyb_interrupt_stub)
     def test_single_host_keyb_interrupt(self):
         _, err = self.badfish_call()
         assert err == KEYBOARD_INTERRUPT
 
-    @patch("src.badfish.main.execute_badfish", raise_badfish_exception_stub)
+    @patch("badfish.main.execute_badfish", raise_badfish_exception_stub)
     def test_single_host_badfish_exception(self):
         _, err = self.badfish_call()
         assert err == WRONG_BADFISH_EXECUTION
@@ -52,17 +52,17 @@ class TestHostListExecution(TestBase):
         "--ls-jobs",
     ]
 
-    @patch("src.badfish.main.execute_badfish", raise_keyb_interrupt_stub)
+    @patch("badfish.main.execute_badfish", raise_keyb_interrupt_stub)
     def test_host_list_keyb_interrupt(self):
         _, err = self.badfish_call(mock_host=None)
         assert err == KEYBOARD_INTERRUPT_HOST_LIST
 
-    @patch("src.badfish.main.execute_badfish", raise_badfish_exception_stub)
+    @patch("badfish.main.execute_badfish", raise_badfish_exception_stub)
     def test_host_list_badfish_exception(self):
         _, err = self.badfish_call(mock_host=None)
         assert err == WRONG_BADFISH_EXECUTION_HOST_LIST
 
-    @patch("src.badfish.main.execute_badfish")
+    @patch("badfish.main.execute_badfish")
     def test_host_list_successful(self, mock_execute):
         mock_execute.return_value = "Successful."
         _, err = self.badfish_call(mock_host=None)

{badfish-1.0.6 → badfish-1.1.0}/tests/test_firmware_inventory.py

@@ -62,7 +62,7 @@ class TestFirmwareInventory(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_request")
+    @patch("badfish.main.Badfish.get_request")
     def test_firmware_inventory_none_response(self, mock_get_req_call, mock_get, mock_post, mock_delete):
         mock_get_req_call.side_effect = [
             MockResponse(FIRMWARE_INVENTORY_RESP, 200),  # Firmware inventory list

{badfish-1.0.6 → badfish-1.1.0}/tests/test_hosts_file.py

@@ -16,7 +16,7 @@ class TestHostsFile(TestBase):
     def test_hosts_good(self):
         self.args = [self.option_arg, self.mock_hosts_good_path]
 
-        with patch("src.badfish.main.execute_badfish") as badfish_mock:
+        with patch("badfish.main.execute_badfish") as badfish_mock:
             self.badfish_call(mock_host=None)
 
         badfish_mock.assert_awaited()
@@ -32,7 +32,7 @@ class TestHostsFile(TestBase):
     def test_hosts_non_existent(self):
         self.args = [self.option_arg, "non/existent/file"]
 
-        with patch("src.badfish.main.execute_badfish") as badfish_mock:
+        with patch("badfish.main.execute_badfish") as badfish_mock:
             out, err = self.badfish_call(mock_host=None)
         badfish_mock.assert_not_awaited()
 
@@ -44,7 +44,7 @@ class TestHostsFile(TestBase):
         """
         self.args = [self.option_arg, self.mock_hosts_empty_path]
 
-        with patch("src.badfish.main.execute_badfish") as badfish_mock:
+        with patch("badfish.main.execute_badfish") as badfish_mock:
             result = self.badfish_call(mock_host=None)
 
         badfish_mock.assert_not_awaited()
@@ -53,7 +53,7 @@ class TestHostsFile(TestBase):
     def test_hosts_bad(self):
         self.args = [self.option_arg, self.mock_hosts_garbled_path]
 
-        with patch("src.badfish.main.execute_badfish") as badfish_mock:
+        with patch("badfish.main.execute_badfish") as badfish_mock:
             self.badfish_call(mock_host=None)
 
         badfish_mock.assert_awaited()

{badfish-1.0.6 → badfish-1.1.0}/tests/test_http_client.py

@@ -5,8 +5,8 @@ from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
 import aiohttp
 import pytest
 
-from src.badfish.helpers.http_client import HTTPClient
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.helpers.http_client import HTTPClient
+from badfish.helpers.exceptions import BadfishException
 
 
 class DummyLogger:

{badfish-1.0.6 → badfish-1.1.0}/tests/test_job_queue.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.helpers.exceptions import BadfishException
 from tests.config import (
     BLANK_RESP,
     INIT_RESP,
@@ -204,7 +204,7 @@ class TestCheckJob(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_request")
+    @patch("badfish.main.Badfish.get_request")
     def test_check_job_error(self, mock_get_req_call, mock_get, mock_post, mock_delete):
         # The check_schedule_job_status method only makes one call to get_request
         # which should return None to simulate the error condition

{badfish-1.0.6 → badfish-1.1.0}/tests/test_logger.py

@@ -2,7 +2,7 @@ import os
 import tempfile
 from logging import INFO, ERROR, DEBUG, LogRecord
 
-from src.badfish.helpers.logger import BadfishHandler, BadfishLogger
+from badfish.helpers.logger import BadfishHandler, BadfishLogger
 import yaml
 from unittest.mock import patch
 

{badfish-1.0.6 → badfish-1.1.0}/tests/test_ls_interfaces.py

@@ -61,8 +61,8 @@ class TestLsInterfaces(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.check_supported_network_interfaces")
-    @patch("src.badfish.main.Badfish.get_ethernet_interfaces")
+    @patch("badfish.main.Badfish.check_supported_network_interfaces")
+    @patch("badfish.main.Badfish.get_ethernet_interfaces")
     def test_ls_interfaces_ethernet(self, mock_get_ethernet, mock_check_support, mock_get, mock_post, mock_delete):
         # Mock the support checks: NetworkAdapters not supported, EthernetInterfaces supported
         mock_check_support.side_effect = [False, True]
@@ -94,7 +94,7 @@ class TestLsInterfaces(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.check_supported_network_interfaces")
+    @patch("badfish.main.Badfish.check_supported_network_interfaces")
     def test_ls_interfaces_ethernet_not_supported(self, mock_check_support, mock_get, mock_post, mock_delete):
         # Mock the support checks: both NetworkAdapters and EthernetInterfaces not supported
         mock_check_support.side_effect = [False, False]
@@ -125,7 +125,7 @@ class TestLsInterfaces(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.check_supported_network_interfaces")
+    @patch("badfish.main.Badfish.check_supported_network_interfaces")
     def test_ls_interfaces_none_supported(self, mock_check_support, mock_get, mock_post, mock_delete):
         # Mock the support checks: both NetworkAdapters and EthernetInterfaces not supported
         mock_check_support.side_effect = [False, False]

{badfish-1.0.6 → badfish-1.1.0}/tests/test_ls_memory.py

@@ -68,12 +68,12 @@ class TestLsMemory(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_memory_summary")
-    @patch("src.badfish.main.Badfish.get_memory_details")
+    @patch("badfish.main.Badfish.get_memory_summary")
+    @patch("badfish.main.Badfish.get_memory_details")
     def test_ls_memory_details_not_found(
         self, mock_get_mem_details, mock_get_mem_summary, mock_get, mock_post, mock_delete
     ):
-        from src.badfish.main import BadfishException
+        from badfish.main import BadfishException
 
         # Mock successful memory summary
         memory_summary = {"MemoryMirroring": "System", "TotalSystemMemoryGiB": 384}

{badfish-1.0.6 → badfish-1.1.0}/tests/test_ls_processors.py

@@ -69,12 +69,12 @@ class TestLsProcessors(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_processor_summary")
-    @patch("src.badfish.main.Badfish.get_processor_details")
+    @patch("badfish.main.Badfish.get_processor_summary")
+    @patch("badfish.main.Badfish.get_processor_details")
     def test_ls_processors_details_not_found(
         self, mock_get_proc_details, mock_get_proc_summary, mock_get, mock_post, mock_delete
     ):
-        from src.badfish.main import BadfishException
+        from badfish.main import BadfishException
 
         # Mock successful processor summary (the data from PROCESSOR_SUMMARY_RESP)
         processor_summary = {

{badfish-1.0.6 → badfish-1.1.0}/tests/test_ls_serial.py

@@ -41,9 +41,9 @@ class TestLsSerial(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_serial_summary")
+    @patch("badfish.main.Badfish.get_serial_summary")
     def test_ls_serial_unsupported_root(self, mock_get_serial_summary, mock_get, mock_post, mock_delete):
-        from src.badfish.main import BadfishException
+        from badfish.main import BadfishException
 
         # Mock serial summary to raise the expected exception
         mock_get_serial_summary.side_effect = BadfishException("Server does not support this functionality")
@@ -57,9 +57,9 @@ class TestLsSerial(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_serial_summary")
+    @patch("badfish.main.Badfish.get_serial_summary")
     def test_ls_serial_unsupported_systems(self, mock_get_serial_summary, mock_get, mock_post, mock_delete):
-        from src.badfish.main import BadfishException
+        from badfish.main import BadfishException
 
         # Mock serial summary to raise the expected exception
         mock_get_serial_summary.side_effect = BadfishException("Server does not support this functionality")

{badfish-1.0.6 → badfish-1.1.0}/tests/test_nic_attributes.py

@@ -124,9 +124,9 @@ class TestGetNICAttribute(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_nic_attribute")
+    @patch("badfish.main.Badfish.get_nic_attribute")
     def test_get_nic_attr_list_unsupported(self, mock_get_nic_attr, mock_get, mock_post, mock_delete):
-        from src.badfish.main import BadfishException
+        from badfish.main import BadfishException
 
         # Mock get_nic_attribute to raise BadfishException with vendor unsupported message
         mock_get_nic_attr.side_effect = BadfishException("Operation not supported by vendor.")
@@ -172,14 +172,14 @@ class TestGetNICAttribute(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_idrac_fw_version")
+    @patch("badfish.main.Badfish.get_idrac_fw_version")
     def test_get_nic_attr_fw_bad(self, mock_get_fw, mock_get, mock_post, mock_delete):
 
         async def fake_get_fw():
             # Emit via Badfish logger name to match formatting
             from logging import getLogger
 
-            getLogger("src.badfish.helpers.logger").error("Operation not supported by vendor.")
+            getLogger("badfish.helpers.logger").error("Operation not supported by vendor.")
             return 0
 
         mock_get_fw.side_effect = fake_get_fw

{badfish-1.0.6 → badfish-1.1.0}/tests/test_power.py

@@ -89,7 +89,7 @@ class TestPowerOff(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_request")
+    @patch("badfish.main.Badfish.get_request")
     def test_power_off_none(self, mock_get_req_call, mock_get, mock_post, mock_delete):
         # The power off operation should return None when getting power state
         mock_get_req_call.side_effect = [None]
@@ -139,7 +139,7 @@ class TestPowerState(TestBase):
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
-    @patch("src.badfish.main.Badfish.get_request")
+    @patch("badfish.main.Badfish.get_request")
     def test_power_state_none(self, mock_get_req_call, mock_get, mock_post, mock_delete):
         # The power state check should return None (simulating communication failure)
         mock_get_req_call.side_effect = [None]

{badfish-1.0.6 → badfish-1.1.0}/tests/test_power_consumed_watts.py

@@ -31,7 +31,7 @@ class TestPowerConsumed(TestBase):
     @patch("aiohttp.ClientSession.get")
     def test_power_consumed_404(self, mock_get, mock_post, mock_delete):
         # Mock the get_request method to return a 404 response that properly triggers vendor error
-        with patch("src.badfish.main.Badfish.get_request") as mock_get_request:
+        with patch("badfish.main.Badfish.get_request") as mock_get_request:
             from tests.test_base import MockResponse
 
             # Mock get_request to return 404 for power endpoint

{badfish-1.0.6 → badfish-1.1.0}/tests/test_reboot_only.py

@@ -90,7 +90,7 @@ class TestRebootOnly(TestBase):
         _, err = self.badfish_call()
         assert err == RESPONSE_REBOOT_ONLY_SUCCESS_WITH_NG_RT
 
-    @patch("src.badfish.main.RETRIES", 0)
+    @patch("badfish.main.RETRIES", 0)
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.get")
     @patch("aiohttp.ClientSession.post")

{badfish-1.0.6 → badfish-1.1.0}/tests/test_scp.py

@@ -164,7 +164,7 @@ class TestExportSCP(TestBase):
         _, err = self.badfish_call()
         assert err == RESPONSE_EXPORT_SCP_NO_LOCATION
 
-    @patch("src.badfish.main.get_now", fixed_datetime)
+    @patch("badfish.main.get_now", fixed_datetime)
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")
@@ -254,7 +254,7 @@ class TestImportSCP(TestBase):
         _, err = self.badfish_call()
         assert err == RESPONSE_EXPORT_SCP_NO_LOCATION
 
-    @patch("src.badfish.main.get_now", fixed_datetime)
+    @patch("badfish.main.get_now", fixed_datetime)
     @patch("aiohttp.ClientSession.delete")
     @patch("aiohttp.ClientSession.post")
     @patch("aiohttp.ClientSession.get")

badfish-1.0.6/pyproject.toml

@@ -1,6 +0,0 @@
-[build-system]
-requires = ["setuptools>=39", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.black]
-line-length = 120

badfish-1.0.6/setup.py

@@ -1,5 +0,0 @@
-import setuptools
-
-setuptools.setup(
-    version="1.0.6"
-)

badfish-1.0.6/src/badfish/helpers/async_lru.py

@@ -1,215 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2018 aio-libs team https://github.com/aio-libs/
-# Copyright (c) 2017 Ocean S. A. https://ocean.io/
-# Copyright (c) 2016-2017 WikiBusiness Corporation http://wikibusiness.org/
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-import asyncio
-from collections import OrderedDict
-from functools import _CacheInfo, _make_key, partial, wraps
-
-
-__version__ = "1.0.2"
-
-__all__ = ("alru_cache",)
-
-
-def unpartial(fn):
-    while hasattr(fn, "func"):
-        fn = fn.func
-
-    return fn
-
-
-def _done_callback(fut, task):
-    if task.cancelled():
-        fut.cancel()
-        return
-
-    exc = task.exception()
-    if exc is not None:
-        fut.set_exception(exc)
-        return
-
-    fut.set_result(task.result())
-
-
-def _cache_invalidate(wrapped, typed, *args, **kwargs):
-    key = _make_key(args, kwargs, typed)
-
-    exists = key in wrapped._cache
-
-    if exists:
-        wrapped._cache.pop(key)
-
-    return exists
-
-
-def _cache_clear(wrapped):
-    wrapped.hits = wrapped.misses = 0
-    wrapped._cache = OrderedDict()
-    wrapped.tasks = set()
-
-
-def _open(wrapped):
-    if not wrapped.closed:
-        raise RuntimeError("alru_cache is not closed")
-
-    was_closed = wrapped.hits == wrapped.misses == len(wrapped.tasks) == len(wrapped._cache) == 0
-
-    if not was_closed:
-        raise RuntimeError("alru_cache was not closed correctly")
-
-    wrapped.closed = False
-
-
-def _close(wrapped, *, cancel=False, return_exceptions=True):
-    if wrapped.closed:
-        raise RuntimeError("alru_cache is closed")
-
-    wrapped.closed = True
-
-    if cancel:
-        for task in wrapped.tasks:
-            if not task.done():  # not sure is it possible
-                task.cancel()
-
-    return _wait_closed(wrapped, return_exceptions=return_exceptions)
-
-
-async def _wait_closed(wrapped, *, return_exceptions):
-    wait_closed = asyncio.gather(*wrapped.tasks, return_exceptions=return_exceptions)
-
-    wait_closed.add_done_callback(partial(_close_waited, wrapped))
-
-    ret = await wait_closed
-
-    # hack to get _close_waited callback to be executed
-    await asyncio.sleep(0)
-
-    return ret
-
-
-def _close_waited(wrapped, _):
-    wrapped.cache_clear()
-
-
-def _cache_info(wrapped, maxsize):
-    return _CacheInfo(
-        wrapped.hits,
-        wrapped.misses,
-        maxsize,
-        len(wrapped._cache),
-    )
-
-
-def __cache_touch(wrapped, key):
-    try:
-        wrapped._cache.move_to_end(key)
-    except KeyError:  # not sure is it possible
-        pass
-
-
-def _cache_hit(wrapped, key):
-    wrapped.hits += 1
-    __cache_touch(wrapped, key)
-
-
-def _cache_miss(wrapped, key):
-    wrapped.misses += 1
-    __cache_touch(wrapped, key)
-
-
-def alru_cache(
-    fn=None,
-    maxsize=128,
-    typed=False,
-    *,
-    cache_exceptions=True,
-):
-    def wrapper(fn):
-        _origin = unpartial(fn)
-
-        if not asyncio.iscoroutinefunction(_origin):
-            raise RuntimeError("Coroutine function is required, got {}".format(fn))
-
-        # functools.partialmethod support
-        if hasattr(fn, "_make_unbound_method"):
-            fn = fn._make_unbound_method()
-
-        @wraps(fn)
-        async def wrapped(*fn_args, **fn_kwargs):
-            if wrapped.closed:
-                raise RuntimeError("alru_cache is closed for {}".format(wrapped))
-
-            loop = asyncio.get_event_loop()
-
-            key = _make_key(fn_args, fn_kwargs, typed)
-
-            fut = wrapped._cache.get(key)
-
-            if fut is not None:
-                if not fut.done():
-                    _cache_hit(wrapped, key)
-                    return await asyncio.shield(fut)
-
-                exc = fut._exception
-
-                if exc is None or cache_exceptions:
-                    _cache_hit(wrapped, key)
-                    return fut.result()
-
-                # exception here and cache_exceptions == False
-                wrapped._cache.pop(key)
-
-            fut = loop.create_future()
-            task = loop.create_task(fn(*fn_args, **fn_kwargs))
-            task.add_done_callback(partial(_done_callback, fut))
-
-            wrapped.tasks.add(task)
-            task.add_done_callback(wrapped.tasks.remove)
-
-            wrapped._cache[key] = fut
-
-            if maxsize is not None and len(wrapped._cache) > maxsize:
-                wrapped._cache.popitem(last=False)
-
-            _cache_miss(wrapped, key)
-            return await asyncio.shield(fut)
-
-        _cache_clear(wrapped)
-        wrapped._origin = _origin
-        wrapped.closed = False
-        wrapped.cache_info = partial(_cache_info, wrapped, maxsize)
-        wrapped.cache_clear = partial(_cache_clear, wrapped)
-        wrapped.invalidate = partial(_cache_invalidate, wrapped, typed)
-        wrapped.close = partial(_close, wrapped)
-        wrapped.open = partial(_open, wrapped)
-
-        return wrapped
-
-    if fn is None:
-        return wrapper
-
-    if callable(fn) or hasattr(fn, "_make_unbound_method"):
-        return wrapper(fn)
-
-    raise NotImplementedError("{} decorating is not supported".format(fn))