Rename module_utils/elb_utils.py to module_utils/elbv2_utils.py since…

… it include util esed by the elbv2 client

Signed-off-by: Alina Buzachis <[email protected]>

plugins/module_utils/elbv2.py

@@ -19,29 +19,29 @@
 from typing import Tuple
 
 from .ec2 import get_ec2_security_group_ids_from_names
-from .elb_utils import AnsibleELBv2Error
-from .elb_utils import add_listener_certificates
-from .elb_utils import add_tags
-from .elb_utils import convert_tg_name_to_arn
-from .elb_utils import create_listener
-from .elb_utils import create_load_balancer
-from .elb_utils import create_rule
-from .elb_utils import delete_listener
-from .elb_utils import delete_load_balancer
-from .elb_utils import delete_rule
-from .elb_utils import describe_listeners
-from .elb_utils import describe_load_balancer_attributes
-from .elb_utils import describe_rules
-from .elb_utils import describe_tags
-from .elb_utils import get_elb
-from .elb_utils import modify_listener
-from .elb_utils import modify_load_balancer_attributes
-from .elb_utils import modify_rule
-from .elb_utils import remove_tags
-from .elb_utils import set_ip_address_type
-from .elb_utils import set_rule_priorities
-from .elb_utils import set_security_groups
-from .elb_utils import set_subnets
+from .elbv2_utils import AnsibleELBv2Error
+from .elbv2_utils import add_listener_certificates
+from .elbv2_utils import add_tags
+from .elbv2_utils import convert_tg_name_to_arn
+from .elbv2_utils import create_listener
+from .elbv2_utils import create_load_balancer
+from .elbv2_utils import create_rule
+from .elbv2_utils import delete_listener
+from .elbv2_utils import delete_load_balancer
+from .elbv2_utils import delete_rule
+from .elbv2_utils import describe_listeners
+from .elbv2_utils import describe_load_balancer_attributes
+from .elbv2_utils import describe_rules
+from .elbv2_utils import describe_tags
+from .elbv2_utils import get_elb
+from .elbv2_utils import modify_listener
+from .elbv2_utils import modify_load_balancer_attributes
+from .elbv2_utils import modify_rule
+from .elbv2_utils import remove_tags
+from .elbv2_utils import set_ip_address_type
+from .elbv2_utils import set_rule_priorities
+from .elbv2_utils import set_security_groups
+from .elbv2_utils import set_subnets
 from .modules import AnsibleAWSModule
 from .retries import AWSRetry
 from .tagging import ansible_dict_to_boto3_tag_list

plugins/modules/autoscaling_group.py

@@ -666,7 +666,7 @@
 from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
 
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_target_groups
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_target_groups
 from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
 from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters

plugins/modules/autoscaling_group_info.py

@@ -354,8 +354,8 @@
 
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_target_groups
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_target_groups
 from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 
 

plugins/modules/elb_application_lb.py

@@ -765,8 +765,8 @@
 
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import get_elb_listener_rules
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import get_elb_listener_rules
 from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ApplicationLoadBalancer
 from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListener
 from ansible_collections.amazon.aws.plugins.module_utils.elbv2 import ELBListenerRule

plugins/modules/elb_application_lb_info.py

@@ -407,12 +407,12 @@
 
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import AnsibleELBv2Error
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_listeners
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_load_balancer_attributes
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_load_balancers
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_rules
-from ansible_collections.amazon.aws.plugins.module_utils.elb_utils import describe_tags
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import AnsibleELBv2Error
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_listeners
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_load_balancer_attributes
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_load_balancers
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_rules
+from ansible_collections.amazon.aws.plugins.module_utils.elbv2_utils import describe_tags
 from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict