From fcb18c5c401e5ad92984d3089bae956d83a036bb Mon Sep 17 00:00:00 2001
From: Simon Dodsley <simon@purestorage.com>
Date: Fri, 16 May 2025 16:10:17 -0400
Subject: [PATCH] [Pure Storage] Fix issue with VLAN LACP bond ports

If a LACP bond port is defined as part of a VLAN, the FlashArray
will retag this port as a VIF rather than an LACP_BOND.

This patch adds in an extra check to find ports of type
VIF.

Closes-Bug: #2112566
Change-Id: Ib31ef5ea318332124abcf2dda2ed74f1ba0df840
---
 cinder/volume/drivers/pure.py                           | 3 ++-
 releasenotes/notes/pure_vlan_lacp-d58f141282efb723.yaml | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/pure_vlan_lacp-d58f141282efb723.yaml

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 14079f439cb..6d6222807bc 100644
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -3561,7 +3561,8 @@ class PureBaseVolumeDriver(san.SanDriver):
                 )
             lacps = list(
                 array.get_network_interfaces(
-                    filter="eth.subtype='lacp_bond'"
+                    filter=("eth.subtype='lacp_bond'" or
+                            "eth.subtype='vif'")
                 ).items
             )
             if lacps:
diff --git a/releasenotes/notes/pure_vlan_lacp-d58f141282efb723.yaml b/releasenotes/notes/pure_vlan_lacp-d58f141282efb723.yaml
new file mode 100644
index 00000000000..56c3605eaeb
--- /dev/null
+++ b/releasenotes/notes/pure_vlan_lacp-d58f141282efb723.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    [Pure Storage] Resolved issue where LACP bonds are being
+    defined as part of a VLAN, resulting in target ports
+    not being correctly identified.