From 32db72e38f94f223631bd266df38c98b60f09f9b Mon Sep 17 00:00:00 2001 From: Zhou Guangjun Date: Tue, 11 May 2021 16:27:20 +0800 Subject: [PATCH 1/2] [merge-LXCA] (138083) [ipmi] Restart Normally and Power off Normally job failed with the message Ensure that the endpoint is reachable on the network from LXCA Details: Revision: d02e5b653f764aeca44efd108acaabc8b173b482 Author: Zhou Guangjun Date: 2018/10/17 17:26:39 --- confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 77dfed89..a75b7a36 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -1368,7 +1368,7 @@ class IpmiHandler(object): oldpower = self.ipmicmd.get_power() if 'powerstate' in oldpower: oldpower = oldpower['powerstate'] - self.ipmicmd.set_power(powerstate, wait=30) + self.ipmicmd.set_power(powerstate, wait=True) if powerstate == 'boot' and oldpower == 'on': power = {'powerstate': 'reset'} else: From 32c84993b0106307c0d32a39a0994eaafb9e7d0c Mon Sep 17 00:00:00 2001 From: Zhou Guangjun Date: Wed, 26 May 2021 10:30:59 +0800 Subject: [PATCH 2/2] [merge-LXCA] fix problem in merge with upstream - htmlify the dict Details: Revision: d9cc888e68abe7794ade82a251c4dffe9108a014 Author: Michael Du Date: 2017/8/2 21:06:22 --- confluent_server/confluent/messages.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py index bd680dde..21f8c1c0 100644 --- a/confluent_server/confluent/messages.py +++ b/confluent_server/confluent/messages.py @@ -199,6 +199,8 @@ class ConfluentMessage(object): notes.append('Broken because of %s' % val['broken']) elif val is not None and 'expression' in val: value = val['expression'] + elif isinstance(val, dict): + value = _htmlify_structure(val) if value is None: value = '' if val is not None and value == '' and 'isset' in val and val[ @@ -298,6 +300,7 @@ class DeletedResource(ConfluentMessage): notnode = True def __init__(self, resource): self.myargs = [resource] + self.desc = 'Delete Resource' self.kvpairs = {'deleted': resource} def strip_node(self, node): @@ -310,6 +313,7 @@ class CreatedResource(ConfluentMessage): def __init__(self, resource): self.myargs = [resource] + self.desc = 'Create Resource' self.kvpairs = {'created': resource} def strip_node(self, node):