Backport FCP fixes.

Author: prajwal-venkatanarayan

persistent_store/crd/apis/netapp/v1/node.go

@@ -42,6 +42,7 @@ func (in *TridentNode) Apply(persistent *models.Node) error {
 	in.IQN = persistent.IQN
 	in.NQN = persistent.NQN
 	in.IPs = persistent.IPs
+	in.HostWWPNMap = persistent.HostWWPNMap
 	in.Deleted = persistent.Deleted
 	in.PublicationState = string(persistent.PublicationState)
 	in.LogLevel = persistent.LogLevel
@@ -75,6 +76,7 @@ func (in *TridentNode) Persistent() (*models.Node, error) {
 		IQN:              in.IQN,
 		NQN:              in.NQN,
 		IPs:              in.IPs,
+		HostWWPNMap:      in.HostWWPNMap,
 		NodePrep:         &models.NodePrep{},
 		HostInfo:         &models.HostSystem{},
 		Deleted:          in.Deleted,

persistent_store/crd/apis/netapp/v1/types.go

@@ -368,6 +368,8 @@ type TridentNode struct {
 	NQN string `json:"nqn,omitempty"`
 	// IPs is a list of IP addresses for the TridentNode
 	IPs []string `json:"ips,omitempty"`
+	// HostWWPNMap is the map of host WWPNs
+	HostWWPNMap map[string][]string `json:"hostWWPNMap,omitempty"`
 	// NodePrep is the current status of node preparation for this node
 	NodePrep runtime.RawExtension `json:"nodePrep,omitempty"`
 	// HostInfo contains information about the node's host machine

storage_drivers/ontap/ontap_factory.go

@@ -111,7 +111,7 @@ func GetDriverProtocol(driverName, configJSON string) (string, error) {
 	if driverName == config.OntapSANStorageDriverName {
 		SANType := strings.ToLower(pool.SANType)
 		switch SANType {
-		case sa.ISCSI, sa.NVMe:
+		case sa.ISCSI, sa.NVMe, sa.FCP:
 			return SANType, nil
 		case "":
 			// Old iSCSI backends will have no value for SANType

storage_drivers/ontap/ontap_factory_test.go

@@ -23,6 +23,11 @@ func TestGetDriverProtocol(t *testing.T) {
 	assert.Equal(t, SANType, sa.NVMe, "Incorrect protocol type.")
 	assert.NoError(t, err, "Failed to get protocol type.")
 
+	// SANType as FCP
+	SANType, err = GetDriverProtocol(driverName, `{"SANType": "fcp"}`)
+	assert.Equal(t, SANType, sa.FCP, "Incorrect protocol type.")
+	assert.NoError(t, err, "Failed to get protocol type.")
+
 	// Empty SANType
 	SANType, err = GetDriverProtocol(driverName, `{}`)
 	assert.Equal(t, sa.ISCSI, SANType, "Incorrect protocol type.")