show lease expected release time instead of start time

"jmp get exporters --with leases" shows lease status and when is the lease expiring. That's more useful that current start time which doesn't tell you for how long it may be held.
"jmp get leases" now shows lease begin time (the time it was acquired) in addition to duration.
future/scheduled leases show their expected begin time and duration, currently active leases show actual begin time and actual duration so far.

(cherry picked from commit f1a1aec)

Author: michalskrivanek

packages/jumpstarter/jumpstarter/client/grpc.py

@@ -32,7 +32,7 @@ def add_display_columns(table, options: WithOptions = None):
     if options.show_leases:
         table.add_column("LEASED BY")
         table.add_column("LEASE STATUS")
-        table.add_column("START TIME")
+        table.add_column("EXPECTED RELEASE")
 
 
 def add_exporter_row(table, exporter, options: WithOptions = None, lease_info: tuple[str, str, str] | None = None):
@@ -45,10 +45,10 @@ def add_exporter_row(table, exporter, options: WithOptions = None, lease_info: t
     row_data.append(",".join(("{}={}".format(k, v) for k, v in sorted(exporter.labels.items()))))
     if options.show_leases:
         if lease_info:
-            lease_client, lease_status, start_time = lease_info
+            lease_client, lease_status, expected_release = lease_info
         else:
-            lease_client, lease_status, start_time = "", "Available", ""
-        row_data.extend([lease_client, lease_status, start_time])
+            lease_client, lease_status, expected_release = "", "Available", ""
+        row_data.extend([lease_client, lease_status, expected_release])
 
     table.add_row(*row_data)
 
@@ -97,10 +97,15 @@ def rich_add_rows(self, table, options: WithOptions = None):
         if options and options.show_leases and self.lease:
             lease_client = self.lease.client
             lease_status = self.lease.get_status()
-            start_time = ""
-            if self.lease.effective_begin_time:
-                start_time = self.lease.effective_begin_time.strftime("%Y-%m-%d %H:%M:%S")
-            lease_info = (lease_client, lease_status, start_time)
+            expected_release = ""
+            if self.lease.effective_begin_time and self.lease.effective_duration:
+                release_time = self.lease.effective_begin_time + self.lease.effective_duration
+                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            elif self.lease.begin_time:
+                dur = self.lease.effective_duration or self.lease.duration
+                release_time = self.lease.begin_time + dur
+                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            lease_info = (lease_client, lease_status, expected_release)
         elif options and options.show_leases:
             lease_info = ("", "Available", "")
         add_exporter_row(table, self, options, lease_info)
@@ -115,6 +120,7 @@ class Lease(BaseModel):
     selector: str
     duration: timedelta
     effective_duration: timedelta | None = None
+    begin_time: datetime | None = None
     client: str
     exporter: str
     conditions: list[kubernetes_pb2.Condition]
@@ -143,6 +149,12 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
         if data.HasField("effective_duration"):
             effective_duration = data.effective_duration.ToTimedelta()
 
+        begin_time = None
+        if data.HasField("begin_time"):
+            begin_time = data.begin_time.ToDatetime(
+                tzinfo=datetime.now().astimezone().tzinfo,
+            )
+
         effective_begin_time = None
         if data.HasField("effective_begin_time"):
             effective_begin_time = data.effective_begin_time.ToDatetime(
@@ -155,6 +167,7 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
             selector=data.selector,
             duration=data.duration.ToTimedelta(),
             effective_duration=effective_duration,
+            begin_time=begin_time,
             client=client,
             exporter=exporter,
             effective_begin_time=effective_begin_time,
@@ -165,15 +178,31 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
     def rich_add_columns(cls, table):
         table.add_column("NAME", no_wrap=True)
         table.add_column("SELECTOR")
+        table.add_column("BEGIN TIME")
         table.add_column("DURATION")
         table.add_column("CLIENT")
         table.add_column("EXPORTER")
 
     def rich_add_rows(self, table):
+        # Show effective_begin_time if active, otherwise show scheduled begin_time
+        begin_time = ""
+        if self.effective_begin_time:
+            begin_time = self.effective_begin_time.strftime("%Y-%m-%d %H:%M:%S")
+        elif self.begin_time:
+            begin_time = self.begin_time.strftime("%Y-%m-%d %H:%M:%S")
+
+        # Show effective_duration if available, otherwise show requested duration
+        duration = ""
+        if self.effective_duration:
+            duration = str(self.effective_duration)
+        elif self.duration:
+            duration = str(self.duration)
+
         table.add_row(
             self.name,
             self.selector,
-            str(self.duration),
+            begin_time,
+            duration,
             self.client,
             self.exporter,
         )

packages/jumpstarter/jumpstarter/client/grpc_test.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from io import StringIO
 from unittest.mock import Mock
 
@@ -48,15 +48,15 @@ def test_with_leases_columns(self):
         add_display_columns(table, options)
 
         columns = [col.header for col in table.columns]
-        assert columns == ["NAME", "LABELS", "LEASED BY", "LEASE STATUS", "START TIME"]
+        assert columns == ["NAME", "LABELS", "LEASED BY", "LEASE STATUS", "EXPECTED RELEASE"]
 
     def test_with_all_columns(self):
         table = Table()
         options = WithOptions(show_online=True, show_leases=True)
         add_display_columns(table, options)
 
         columns = [col.header for col in table.columns]
-        assert columns == ["NAME", "ONLINE", "LABELS", "LEASED BY", "LEASE STATUS", "START TIME"]
+        assert columns == ["NAME", "ONLINE", "LABELS", "LEASED BY", "LEASE STATUS", "EXPECTED RELEASE"]
 
 
 class TestAddExporterRow:
@@ -91,7 +91,7 @@ def test_row_with_lease_info(self):
         add_exporter_row(table, exporter, options, lease_info)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, START TIME
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
 
     def test_row_with_lease_info_available(self):
         table = Table()
@@ -115,15 +115,21 @@ def test_row_with_all_options(self):
         add_exporter_row(table, exporter, options, lease_info)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, START TIME
+        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
 
 
 class TestExporterList:
-    def create_test_lease(self, client="test-client", status="Active"):
+    def create_test_lease(self, client="test-client", status="Active",
+                          effective_begin_time=datetime(2023, 1, 1, 10, 0, 0),
+                          effective_duration=timedelta(hours=1),
+                          begin_time=None, duration=timedelta(hours=1)):
         lease = Mock(spec=Lease)
         lease.client = client
         lease.get_status.return_value = status
-        lease.effective_begin_time = datetime(2023, 1, 1, 10, 0, 0)
+        lease.effective_begin_time = effective_begin_time
+        lease.effective_duration = effective_duration
+        lease.begin_time = begin_time
+        lease.duration = duration
         return lease
 
     def test_exporter_without_lease(self):
@@ -175,7 +181,7 @@ def test_exporter_with_lease_display(self):
         exporter.rich_add_rows(table, options)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, START TIME
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=120)
@@ -187,7 +193,7 @@ def test_exporter_with_lease_display(self):
         assert "type=device" in output
         assert "test-client" in output
         assert "Active" in output
-        assert "2023-01-01 10:00:00" in output
+        assert "2023-01-01 11:00:00" in output  # Expected release: begin_time (10:00:00) + duration (1h)
 
     def test_exporter_without_lease_but_show_leases(self):
         exporter = Exporter(
@@ -203,7 +209,7 @@ def test_exporter_without_lease_but_show_leases(self):
         exporter.rich_add_rows(table, options)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, START TIME
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=120)
@@ -285,7 +291,7 @@ def test_exporter_all_features_display(self):
         exporter_offline_no_lease.rich_add_rows(table, options)
 
         assert len(table.rows) == 2
-        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, START TIME
+        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=150)
@@ -302,7 +308,7 @@ def test_exporter_all_features_display(self):
         assert "full-test-client" in output  # Lease client
         assert "Active" in output  # Lease status
         assert "Available" in output  # Available status for no lease
