pillar: report device name to controller/LOC

a DeviceInfoMsg is used for that

Signed-off-by: Christoph Ostarek <[email protected]>

Author: christoph-zededa

pkg/pillar/cmd/zedagent/handleconfig.go

@@ -70,6 +70,16 @@ type L2Adapter struct {
 	lowerPhysPorts []*types.PhysicalIOAdapter
 }
 
+// contains fields that are sent in the DeviceInfo message to the
+// controller and to LOC
+type deviceInfoFields struct {
+	deviceName     string
+	enterpriseName string
+	enterpriseId   string
+	projectName    string
+	projectId      string
+}
+
 type getconfigContext struct {
 	zedagentCtx                *zedagentContext    // Cross link
 	ledBlinkCount              types.LedBlinkCount // Current count
@@ -158,6 +168,8 @@ type getconfigContext struct {
 		localCommands *types.LocalCommands
 	}
 
+	deviceInfoFields deviceInfoFields
+
 	configRetryUpdateCounter uint32 // received from config
 
 	// Frequency in seconds at which metrics is published to the controller.
@@ -885,6 +897,11 @@ func getLatestConfig(getconfigCtx *getconfigContext, iteration int,
 		url = controllerconn.URLPathString(locURL, ctrlClient.UsingV2API(),
 			devUUID, "compound-config")
 
+		// send DeviceInfoMsg to inform LOC about device name, enterprise and project
+		// send it regularly in case LOC exits (f.e. crash), as the LOC is expected
+		// in to be in the local network, the traffic is negligible
+		getconfigCtx.zedagentCtx.triggerDeviceInfo <- LOCDest
+
 		// Request compound config, if LOC configuration is outdated, then we
 		// get @obsoleteConfig return value (see parseConfig() for details)
 		// and we repeat on the next fetch attempt

pkg/pillar/cmd/zedagent/parseconfig.go

@@ -43,6 +43,14 @@ const (
 	maxVlanID = 4094
 )
 
+func (dif *deviceInfoFields) parseConfig(config *zconfig.EdgeDevConfig) {
+	dif.deviceName = config.DeviceName
+	dif.enterpriseName = config.EnterpriseName
+	dif.enterpriseId = config.EnterpriseId
+	dif.projectName = config.ProductName
+	dif.projectId = config.ProjectId
+}
+
 func parseConfig(getconfigCtx *getconfigContext, config *zconfig.EdgeDevConfig,
 	source configSource) configProcessingRetval {
 
@@ -51,6 +59,8 @@ func parseConfig(getconfigCtx *getconfigContext, config *zconfig.EdgeDevConfig,
 	getconfigCtx.sideController.Lock()
 	defer getconfigCtx.sideController.Unlock()
 
+	getconfigCtx.deviceInfoFields.parseConfig(config)
+
 	// Make sure we do not accidentally revert to an older configuration.
 	// This depends on the controller attaching config timestamp.
 	// If not provided, the check is skipped.

pkg/pillar/cmd/zedagent/reportinfo.go

@@ -226,6 +226,11 @@ func PublishDeviceInfoToZedCloud(ctx *zedagentContext, dest destinationBitset) {
 	log.Functionf("PublishDeviceInfoToZedCloud uuid %s", deviceUUID)
 
 	ReportDeviceInfo := new(info.ZInfoDevice)
+	ReportDeviceInfo.DeviceName = ctx.getconfigCtx.deviceInfoFields.enterpriseName
+	ReportDeviceInfo.EnterpriseName = ctx.getconfigCtx.deviceInfoFields.enterpriseName
+	ReportDeviceInfo.EnterpriseId = ctx.getconfigCtx.deviceInfoFields.enterpriseId
+	ReportDeviceInfo.ProjectName = ctx.getconfigCtx.deviceInfoFields.projectName
+	ReportDeviceInfo.ProjectId = ctx.getconfigCtx.deviceInfoFields.projectId
 
 	// Get the remote access status
 	ReportDeviceInfo.RemoteAccessDisabled = utils.RemoteAccessDisabled()

pkg/pillar/cmd/zedagent/zedagent.go

@@ -31,6 +31,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
+	"sync/atomic"
 	"time"
 
 	"github.com/eriknordmark/ipinfo"
@@ -657,6 +658,7 @@ func (zedagentCtx *zedagentContext) init() {
 		// edge-view configure
 		configEdgeview: &types.EdgeviewConfig{},
 	}
+	getconfigCtx.sideControllerSentInitialDeviceInfoMsg.Store(false)
 	getconfigCtx.sideController.localServerMap = &localServerMap{}
 
 	cipherCtx := &cipherContext{}