Merge pull request #120 from KelvinLinBU/time_clamping_test

Add test for Error event time clamping

Author: knikolla

src/openstack_billing_db/model.py

@@ -95,26 +95,26 @@ def run_state_machine():
             """
             current_state = None
             for event in self.events:
-                event_time = self._clamp_time(event.time, start_time, end_time)
+                clamped_event_time = self._clamp_time(event.time, start_time, end_time)
 
                 # Error state can only be determined by the event message
                 if event.message == "Error":
                     if current_state is None:
-                        current_state = enter_state("Error", event_time)
+                        current_state = enter_state("Error", clamped_event_time)
                     else:
-                        current_state.exit(event_time)
-                        current_state = enter_state("Error", event_time)
+                        current_state.exit(clamped_event_time)
+                        current_state = enter_state("Error", clamped_event_time)
                     continue
 
                 for state in vm_states:
                     if event.name in state.triggers:
                         if current_state is None:
                             current_state = state
-                            state.enter(event_time)
+                            state.enter(clamped_event_time)
                         elif state.name != current_state.name:
-                            current_state.exit(event_time)
+                            current_state.exit(clamped_event_time)
                             current_state = state
-                            state.enter(event_time)
+                            state.enter(clamped_event_time)
 
             # Some VM instances may have a `deleted_at` time, another trigger for the `Deleted` state
             if self.deleted_at:

src/openstack_billing_db/tests/unit/test_instance.py

@@ -337,3 +337,26 @@ def test_instance_get_gpu_flavor():
         su_type, count = Database._get_gpu_flavor_info(pci_request)
         assert su_type == answers[i][0]
         assert count == answers[i][1]
+
+
+def test_error_event_outside_window():
+    start = datetime(2000, 1, 1, 0, 0, 0)
+    end = datetime(2000, 2, 1, 0, 0, 0)
+    events = [
+        InstanceEvent(time=start - timedelta(hours=1), name="create", message="Error")
+    ]
+    # Case 1: Error BEFORE window
+    i = Instance(
+        uuid=uuid.uuid4().hex, name=uuid.uuid4().hex, flavor=FLAVORS[1], events=events
+    )
+    r_before = i.get_runtime_during(start, end)
+    assert r_before.total_seconds_running == 0
+    assert r_before.total_seconds_stopped == 0
+    # Case 2: Error AFTER window
+    i.events = [
+        InstanceEvent(time=start, name="create", message=""),
+        InstanceEvent(time=end + timedelta(hours=1), name="stop", message="Error"),
+    ]
+    r_after = i.get_runtime_during(start, end)
+    assert r_after.total_seconds_running == 1 * MONTH
+    assert r_after.total_seconds_stopped == 0