-        assert "2023-01-01 10:00:00" in output  # Lease start time
+        assert "2023-01-01 11:00:00" in output  # Expected release time (begin_time + duration)
 
     def test_exporter_lease_info_extraction(self):
         """Test that lease information is correctly extracted from lease objects"""
@@ -325,10 +331,13 @@ def test_exporter_lease_info_extraction(self):
         if options.show_leases and exporter.lease:
             lease_client = exporter.lease.client
             lease_status = exporter.lease.get_status()
-            start_time = exporter.lease.effective_begin_time.strftime("%Y-%m-%d %H:%M:%S")
-            lease_info = (lease_client, lease_status, start_time)
+            expected_release = ""
+            if exporter.lease.effective_begin_time and exporter.lease.effective_duration:
+                release_time = exporter.lease.effective_begin_time + exporter.lease.effective_duration
+                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            lease_info = (lease_client, lease_status, expected_release)
 
-            assert lease_info == ("my-client", "Expired", "2023-01-01 10:00:00")
+            assert lease_info == ("my-client", "Expired", "2023-01-01 11:00:00")
 
     def test_exporter_no_lease_info_extraction(self):
         """Test that default lease information is used when no lease exists"""
@@ -351,4 +360,43 @@ def test_exporter_no_lease_info_extraction(self):
                 lease_info = ("", "Available", "")
                 assert lease_info == ("", "Available", "")
 
+    def test_exporter_scheduled_lease_expected_release(self):
+        """Test that scheduled leases show expected release time"""
+        lease = self.create_test_lease(
+            client="my-client",
+            status="Scheduled",
+            effective_begin_time=None,  # Not started yet
+            effective_duration=None,    # Not started yet
+            begin_time=datetime(2023, 1, 1, 10, 0, 0),
+            duration=timedelta(hours=1)
+        )
+        exporter = Exporter(
+            namespace="default",
+            name="test-exporter",
+            labels={"type": "device"},
+            online=True,
+            lease=lease
+        )
+
+        # Test the table display with scheduled lease
+        table = Table()
+        options = WithOptions(show_leases=True)
+        Exporter.rich_add_columns(table, options)
+        exporter.rich_add_rows(table, options)
+
+        # Should have 5 columns: NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 5
+        assert len(table.rows) == 1
+
+        # Test actual table content by rendering it
+        console = Console(file=StringIO(), width=120)
+        console.print(table)
+        output = console.file.getvalue()
+
+        # Verify the scheduled lease displays expected release time
+        assert "test-exporter" in output
+        assert "my-client" in output
+        assert "Scheduled" in output
+        assert "2023-01-01 11:00:00" in output  # begin_time (10:00) + duration (1h)
+