ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-01 22:09:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

To ipv6 network (#48572)

Browse source 
* Add to_ipv6_subnet function

* Use the correct function for subnet

* Corrected code style and tests

* Corrected testcase assertion

64 bits make 8 octets, or 4 hextets

* Import from correct module directly
This commit is contained in:
dgadmin 2019-03-27 11:20:27 -04:00 • committed by Nathaniel Case
parent 5ed9d819ab
commit 8de00e3e1c
4 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/amazon/ec2_group.py
View file

@ -303,7 +303,7 @@ from ansible.module_utils.aws.iam import get_aws_account_id
from ansible.module_utils.aws.waiters import get_waiter
from ansible.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict, compare_aws_tags
from ansible.module_utils.ec2 import ansible_dict_to_boto3_filter_list, boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list
from ansible.module_utils.network.common.utils import to_ipv6_network, to_subnet
from ansible.module_utils.common.network import to_ipv6_subnet, to_subnet
from ansible.module_utils._text import to_text
from ansible.module_utils.six import string_types
@ -726,7 +726,7 @@ def validate_ip(module, cidr_ip):
try:
ip = to_subnet(split_addr[0], split_addr[1])
except ValueError:
ip = to_ipv6_network(split_addr[0]) + "/" + split_addr[1]
ip = to_ipv6_subnet(split_addr[0]) + "/" + split_addr[1]
if ip != cidr_ip:
module.warn("One of your CIDR addresses ({0}) has host bits set. To get rid of this warning, "
"check the network mask and make sure that only network bits are set: {1}.".format(cidr_ip, ip))