From 98f05a52a82532b483dd8602f0e18a4e530c6662 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 7 Dec 2015 10:18:26 -0600 Subject: [PATCH] Fix Watcher Applier variables in CamelCase PEP8 standards call for instance variable names to be written in the same manner as methods, with underscores separating words. This fix addresses an instance variable in the DeployPhase class. As the instance variable seems public, the Java-ish getter and setter mentioned in the bug report have been removed as well. Change-Id: I8835315c8cae64665d3ccb321c4066e37a22c467 Closes-Bug: 1522489 --- watcher/applier/execution/deploy_phase.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/watcher/applier/execution/deploy_phase.py b/watcher/applier/execution/deploy_phase.py index 93aa121ce..5946fbc24 100644 --- a/watcher/applier/execution/deploy_phase.py +++ b/watcher/applier/execution/deploy_phase.py @@ -24,22 +24,16 @@ LOG = log.getLogger(__name__) class DeployPhase(object): def __init__(self, executor): # todo(jed) oslo_conf 10 secondes - self.maxTimeout = 100000 + self.max_timeout = 100000 self.commands = [] self.executor = executor - def set_max_time(self, mt): - self.maxTimeout = mt - - def get_max_time(self): - return self.maxTimeout - def populate(self, action): self.commands.append(action) def execute_primitive(self, primitive): - futur = primitive.execute(primitive) - return futur.result(self.get_max_time()) + future = primitive.execute(primitive) + return future.result(self.max_timeout) def rollback(self): reverted = sorted(self.commands, reverse=True)