Adding upstream version 10.0.0+dfsg.upstream/10.0.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 8 deletions

diff --git a/ansible_collections/hetzner/hcloud/plugins/modules/server_network.py b/ansible_collections/hetzner/hcloud/plugins/modules/server_network.py
index ca80a8a76..bc6dec428 100644
--- a/ansible_collections/hetzner/hcloud/plugins/modules/server_network.py
+++ b/ansible_collections/hetzner/hcloud/plugins/modules/server_network.py
@@ -111,7 +111,6 @@ hcloud_server_network:
 """
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
 
 from ..module_utils.hcloud import AnsibleHCloud
 from ..module_utils.vendor.hcloud import APIException, HCloudException
@@ -128,10 +127,10 @@ class AnsibleHCloudServerNetwork(AnsibleHCloud):
 
     def _prepare_result(self):
         return {
-            "network": to_native(self.hcloud_network.name),
-            "server": to_native(self.hcloud_server.name),
-            "ip": to_native(self.hcloud_server_network.ip),
-            "alias_ips": self.hcloud_server_network.alias_ips,
+            "network": self.hcloud_network.name,
+            "server": self.hcloud_server.name,
+            "ip": self.hcloud_server_network.ip,
+            "alias_ips": list(sorted(self.hcloud_server_network.alias_ips)),
         }
 
     def _get_server_and_network(self):
@@ -165,7 +164,8 @@ class AnsibleHCloudServerNetwork(AnsibleHCloud):
 
         if not self.module.check_mode:
             try:
-                self.hcloud_server.attach_to_network(**params).wait_until_finished()
+                action = self.hcloud_server.attach_to_network(**params)
+                action.wait_until_finished()
             except HCloudException as exception:
                 self.fail_json_hcloud(exception)
 
@@ -183,7 +183,8 @@ class AnsibleHCloudServerNetwork(AnsibleHCloud):
 
             if not self.module.check_mode:
                 try:
-                    self.hcloud_server.change_alias_ips(**params).wait_until_finished()
+                    action = self.hcloud_server.change_alias_ips(**params)
+                    action.wait_until_finished()
                 except APIException as exception:
                     self.fail_json_hcloud(exception)
 
@@ -205,7 +206,8 @@ class AnsibleHCloudServerNetwork(AnsibleHCloud):
         if self.hcloud_server_network is not None and self.hcloud_server is not None:
             if not self.module.check_mode:
                 try:
-                    self.hcloud_server.detach_from_network(self.hcloud_server_network.network).wait_until_finished()
+                    action = self.hcloud_server.detach_from_network(self.hcloud_server_network.network)
+                    action.wait_until_finished()
                 except HCloudException as exception:
                     self.fail_json_hcloud(exception)
             self._mark_as_changed()