From 8e89d5489cd5fe89e168d977755908e8b38a5f1f Mon Sep 17 00:00:00 2001 From: aditi Date: Wed, 27 Sep 2017 10:41:19 +0900 Subject: [PATCH] Use Property setters At various places in watcher code, we are using property getters to set property, in this way the property setters defined are never used, this patch fixes to use property setters to set property. Change-Id: Idb274887f383523cea39277b166ec9b46ebcda85 --- .../strategy/strategies/basic_consolidation.py | 6 +++--- .../decision_engine/strategy/strategies/noisy_neighbor.py | 2 +- .../strategy/strategies/outlet_temp_control.py | 4 ++-- .../decision_engine/strategy/strategies/uniform_airflow.py | 4 ++-- .../strategy/strategies/vm_workload_consolidation.py | 4 ++-- .../decision_engine/strategy/strategies/workload_balance.py | 4 ++-- .../strategy/strategies/workload_stabilization.py | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index 8825a0d3d..224126c69 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -170,7 +170,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter @@ -180,7 +180,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): @property def monasca(self): if self._monasca is None: - self._monasca = mon.MonascaHelper(osc=self.osc) + self.monasca = mon.MonascaHelper(osc=self.osc) return self._monasca @monasca.setter @@ -190,7 +190,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter diff --git a/watcher/decision_engine/strategy/strategies/noisy_neighbor.py b/watcher/decision_engine/strategy/strategies/noisy_neighbor.py index d67b411f2..b423a798c 100644 --- a/watcher/decision_engine/strategy/strategies/noisy_neighbor.py +++ b/watcher/decision_engine/strategy/strategies/noisy_neighbor.py @@ -50,7 +50,7 @@ class NoisyNeighbor(base.NoisyNeighborBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter diff --git a/watcher/decision_engine/strategy/strategies/outlet_temp_control.py b/watcher/decision_engine/strategy/strategies/outlet_temp_control.py index 09b78be6b..a0c3060f6 100644 --- a/watcher/decision_engine/strategy/strategies/outlet_temp_control.py +++ b/watcher/decision_engine/strategy/strategies/outlet_temp_control.py @@ -140,7 +140,7 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter @@ -150,7 +150,7 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter diff --git a/watcher/decision_engine/strategy/strategies/uniform_airflow.py b/watcher/decision_engine/strategy/strategies/uniform_airflow.py index c235923eb..8a764dfc2 100644 --- a/watcher/decision_engine/strategy/strategies/uniform_airflow.py +++ b/watcher/decision_engine/strategy/strategies/uniform_airflow.py @@ -130,7 +130,7 @@ class UniformAirflow(base.BaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter @@ -140,7 +140,7 @@ class UniformAirflow(base.BaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py index 1117c3ae6..a7bc1eefc 100644 --- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py @@ -118,7 +118,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter @@ -128,7 +128,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter diff --git a/watcher/decision_engine/strategy/strategies/workload_balance.py b/watcher/decision_engine/strategy/strategies/workload_balance.py index 336fcaa4c..a5cb3ccbd 100644 --- a/watcher/decision_engine/strategy/strategies/workload_balance.py +++ b/watcher/decision_engine/strategy/strategies/workload_balance.py @@ -117,7 +117,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @ceilometer.setter @@ -127,7 +127,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter diff --git a/watcher/decision_engine/strategy/strategies/workload_stabilization.py b/watcher/decision_engine/strategy/strategies/workload_stabilization.py index 7e3e96f40..db094f568 100644 --- a/watcher/decision_engine/strategy/strategies/workload_stabilization.py +++ b/watcher/decision_engine/strategy/strategies/workload_stabilization.py @@ -179,13 +179,13 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy): @property def ceilometer(self): if self._ceilometer is None: - self._ceilometer = ceil.CeilometerHelper(osc=self.osc) + self.ceilometer = ceil.CeilometerHelper(osc=self.osc) return self._ceilometer @property def nova(self): if self._nova is None: - self._nova = self.osc.nova() + self.nova = self.osc.nova() return self._nova @nova.setter @@ -199,7 +199,7 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy): @property def gnocchi(self): if self._gnocchi is None: - self._gnocchi = gnoc.GnocchiHelper(osc=self.osc) + self.gnocchi = gnoc.GnocchiHelper(osc=self.osc) return self._gnocchi @gnocchi.setter