From 349e75f11e736ceff586d245e0bd109cf9ad8bee Mon Sep 17 00:00:00 2001 From: Heitor Matsui Date: Mon, 5 Aug 2024 19:05:53 -0300 Subject: [PATCH] Fix USM tox issues This commit fix tox issues. Test Plan PASS: run tox and verify no errors Story: 2010676 Task: 50743 Change-Id: I00ca6a6f323ed26d165a17255de2f660ba126a2e Signed-off-by: Heitor Matsui --- software/scripts/upgrade_utils.py | 1 + software/software/base.py | 9 ++++----- software/software/db/api.py | 2 +- software/software/software_controller.py | 4 ++-- software/software/sysinv_utils.py | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/software/scripts/upgrade_utils.py b/software/scripts/upgrade_utils.py index 947f71e6..ec29fcd7 100644 --- a/software/scripts/upgrade_utils.py +++ b/software/scripts/upgrade_utils.py @@ -77,6 +77,7 @@ def get_sysinv_client(token, endpoint): msg = "Failed to get sysinv client. Error: %s" % str(e) raise Exception(msg) + def call_api(token_id, method, api_cmd, api_cmd_headers=None, api_cmd_payload=None, timeout_in_secs=40): diff --git a/software/software/base.py b/software/software/base.py index ad212d98..8ca65a2a 100644 --- a/software/software/base.py +++ b/software/software/base.py @@ -139,9 +139,9 @@ class PatchService(object): if utils.get_management_version(hostname=constants.PREBOOTSTRAP_HOSTNAME ) == constants.ADDRESS_VERSION_IPV6: self.sock_out = socket.socket(socket.AF_INET6, - socket.SOCK_DGRAM) + socket.SOCK_DGRAM) self.sock_in = socket.socket(socket.AF_INET6, - socket.SOCK_DGRAM) + socket.SOCK_DGRAM) self.sock_out.setblocking(0) self.sock_in.setblocking(0) @@ -153,9 +153,9 @@ class PatchService(object): self.sock_in.bind(('', self.port)) else: self.sock_out = socket.socket(socket.AF_INET, - socket.SOCK_DGRAM) + socket.SOCK_DGRAM) self.sock_in = socket.socket(socket.AF_INET, - socket.SOCK_DGRAM) + socket.SOCK_DGRAM) self.sock_out.setblocking(0) self.sock_in.setblocking(0) @@ -167,7 +167,6 @@ class PatchService(object): return self.sock_in - def setup_socket(self): self.socket_lock_acquire() diff --git a/software/software/db/api.py b/software/software/db/api.py index 09434180..a79b030a 100644 --- a/software/software/db/api.py +++ b/software/software/db/api.py @@ -60,7 +60,7 @@ class SoftwareAPI: self.end_update() def update_deploy(self, from_release=None, to_release=None, feed_repo=None, commit_id=None, - reboot_required: bool = None, state: DEPLOY_STATES = None): + reboot_required: bool = None, state: DEPLOY_STATES = None): self.begin_update() try: self.deploy_handler.update( diff --git a/software/software/software_controller.py b/software/software/software_controller.py index f774de6d..a64e984a 100644 --- a/software/software/software_controller.py +++ b/software/software/software_controller.py @@ -2746,8 +2746,8 @@ class PatchController(PatchService): self.install_releases_thread(deployment_list, feed_repo) msg_info += "%s is now starting, await for the states: " \ - "[deploy-start-done | deploy-start-failed] in " \ - "'software deploy show'\n" % deployment_list + "[deploy-start-done | deploy-start-failed] in " \ + "'software deploy show'\n" % deployment_list elif operation == "remove": collect_current_load_for_hosts(deploy_sw_version, hostname=hostname) diff --git a/software/software/sysinv_utils.py b/software/software/sysinv_utils.py index 32aa375f..005f25f6 100644 --- a/software/software/sysinv_utils.py +++ b/software/software/sysinv_utils.py @@ -61,6 +61,7 @@ def is_host_locked_and_online(host): return True return False + def are_all_hosts_unlocked_and_online(): for ihost in get_ihost_list(): if ihost.administrative != constants.ADMIN_UNLOCKED or ihost.availability != constants.AVAILABILITY_AVAILABLE: