Added support for nvme, and bug fixes for na_ontap_interface (#52283)

* Revert "changes to clusteR"

This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80.

* add interface

* updates

* fix author

* Revert "add interface"

This reverts commit 26ef11602e549fee0a6070c1e983c325d08da8df.

* Revert "Revert "add interface""

This reverts commit 4518d537a2b876a8cb0eae4e4cc02f5232c813f3.

* Revert "updates"

This reverts commit 47b58dde021c1dd6aeca6080bffc26b78cf944ea.

* Revert "Revert "changes to clusteR""

This reverts commit 2c517792115179665d43d74780dc356ca41b9abe.
This commit is contained in:
Chris Archibald 2019-02-19 09:49:59 -08:00 committed by John R Barker
parent a5cd619ea6
commit f9139be5e6
2 changed files with 109 additions and 20 deletions

View file

@ -17,7 +17,7 @@ from ansible.modules.storage.netapp.na_ontap_interface \
import NetAppOntapInterface as interface_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):
@ -84,7 +84,8 @@ class MockONTAPConnection(object):
'home-port': data['home_port'],
'address': data['address'],
'netmask': data['netmask'],
'role': data['role']
'role': data['role'],
'protocols': data['protocols'] if data.get('protocols') else None
}
}
}
@ -181,6 +182,43 @@ class TestMyModule(unittest.TestCase):
self.get_interface_mock_object().apply()
assert exc.value.args[0]['changed']
def test_successful_create_for_NVMe(self):
''' Test successful create for NVMe protocol'''
data = self.mock_args()
data['protocols'] = 'fc-nvme'
del data['address']
del data['netmask']
del data['home_port']
set_module_args(data)
with pytest.raises(AnsibleExitJson) as exc:
self.get_interface_mock_object().apply()
assert exc.value.args[0]['changed']
def test_create_idempotency_for_NVMe(self):
''' Test create idempotency for NVMe protocol '''
data = self.mock_args()
data['protocols'] = 'fc-nvme'
del data['address']
del data['netmask']
del data['home_port']
set_module_args(data)
with pytest.raises(AnsibleExitJson) as exc:
self.get_interface_mock_object('interface').apply()
assert not exc.value.args[0]['changed']
def test_create_error_for_NVMe(self):
''' Test if create throws an error if required param 'protocols' uses NVMe'''
data = self.mock_args()
data['protocols'] = 'fc-nvme'
set_module_args(data)
with pytest.raises(AnsibleFailJson) as exc:
self.get_interface_mock_object('interface').create_interface()
msg = 'Error: Following parameters for creating interface are not supported for data-protocol fc-nvme: ' \
'netmask, firewall_policy, address'
expected = sorted(','.split(msg))
received = sorted(','.split(exc.value.args[0]['msg']))
assert expected == received
def test_create_idempotency(self):
''' Test create idempotency '''
set_module_args(self.mock_args())