From 7e2f8eec95185ec8455cc420f52f944afba6b212 Mon Sep 17 00:00:00 2001
From: Thomas Gambier <thomas.gambier@nexedi.com>
Date: Thu, 2 Mar 2023 15:38:55 +0100
Subject: [PATCH] cli/info: support connection dict from SlapOS Master
---
slapos/cli/info.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/slapos/cli/info.py b/slapos/cli/info.py
index fed1c6a84..e6a3a8fbe 100644
--- a/slapos/cli/info.py
+++ b/slapos/cli/info.py
@@ -82,7 +82,14 @@ def do_info(logger, conf, local):
software_schema = SoftwareReleaseSchema(
instance._software_release_url,
getattr(instance, '_software_type', None))
- connection_parameter_dict = xml2dict(instance._connection_dict)
+ if isinstance(instance._connection_dict, list):
+ # this is slapos master connection dict
+ connection_parameter_dict = {}
+ for param in instance._connection_dict:
+ connection_parameter_dict[param['connection_key']] = param['connection_value']
+ else:
+ # this is slapproxy connection dict
+ connection_parameter_dict = xml2dict(instance._connection_dict)
try:
software_serialisation = software_schema.getSerialisation()
except UndefinedSerializationError:
--
2.30.9