From 6e4789f22565a643f44faba94a53bdd25c37c989 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 4 Apr 2022 19:47:27 +0200
Subject: [PATCH] Interfaces: Other Types: VLAN - add not yet applied vlan's in
 model field.

---
 .../FieldTypes/VlanInterfaceField.php         | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php
index 5451c4c18..8c4bbdbf9 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/VlanInterfaceField.php
@@ -60,11 +60,30 @@ class VlanInterfaceField extends BaseListField
                     ) {
                         continue;
                     }
-                    self::$interface_devices[$ifname] = sprintf(
-                        "%s (%s) [%s]",
-                        $ifname,
-                        $details['macaddr'],
-                        !empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
+                    if (empty($details['vlan'])) {
+                        self::$interface_devices[$ifname] = sprintf(
+                            "%s (%s) [%s]",
+                            $ifname,
+                            $details['macaddr'],
+                            !empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
+                        );
+                    } else {
+                        self::$interface_devices[$ifname] = sprintf(
+                            "%s (%s) [%s]",
+                            $ifname,
+                            sprintf("tag: %s, if: %s", $details['vlan']['tag'], $details['vlan']['parent']),
+                            !empty($ifnames[$ifname]) ? $ifnames[$ifname] : ""
+                        );
+                    }
+                }
+            }
+            // append not yet applied vlan interfaces
+            foreach ($this->getParentModel()->vlan->iterateItems() as $key => $vlan) {
+                if (strpos((string)$vlan->vlanif, "qinq") !== 0 && !isset(self::$interface_devices[(string)$vlan->vlanif])) {
+                    self::$interface_devices[(string)$vlan->vlanif] = sprintf(
+                        "%s (%s) []",
+                        (string)$vlan->vlanif,
+                        sprintf("tag: %s, if: %s", (string)$vlan->tag, (string)$vlan->if)
                     );
                 }
             }