mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-23 05:10:22 -07:00
Modify port would remove and re-add ports on a modify which can results in an error (#53341)
* Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * documentation changes * Revert "documentation changes" This reverts commit 02c369d0414fdff492d90865c903bdade3174261. * Issue with port being removed and added on modify
This commit is contained in:
parent
057d572f3e
commit
3ff20436b6
2 changed files with 25 additions and 11 deletions
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/python
|
||||
|
||||
# (c) 2018, NetApp, Inc
|
||||
# (c) 2018-2019, NetApp, Inc
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
@ -248,10 +248,12 @@ class NetAppOntapIfGrp(object):
|
|||
exception=traceback.format_exc())
|
||||
|
||||
def modify_ports(self, current_ports):
|
||||
for port in current_ports:
|
||||
self.remove_port_to_if_grp(port)
|
||||
for port in self.parameters['ports']:
|
||||
add_ports = set(self.parameters['ports']) - set(current_ports)
|
||||
remove_ports = set(current_ports) - set(self.parameters['ports'])
|
||||
for port in add_ports:
|
||||
self.add_port_to_if_grp(port)
|
||||
for port in remove_ports:
|
||||
self.remove_port_to_if_grp(port)
|
||||
|
||||
def remove_port_to_if_grp(self, port):
|
||||
"""
|
||||
|
@ -275,9 +277,9 @@ class NetAppOntapIfGrp(object):
|
|||
|
||||
def apply(self):
|
||||
self.autosupport_log()
|
||||
current = self.get_if_grp()
|
||||
current, modify = self.get_if_grp(), None
|
||||
cd_action = self.na_helper.get_cd_action(current, self.parameters)
|
||||
if current and self.parameters['state'] == 'present':
|
||||
if cd_action is None and self.parameters['state'] == 'present':
|
||||
current_ports = self.get_if_grp_ports()
|
||||
modify = self.na_helper.get_modified_attributes(current_ports, self.parameters)
|
||||
if self.na_helper.changed:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue