Use Home Assistant Core instead of just Core

Avoid any ambiguity in what is exactly outdated/unsupported by using
Home Assistant Core instead of just Core.

Author: agners

supervisor/jobs/const.py

@@ -20,7 +20,7 @@ class JobCondition(StrEnum):
     """Job condition enum."""
 
     AUTO_UPDATE = "auto_update"
-    CORE_SUPPORTED = "core_supported"
+    HOME_ASSISTANT_CORE_SUPPORTED = "home_assistant_core_supported"
     FREE_SPACE = "free_space"
     FROZEN = "frozen"
     HAOS = "haos"

supervisor/jobs/decorator.py

@@ -405,8 +405,9 @@ async def check_conditions(
             )
 
         if (
-            JobCondition.CORE_SUPPORTED in used_conditions
-            and UnsupportedReason.CORE_VERSION in coresys.sys_resolution.unsupported
+            JobCondition.HOME_ASSISTANT_CORE_SUPPORTED in used_conditions
+            and UnsupportedReason.HOME_ASSISTANT_CORE_VERSION
+            in coresys.sys_resolution.unsupported
         ):
             raise JobConditionException(
                 f"'{method_name}' blocked from execution, unsupported Home Assistant Core version"

supervisor/misc/tasks.py

@@ -361,7 +361,7 @@ async def _watchdog_addon_application(self):
         conditions=[
             JobCondition.SUPERVISOR_UPDATED,
             JobCondition.OS_SUPPORTED,
-            JobCondition.CORE_SUPPORTED,
+            JobCondition.HOME_ASSISTANT_CORE_SUPPORTED,
         ],
     )
     async def _reload_store(self) -> None:

supervisor/resolution/const.py

@@ -40,7 +40,7 @@ class UnsupportedReason(StrEnum):
     CGROUP_VERSION = "cgroup_version"
     CONNECTIVITY_CHECK = "connectivity_check"
     CONTENT_TRUST = "content_trust"
-    CORE_VERSION = "core_version"
+    HOME_ASSISTANT_CORE_VERSION = "home_assistant_core_version"
     DBUS = "dbus"
     DNS_SERVER = "dns_server"
     DOCKER_CONFIGURATION = "docker_configuration"

supervisor/resolution/evaluations/core_version.py renamed to supervisor/resolution/evaluations/home_assistant_core_version.py

@@ -19,16 +19,16 @@
 
 def setup(coresys: CoreSys) -> EvaluateBase:
     """Initialize evaluation-setup function."""
-    return EvaluateCoreVersion(coresys)
+    return EvaluateHomeAssistantCoreVersion(coresys)
 
 
-class EvaluateCoreVersion(EvaluateBase):
+class EvaluateHomeAssistantCoreVersion(EvaluateBase):
     """Evaluate the Home Assistant Core version."""
 
     @property
     def reason(self) -> UnsupportedReason:
         """Return a UnsupportedReason enum."""
-        return UnsupportedReason.CORE_VERSION
+        return UnsupportedReason.HOME_ASSISTANT_CORE_VERSION
 
     @property
     def on_failure(self) -> str:

supervisor/store/__init__.py

@@ -77,7 +77,7 @@ async def load(self) -> None:
         conditions=[
             JobCondition.SUPERVISOR_UPDATED,
             JobCondition.OS_SUPPORTED,
-            JobCondition.CORE_SUPPORTED,
+            JobCondition.HOME_ASSISTANT_CORE_SUPPORTED,
         ],
         on_condition=StoreJobError,
     )
@@ -121,7 +121,7 @@ async def reload(self, repository: Repository | None = None) -> None:
             JobCondition.INTERNET_SYSTEM,
             JobCondition.SUPERVISOR_UPDATED,
             JobCondition.OS_SUPPORTED,
-            JobCondition.CORE_SUPPORTED,
+            JobCondition.HOME_ASSISTANT_CORE_SUPPORTED,
         ],
         on_condition=StoreJobError,
     )

supervisor/updater.py

@@ -250,7 +250,7 @@ async def _check_connectivity(self, connectivity: bool):
         conditions=[
             JobCondition.INTERNET_SYSTEM,
             JobCondition.OS_SUPPORTED,
-            JobCondition.CORE_SUPPORTED,
+            JobCondition.HOME_ASSISTANT_CORE_SUPPORTED,
         ],
         on_condition=UpdaterJobError,
         throttle_period=timedelta(seconds=30),

