From a0e91d942a9fac0e04d109acc4ef3962b77b045e Mon Sep 17 00:00:00 2001 From: Jonas L Date: Fri, 4 Aug 2023 09:24:14 +0200 Subject: [PATCH] refactor: rename ansible module classes (#284) * refactor: rename Hcloud class to AnsibleHCloud * refactor: rename AnsibleHCloud* modules * refactor: remove Hcloud deprecation wrapper --- plugins/module_utils/hcloud.py | 2 +- plugins/modules/hcloud_certificate.py | 8 ++++---- plugins/modules/hcloud_certificate_info.py | 8 ++++---- plugins/modules/hcloud_datacenter_info.py | 8 ++++---- plugins/modules/hcloud_firewall.py | 8 ++++---- plugins/modules/hcloud_floating_ip.py | 8 ++++---- plugins/modules/hcloud_floating_ip_info.py | 8 ++++---- plugins/modules/hcloud_image_info.py | 8 ++++---- plugins/modules/hcloud_iso_info.py | 8 ++++---- plugins/modules/hcloud_load_balancer.py | 8 ++++---- plugins/modules/hcloud_load_balancer_info.py | 8 ++++---- plugins/modules/hcloud_load_balancer_network.py | 8 ++++---- plugins/modules/hcloud_load_balancer_service.py | 8 ++++---- plugins/modules/hcloud_load_balancer_target.py | 8 ++++---- plugins/modules/hcloud_load_balancer_type_info.py | 8 ++++---- plugins/modules/hcloud_location_info.py | 8 ++++---- plugins/modules/hcloud_network.py | 8 ++++---- plugins/modules/hcloud_network_info.py | 8 ++++---- plugins/modules/hcloud_placement_group.py | 8 ++++---- plugins/modules/hcloud_primary_ip.py | 8 ++++---- plugins/modules/hcloud_primary_ip_info.py | 8 ++++---- plugins/modules/hcloud_rdns.py | 8 ++++---- plugins/modules/hcloud_route.py | 8 ++++---- plugins/modules/hcloud_server.py | 8 ++++---- plugins/modules/hcloud_server_info.py | 8 ++++---- plugins/modules/hcloud_server_network.py | 8 ++++---- plugins/modules/hcloud_server_type_info.py | 8 ++++---- plugins/modules/hcloud_ssh_key.py | 8 ++++---- plugins/modules/hcloud_ssh_key_info.py | 8 ++++---- plugins/modules/hcloud_subnetwork.py | 8 ++++---- plugins/modules/hcloud_volume.py | 8 ++++---- plugins/modules/hcloud_volume_info.py | 8 ++++---- tests/unit/module_utils/test_hcloud.py | 4 ++-- 33 files changed, 127 insertions(+), 127 deletions(-) diff --git a/plugins/module_utils/hcloud.py b/plugins/module_utils/hcloud.py index d47f501..743cb39 100644 --- a/plugins/module_utils/hcloud.py +++ b/plugins/module_utils/hcloud.py @@ -25,7 +25,7 @@ except ImportError: HAS_DATEUTIL = False -class Hcloud: +class AnsibleHCloud: def __init__(self, module, represent): self.module = module self.represent = represent diff --git a/plugins/modules/hcloud_certificate.py b/plugins/modules/hcloud_certificate.py index aff913e..ea9bc6a 100644 --- a/plugins/modules/hcloud_certificate.py +++ b/plugins/modules/hcloud_certificate.py @@ -137,11 +137,11 @@ hcloud_certificate: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudCertificate(Hcloud): +class AnsibleHCloudCertificate(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_certificate") self.hcloud_certificate = None @@ -261,9 +261,9 @@ class AnsibleHcloudCertificate(Hcloud): def main(): - module = AnsibleHcloudCertificate.define_module() + module = AnsibleHCloudCertificate.define_module() - hcloud = AnsibleHcloudCertificate(module) + hcloud = AnsibleHCloudCertificate(module) state = module.params.get("state") if state == "absent": hcloud.delete_certificate() diff --git a/plugins/modules/hcloud_certificate_info.py b/plugins/modules/hcloud_certificate_info.py index 578d088..89a98a2 100644 --- a/plugins/modules/hcloud_certificate_info.py +++ b/plugins/modules/hcloud_certificate_info.py @@ -85,11 +85,11 @@ hcloud_certificate_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudCertificateInfo(Hcloud): +class AnsibleHCloudCertificateInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_certificate_info") self.hcloud_certificate_info = None @@ -143,8 +143,8 @@ class AnsibleHcloudCertificateInfo(Hcloud): def main(): - module = AnsibleHcloudCertificateInfo.define_module() - hcloud = AnsibleHcloudCertificateInfo(module) + module = AnsibleHCloudCertificateInfo.define_module() + hcloud = AnsibleHCloudCertificateInfo(module) hcloud.get_certificates() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_datacenter_info.py b/plugins/modules/hcloud_datacenter_info.py index 96e3b7f..97a5f7c 100644 --- a/plugins/modules/hcloud_datacenter_info.py +++ b/plugins/modules/hcloud_datacenter_info.py @@ -76,11 +76,11 @@ hcloud_datacenter_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudDatacenterInfo(Hcloud): +class AnsibleHCloudDatacenterInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_datacenter_info") self.hcloud_datacenter_info = None @@ -126,8 +126,8 @@ class AnsibleHcloudDatacenterInfo(Hcloud): def main(): - module = AnsibleHcloudDatacenterInfo.define_module() - hcloud = AnsibleHcloudDatacenterInfo(module) + module = AnsibleHCloudDatacenterInfo.define_module() + hcloud = AnsibleHCloudDatacenterInfo(module) hcloud.get_datacenters() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_firewall.py b/plugins/modules/hcloud_firewall.py index 46980eb..fec847e 100644 --- a/plugins/modules/hcloud_firewall.py +++ b/plugins/modules/hcloud_firewall.py @@ -171,12 +171,12 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import APIException, HCloudException from ..module_utils.vendor.hcloud.firewalls.domain import FirewallRule -class AnsibleHcloudFirewall(Hcloud): +class AnsibleHCloudFirewall(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_firewall") self.hcloud_firewall = None @@ -328,9 +328,9 @@ class AnsibleHcloudFirewall(Hcloud): def main(): - module = AnsibleHcloudFirewall.define_module() + module = AnsibleHCloudFirewall.define_module() - hcloud = AnsibleHcloudFirewall(module) + hcloud = AnsibleHCloudFirewall(module) state = module.params.get("state") if state == "absent": hcloud.delete_firewall() diff --git a/plugins/modules/hcloud_floating_ip.py b/plugins/modules/hcloud_floating_ip.py index 7722fba..ed77c08 100644 --- a/plugins/modules/hcloud_floating_ip.py +++ b/plugins/modules/hcloud_floating_ip.py @@ -164,11 +164,11 @@ hcloud_floating_ip: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudFloatingIP(Hcloud): +class AnsibleHCloudFloatingIP(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_floating_ip") self.hcloud_floating_ip = None @@ -323,9 +323,9 @@ class AnsibleHcloudFloatingIP(Hcloud): def main(): - module = AnsibleHcloudFloatingIP.define_module() + module = AnsibleHCloudFloatingIP.define_module() - hcloud = AnsibleHcloudFloatingIP(module) + hcloud = AnsibleHCloudFloatingIP(module) state = module.params["state"] if state == "absent": hcloud.delete_floating_ip() diff --git a/plugins/modules/hcloud_floating_ip_info.py b/plugins/modules/hcloud_floating_ip_info.py index 1059b44..20b9a82 100644 --- a/plugins/modules/hcloud_floating_ip_info.py +++ b/plugins/modules/hcloud_floating_ip_info.py @@ -95,11 +95,11 @@ hcloud_floating_ip_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudFloatingIPInfo(Hcloud): +class AnsibleHCloudFloatingIPInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_floating_ip_info") self.hcloud_floating_ip_info = None @@ -155,8 +155,8 @@ class AnsibleHcloudFloatingIPInfo(Hcloud): def main(): - module = AnsibleHcloudFloatingIPInfo.define_module() - hcloud = AnsibleHcloudFloatingIPInfo(module) + module = AnsibleHCloudFloatingIPInfo.define_module() + hcloud = AnsibleHCloudFloatingIPInfo(module) hcloud.get_floating_ips() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_image_info.py b/plugins/modules/hcloud_image_info.py index e2f1c7e..6fae6df 100644 --- a/plugins/modules/hcloud_image_info.py +++ b/plugins/modules/hcloud_image_info.py @@ -111,11 +111,11 @@ hcloud_image_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudImageInfo(Hcloud): +class AnsibleHCloudImageInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_image_info") self.hcloud_image_info = None @@ -191,8 +191,8 @@ class AnsibleHcloudImageInfo(Hcloud): def main(): - module = AnsibleHcloudImageInfo.define_module() - hcloud = AnsibleHcloudImageInfo(module) + module = AnsibleHCloudImageInfo.define_module() + hcloud = AnsibleHCloudImageInfo(module) hcloud.get_images() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_iso_info.py b/plugins/modules/hcloud_iso_info.py index 84c0be9..db289c4 100644 --- a/plugins/modules/hcloud_iso_info.py +++ b/plugins/modules/hcloud_iso_info.py @@ -98,10 +98,10 @@ hcloud_iso_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud -class AnsibleHcloudIsoInfo(Hcloud): +class AnsibleHCloudIsoInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_iso_info") self.hcloud_iso_info = None @@ -156,8 +156,8 @@ class AnsibleHcloudIsoInfo(Hcloud): def main(): - module = AnsibleHcloudIsoInfo.define_module() - hcloud = AnsibleHcloudIsoInfo(module) + module = AnsibleHCloudIsoInfo.define_module() + hcloud = AnsibleHCloudIsoInfo(module) hcloud.get_iso_infos() result = hcloud.get_result() ansible_info = {"hcloud_iso_info": result["hcloud_iso_info"]} diff --git a/plugins/modules/hcloud_load_balancer.py b/plugins/modules/hcloud_load_balancer.py index 98f23a4..fbf4136 100644 --- a/plugins/modules/hcloud_load_balancer.py +++ b/plugins/modules/hcloud_load_balancer.py @@ -144,11 +144,11 @@ hcloud_load_balancer: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudLoadBalancer(Hcloud): +class AnsibleHCloudLoadBalancer(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer") self.hcloud_load_balancer = None @@ -299,9 +299,9 @@ class AnsibleHcloudLoadBalancer(Hcloud): def main(): - module = AnsibleHcloudLoadBalancer.define_module() + module = AnsibleHCloudLoadBalancer.define_module() - hcloud = AnsibleHcloudLoadBalancer(module) + hcloud = AnsibleHCloudLoadBalancer(module) state = module.params.get("state") if state == "absent": hcloud.delete_load_balancer() diff --git a/plugins/modules/hcloud_load_balancer_info.py b/plugins/modules/hcloud_load_balancer_info.py index 3d76b07..56a16c0 100644 --- a/plugins/modules/hcloud_load_balancer_info.py +++ b/plugins/modules/hcloud_load_balancer_info.py @@ -259,11 +259,11 @@ hcloud_load_balancer_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudLoadBalancerInfo(Hcloud): +class AnsibleHCloudLoadBalancerInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer_info") self.hcloud_load_balancer_info = None @@ -379,8 +379,8 @@ class AnsibleHcloudLoadBalancerInfo(Hcloud): def main(): - module = AnsibleHcloudLoadBalancerInfo.define_module() - hcloud = AnsibleHcloudLoadBalancerInfo(module) + module = AnsibleHCloudLoadBalancerInfo.define_module() + hcloud = AnsibleHCloudLoadBalancerInfo(module) hcloud.get_load_balancers() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_load_balancer_network.py b/plugins/modules/hcloud_load_balancer_network.py index e5712ca..a4e4854 100644 --- a/plugins/modules/hcloud_load_balancer_network.py +++ b/plugins/modules/hcloud_load_balancer_network.py @@ -94,11 +94,11 @@ hcloud_load_balancer_network: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudLoadBalancerNetwork(Hcloud): +class AnsibleHCloudLoadBalancerNetwork(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer_network") self.hcloud_network = None @@ -188,9 +188,9 @@ class AnsibleHcloudLoadBalancerNetwork(Hcloud): def main(): - module = AnsibleHcloudLoadBalancerNetwork.define_module() + module = AnsibleHCloudLoadBalancerNetwork.define_module() - hcloud = AnsibleHcloudLoadBalancerNetwork(module) + hcloud = AnsibleHCloudLoadBalancerNetwork(module) state = module.params["state"] if state == "absent": hcloud.delete_load_balancer_network() diff --git a/plugins/modules/hcloud_load_balancer_service.py b/plugins/modules/hcloud_load_balancer_service.py index c499246..3e0d950 100644 --- a/plugins/modules/hcloud_load_balancer_service.py +++ b/plugins/modules/hcloud_load_balancer_service.py @@ -282,7 +282,7 @@ hcloud_load_balancer_service: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import APIException, HCloudException from ..module_utils.vendor.hcloud.load_balancers.domain import ( LoadBalancerHealtCheckHttp, @@ -292,7 +292,7 @@ from ..module_utils.vendor.hcloud.load_balancers.domain import ( ) -class AnsibleHcloudLoadBalancerService(Hcloud): +class AnsibleHCloudLoadBalancerService(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer_service") self.hcloud_load_balancer = None @@ -563,9 +563,9 @@ class AnsibleHcloudLoadBalancerService(Hcloud): def main(): - module = AnsibleHcloudLoadBalancerService.define_module() + module = AnsibleHCloudLoadBalancerService.define_module() - hcloud = AnsibleHcloudLoadBalancerService(module) + hcloud = AnsibleHCloudLoadBalancerService(module) state = module.params.get("state") if state == "absent": hcloud.delete_load_balancer_service() diff --git a/plugins/modules/hcloud_load_balancer_target.py b/plugins/modules/hcloud_load_balancer_target.py index 4411adb..e3b481c 100644 --- a/plugins/modules/hcloud_load_balancer_target.py +++ b/plugins/modules/hcloud_load_balancer_target.py @@ -138,7 +138,7 @@ hcloud_load_balancer_target: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import APIException, HCloudException from ..module_utils.vendor.hcloud.load_balancers.domain import ( LoadBalancerTarget, @@ -147,7 +147,7 @@ from ..module_utils.vendor.hcloud.load_balancers.domain import ( ) -class AnsibleHcloudLoadBalancerTarget(Hcloud): +class AnsibleHCloudLoadBalancerTarget(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer_target") self.hcloud_load_balancer = None @@ -297,9 +297,9 @@ class AnsibleHcloudLoadBalancerTarget(Hcloud): def main(): - module = AnsibleHcloudLoadBalancerTarget.define_module() + module = AnsibleHCloudLoadBalancerTarget.define_module() - hcloud = AnsibleHcloudLoadBalancerTarget(module) + hcloud = AnsibleHCloudLoadBalancerTarget(module) state = module.params["state"] if state == "absent": hcloud.delete_load_balancer_target() diff --git a/plugins/modules/hcloud_load_balancer_type_info.py b/plugins/modules/hcloud_load_balancer_type_info.py index 8527f8c..44f8f83 100644 --- a/plugins/modules/hcloud_load_balancer_type_info.py +++ b/plugins/modules/hcloud_load_balancer_type_info.py @@ -87,11 +87,11 @@ hcloud_load_balancer_type_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudLoadBalancerTypeInfo(Hcloud): +class AnsibleHCloudLoadBalancerTypeInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_load_balancer_type_info") self.hcloud_load_balancer_type_info = None @@ -143,8 +143,8 @@ class AnsibleHcloudLoadBalancerTypeInfo(Hcloud): def main(): - module = AnsibleHcloudLoadBalancerTypeInfo.define_module() - hcloud = AnsibleHcloudLoadBalancerTypeInfo(module) + module = AnsibleHCloudLoadBalancerTypeInfo.define_module() + hcloud = AnsibleHCloudLoadBalancerTypeInfo(module) hcloud.get_load_balancer_types() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_location_info.py b/plugins/modules/hcloud_location_info.py index d6064e2..6fd87d2 100644 --- a/plugins/modules/hcloud_location_info.py +++ b/plugins/modules/hcloud_location_info.py @@ -77,11 +77,11 @@ hcloud_location_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudLocationInfo(Hcloud): +class AnsibleHCloudLocationInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_location_info") self.hcloud_location_info = None @@ -127,8 +127,8 @@ class AnsibleHcloudLocationInfo(Hcloud): def main(): - module = AnsibleHcloudLocationInfo.define_module() - hcloud = AnsibleHcloudLocationInfo(module) + module = AnsibleHCloudLocationInfo.define_module() + hcloud = AnsibleHCloudLocationInfo(module) hcloud.get_locations() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_network.py b/plugins/modules/hcloud_network.py index 055c238..4eafb1a 100644 --- a/plugins/modules/hcloud_network.py +++ b/plugins/modules/hcloud_network.py @@ -119,11 +119,11 @@ hcloud_network: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudNetwork(Hcloud): +class AnsibleHCloudNetwork(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_network") self.hcloud_network = None @@ -244,9 +244,9 @@ class AnsibleHcloudNetwork(Hcloud): def main(): - module = AnsibleHcloudNetwork.define_module() + module = AnsibleHCloudNetwork.define_module() - hcloud = AnsibleHcloudNetwork(module) + hcloud = AnsibleHCloudNetwork(module) state = module.params["state"] if state == "absent": hcloud.delete_network() diff --git a/plugins/modules/hcloud_network_info.py b/plugins/modules/hcloud_network_info.py index 8f1db04..6c5c654 100644 --- a/plugins/modules/hcloud_network_info.py +++ b/plugins/modules/hcloud_network_info.py @@ -184,11 +184,11 @@ hcloud_network_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudNetworkInfo(Hcloud): +class AnsibleHCloudNetworkInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_network_info") self.hcloud_network_info = None @@ -278,8 +278,8 @@ class AnsibleHcloudNetworkInfo(Hcloud): def main(): - module = AnsibleHcloudNetworkInfo.define_module() - hcloud = AnsibleHcloudNetworkInfo(module) + module = AnsibleHCloudNetworkInfo.define_module() + hcloud = AnsibleHCloudNetworkInfo(module) hcloud.get_networks() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_placement_group.py b/plugins/modules/hcloud_placement_group.py index 0dd775d..4330faa 100644 --- a/plugins/modules/hcloud_placement_group.py +++ b/plugins/modules/hcloud_placement_group.py @@ -110,11 +110,11 @@ hcloud_placement_group: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudPlacementGroup(Hcloud): +class AnsibleHCloudPlacementGroup(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_placement_group") self.hcloud_placement_group = None @@ -204,9 +204,9 @@ class AnsibleHcloudPlacementGroup(Hcloud): def main(): - module = AnsibleHcloudPlacementGroup.define_module() + module = AnsibleHCloudPlacementGroup.define_module() - hcloud = AnsibleHcloudPlacementGroup(module) + hcloud = AnsibleHCloudPlacementGroup(module) state = module.params.get("state") if state == "absent": hcloud.delete_placement_group() diff --git a/plugins/modules/hcloud_primary_ip.py b/plugins/modules/hcloud_primary_ip.py index 296cc2c..5361e80 100644 --- a/plugins/modules/hcloud_primary_ip.py +++ b/plugins/modules/hcloud_primary_ip.py @@ -134,11 +134,11 @@ hcloud_primary_ip: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudPrimaryIP(Hcloud): +class AnsibleHCloudPrimaryIP(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_primary_ip") self.hcloud_primary_ip = None @@ -245,9 +245,9 @@ class AnsibleHcloudPrimaryIP(Hcloud): def main(): - module = AnsibleHcloudPrimaryIP.define_module() + module = AnsibleHCloudPrimaryIP.define_module() - hcloud = AnsibleHcloudPrimaryIP(module) + hcloud = AnsibleHCloudPrimaryIP(module) state = module.params["state"] if state == "absent": hcloud.delete_primary_ip() diff --git a/plugins/modules/hcloud_primary_ip_info.py b/plugins/modules/hcloud_primary_ip_info.py index e1e5e33..c450b9e 100644 --- a/plugins/modules/hcloud_primary_ip_info.py +++ b/plugins/modules/hcloud_primary_ip_info.py @@ -120,11 +120,11 @@ hcloud_primary_ip_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudPrimaryIPInfo(Hcloud): +class AnsibleHCloudPrimaryIPInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_primary_ip_info") self.hcloud_primary_ip_info = None @@ -186,8 +186,8 @@ class AnsibleHcloudPrimaryIPInfo(Hcloud): def main(): - module = AnsibleHcloudPrimaryIPInfo.define_module() - hcloud = AnsibleHcloudPrimaryIPInfo(module) + module = AnsibleHCloudPrimaryIPInfo.define_module() + hcloud = AnsibleHCloudPrimaryIPInfo(module) hcloud.get_primary_ips() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_rdns.py b/plugins/modules/hcloud_rdns.py index b88100e..c39c0b8 100644 --- a/plugins/modules/hcloud_rdns.py +++ b/plugins/modules/hcloud_rdns.py @@ -140,11 +140,11 @@ from ansible_collections.ansible.netcommon.plugins.module_utils.network.common i utils, ) -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudReverseDNS(Hcloud): +class AnsibleHCloudReverseDNS(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_rdns") self.hcloud_resource = None @@ -334,9 +334,9 @@ class AnsibleHcloudReverseDNS(Hcloud): def main(): - module = AnsibleHcloudReverseDNS.define_module() + module = AnsibleHCloudReverseDNS.define_module() - hcloud = AnsibleHcloudReverseDNS(module) + hcloud = AnsibleHCloudReverseDNS(module) state = module.params["state"] if state == "absent": hcloud.delete_rdns() diff --git a/plugins/modules/hcloud_route.py b/plugins/modules/hcloud_route.py index 20ed53c..5c132da 100644 --- a/plugins/modules/hcloud_route.py +++ b/plugins/modules/hcloud_route.py @@ -90,12 +90,12 @@ hcloud_route: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException from ..module_utils.vendor.hcloud.networks.domain import NetworkRoute -class AnsibleHcloudRoute(Hcloud): +class AnsibleHCloudRoute(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_route") self.hcloud_network = None @@ -173,9 +173,9 @@ class AnsibleHcloudRoute(Hcloud): def main(): - module = AnsibleHcloudRoute.define_module() + module = AnsibleHCloudRoute.define_module() - hcloud = AnsibleHcloudRoute(module) + hcloud = AnsibleHCloudRoute(module) state = module.params["state"] if state == "absent": hcloud.delete_route() diff --git a/plugins/modules/hcloud_server.py b/plugins/modules/hcloud_server.py index c0be8b4..81cba32 100644 --- a/plugins/modules/hcloud_server.py +++ b/plugins/modules/hcloud_server.py @@ -333,7 +333,7 @@ from datetime import datetime, timedelta, timezone from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException from ..module_utils.vendor.hcloud.firewalls.domain import FirewallResource from ..module_utils.vendor.hcloud.servers.domain import ( @@ -344,7 +344,7 @@ from ..module_utils.vendor.hcloud.ssh_keys.domain import SSHKey from ..module_utils.vendor.hcloud.volumes.domain import Volume -class AnsibleHcloudServer(Hcloud): +class AnsibleHCloudServer(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_server") self.hcloud_server = None @@ -906,9 +906,9 @@ class AnsibleHcloudServer(Hcloud): def main(): - module = AnsibleHcloudServer.define_module() + module = AnsibleHCloudServer.define_module() - hcloud = AnsibleHcloudServer(module) + hcloud = AnsibleHCloudServer(module) state = module.params.get("state") if state == "absent": hcloud.delete_server() diff --git a/plugins/modules/hcloud_server_info.py b/plugins/modules/hcloud_server_info.py index f6f64d6..60d586b 100644 --- a/plugins/modules/hcloud_server_info.py +++ b/plugins/modules/hcloud_server_info.py @@ -140,11 +140,11 @@ hcloud_server_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudServerInfo(Hcloud): +class AnsibleHCloudServerInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_server_info") self.hcloud_server_info = None @@ -214,8 +214,8 @@ class AnsibleHcloudServerInfo(Hcloud): def main(): - module = AnsibleHcloudServerInfo.define_module() - hcloud = AnsibleHcloudServerInfo(module) + module = AnsibleHCloudServerInfo.define_module() + hcloud = AnsibleHCloudServerInfo(module) hcloud.get_servers() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_server_network.py b/plugins/modules/hcloud_server_network.py index 22220d5..8c087a3 100644 --- a/plugins/modules/hcloud_server_network.py +++ b/plugins/modules/hcloud_server_network.py @@ -115,11 +115,11 @@ 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 Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import APIException, HCloudException -class AnsibleHcloudServerNetwork(Hcloud): +class AnsibleHCloudServerNetwork(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_server_network") self.hcloud_network = None @@ -224,9 +224,9 @@ class AnsibleHcloudServerNetwork(Hcloud): def main(): - module = AnsibleHcloudServerNetwork.define_module() + module = AnsibleHCloudServerNetwork.define_module() - hcloud = AnsibleHcloudServerNetwork(module) + hcloud = AnsibleHCloudServerNetwork(module) state = module.params["state"] if state == "absent": hcloud.delete_server_network() diff --git a/plugins/modules/hcloud_server_type_info.py b/plugins/modules/hcloud_server_type_info.py index 566f9b0..d901b27 100644 --- a/plugins/modules/hcloud_server_type_info.py +++ b/plugins/modules/hcloud_server_type_info.py @@ -123,11 +123,11 @@ hcloud_server_type_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudServerTypeInfo(Hcloud): +class AnsibleHCloudServerTypeInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_server_type_info") self.hcloud_server_type_info = None @@ -184,8 +184,8 @@ class AnsibleHcloudServerTypeInfo(Hcloud): def main(): - module = AnsibleHcloudServerTypeInfo.define_module() - hcloud = AnsibleHcloudServerTypeInfo(module) + module = AnsibleHCloudServerTypeInfo.define_module() + hcloud = AnsibleHCloudServerTypeInfo(module) hcloud.get_server_types() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_ssh_key.py b/plugins/modules/hcloud_ssh_key.py index d62d7e7..31fc9a4 100644 --- a/plugins/modules/hcloud_ssh_key.py +++ b/plugins/modules/hcloud_ssh_key.py @@ -113,11 +113,11 @@ hcloud_ssh_key: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudSSHKey(Hcloud): +class AnsibleHCloudSSHKey(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_ssh_key") self.hcloud_ssh_key = None @@ -215,9 +215,9 @@ class AnsibleHcloudSSHKey(Hcloud): def main(): - module = AnsibleHcloudSSHKey.define_module() + module = AnsibleHCloudSSHKey.define_module() - hcloud = AnsibleHcloudSSHKey(module) + hcloud = AnsibleHCloudSSHKey(module) state = module.params.get("state") if state == "absent": hcloud.delete_ssh_key() diff --git a/plugins/modules/hcloud_ssh_key_info.py b/plugins/modules/hcloud_ssh_key_info.py index 4d1391c..f23e7f2 100644 --- a/plugins/modules/hcloud_ssh_key_info.py +++ b/plugins/modules/hcloud_ssh_key_info.py @@ -77,11 +77,11 @@ hcloud_ssh_key_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudSSHKeyInfo(Hcloud): +class AnsibleHCloudSSHKeyInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_ssh_key_info") self.hcloud_ssh_key_info = None @@ -137,8 +137,8 @@ class AnsibleHcloudSSHKeyInfo(Hcloud): def main(): - module = AnsibleHcloudSSHKeyInfo.define_module() - hcloud = AnsibleHcloudSSHKeyInfo(module) + module = AnsibleHCloudSSHKeyInfo.define_module() + hcloud = AnsibleHCloudSSHKeyInfo(module) hcloud.get_ssh_keys() result = hcloud.get_result() diff --git a/plugins/modules/hcloud_subnetwork.py b/plugins/modules/hcloud_subnetwork.py index 93d2b01..0debda9 100644 --- a/plugins/modules/hcloud_subnetwork.py +++ b/plugins/modules/hcloud_subnetwork.py @@ -127,12 +127,12 @@ hcloud_subnetwork: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException from ..module_utils.vendor.hcloud.networks.domain import NetworkSubnet -class AnsibleHcloudSubnetwork(Hcloud): +class AnsibleHCloudSubnetwork(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_subnetwork") self.hcloud_network = None @@ -219,9 +219,9 @@ class AnsibleHcloudSubnetwork(Hcloud): def main(): - module = AnsibleHcloudSubnetwork.define_module() + module = AnsibleHCloudSubnetwork.define_module() - hcloud = AnsibleHcloudSubnetwork(module) + hcloud = AnsibleHCloudSubnetwork(module) state = module.params["state"] if state == "absent": hcloud.delete_subnetwork() diff --git a/plugins/modules/hcloud_volume.py b/plugins/modules/hcloud_volume.py index 4ad2267..89702a4 100644 --- a/plugins/modules/hcloud_volume.py +++ b/plugins/modules/hcloud_volume.py @@ -160,11 +160,11 @@ hcloud_volume: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudVolume(Hcloud): +class AnsibleHCloudVolume(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_volume") self.hcloud_volume = None @@ -311,9 +311,9 @@ class AnsibleHcloudVolume(Hcloud): def main(): - module = AnsibleHcloudVolume.define_module() + module = AnsibleHCloudVolume.define_module() - hcloud = AnsibleHcloudVolume(module) + hcloud = AnsibleHCloudVolume(module) state = module.params.get("state") if state == "absent": module.fail_on_missing_params(required_params=["name"]) diff --git a/plugins/modules/hcloud_volume_info.py b/plugins/modules/hcloud_volume_info.py index 094c5e6..c172dda 100644 --- a/plugins/modules/hcloud_volume_info.py +++ b/plugins/modules/hcloud_volume_info.py @@ -94,11 +94,11 @@ hcloud_volume_info: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -from ..module_utils.hcloud import Hcloud +from ..module_utils.hcloud import AnsibleHCloud from ..module_utils.vendor.hcloud import HCloudException -class AnsibleHcloudVolumeInfo(Hcloud): +class AnsibleHCloudVolumeInfo(AnsibleHCloud): def __init__(self, module): super().__init__(module, "hcloud_volume_info") self.hcloud_volume_info = None @@ -156,8 +156,8 @@ class AnsibleHcloudVolumeInfo(Hcloud): def main(): - module = AnsibleHcloudVolumeInfo.define_module() - hcloud = AnsibleHcloudVolumeInfo(module) + module = AnsibleHCloudVolumeInfo.define_module() + hcloud = AnsibleHCloudVolumeInfo(module) hcloud.get_volumes() result = hcloud.get_result() diff --git a/tests/unit/module_utils/test_hcloud.py b/tests/unit/module_utils/test_hcloud.py index 798a3ad..08c9cdf 100644 --- a/tests/unit/module_utils/test_hcloud.py +++ b/tests/unit/module_utils/test_hcloud.py @@ -2,7 +2,7 @@ import traceback from datetime import datetime, timezone from unittest.mock import MagicMock -from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud +from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import AnsibleHCloud from ansible_collections.hetzner.hcloud.plugins.module_utils.vendor.hcloud import ( APIException, ) @@ -21,7 +21,7 @@ def test_hcloud_fail_json_hcloud(): "endpoint": "https://api.hetzner.cloud/v1", } - hcloud = Hcloud(module, "hcloud_test") + hcloud = AnsibleHCloud(module, "hcloud_test") try: raise APIException(