Merge pull request #20193 from ashley-cui/lastupnever

New machines should show Never as LastUp

Author: openshift-merge-robot

cmd/podman/machine/list.go

@@ -206,6 +206,8 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*entities.ListReporter, error
 case vm.Running:
 response.LastUp = "Currently running"
 response.Running = true
+case vm.LastUp.IsZero():
+response.LastUp = "Never"
 default:
 response.LastUp = units.HumanDuration(time.Since(vm.LastUp)) + " ago"
 }

pkg/machine/applehv/machine.go

@@ -787,16 +787,7 @@ func getVMInfos() ([]*machine.ListResponse, error) {
 return err
 }
 listEntry.Running = vmState == machine.Running
-
-if !vm.LastUp.IsZero() { // this means we have already written a time to the config
-listEntry.LastUp = vm.LastUp
-} else { // else we just created the machine AKA last up = created time
-listEntry.LastUp = vm.Created
-vm.LastUp = listEntry.LastUp
-if err := vm.writeConfig(); err != nil {
-return err
-}
-}
+listEntry.LastUp = vm.LastUp
 
 listed = append(listed, listEntry)
 }

pkg/machine/e2e/list_test.go

@@ -84,10 +84,16 @@ var _ = Describe("podman machine list", func() {
 session, err := mb.setCmd(i.withImagePath(mb.imagePath)).run()
 Expect(err).ToNot(HaveOccurred())
 Expect(session).To(Exit(0))
+
+l := new(listMachine)
+listSession, err := mb.setCmd(l.withFormat("{{.LastUp}}")).run()
+Expect(err).NotTo(HaveOccurred())
+Expect(listSession).To(Exit(0))
+Expect(listSession.outputToString()).To(Equal("Never"))
+
 s := new(startMachine)
 startSession, err := mb.setCmd(s).runWithoutWait()
 Expect(err).ToNot(HaveOccurred())
-l := new(listMachine)
 for i := 0; i < 30; i++ {
 listSession, err := mb.setCmd(l).run()
 Expect(listSession).To(Exit(0))
@@ -100,7 +106,7 @@ var _ = Describe("podman machine list", func() {
 time.Sleep(3 * time.Second)
 }
 Expect(startSession).To(Exit(0))
-listSession, err := mb.setCmd(l).run()
+listSession, err = mb.setCmd(l).run()
 Expect(listSession).To(Exit(0))
 Expect(err).ToNot(HaveOccurred())
 Expect(listSession.outputToString()).To(ContainSubstring("Currently running"))

pkg/machine/qemu/config.go

@@ -204,16 +204,7 @@ func getVMInfos() ([]*machine.ListResponse, error) {
 return err
 }
 listEntry.Running = state == machine.Running
-
-if !vm.LastUp.IsZero() { // this means we have already written a time to the config
-listEntry.LastUp = vm.LastUp
-} else { // else we just created the machine AKA last up = created time
-listEntry.LastUp = vm.Created
-vm.LastUp = listEntry.LastUp
-if err := vm.writeConfig(); err != nil {
-return err
-}
-}
+listEntry.LastUp = vm.LastUp
 
 listed = append(listed, listEntry)
 }

pkg/machine/wsl/config.go

@@ -46,7 +46,6 @@ func (p *WSLVirtualization) NewMachine(opts machine.InitOptions) (machine.VM, er
 }
 
 vm.Created = time.Now()
-vm.LastUp = vm.Created
 
 // Default is false
 if opts.UserModeNetworking != nil {