From e4add1d57d58f1f7194fc9ed29d8c3749142a0e0 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 29 Aug 2016 17:02:15 -0600 Subject: [PATCH] Console: rename has_credentials ... to has_ipmi_credentials Signed-off-by: Zack Cerza --- teuthology/orchestra/console.py | 4 ++-- teuthology/task/console_log.py | 2 +- teuthology/test/task/test_console_log.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py index e32acd6ec2..306f8fb32c 100644 --- a/teuthology/orchestra/console.py +++ b/teuthology/orchestra/console.py @@ -32,13 +32,13 @@ class PhysicalConsole(): self.ipmiuser = ipmiuser or config.ipmi_user self.ipmipass = ipmipass or config.ipmi_password self.ipmidomain = ipmidomain or config.ipmi_domain - self.has_credentials = all(map( + self.has_ipmi_credentials = all(map( lambda x: x is not None, [self.ipmiuser, self.ipmipass, self.ipmidomain] )) def _check_credentials(self): - if not self.has_credentials: + if not self.has_ipmi_credentials: log.error( "Must set ipmi_user, ipmi_password, and ipmi_domain in " \ ".teuthology.yaml" diff --git a/teuthology/task/console_log.py b/teuthology/task/console_log.py index 2624aed2e3..c8ace9cc45 100644 --- a/teuthology/task/console_log.py +++ b/teuthology/task/console_log.py @@ -28,7 +28,7 @@ class ConsoleLog(Task): if not hasattr(remote.console, 'spawn_sol_log'): log.debug("%s does not support IPMI; excluding", remote.shortname) - elif not remote.console.has_credentials: + elif not remote.console.has_ipmi_credentials: log.debug("IPMI credentials not found for %s; excluding", remote.shortname) else: diff --git a/teuthology/test/task/test_console_log.py b/teuthology/test/task/test_console_log.py index e16eec2691..e96dee9e28 100644 --- a/teuthology/test/task/test_console_log.py +++ b/teuthology/test/task/test_console_log.py @@ -49,9 +49,9 @@ class TestConsoleLog(TestTask): task = self.klass(self.ctx, self.task_config) assert task.enabled is False - def test_has_credentials(self): + def test_has_ipmi_credentials(self): for remote in self.ctx.cluster.remotes.keys(): - remote.console.has_credentials = False + remote.console.has_ipmi_credentials = False task = self.klass(self.ctx, self.task_config) assert len(task.cluster.remotes.keys()) == 0 -- 2.39.5