From e2285777e2bec336c9affc88457c4463604786fb Mon Sep 17 00:00:00 2001 From: chenke Date: Thu, 11 Apr 2019 18:04:55 +0800 Subject: [PATCH] Using node replace resource_id in method add_action_disable_node() We have a bp to add resource_name in action input parameter field. Before doing this, one of this method's parameter should be node instead of resource_id. Change-Id: I4ce5ae97efce98d80a460fd6003df3cc5cacab82 --- .../strategy/strategies/basic_consolidation.py | 6 +++--- 1 file 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 d53b0ccd5..9d399e245 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -333,11 +333,11 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): return self.calculate_weight(instance, total_cores_used, 0, 0) - def add_action_disable_node(self, resource_id): + def add_action_disable_node(self, node): parameters = {'state': element.ServiceState.DISABLED.value, 'disabled_reason': self.REASON_FOR_DISABLE} self.solution.add_action(action_type=self.CHANGE_NOVA_SERVICE_STATE, - resource_id=resource_id, + resource_id=node.uuid, input_parameters=parameters) def compute_score_of_nodes(self): @@ -379,7 +379,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): mig_destination_node) if len(self.compute_model.get_node_instances(mig_source_node)) == 0: - self.add_action_disable_node(mig_source_node.uuid) + self.add_action_disable_node(mig_source_node) self.number_of_released_nodes += 1 def calculate_num_migrations(self, sorted_instances, node_to_release,