From 610b4ac37dff343045ad8b06c71c6fd289e68bdc Mon Sep 17 00:00:00 2001
From: Milan Lenco <milan@zededa.com>
Date: Wed, 2 Oct 2024 11:55:31 +0200
Subject: [PATCH] Set WType even for wireless ports without network config

nim, zedrouter and other microservices depend on the WType port
attribute to recognize wireless network port. This is needed even in
cases where the wireless adapter is not really used and has no network
config attached. Otherwise, we may get to situation where we try to
bridge a wireless adapter or perform some other invalid operation,
especially after the switch NI enhancements done in:
7a6981ba729e0802bd1c3cb2b8da3ec2b93b8ae7

In the case wireless config is not present, we can get the physical port
type from the device model and set WType accordingly.

Signed-off-by: Milan Lenco <milan@zededa.com>
---
 pkg/pillar/cmd/zedagent/parseconfig.go | 11 +++++++++++
 pkg/pillar/dpcmanager/verify.go        |  9 +++++----
 pkg/pillar/dpcreconciler/linux.go      |  6 ++++--
 pkg/pillar/types/dpc.go                | 12 ++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pkg/pillar/cmd/zedagent/parseconfig.go b/pkg/pillar/cmd/zedagent/parseconfig.go
index 0f6f3206f7..45c42bff96 100644
--- a/pkg/pillar/cmd/zedagent/parseconfig.go
+++ b/pkg/pillar/cmd/zedagent/parseconfig.go
@@ -1362,6 +1362,17 @@ func parseOneSystemAdapterConfig(getconfigCtx *getconfigContext,
 		log.Errorf("parseSystemAdapterConfig: %s", errStr)
 		port.RecordFailure(errStr)
 	}
+	// Make sure that even without wireless network config attached,
+	// EVE microservices properly recognize wireless network ports
+	// using the WType attribute.
+	if port.WirelessCfg.IsEmpty() && phyio != nil {
+		switch phyio.Ptype {
+		case zevecommon.PhyIoType_PhyIoNetWLAN:
+			port.WirelessCfg.WType = types.WirelessTypeWifi
+		case zevecommon.PhyIoType_PhyIoNetWWAN:
+			port.WirelessCfg.WType = types.WirelessTypeCellular
+		}
+	}
 	ports = append(ports, port)
 	return ports, nil // there can still be error recorded inside individual ports
 }
diff --git a/pkg/pillar/dpcmanager/verify.go b/pkg/pillar/dpcmanager/verify.go
index 7c187c9b0c..c142328df9 100644
--- a/pkg/pillar/dpcmanager/verify.go
+++ b/pkg/pillar/dpcmanager/verify.go
@@ -604,14 +604,15 @@ func (m *DpcManager) waitForWwanUpdate() bool {
 	if dpc == nil {
 		return false
 	}
-	var hasMgmtWwan bool
+	var hasUsedMgmtWwan bool
 	for _, port := range dpc.Ports {
-		if port.IsMgmt && port.WirelessCfg.WType == types.WirelessTypeCellular {
-			hasMgmtWwan = true
+		if port.IsMgmt && port.WirelessCfg.WType == types.WirelessTypeCellular &&
+			!port.WirelessCfg.IsEmpty() {
+			hasUsedMgmtWwan = true
 			break
 		}
 	}
-	if !hasMgmtWwan {
+	if !hasUsedMgmtWwan {
 		return false
 	}
 	statusIsUpToDate := dpc.Key == m.wwanStatus.DPCKey &&
diff --git a/pkg/pillar/dpcreconciler/linux.go b/pkg/pillar/dpcreconciler/linux.go
index 0ba33a00bf..81d01a49c1 100644
--- a/pkg/pillar/dpcreconciler/linux.go
+++ b/pkg/pillar/dpcreconciler/linux.go
@@ -1365,7 +1365,8 @@ func (r *LinuxDpcReconciler) getIntendedWlanConfig(
 	dpc types.DevicePortConfig, radioSilence types.RadioSilence) dg.Item {
 	var wifiPort *types.NetworkPortConfig
 	for _, portCfg := range dpc.Ports {
-		if portCfg.WirelessCfg.WType == types.WirelessTypeWifi {
+		if portCfg.WirelessCfg.WType == types.WirelessTypeWifi &&
+			!portCfg.WirelessCfg.IsEmpty() {
 			wifiPort = &portCfg
 			break
 		}
@@ -1457,7 +1458,8 @@ func (r *LinuxDpcReconciler) getIntendedWwanConfig(dpc types.DevicePortConfig,
 		if port.InvalidConfig {
 			continue
 		}
-		if port.WirelessCfg.WType != types.WirelessTypeCellular {
+		if port.WirelessCfg.WType != types.WirelessTypeCellular ||
+			port.WirelessCfg.IsEmpty() {
 			continue
 		}
 		if !aa.Initialized {
diff --git a/pkg/pillar/types/dpc.go b/pkg/pillar/types/dpc.go
index a78c7dda17..bf1dc3f1ea 100644
--- a/pkg/pillar/types/dpc.go
+++ b/pkg/pillar/types/dpc.go
@@ -750,6 +750,18 @@ type WirelessConfig struct {
 	Cellular []DeprecatedCellConfig
 }
 
+// IsEmpty returns true if the wireless config is empty.
+func (wc WirelessConfig) IsEmpty() bool {
+	switch wc.WType {
+	case WirelessTypeWifi:
+		return len(wc.Wifi) == 0
+	case WirelessTypeCellular:
+		return len(wc.CellularV2.AccessPoints) == 0 &&
+			len(wc.Cellular) == 0
+	}
+	return true
+}
+
 // WifiConfig - Wifi structure
 type WifiConfig struct {
 	SSID      string            // wifi SSID