internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify port would remove and re-add ports on a modify which can results in an error (#53341)

Browse Source 
* 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:
Chris Archibald
2019-03-19 07:47:24 -07:00
committed by John R Barker
parent 057d572f3e
commit 3ff20436b6
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/units/modules/storage/netapp/test_na_ontap_net_ifgrp.py
View File

@@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_net_ifgrp \
import NetAppOntapIfGrp as ifgrp_module # module under test
if not netapp_utils.has_netapp_lib():
pytestmark = pytest.skip('skipping as missing required netapp_lib')
pytestmark = pytest.mark.skip('skipping as missing required netapp_lib')
def set_module_args(args):
@@ -249,13 +249,25 @@ class TestMyModule(unittest.TestCase):
@patch('ansible.modules.storage.netapp.na_ontap_net_ifgrp.NetAppOntapIfGrp.remove_port_to_if_grp')
@patch('ansible.modules.storage.netapp.na_ontap_net_ifgrp.NetAppOntapIfGrp.add_port_to_if_grp')
def test_modify_ports_calls(self, add_port, remove_port):
def test_modify_ports_calls_remove_existing_ports(self, add_port, remove_port):
''' Test if already existing ports are not being added again '''
data = self.mock_args()
data['ports'] = ['1', '2', '3']
data['ports'] = ['1', '2']
set_module_args(data)
self.get_ifgrp_mock_object('ifgrp').modify_ports(current_ports=['1', '2', '3'])
assert remove_port.call_count == 1
assert add_port.call_count == 0
@patch('ansible.modules.storage.netapp.na_ontap_net_ifgrp.NetAppOntapIfGrp.remove_port_to_if_grp')
@patch('ansible.modules.storage.netapp.na_ontap_net_ifgrp.NetAppOntapIfGrp.add_port_to_if_grp')
def test_modify_ports_calls_add_new_ports(self, add_port, remove_port):
''' Test new ports are added '''
data = self.mock_args()
data['ports'] = ['1', '2', '3', '4']
set_module_args(data)
self.get_ifgrp_mock_object('ifgrp').modify_ports(current_ports=['1', '2'])
assert remove_port.call_count == 2
assert add_port.call_count == 3
assert remove_port.call_count == 0
assert add_port.call_count == 2
def test_get_ports_returns_none(self):
set_module_args(self.mock_args())