diff --git a/plugins/module_utils/hcloud.py b/plugins/module_utils/hcloud.py index 42f031e..d47f501 100644 --- a/plugins/module_utils/hcloud.py +++ b/plugins/module_utils/hcloud.py @@ -71,8 +71,8 @@ class Hcloud: def _mark_as_changed(self): self.result["changed"] = True - @staticmethod - def base_module_arguments(): + @classmethod + def base_module_arguments(cls): return { "api_token": { "type": "str", diff --git a/plugins/modules/hcloud_certificate.py b/plugins/modules/hcloud_certificate.py index 9a949c1..aff913e 100644 --- a/plugins/modules/hcloud_certificate.py +++ b/plugins/modules/hcloud_certificate.py @@ -143,7 +143,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudCertificate(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_certificate") + super().__init__(module, "hcloud_certificate") self.hcloud_certificate = None def _prepare_result(self): @@ -234,8 +234,8 @@ class AnsibleHcloudCertificate(Hcloud): self._mark_as_changed() self.hcloud_certificate = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -252,7 +252,7 @@ class AnsibleHcloudCertificate(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], required_if=[["state", "present", ["name"]]], diff --git a/plugins/modules/hcloud_certificate_info.py b/plugins/modules/hcloud_certificate_info.py index 280563e..578d088 100644 --- a/plugins/modules/hcloud_certificate_info.py +++ b/plugins/modules/hcloud_certificate_info.py @@ -91,7 +91,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudCertificateInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_certificate_info") + super().__init__(module, "hcloud_certificate_info") self.hcloud_certificate_info = None def _prepare_result(self): @@ -129,14 +129,14 @@ class AnsibleHcloudCertificateInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_datacenter_info.py b/plugins/modules/hcloud_datacenter_info.py index ea830ce..96e3b7f 100644 --- a/plugins/modules/hcloud_datacenter_info.py +++ b/plugins/modules/hcloud_datacenter_info.py @@ -82,7 +82,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudDatacenterInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_datacenter_info") + super().__init__(module, "hcloud_datacenter_info") self.hcloud_datacenter_info = None def _prepare_result(self): @@ -113,13 +113,13 @@ class AnsibleHcloudDatacenterInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_firewall.py b/plugins/modules/hcloud_firewall.py index 734d8ba..46980eb 100644 --- a/plugins/modules/hcloud_firewall.py +++ b/plugins/modules/hcloud_firewall.py @@ -178,7 +178,7 @@ from ..module_utils.vendor.hcloud.firewalls.domain import FirewallRule class AnsibleHcloudFirewall(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_firewall") + super().__init__(module, "hcloud_firewall") self.hcloud_firewall = None def _prepare_result(self): @@ -295,8 +295,8 @@ class AnsibleHcloudFirewall(Hcloud): self._mark_as_changed() self.hcloud_firewall = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -319,7 +319,7 @@ class AnsibleHcloudFirewall(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], required_if=[["state", "present", ["name"]]], diff --git a/plugins/modules/hcloud_floating_ip.py b/plugins/modules/hcloud_floating_ip.py index 900e08c..7722fba 100644 --- a/plugins/modules/hcloud_floating_ip.py +++ b/plugins/modules/hcloud_floating_ip.py @@ -170,7 +170,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudFloatingIP(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_floating_ip") + super().__init__(module, "hcloud_floating_ip") self.hcloud_floating_ip = None def _prepare_result(self): @@ -297,8 +297,8 @@ class AnsibleHcloudFloatingIP(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -314,7 +314,7 @@ class AnsibleHcloudFloatingIP(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], mutually_exclusive=[["home_location", "server"]], diff --git a/plugins/modules/hcloud_floating_ip_info.py b/plugins/modules/hcloud_floating_ip_info.py index 8d6e4e1..1059b44 100644 --- a/plugins/modules/hcloud_floating_ip_info.py +++ b/plugins/modules/hcloud_floating_ip_info.py @@ -101,7 +101,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudFloatingIPInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_floating_ip_info") + super().__init__(module, "hcloud_floating_ip_info") self.hcloud_floating_ip_info = None def _prepare_result(self): @@ -142,13 +142,13 @@ class AnsibleHcloudFloatingIPInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_image_info.py b/plugins/modules/hcloud_image_info.py index 0677e34..e2f1c7e 100644 --- a/plugins/modules/hcloud_image_info.py +++ b/plugins/modules/hcloud_image_info.py @@ -117,7 +117,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudImageInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_image_info") + super().__init__(module, "hcloud_image_info") self.hcloud_image_info = None def _prepare_result(self): @@ -175,8 +175,8 @@ class AnsibleHcloudImageInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -184,7 +184,7 @@ class AnsibleHcloudImageInfo(Hcloud): label_selector={"type": "str"}, type={"choices": ["system", "snapshot", "backup"], "default": "system", "type": "str"}, architecture={"choices": ["x86", "arm"], "type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_iso_info.py b/plugins/modules/hcloud_iso_info.py index 1741e08..84c0be9 100644 --- a/plugins/modules/hcloud_iso_info.py +++ b/plugins/modules/hcloud_iso_info.py @@ -103,7 +103,7 @@ from ..module_utils.hcloud import Hcloud class AnsibleHcloudIsoInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_iso_info") + super().__init__(module, "hcloud_iso_info") self.hcloud_iso_info = None def _prepare_result(self): @@ -141,15 +141,15 @@ class AnsibleHcloudIsoInfo(Hcloud): except Exception as e: self.module.fail_json(msg=e.message) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, architecture={"type": "str", "choices": ["x86", "arm"]}, include_architecture_wildcard={"type": "bool"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_load_balancer.py b/plugins/modules/hcloud_load_balancer.py index c2aff36..98f23a4 100644 --- a/plugins/modules/hcloud_load_balancer.py +++ b/plugins/modules/hcloud_load_balancer.py @@ -150,7 +150,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancer(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer") + super().__init__(module, "hcloud_load_balancer") self.hcloud_load_balancer = None def _prepare_result(self): @@ -274,8 +274,8 @@ class AnsibleHcloudLoadBalancer(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -290,7 +290,7 @@ class AnsibleHcloudLoadBalancer(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], mutually_exclusive=[["location", "network_zone"]], diff --git a/plugins/modules/hcloud_load_balancer_info.py b/plugins/modules/hcloud_load_balancer_info.py index 3771be8..3d76b07 100644 --- a/plugins/modules/hcloud_load_balancer_info.py +++ b/plugins/modules/hcloud_load_balancer_info.py @@ -265,7 +265,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer_info") + super().__init__(module, "hcloud_load_balancer_info") self.hcloud_load_balancer_info = None def _prepare_result(self): @@ -365,14 +365,14 @@ class AnsibleHcloudLoadBalancerInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_load_balancer_network.py b/plugins/modules/hcloud_load_balancer_network.py index 531300e..e5712ca 100644 --- a/plugins/modules/hcloud_load_balancer_network.py +++ b/plugins/modules/hcloud_load_balancer_network.py @@ -100,7 +100,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerNetwork(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer_network") + super().__init__(module, "hcloud_load_balancer_network") self.hcloud_network = None self.hcloud_load_balancer = None self.hcloud_load_balancer_network = None @@ -170,8 +170,8 @@ class AnsibleHcloudLoadBalancerNetwork(Hcloud): self.hcloud_load_balancer_network = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( network={"type": "str", "required": True}, @@ -181,7 +181,7 @@ class AnsibleHcloudLoadBalancerNetwork(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_load_balancer_service.py b/plugins/modules/hcloud_load_balancer_service.py index 42c1f81..c499246 100644 --- a/plugins/modules/hcloud_load_balancer_service.py +++ b/plugins/modules/hcloud_load_balancer_service.py @@ -294,7 +294,7 @@ from ..module_utils.vendor.hcloud.load_balancers.domain import ( class AnsibleHcloudLoadBalancerService(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer_service") + super().__init__(module, "hcloud_load_balancer_service") self.hcloud_load_balancer = None self.hcloud_load_balancer_service = None @@ -507,8 +507,8 @@ class AnsibleHcloudLoadBalancerService(Hcloud): except APIException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( load_balancer={"type": "str", "required": True}, @@ -556,7 +556,7 @@ class AnsibleHcloudLoadBalancerService(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_load_balancer_target.py b/plugins/modules/hcloud_load_balancer_target.py index a68b974..4411adb 100644 --- a/plugins/modules/hcloud_load_balancer_target.py +++ b/plugins/modules/hcloud_load_balancer_target.py @@ -149,7 +149,7 @@ from ..module_utils.vendor.hcloud.load_balancers.domain import ( class AnsibleHcloudLoadBalancerTarget(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer_target") + super().__init__(module, "hcloud_load_balancer_target") self.hcloud_load_balancer = None self.hcloud_load_balancer_target = None self.hcloud_server = None @@ -276,8 +276,8 @@ class AnsibleHcloudLoadBalancerTarget(Hcloud): self._mark_as_changed() self.hcloud_load_balancer_target = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( type={"type": "str", "required": True, "choices": ["server", "label_selector", "ip"]}, @@ -290,7 +290,7 @@ class AnsibleHcloudLoadBalancerTarget(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_load_balancer_type_info.py b/plugins/modules/hcloud_load_balancer_type_info.py index 9afd53a..8527f8c 100644 --- a/plugins/modules/hcloud_load_balancer_type_info.py +++ b/plugins/modules/hcloud_load_balancer_type_info.py @@ -93,7 +93,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLoadBalancerTypeInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_load_balancer_type_info") + super().__init__(module, "hcloud_load_balancer_type_info") self.hcloud_load_balancer_type_info = None def _prepare_result(self): @@ -130,13 +130,13 @@ class AnsibleHcloudLoadBalancerTypeInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_location_info.py b/plugins/modules/hcloud_location_info.py index d65eea0..d6064e2 100644 --- a/plugins/modules/hcloud_location_info.py +++ b/plugins/modules/hcloud_location_info.py @@ -83,7 +83,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudLocationInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_location_info") + super().__init__(module, "hcloud_location_info") self.hcloud_location_info = None def _prepare_result(self): @@ -114,13 +114,13 @@ class AnsibleHcloudLocationInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_network.py b/plugins/modules/hcloud_network.py index ac3003d..055c238 100644 --- a/plugins/modules/hcloud_network.py +++ b/plugins/modules/hcloud_network.py @@ -125,7 +125,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudNetwork(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_network") + super().__init__(module, "hcloud_network") self.hcloud_network = None def _prepare_result(self): @@ -222,8 +222,8 @@ class AnsibleHcloudNetwork(Hcloud): self.fail_json_hcloud(e) self.hcloud_network = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -236,7 +236,7 @@ class AnsibleHcloudNetwork(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], supports_check_mode=True, diff --git a/plugins/modules/hcloud_network_info.py b/plugins/modules/hcloud_network_info.py index c56806b..8f1db04 100644 --- a/plugins/modules/hcloud_network_info.py +++ b/plugins/modules/hcloud_network_info.py @@ -190,7 +190,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudNetworkInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_network_info") + super().__init__(module, "hcloud_network_info") self.hcloud_network_info = None def _prepare_result(self): @@ -264,14 +264,14 @@ class AnsibleHcloudNetworkInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_placement_group.py b/plugins/modules/hcloud_placement_group.py index 5927d8c..0dd775d 100644 --- a/plugins/modules/hcloud_placement_group.py +++ b/plugins/modules/hcloud_placement_group.py @@ -116,7 +116,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPlacementGroup(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_placement_group") + super().__init__(module, "hcloud_placement_group") self.hcloud_placement_group = None def _prepare_result(self): @@ -183,8 +183,8 @@ class AnsibleHcloudPlacementGroup(Hcloud): self._mark_as_changed() self.hcloud_placement_group = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -195,7 +195,7 @@ class AnsibleHcloudPlacementGroup(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], required_if=[["state", "present", ["name"]]], diff --git a/plugins/modules/hcloud_primary_ip.py b/plugins/modules/hcloud_primary_ip.py index 95a19b4..296cc2c 100644 --- a/plugins/modules/hcloud_primary_ip.py +++ b/plugins/modules/hcloud_primary_ip.py @@ -140,7 +140,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPrimaryIP(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_primary_ip") + super().__init__(module, "hcloud_primary_ip") self.hcloud_primary_ip = None def _prepare_result(self): @@ -222,8 +222,8 @@ class AnsibleHcloudPrimaryIP(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -237,7 +237,7 @@ class AnsibleHcloudPrimaryIP(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], supports_check_mode=True, diff --git a/plugins/modules/hcloud_primary_ip_info.py b/plugins/modules/hcloud_primary_ip_info.py index 1b49f89..e1e5e33 100644 --- a/plugins/modules/hcloud_primary_ip_info.py +++ b/plugins/modules/hcloud_primary_ip_info.py @@ -126,7 +126,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudPrimaryIPInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_primary_ip_info") + super().__init__(module, "hcloud_primary_ip_info") self.hcloud_primary_ip_info = None def _prepare_result(self): @@ -172,14 +172,14 @@ class AnsibleHcloudPrimaryIPInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, label_selector={"type": "str"}, name={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_rdns.py b/plugins/modules/hcloud_rdns.py index b123fbb..b88100e 100644 --- a/plugins/modules/hcloud_rdns.py +++ b/plugins/modules/hcloud_rdns.py @@ -146,7 +146,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudReverseDNS(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_rdns") + super().__init__(module, "hcloud_rdns") self.hcloud_resource = None self.hcloud_rdns = None @@ -311,8 +311,8 @@ class AnsibleHcloudReverseDNS(Hcloud): self._mark_as_changed() self.hcloud_rdns = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( server={"type": "str"}, @@ -325,7 +325,7 @@ class AnsibleHcloudReverseDNS(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["server", "floating_ip", "load_balancer", "primary_ip"]], mutually_exclusive=[["server", "floating_ip", "load_balancer", "primary_ip"]], diff --git a/plugins/modules/hcloud_route.py b/plugins/modules/hcloud_route.py index d8ef7e3..20ed53c 100644 --- a/plugins/modules/hcloud_route.py +++ b/plugins/modules/hcloud_route.py @@ -97,7 +97,7 @@ from ..module_utils.vendor.hcloud.networks.domain import NetworkRoute class AnsibleHcloudRoute(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_route") + super().__init__(module, "hcloud_route") self.hcloud_network = None self.hcloud_route = None @@ -155,8 +155,8 @@ class AnsibleHcloudRoute(Hcloud): self._mark_as_changed() self.hcloud_route = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( network={"type": "str", "required": True}, @@ -166,7 +166,7 @@ class AnsibleHcloudRoute(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_server.py b/plugins/modules/hcloud_server.py index 4970c60..c0be8b4 100644 --- a/plugins/modules/hcloud_server.py +++ b/plugins/modules/hcloud_server.py @@ -346,7 +346,7 @@ from ..module_utils.vendor.hcloud.volumes.domain import Volume class AnsibleHcloudServer(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_server") + super().__init__(module, "hcloud_server") self.hcloud_server = None def _prepare_result(self): @@ -863,8 +863,8 @@ class AnsibleHcloudServer(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -896,7 +896,7 @@ class AnsibleHcloudServer(Hcloud): "choices": ["absent", "present", "restarted", "started", "stopped", "rebuild"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], mutually_exclusive=[["location", "datacenter"]], diff --git a/plugins/modules/hcloud_server_info.py b/plugins/modules/hcloud_server_info.py index 1cd568d..f6f64d6 100644 --- a/plugins/modules/hcloud_server_info.py +++ b/plugins/modules/hcloud_server_info.py @@ -146,7 +146,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudServerInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_server_info") + super().__init__(module, "hcloud_server_info") self.hcloud_server_info = None def _prepare_result(self): @@ -200,14 +200,14 @@ class AnsibleHcloudServerInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_server_network.py b/plugins/modules/hcloud_server_network.py index 63f80b0..22220d5 100644 --- a/plugins/modules/hcloud_server_network.py +++ b/plugins/modules/hcloud_server_network.py @@ -121,7 +121,7 @@ from ..module_utils.vendor.hcloud import APIException, HCloudException class AnsibleHcloudServerNetwork(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_server_network") + super().__init__(module, "hcloud_server_network") self.hcloud_network = None self.hcloud_server = None self.hcloud_server_network = None @@ -205,8 +205,8 @@ class AnsibleHcloudServerNetwork(Hcloud): self._mark_as_changed() self.hcloud_server_network = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( network={"type": "str", "required": True}, @@ -217,7 +217,7 @@ class AnsibleHcloudServerNetwork(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_server_type_info.py b/plugins/modules/hcloud_server_type_info.py index 279a813..566f9b0 100644 --- a/plugins/modules/hcloud_server_type_info.py +++ b/plugins/modules/hcloud_server_type_info.py @@ -129,7 +129,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudServerTypeInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_server_type_info") + super().__init__(module, "hcloud_server_type_info") self.hcloud_server_type_info = None def _prepare_result(self): @@ -171,13 +171,13 @@ class AnsibleHcloudServerTypeInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, - **Hcloud.base_module_arguments(), + **super().base_module_arguments(), ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_ssh_key.py b/plugins/modules/hcloud_ssh_key.py index cd71149..d62d7e7 100644 --- a/plugins/modules/hcloud_ssh_key.py +++ b/plugins/modules/hcloud_ssh_key.py @@ -119,7 +119,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudSSHKey(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_ssh_key") + super().__init__(module, "hcloud_ssh_key") self.hcloud_ssh_key = None def _prepare_result(self): @@ -193,8 +193,8 @@ class AnsibleHcloudSSHKey(Hcloud): self._mark_as_changed() self.hcloud_ssh_key = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -206,7 +206,7 @@ class AnsibleHcloudSSHKey(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name", "fingerprint"]], required_if=[["state", "present", ["name"]]], diff --git a/plugins/modules/hcloud_ssh_key_info.py b/plugins/modules/hcloud_ssh_key_info.py index 28eff74..4d1391c 100644 --- a/plugins/modules/hcloud_ssh_key_info.py +++ b/plugins/modules/hcloud_ssh_key_info.py @@ -83,7 +83,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudSSHKeyInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_ssh_key_info") + super().__init__(module, "hcloud_ssh_key_info") self.hcloud_ssh_key_info = None def _prepare_result(self): @@ -122,15 +122,15 @@ class AnsibleHcloudSSHKeyInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, fingerprint={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_subnetwork.py b/plugins/modules/hcloud_subnetwork.py index 4abdbfc..93d2b01 100644 --- a/plugins/modules/hcloud_subnetwork.py +++ b/plugins/modules/hcloud_subnetwork.py @@ -134,7 +134,7 @@ from ..module_utils.vendor.hcloud.networks.domain import NetworkSubnet class AnsibleHcloudSubnetwork(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_subnetwork") + super().__init__(module, "hcloud_subnetwork") self.hcloud_network = None self.hcloud_subnetwork = None @@ -199,8 +199,8 @@ class AnsibleHcloudSubnetwork(Hcloud): self._mark_as_changed() self.hcloud_subnetwork = None - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( network={"type": "str", "required": True}, @@ -212,7 +212,7 @@ class AnsibleHcloudSubnetwork(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, ) diff --git a/plugins/modules/hcloud_volume.py b/plugins/modules/hcloud_volume.py index e4de0bf..4ad2267 100644 --- a/plugins/modules/hcloud_volume.py +++ b/plugins/modules/hcloud_volume.py @@ -166,7 +166,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudVolume(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_volume") + super().__init__(module, "hcloud_volume") self.hcloud_volume = None def _prepare_result(self): @@ -285,8 +285,8 @@ class AnsibleHcloudVolume(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, @@ -302,7 +302,7 @@ class AnsibleHcloudVolume(Hcloud): "choices": ["absent", "present"], "default": "present", }, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), required_one_of=[["id", "name"]], mutually_exclusive=[["location", "server"]], diff --git a/plugins/modules/hcloud_volume_info.py b/plugins/modules/hcloud_volume_info.py index 5e9c788..094c5e6 100644 --- a/plugins/modules/hcloud_volume_info.py +++ b/plugins/modules/hcloud_volume_info.py @@ -100,7 +100,7 @@ from ..module_utils.vendor.hcloud import HCloudException class AnsibleHcloudVolumeInfo(Hcloud): def __init__(self, module): - Hcloud.__init__(self, module, "hcloud_volume_info") + super().__init__(module, "hcloud_volume_info") self.hcloud_volume_info = None def _prepare_result(self): @@ -142,14 +142,14 @@ class AnsibleHcloudVolumeInfo(Hcloud): except HCloudException as e: self.fail_json_hcloud(e) - @staticmethod - def define_module(): + @classmethod + def define_module(cls): return AnsibleModule( argument_spec=dict( id={"type": "int"}, name={"type": "str"}, label_selector={"type": "str"}, - **Hcloud.base_module_arguments() + **super().base_module_arguments() ), supports_check_mode=True, )