tests/jobs/test_job_decorator.py

@@ -1397,7 +1397,8 @@ def __init__(self, coresys: CoreSys):
             self.coresys = coresys
 
         @Job(
-            name="test_core_supported_execute", conditions=[JobCondition.CORE_SUPPORTED]
+            name="test_core_supported_execute",
+            conditions=[JobCondition.HOME_ASSISTANT_CORE_SUPPORTED],
         )
         async def execute(self):
             """Execute the class method."""
@@ -1406,11 +1407,11 @@ async def execute(self):
     test = TestClass(coresys)
     assert await test.execute()
 
-    coresys.resolution.unsupported.append(UnsupportedReason.CORE_VERSION)
+    coresys.resolution.unsupported.append(UnsupportedReason.HOME_ASSISTANT_CORE_VERSION)
     assert not await test.execute()
     assert (
         "blocked from execution, unsupported Home Assistant Core version" in caplog.text
     )
 
-    coresys.jobs.ignore_conditions = [JobCondition.CORE_SUPPORTED]
+    coresys.jobs.ignore_conditions = [JobCondition.HOME_ASSISTANT_CORE_SUPPORTED]
     assert await test.execute()

tests/resolution/evaluation/test_evaluate_core_version.py renamed to tests/resolution/evaluation/test_evaluate_home_assistant_core_version.py

@@ -9,7 +9,9 @@
 from supervisor.coresys import CoreSys
 from supervisor.homeassistant.const import LANDINGPAGE
 from supervisor.homeassistant.module import HomeAssistant
-from supervisor.resolution.evaluations.core_version import EvaluateCoreVersion
+from supervisor.resolution.evaluations.home_assistant_core_version import (
+    EvaluateHomeAssistantCoreVersion,
+)
 
 
 @pytest.mark.parametrize(
@@ -38,7 +40,7 @@ async def test_core_version_evaluation(
     coresys: CoreSys, current: str | None, latest: str | None, expected: bool
 ):
     """Test evaluation logic on Core versions."""
-    evaluation = EvaluateCoreVersion(coresys)
+    evaluation = EvaluateHomeAssistantCoreVersion(coresys)
     await coresys.core.set_state(CoreState.RUNNING)
 
     with (
@@ -60,7 +62,7 @@ async def test_core_version_evaluation(
 
 async def test_core_version_evaluation_no_latest(coresys: CoreSys):
     """Test evaluation when no latest version is available."""
-    evaluation = EvaluateCoreVersion(coresys)
+    evaluation = EvaluateHomeAssistantCoreVersion(coresys)
     await coresys.core.set_state(CoreState.RUNNING)
 
     with (
@@ -83,7 +85,7 @@ async def test_core_version_evaluation_no_latest(coresys: CoreSys):
 
 async def test_core_version_invalid_format(coresys: CoreSys):
     """Test evaluation with invalid version format."""
-    evaluation = EvaluateCoreVersion(coresys)
+    evaluation = EvaluateHomeAssistantCoreVersion(coresys)
     await coresys.core.set_state(CoreState.RUNNING)
 
     with (
@@ -106,7 +108,7 @@ async def test_core_version_invalid_format(coresys: CoreSys):
 
 async def test_core_version_landingpage(coresys: CoreSys):
     """Test evaluation with landingpage version."""
-    evaluation = EvaluateCoreVersion(coresys)
+    evaluation = EvaluateHomeAssistantCoreVersion(coresys)
     await coresys.core.set_state(CoreState.RUNNING)
 
     with (
@@ -129,14 +131,14 @@ async def test_core_version_landingpage(coresys: CoreSys):
 
 async def test_did_run(coresys: CoreSys):
     """Test that the evaluation ran as expected."""
-    evaluation = EvaluateCoreVersion(coresys)
+    evaluation = EvaluateHomeAssistantCoreVersion(coresys)
     should_run = evaluation.states
     should_not_run = [state for state in CoreState if state not in should_run]
     assert len(should_run) != 0
     assert len(should_not_run) != 0
 
     with patch(
-        "supervisor.resolution.evaluations.core_version.EvaluateCoreVersion.evaluate",
+        "supervisor.resolution.evaluations.home_assistant_core_version.EvaluateHomeAssistantCoreVersion.evaluate",
         return_value=None,
     ) as evaluate:
         for state in should_run: