wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update ce_aaa_server to fix bugs (#60355)

Browse source 
* update ce_aaa_server to fix bugs (#60270)

* update ce_aaa_server to fix bugs

* update ce_aaa_server to fix bugs

(cherry picked from commit c2e7683926)

* Update ce_aaa_server modified information
This commit is contained in:
yanzhangi 2019-08-13 09:22:03 +08:00 committed by Toshio Kuratomi
parent b51fdab9ea
commit f4aaf4d148
2 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/60270-ce_aaa_server-to-fix-bugs.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ce_aaa_server - update to fix some bugs - When you want to delete a parameter, a conflict will occur, causing the download configuration to fail. (https://github.com/ansible/ansible/pull/60270)

75
lib/ansible/modules/network/cloudengine/ce_aaa_server.py
View file

@ -1797,20 +1797,21 @@ def main():
else: else:
# absent authentication scheme # absent authentication scheme
if len(scheme_exist) == 0: if not domain_name:
pass if len(scheme_exist) == 0:
elif scheme_new not in scheme_exist: pass
pass elif scheme_new not in scheme_exist:
else: pass
cmd = ce_aaa_server.delete_authentication_scheme( else:
module=module, cmd = ce_aaa_server.delete_authentication_scheme(
authen_scheme_name=authen_scheme_name, module=module,
first_authen_mode=first_authen_mode) authen_scheme_name=authen_scheme_name,
updates.append(cmd) first_authen_mode=first_authen_mode)
changed = True updates.append(cmd)
changed = True
# absent authentication domain # absent authentication domain
if domain_name: else:
domain_exist = ce_aaa_server.get_authentication_domain( domain_exist = ce_aaa_server.get_authentication_domain(
module=module) module=module)
domain_new = (domain_name.lower(), authen_scheme_name.lower()) domain_new = (domain_name.lower(), authen_scheme_name.lower())
@ -1878,20 +1879,21 @@ def main():
else: else:
# absent authorization scheme # absent authorization scheme
if len(scheme_exist) == 0: if not domain_name:
pass if len(scheme_exist) == 0:
elif scheme_new not in scheme_exist: pass
pass elif scheme_new not in scheme_exist:
else: pass
cmd = ce_aaa_server.delete_authorization_scheme( else:
module=module, cmd = ce_aaa_server.delete_authorization_scheme(
author_scheme_name=author_scheme_name, module=module,
first_author_mode=first_author_mode) author_scheme_name=author_scheme_name,
updates.append(cmd) first_author_mode=first_author_mode)
changed = True updates.append(cmd)
changed = True
# absent authorization domain # absent authorization domain
if domain_name: else:
domain_exist = ce_aaa_server.get_authorization_domain( domain_exist = ce_aaa_server.get_authorization_domain(
module=module) module=module)
domain_new = (domain_name.lower(), author_scheme_name.lower()) domain_new = (domain_name.lower(), author_scheme_name.lower())
@ -1959,20 +1961,21 @@ def main():
else: else:
# absent accounting scheme # absent accounting scheme
if len(scheme_exist) == 0: if not domain_name:
pass if len(scheme_exist) == 0:
elif scheme_new not in scheme_exist: pass
pass elif scheme_new not in scheme_exist:
else: pass
cmd = ce_aaa_server.delete_accounting_scheme( else:
module=module, cmd = ce_aaa_server.delete_accounting_scheme(
acct_scheme_name=acct_scheme_name, module=module,
accounting_mode=accounting_mode) acct_scheme_name=acct_scheme_name,
updates.append(cmd) accounting_mode=accounting_mode)
changed = True updates.append(cmd)
changed = True
# absent accounting domain # absent accounting domain
if domain_name: else:
domain_exist = ce_aaa_server.get_accounting_domain( domain_exist = ce_aaa_server.get_accounting_domain(
module=module) module=module)
domain_new = (domain_name.lower(), acct_scheme_name.lower()) domain_new = (domain_name.lower(), acct_scheme_name.lower())