Add os to NodeListStub struct.

Signed-off-by: Shishir Mahajan <smahajan@roblox.com>

api/nodes.go

@@ -905,6 +905,7 @@ func (v *StatValue) String() string {
 type NodeListStub struct {
 	Address               string
 	ID                    string
+	OS                    string
 	Datacenter            string
 	Name                  string
 	NodeClass             string

command/node_status.go

@@ -231,24 +231,14 @@ func (c *NodeStatusCommand) Run(args []string) int {
 			out[0] += "|Running Allocs"
 		}
 
-		queryOptions := &api.QueryOptions{AllowStale: true}
-		var nodeInfo *api.Node
-
 		for i, node := range nodes {
-			if c.os {
-				nodeInfo, _, err = client.Nodes().Info(node.ID, queryOptions)
-				if err != nil {
-					c.Ui.Error(fmt.Sprintf("Error getting node info: %s", err))
-					return 1
-				}
-			}
 			out[i+1] = fmt.Sprintf("%s|%s|%s|%s",
 				limit(node.ID, c.length),
 				node.Datacenter,
 				node.Name,
 				node.NodeClass)
 			if c.os {
-				out[i+1] += fmt.Sprintf("|%s", nodeInfo.Attributes["os.name"])
+				out[i+1] += fmt.Sprintf("|%s", node.OS)
 			}
 			if c.verbose {
 				out[i+1] += fmt.Sprintf("|%s|%s",

nomad/structs/structs.go

@@ -2191,6 +2191,7 @@ func (n *Node) Stub(fields *NodeStubFields) *NodeListStub {
 	s := &NodeListStub{
 		Address:               addr,
 		ID:                    n.ID,
+		OS:                    n.Attributes["os.name"],
 		Datacenter:            n.Datacenter,
 		Name:                  n.Name,
 		NodeClass:             n.NodeClass,
@@ -2221,6 +2222,7 @@ func (n *Node) Stub(fields *NodeStubFields) *NodeListStub {
 type NodeListStub struct {
 	Address               string
 	ID                    string
+	OS                    string
 	Datacenter            string
 	Name                  string
 	NodeClass             string