Merge ~racb/ubuntu/+source/fence-agents:azure-api-fix into ubuntu/+source/fence-agents:ubuntu/devel

[Robie Basak]

[Robie Basak (racb)]

Test build at ppa:racb/experimental

I'm still testing this. Feel free to review or ask me to hold if you think appropriate, but since it's trivial I will self-accept as soon as I'm done testing.

[Robie Basak (racb)]

Self-approving as the fix is trivial, and uploaded.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 5765348..a0f9397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fence-agents (4.12.1-2~exp1ubuntu4) noble; urgency=medium
+
+  * d/p/fence_azure_arm-fix-get-virtual-machines-call: fix get virtual machines
+    call to match API changes in python3-azure. This fixes the otherwise
+    completely broken Azure fence agent.
+
+ -- Robie Basak <[e-mail]>  Tue, 16 Apr 2024 13:38:28 +0000
+
 fence-agents (4.12.1-2~exp1ubuntu3) noble; urgency=high
 
   * No change rebuild for 64-bit time_t and frame pointers.
diff --git a/debian/patches/fence_azure_arm-fix-get-virtual-machines-call b/debian/patches/fence_azure_arm-fix-get-virtual-machines-call
new file mode 100644
index 0000000..b7f2188
--- /dev/null
+++ b/debian/patches/fence_azure_arm-fix-get-virtual-machines-call
@@ -0,0 +1,53 @@
+From 3f3655e8370067fd4a133592a75778778c8e6eef Mon Sep 17 00:00:00 2001
+From: Javier Cano Cano <[e-mail]>
+Date: Wed, 11 Oct 2023 15:12:14 +0200
+Subject: [PATCH] fence_azure_arm: fix get virtual machines call
+
+The function virtual_machines.get() has changed it's signature from:
+
+```
+def get(
+    self,
+    resource_group_name,
+    expand=None,
+    **kwargs
+):
+```
+to:
+
+```
+def get(
+    self,
+    resource_group_name: str,
+    machine_name: str,
+    expand: Optional[Union[str, _models.InstanceViewTypes]] = None,
+    **kwargs: Any
+    ) -> _models.Machine:
+```
+
+Therefore, the number of positional arguments has been reduced to two:
+`resource_group_name` and `machine_name`, while  the `expand`
+parameter has swift from a *positional argument* to a *keyword-only
+argument*.
+
+Signed-off-by: Javier Cano Cano <[e-mail]>
+
+Origin: upstream, https://github.com/ClusterLabs/fence-agents/commit/3f3655e8370067fd4a133592a75778778c8e6eef
+Last-Update: 2024-04-16
+---
+ agents/azure_arm/fence_azure_arm.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agents/azure_arm/fence_azure_arm.py b/agents/azure_arm/fence_azure_arm.py
+index e3b7c85c7..515aae294 100755
+--- a/agents/azure_arm/fence_azure_arm.py
++++ b/agents/azure_arm/fence_azure_arm.py
+@@ -72,7 +72,7 @@ def get_power_status(clients, options):
+ 
+         powerState = "unknown"
+         try:
+-            vmStatus = compute_client.virtual_machines.get(rgName, vmName, "instanceView")
++            vmStatus = compute_client.virtual_machines.get(rgName, vmName, expand="instanceView")
+         except Exception as e:
+             fail_usage("Failed: %s" % e)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dc1af89..72195c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ systemd-syslog-target
 logging-warn-deprecated
 fence-virt-key
 fence-vmware-helper
+fence_azure_arm-fix-get-virtual-machines-call