From 59ae1b5f6272c19d44f5c1bddc034e8d16233356 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Tue, 14 Jan 2025 12:39:21 +0000 Subject: [PATCH 1/3] fix: Shares is already a dict --- cloud_info_provider/formatters/glue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud_info_provider/formatters/glue.py b/cloud_info_provider/formatters/glue.py index 5f8bb51f..702d6c8a 100644 --- a/cloud_info_provider/formatters/glue.py +++ b/cloud_info_provider/formatters/glue.py @@ -524,7 +524,7 @@ def glue_shares(self, info): self.glue_images(share, share_id) self.glue_templates(share, share_id) self.glue_access_policy(share, share_id, vo) - self._dict_append({"Share": [shares]}) + self._dict_append({"Share": shares}) def build_glue(self, info): self.static_compute_info = info["static_compute_info"] From 232f11bc3cc4558b96c2d38e5ec8bc8153f264a8 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Tue, 14 Jan 2025 12:49:10 +0000 Subject: [PATCH 2/3] Associations is a dict, not a list of dicts --- cloud_info_provider/formatters/glue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud_info_provider/formatters/glue.py b/cloud_info_provider/formatters/glue.py index 702d6c8a..90848fc6 100644 --- a/cloud_info_provider/formatters/glue.py +++ b/cloud_info_provider/formatters/glue.py @@ -230,7 +230,7 @@ def glue_service(self): "RunningVM": self.count_instance_status(instances, "ACTIVE"), "SuspendedVM": self.count_instance_status(instances, "SUSPENDED"), "HaltedVM": self.count_instance_status(instances, "SHUTOFF"), - "Associations": [{"AdminDomain": [self.site_name]}], + "Associations": {"AdminDomain": [self.site_name]}, } ) if "gocdb_id" in self.static_compute_info: From 4286710e20cd9515f4ffabf87ff84c99a0723043 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Tue, 14 Jan 2025 15:20:41 +0000 Subject: [PATCH 3/3] Use the right object (fixes #276) --- cloud_info_provider/formatters/glue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud_info_provider/formatters/glue.py b/cloud_info_provider/formatters/glue.py index 90848fc6..134af5e6 100644 --- a/cloud_info_provider/formatters/glue.py +++ b/cloud_info_provider/formatters/glue.py @@ -367,7 +367,7 @@ def glue_images(self, share, share_id): "Port": network_conf["ad:net_port"], "AddressRange": network_conf["ad:net_range"], } - img_assoc = image["Associations"].get( + img_assoc = img_obj["Associations"].get( "ImageNetworkConfiguration", [] ) img_assoc.append(network_conf_id)