Port #51088 to master

changelog/51088.added

@@ -0,0 +1 @@
+Add support for NVMeF as a transport protocol for hosts in a Pure Storage FlashArray

salt/modules/purefa.py

@@ -623,7 +623,7 @@ def volume_detach(name, host):
             return False
 
 
-def host_create(name, iqn=None, wwn=None):
+def host_create(name, iqn=None, wwn=None, nqn=None):
     """
 
     Add a host on a Pure Storage FlashArray.
@@ -638,14 +638,16 @@ def host_create(name, iqn=None, wwn=None):
         name of host (truncated to 63 characters)
     iqn : string
         iSCSI IQN of host
+    nqn : string
+        NVMeF NQN of host
     wwn : string
         Fibre Channel WWN of host
 
     CLI Example:
 
     .. code-block:: bash
 
-        salt '*' purefa.host_create foo iqn='<Valid iSCSI IQN>' wwn='<Valid WWN>'
+        salt '*' purefa.host_create foo iqn='<Valid iSCSI IQN>' wwn='<Valid WWN>' nqn='<Valid NQN>'
 
     """
     array = _get_system()
@@ -656,6 +658,12 @@ def host_create(name, iqn=None, wwn=None):
             array.create_host(name)
         except purestorage.PureError:
             return False
+        if nqn:
+            try:
+                array.set_host(name, addnqnlist=[nqn])
+            except purestorage.PureError:
+                array.delete_host(name)
+                return False
         if iqn is not None:
             try:
                 array.set_host(name, addiqnlist=[iqn])
@@ -674,7 +682,7 @@ def host_create(name, iqn=None, wwn=None):
     return True
 
 
-def host_update(name, iqn=None, wwn=None):
+def host_update(name, iqn=None, wwn=None, nqn=None):
     """
 
     Update a hosts port definitions on a Pure Storage FlashArray.
@@ -687,6 +695,8 @@ def host_update(name, iqn=None, wwn=None):
 
     name : string
         name of host
+    nqn : string
+        Additional NVMeF NQN of host
     iqn : string
         Additional iSCSI IQN of host
     wwn : string
@@ -696,11 +706,16 @@ def host_update(name, iqn=None, wwn=None):
 
     .. code-block:: bash
 
-        salt '*' purefa.host_update foo iqn='<Valid iSCSI IQN>' wwn='<Valid WWN>'
+        salt '*' purefa.host_update foo iqn='<Valid iSCSI IQN>' wwn='<Valid WWN>' nqn='<Valid NQN>'
 
     """
     array = _get_system()
     if _get_host(name, array) is not None:
+        if nqn:
+            try:
+                array.set_host(name, addnqnlist=[nqn])
+            except purestorage.PureError:
+                return False
         if iqn is not None:
             try:
                 array.set_host(name, addiqnlist=[iqn])

tests/pytests/unit/modules/test_purefa.py

@@ -0,0 +1,118 @@
+# pylint: disable=unexpected-keyword-arg
+import pytest
+import salt.modules.purefa as purefa
+from tests.support.mock import MagicMock, call, create_autospec, patch
+
+
+@pytest.fixture
+def configure_loader_modules():
+    fake_pure_storage = MagicMock()
+    fake_pure_storage.PureError = Exception
+    return {
+        purefa: {
+            "_get_host": create_autospec(purefa._get_host, return_value=None),
+            "purestorage": fake_pure_storage,
+        }
+    }
+
+
+@pytest.fixture
+def patch_get_system():
+    with patch("salt.modules.purefa._get_system", autospec=True) as fake_sys:
+        yield fake_sys
+
+
+@pytest.fixture
+def fake_set_host(patch_get_system):
+    fake_set_host = MagicMock()
+    patch_get_system.return_value.set_host = fake_set_host
+    yield fake_set_host
+
+
+@pytest.fixture
+def fake_delete_host(patch_get_system):
+    fake_delete_host = MagicMock()
+    patch_get_system.return_value.delete_host = fake_delete_host
+    yield fake_delete_host
+
+
+@pytest.mark.parametrize(
+    "nqn", [None, "", [], ()],
+)
+def test_when_nqn_is_not_anything_set_host_should_not_have_addnqnlist_called(
+    nqn, fake_set_host
+):
+    purefa.host_create("fnord", nqn=nqn)
+
+    for call in fake_set_host.mock_calls:
+        assert "addnqnlist" not in call.kwargs
+
+
+def test_when_nqn_is_provided_and_adding_is_successful_then_set_host_should_have_addqnlist(
+    fake_set_host,
+):
+    nqn = "fnord"
+    host = "fnord-host"
+    expected_calls = [call(host, addnqnlist=[nqn])]
+    purefa.host_create(host, nqn=nqn)
+
+    fake_set_host.assert_has_calls(expected_calls)
+
+
+def test_when_nqn_is_provided_and_adding_is_successful_then_result_should_be_True(
+    fake_set_host,
+):
+
+    result = purefa.host_create("fnord", nqn="fnordqn")
+
+    assert result is True
+
+
+def test_when_nqn_is_provided_but_set_host_fails_then_creation_should_be_rolled_back(
+    fake_set_host, fake_delete_host
+):
+    expected_host = "fnord"
+    fake_set_host.side_effect = purefa.purestorage.PureError("oops!")
+    result = purefa.host_create(expected_host, nqn="badness or whatever")
+
+    assert result is False
+    fake_delete_host.assert_called_with(expected_host)
+
+
+@pytest.mark.parametrize(
+    "nqn", [None, "", [], ()],
+)
+def test_when_nqn_is_not_then_host_update_should_not_call_set_host(fake_set_host, nqn):
+    # if _get_host is None then there's no host to update, is there?
+    purefa._get_host.return_value = True
+
+    purefa.host_update("fnord", nqn=nqn)
+
+    for call in fake_set_host.mock_calls:
+        assert "addnqnlist" not in call.kwargs
+
+
+def test_when_nqn_is_correctly_provided_it_should_be_set_on_the_host(fake_set_host):
+    purefa._get_host.return_value = True
+    expected_calls = [call("fnord", addnqnlist=["roscivs"])]
+
+    purefa.host_update("fnord", nqn="roscivs")
+
+    fake_set_host.assert_has_calls(expected_calls)
+
+
+def test_when_nqn_is_correctly_provided_result_should_be_True(fake_set_host):
+    purefa._get_host.return_value = True
+
+    result = purefa.host_update("fnord", nqn="roscivs")
+
+    assert result is True
+
+
+def test_when_nqn_fails_result_should_be_False(fake_set_host):
+    purefa._get_host.return_value = True
+    fake_set_host.side_effect = purefa.purestorage.PureError("oops!")
+
+    result = purefa.host_update("fnord", nqn="roscivs")
+
+    assert result is False