From 9c4b750c9a2bd6ac8ddca1443c886620662f4a70 Mon Sep 17 00:00:00 2001 From: licanwei Date: Tue, 19 Feb 2019 17:01:50 +0800 Subject: [PATCH] remove config parameter 'datasource' Change-Id: I9d8435663710f4c5f1698df71bec67aa799722bd --- .../strategy/strategies/basic_consolidation.py | 4 ++-- .../decision_engine/strategy/strategies/workload_balance.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index d4929774b..9280bfd9b 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -308,7 +308,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): "for %(metric_name)s", dict( resource_id=resource_id, metric_name=self.METRIC_NAMES[ - self.config.datasource]['host_cpu_usage'])) + self.datasource_backend.NAME]['host_cpu_usage'])) host_avg_cpu_util = 100 total_cores_used = node.vcpus * (host_avg_cpu_util / 100.0) @@ -328,7 +328,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): "for %(metric_name)s", dict( resource_id=instance.uuid, metric_name=self.METRIC_NAMES[ - self.config.datasource]['instance_cpu_usage'])) + self.datasource_backend.NAME]['instance_cpu_usage'])) instance_cpu_utilization = 100 total_cores_used = instance.vcpus * (instance_cpu_utilization / 100.0) diff --git a/watcher/decision_engine/strategy/strategies/workload_balance.py b/watcher/decision_engine/strategy/strategies/workload_balance.py index 1021948d1..b24590a5b 100644 --- a/watcher/decision_engine/strategy/strategies/workload_balance.py +++ b/watcher/decision_engine/strategy/strategies/workload_balance.py @@ -273,7 +273,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy): except Exception as exc: LOG.exception(exc) LOG.error("Can not get %s from %s", self._meter, - self.config.datasource) + self.datasource_backend.NAME) continue if util is None: LOG.debug("Instance (%s): %s is None",