cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix 66530 (#66654)

Browse source
This commit is contained in:
Sumit Jaiswal 2020-01-22 13:35:51 +05:30 committed by GitHub
parent ebf21bb48d
commit 0c4f167b82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/module_utils/network/ios/utils/utils.py
View file

@ -62,24 +62,36 @@ def dict_to_set(sample_dict):
def filter_dict_having_none_value(want, have):
# Generate dict with have dict value which is None in want dict
test_dict = dict()
test_key_dict = dict()
name = want.get('name')
if name:
test_dict['name'] = name
diff_ip = False
want_ip = ''
for k, v in iteritems(want):
if isinstance(v, dict):
for key, value in iteritems(v):
test_key_dict = dict()
if value is None:
dict_val = have.get(k).get(key)
test_key_dict.update({key: dict_val})
elif k == 'ipv6' and value.lower() != have.get(k)[0].get(key).lower():
# as multiple IPV6 address can be configured on same
# interface, for replace state in place update will
# actually create new entry, which isn't as expected
# for replace state, so in case of IPV6 address
# every time 1st delete the existing IPV6 config and
# then apply the new change
dict_val = have.get(k)[0].get(key)
test_key_dict.update({key: dict_val})
test_dict.update({k: test_key_dict})
if isinstance(v, list):
for key, value in iteritems(v[0]):
test_key_dict = dict()
if value is None:
dict_val = have.get(k).get(key)
test_key_dict.update({key: dict_val})
elif k == 'ipv6' and value.lower() != have.get(k)[0].get(key).lower():
dict_val = have.get(k)[0].get(key)
test_key_dict.update({key: dict_val})
test_dict.update({k: test_key_dict})
# below conditions checks are added to check if
# secondary IP is configured, if yes then delete

2
test/integration/targets/ios_l3_interfaces/tests/cli/replaced.yaml
View file

@ -18,6 +18,8 @@
- address: 198.51.100.1/24
secondary: True
- address: 198.51.100.2/24
ipv6:
- address: 2001:db8:1:1::/64
state: replaced
register: result

3
test/integration/targets/ios_l3_interfaces/vars/main.yaml
View file

@ -63,6 +63,7 @@ replaced:
- "no ipv6 address"
- "ip address 198.51.100.1 255.255.255.0 secondary"
- "ip address 198.51.100.2 255.255.255.0"
- "ipv6 address 2001:db8:1:1::/64"
after:
- name: loopback888
@ -77,6 +78,8 @@ replaced:
- address: 198.51.100.1 255.255.255.0
secondary: true
- address: 198.51.100.2 255.255.255.0
ipv6:
- address: 2001:db8:1:1::/64
name: GigabitEthernet0/2
overridden: