Merge pull request #46 from threefoldtech/development-node-last-seen

Introduce node last seen, online status, and filters

Author: sameh-farouk

node-registrar/client/node.go

@@ -59,6 +59,8 @@ type nodeCfg struct {
 	twinID        uint64
 	status        string
 	healthy       bool
+	online        *bool
+	lastSeen      *int64
 	Location      Location
 	Resources     Resources
 	Interfaces    []Interface
@@ -100,6 +102,18 @@ func ListNodesWithHealthy() ListNodeOpts {
 	}
 }
 
+func ListNodesWithOnline(online bool) ListNodeOpts {
+	return func(n *nodeCfg) {
+		n.online = &online
+	}
+}
+
+func ListNodesWithLastSeen(minutes int64) ListNodeOpts {
+	return func(n *nodeCfg) {
+		n.lastSeen = &minutes
+	}
+}
+
 func ListNodesWithTwinID(id uint64) ListNodeOpts {
 	return func(n *nodeCfg) {
 		n.twinID = id
@@ -240,7 +254,9 @@ func (c *RegistrarClient) registerNode(
 	}{}
 
 	err = json.NewDecoder(resp.Body).Decode(&result)
-
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to decode response body")
+	}
 	c.nodeID = result.NodeID
 	return result.NodeID, err
 }
@@ -495,13 +511,15 @@ func (c *RegistrarClient) parseUpdateNodeOpts(node Node, opts []UpdateNodeOpts)
 
 func parseListNodeOpts(opts []ListNodeOpts) map[string]any {
 	cfg := nodeCfg{
-		nodeID:  0,
-		twinID:  0,
-		farmID:  0,
-		status:  "",
-		healthy: false,
-		size:    50,
-		page:    1,
+		nodeID:   0,
+		twinID:   0,
+		farmID:   0,
+		status:   "",
+		healthy:  false,
+		online:   nil,
+		lastSeen: nil,
+		size:     50,
+		page:     1,
 	}
 
 	for _, opt := range opts {
@@ -530,6 +548,14 @@ func parseListNodeOpts(opts []ListNodeOpts) map[string]any {
 		data["healthy"] = cfg.healthy
 	}
 
+	if cfg.online != nil {
+		data["online"] = *cfg.online
+	}
+
+	if cfg.lastSeen != nil {
+		data["last_seen"] = *cfg.lastSeen
+	}
+
 	data["size"] = cfg.size
 	data["page"] = cfg.page
 

node-registrar/client/node_test.go

@@ -99,8 +99,8 @@ func TestUpdateNode(t *testing.T) {
 		request = updateNodeSendUptimeReport
 
 		report := UptimeReport{
-			Uptime:    40 * time.Minute,
-			Timestamp: time.Now(),
+			Uptime:    40 * 60,
+			Timestamp: time.Now().Unix(),
 		}
 		err = c.ReportUptime(report)
 		require.NoError(err)

node-registrar/client/types.go

@@ -30,12 +30,14 @@ type Node struct {
 	Virtualized   bool           `json:"virtualized"`
 	SerialNumber  string         `json:"serial_number"`
 	UptimeReports []UptimeReport `json:"uptime"`
+	LastSeen      *time.Time     `json:"last_seen"`
+	Online        bool           `json:"online"`
 	Approved      bool
 }
 
 type UptimeReport struct {
-	Uptime    time.Duration `json:"uptime"`
-	Timestamp time.Time     `json:"timestamp"`
+	Uptime    uint64 `json:"uptime"`    // in seconds
+	Timestamp int64  `json:"timestamp"` // in seconds since epoch
 }
 
 type ZosVersion struct {