anta 1.10.0.dev5__tar.gz → 1.10.0.dev6__tar.gz

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anta
-Version: 1.10.0.dev5
+Version: 1.10.0.dev6
 Summary: Arista Network Test Automation (ANTA) Framework
 Author-email: Arista Networks ANTA maintainers <anta-dev@arista.com>
 Maintainer-email: Arista Networks ANTA maintainers <anta-dev@arista.com>, Khelil Sator <ksator@arista.com>, Matthieu Tâche <mtache@arista.com>, Thomas Grimonet <tgrimonet@arista.com>, Guillaume Mulocher <gmulocher@arista.com>, Carl Baillargeon <carl.baillargeon@arista.com>

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/__init__.py

@@ -33,7 +33,6 @@ class RICH_COLOR_PALETTE:
 
     ERROR = "indian_red"
     FAILURE = "bold red"
-    INCONCLUSIVE = "bold orange3"
     SUCCESS = "green4"
     SKIPPED = "bold orange4"
     HEADER = "cyan"
@@ -44,7 +43,6 @@ class RICH_COLOR_PALETTE:
 RICH_COLOR_THEME = {
     "success": RICH_COLOR_PALETTE.SUCCESS,
     "skipped": RICH_COLOR_PALETTE.SKIPPED,
-    "inconclusive": RICH_COLOR_PALETTE.INCONCLUSIVE,
     "failure": RICH_COLOR_PALETTE.FAILURE,
     "error": RICH_COLOR_PALETTE.ERROR,
     "unset": RICH_COLOR_PALETTE.UNSET,

anta-1.10.0.dev6/anta/_advisory/findings/assessment.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2026 Arista Networks, Inc.
+# Use of this source code is governed by the Apache License 2.0
+# that can be found in the LICENSE file.
+"""Shared assessment steps for structured advisory findings."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from anta._advisory.eos_versions import AffectedStatus, evaluate_version
+from anta._advisory.facts.models import Fact, FactProblemKind, UnavailableFact
+from anta._advisory.findings.models import EosReleaseAssessment, ErrorResult, NotAffectedResult, VersionRelation
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from anta._advisory.eos_versions import VersionRule
+    from anta._eos.version import EOSVersion
+
+
+def assess_eos_scope(
+    vulnerability_id: str,
+    version: Fact[EOSVersion],
+    affected_versions: Sequence[VersionRule],
+) -> EosReleaseAssessment | ErrorResult | NotAffectedResult:
+    """Return an affected EOS assessment or a terminal error or not-affected result."""
+    release = assess_eos_version(version, affected_versions)
+    if isinstance(release, UnavailableFact):
+        return ErrorResult(vulnerability_id=vulnerability_id, problems=(release,))
+    if release.relation is VersionRelation.OUTSIDE_SCOPE:
+        return NotAffectedResult(vulnerability_id=vulnerability_id, decisive=(release,))
+    return release
+
+
+def assess_eos_version(
+    version: Fact[EOSVersion],
+    affected_versions: Sequence[VersionRule],
+) -> EosReleaseAssessment | UnavailableFact[EOSVersion]:
+    """Interpret an EOS version fact without making a terminal vulnerability decision."""
+    if isinstance(version, UnavailableFact):
+        return version
+
+    evaluation = evaluate_version(version.value, affected_versions)
+    if evaluation.affected_status is AffectedStatus.UNKNOWN:
+        return version.definition.unavailable(FactProblemKind.INVALID, version.source)
+
+    relation = VersionRelation.AFFECTED if evaluation.affected_status is AffectedStatus.AFFECTED else VersionRelation.OUTSIDE_SCOPE
+    return EosReleaseAssessment(version, relation)

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/_advisory/reporter/reporting.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
 from anta._advisory.models import _ADVISORY_VULNERABILITY_SEVERITY_RANK, _AdvisoryVulnerabilitySeverity
-from anta._advisory.results import _get_advisory_metadata
+from anta._advisory.results import _get_advisory_metadata, _get_advisory_status
 from anta.logger import anta_log_exception
 from anta.result_manager.models import AntaTestStatus
 
@@ -26,27 +26,16 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
-_ADVISORY_RESULT_RANK = {
-    AntaTestStatus.FAILURE: 0,
-    AntaTestStatus.INCONCLUSIVE: 1,
-    AntaTestStatus.SUCCESS: 2,
-    AntaTestStatus.ERROR: 3,
-    AntaTestStatus.SKIPPED: 4,
-    AntaTestStatus.UNSET: 5,
-}
+_ADVISORY_RESULT_RANK = {"affected": 0, "inconclusive": 1, "mitigated": 2, "not affected": 3, "error": 4, "skipped": 5, "unset": 6}
 
 
 def _get_advisory_result(result: TestResult | AtomicTestResult) -> str:
-    """Translate an ANTA status to advisory-facing result wording."""
-    # MITIGATED is projected to native INCONCLUSIVE until the semantic state is retained on the atomic
-    # result. Reporters follow that native status and do not recover mitigation from inconclusive
-    # message text. SUCCESS remains accepted for results that used the earlier success-based encoding.
-    if result.result is AntaTestStatus.SUCCESS:
-        mitigated_opening = "The device is affected but mitigated because "
-        return "mitigated" if any(mitigated_opening in message for message in result.messages) else "not affected"
+    """Translate retained advisory status or an ANTA lifecycle status to report wording."""
+    if (status := _get_advisory_status(result)) is not None:
+        return status.value.replace("_", " ")
     return {
         AntaTestStatus.UNSET: "unset",
-        AntaTestStatus.INCONCLUSIVE: "inconclusive",
+        AntaTestStatus.SUCCESS: "not affected",
         AntaTestStatus.FAILURE: "affected",
         AntaTestStatus.ERROR: "error",
         AntaTestStatus.SKIPPED: "skipped",
@@ -169,7 +158,9 @@ def group_advisory_results(results: Sequence[TestResult]) -> tuple[AdvisoryResul
         else:
             group_results = []
             groups[advisory.sa_number] = (advisory, group_results)
-        sorted_result = result.model_copy(update={"atomic_results": sorted(result.atomic_results, key=lambda atomic: _ADVISORY_RESULT_RANK[atomic.result])})
+        sorted_result = result.model_copy(
+            update={"atomic_results": sorted(result.atomic_results, key=lambda atomic: _ADVISORY_RESULT_RANK[_get_advisory_result(atomic)])}
+        )
         group_results.append(sorted_result)
 
     result_groups = (
@@ -178,7 +169,7 @@ def group_advisory_results(results: Sequence[TestResult]) -> tuple[AdvisoryResul
             results=tuple(
                 sorted(
                     group_results,
-                    key=lambda result: (_ADVISORY_RESULT_RANK[result.result], result.name.casefold(), result.test.casefold()),
+                    key=lambda result: (_ADVISORY_RESULT_RANK[_get_advisory_result(result)], result.name.casefold(), result.test.casefold()),
                 )
             ),
         )

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/_advisory/results.py

@@ -9,12 +9,22 @@ from pydantic import Field
 
 from anta._advisory.models import _AdvisoryMetadata  # noqa: TC001  # Pydantic resolves this annotation at runtime.
 from anta._advisory.remediation import RemediationGuidance, RemediationPlan  # noqa: TC001  # Pydantic resolves these annotations at runtime.
+from anta._advisory.status import AdvisoryStatus
 from anta.result_manager.models import AntaTestStatus, AtomicTestResult, TestResult
 
+_ADVISORY_STATUS_PRIORITY = {
+    AdvisoryStatus.NOT_AFFECTED: 0,
+    AdvisoryStatus.MITIGATED: 1,
+    AdvisoryStatus.INCONCLUSIVE: 2,
+    AdvisoryStatus.AFFECTED: 3,
+    AdvisoryStatus.ERROR: 4,
+}
+
 
 class _AdvisoryAtomicTestResult(AtomicTestResult):
     """Atomic advisory result with optional vulnerability association and remediation."""
 
+    advisory_status: AdvisoryStatus | None = Field(default=None, exclude=True)
     vulnerability_ids: tuple[str, ...] | None = Field(default=None, exclude=True)
     remediation: RemediationPlan | None = Field(default=None, exclude=True)
     remediation_guidance: frozenset[RemediationGuidance] = Field(default_factory=frozenset, exclude=True)
@@ -25,6 +35,18 @@ class _AdvisoryTestResult(TestResult):
 
     advisory: _AdvisoryMetadata = Field(exclude=True)
 
+    @property
+    def advisory_status(self) -> AdvisoryStatus | None:
+        """Return the highest-priority semantic status from this advisory result."""
+        if self.result is AntaTestStatus.ERROR:
+            return AdvisoryStatus.ERROR
+        statuses = (atomic.advisory_status for atomic in self.atomic_results if isinstance(atomic, _AdvisoryAtomicTestResult))
+        return max(
+            (status for status in statuses if status is not None),
+            key=_ADVISORY_STATUS_PRIORITY.__getitem__,
+            default=None,
+        )
+
     def add(
         self,
         description: str,
@@ -68,6 +90,15 @@ def _get_advisory_metadata(result: TestResult) -> _AdvisoryMetadata | None:
     return result.advisory if isinstance(result, _AdvisoryTestResult) else None
 
 
+def _get_advisory_status(result: TestResult | AtomicTestResult) -> AdvisoryStatus | None:
+    """Return the semantic status from an advisory result, otherwise None."""
+    if isinstance(result, _AdvisoryTestResult):
+        return result.advisory_status
+    if isinstance(result, _AdvisoryAtomicTestResult):
+        return result.advisory_status
+    return None
+
+
 def _get_atomic_vulnerability_ids(result: AtomicTestResult) -> tuple[str, ...] | None:
     """Return explicitly associated vulnerability IDs from an advisory atomic result."""
     return result.vulnerability_ids if isinstance(result, _AdvisoryAtomicTestResult) else None

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/_advisory/status.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2026 Arista Networks, Inc.
 # Use of this source code is governed by the Apache License 2.0
 # that can be found in the LICENSE file.
-"""Semantic advisory statuses and their temporary ANTA projection."""
+"""Semantic advisory statuses and their ANTA projection."""
 
 from __future__ import annotations
 
@@ -34,12 +34,7 @@ def project_advisory_status(
     message: str,
     remediation: RemediationPlan | None,
 ) -> None:
-    """Attach remediation and project a semantic advisory status onto ANTA.
-
-    MITIGATED remains distinct throughout assessment and is projected to INCONCLUSIVE only
-    because ANTA does not yet expose a native mitigated status. When it does, this function
-    is the single compatibility boundary that must change.
-    """
+    """Retain an advisory status, attach remediation, and project it onto ANTA."""
     requires_remediation = status in {AdvisoryStatus.AFFECTED, AdvisoryStatus.MITIGATED, AdvisoryStatus.INCONCLUSIVE}
     if requires_remediation != (remediation is not None):
         requirement = "requires" if requires_remediation else "must not include"
@@ -53,12 +48,12 @@ def project_advisory_status(
             guidance.add(RemediationGuidance.UNRESOLVED_CONDITIONS)
         result.remediation_guidance = frozenset(guidance)
 
-    if status is AdvisoryStatus.NOT_AFFECTED:
+    result.advisory_status = status
+
+    if status in {AdvisoryStatus.NOT_AFFECTED, AdvisoryStatus.MITIGATED}:
         result.is_success(message)
-    elif status is AdvisoryStatus.AFFECTED:
+    elif status in {AdvisoryStatus.AFFECTED, AdvisoryStatus.INCONCLUSIVE}:
         result.is_failure(message)
-    elif status in {AdvisoryStatus.MITIGATED, AdvisoryStatus.INCONCLUSIVE}:
-        result.is_inconclusive(message)
     elif status is AdvisoryStatus.ERROR:
         result.is_error(message)
     else:

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/_eos/platform.py

@@ -64,13 +64,18 @@ class PlatformFamily(str, Enum):
     """
 
     SERIES_720_D = "720D Series"
+    SERIES_720_DF = "720DF Series"
+    SERIES_720_DP = "720DP Series"
+    SERIES_720_DT = "720DT Series"
     SERIES_720_XP = "720XP Series"
     SERIES_720_XDM = "720XDM Series"
     SERIES_722_XPM = "722XPM Series"
-    SERIES_755_758 = "755/758 Series"
+    SERIES_750 = "750 Series"
+    SERIES_750_X = "750X Series"
     SERIES_710 = "710 Series"
     SERIES_7010 = "7010 Series"
     SERIES_7010_X = "7010X Series"
+    SERIES_7010_TX = "7010TX Series"
     SERIES_7020_R = "7020R Series"
     SERIES_7020_R4 = "7020R4 Series"
     SERIES_7130 = "7130 Series"
@@ -90,6 +95,7 @@ class PlatformFamily(str, Enum):
     SERIES_7260_X = "7260X Series"
     SERIES_7260_X3 = "7260X3 Series"
     SERIES_7280_E = "7280E Series"
+    SERIES_7280_SE = "7280SE Series"
     SERIES_7280_R = "7280R Series"
     SERIES_7280_R2 = "7280R2 Series"
     SERIES_7280_R3 = "7280R3 Series"
@@ -114,7 +120,7 @@ class PlatformFamily(str, Enum):
     CLOUDEOS = "CloudEOS"
     CEOS_LAB = "cEOS-lab"
     VEOS_LAB = "vEOS-lab"
-    CLOUDVISION_EXCHANGE = "CloudVision eXchange"
+    CVX = "CloudVision eXchange"
 
 
 @dataclass(frozen=True, slots=True)
@@ -213,14 +219,16 @@ def _module_rule(role: PlatformComponentRole, *patterns: str) -> _ModuleFamilyRu
 
 
 SYSTEM_PLATFORM_RULES: tuple[_SystemPlatformRule, ...] = (
-    _system_rule(PlatformType.FIXED, r"^CCS-720D[FTP]-.*$", families=(PlatformFamily.SERIES_720_D,)),
+    _system_rule(PlatformType.FIXED, r"^CCS-720DF-.*$", families=(PlatformFamily.SERIES_720_D, PlatformFamily.SERIES_720_DF)),
+    _system_rule(PlatformType.FIXED, r"^CCS-720DP-.*$", families=(PlatformFamily.SERIES_720_D, PlatformFamily.SERIES_720_DP)),
+    _system_rule(PlatformType.FIXED, r"^CCS-720DT-.*$", families=(PlatformFamily.SERIES_720_D, PlatformFamily.SERIES_720_DT)),
     _system_rule(PlatformType.FIXED, r"^CCS-720XP-.*$", families=(PlatformFamily.SERIES_720_XP,)),
     _system_rule(PlatformType.FIXED, r"^CCS-720XDM-.*$", families=(PlatformFamily.SERIES_720_XDM,)),
     _system_rule(PlatformType.FIXED, r"^CCS-72[02]XPM-.*$", families=(PlatformFamily.SERIES_722_XPM,)),
-    _system_rule(PlatformType.CHASSIS, r"^CCS-75[58]-CH.*$", families=(PlatformFamily.SERIES_755_758,)),
+    _system_rule(PlatformType.CHASSIS, r"^CCS-75[58]-CH.*$", families=(PlatformFamily.SERIES_750, PlatformFamily.SERIES_750_X)),
     _system_rule(PlatformType.FIXED, r"^CCS-710[A-Z0-9]*-.*$", families=(PlatformFamily.SERIES_710,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7010T-.*$", families=(PlatformFamily.SERIES_7010,)),
-    _system_rule(PlatformType.FIXED, r"^DCS-7010TX-.*$", families=(PlatformFamily.SERIES_7010_X,)),
+    _system_rule(PlatformType.FIXED, r"^DCS-7010TX-.*$", families=(PlatformFamily.SERIES_7010_X, PlatformFamily.SERIES_7010_TX)),
     _system_rule(PlatformType.FIXED, r"^DCS-7020[ST]R[A-Z]*-.*$", families=(PlatformFamily.SERIES_7020_R,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7020H?R4M?-.*$", families=(PlatformFamily.SERIES_7020_R4,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7050[A-Z]*X(?!\d).*$", families=(PlatformFamily.SERIES_7050_X,)),
@@ -239,7 +247,7 @@ SYSTEM_PLATFORM_RULES: tuple[_SystemPlatformRule, ...] = (
     _system_rule(PlatformType.FIXED, r"^DCS-7250[A-WY-Z]*X.*$", families=(PlatformFamily.SERIES_7250_X,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7260[A-Z]*X(?!\d).*$", families=(PlatformFamily.SERIES_7260_X,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7260[A-Z]*X3.*$", families=(PlatformFamily.SERIES_7260_X3,)),
-    _system_rule(PlatformType.FIXED, r"^DCS-7280SE-.*$", families=(PlatformFamily.SERIES_7280_E,)),
+    _system_rule(PlatformType.FIXED, r"^DCS-7280SE-.*$", families=(PlatformFamily.SERIES_7280_E, PlatformFamily.SERIES_7280_SE)),
     _system_rule(PlatformType.FIXED, r"^DCS-7280[CQST]R(?!\d).*$", families=(PlatformFamily.SERIES_7280_R,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7280[CS]R2.*$", families=(PlatformFamily.SERIES_7280_R2,)),
     _system_rule(PlatformType.FIXED, r"^DCS-7280[CDPST]R3.*$", families=(PlatformFamily.SERIES_7280_R3,)),
@@ -258,19 +266,33 @@ SYSTEM_PLATFORM_RULES: tuple[_SystemPlatformRule, ...] = (
     _system_rule(PlatformType.VIRTUAL, r"^CLOUDEOS$", families=(PlatformFamily.CLOUDEOS,)),
     _system_rule(PlatformType.VIRTUAL, r"^(?:CEOS-LAB|CEOSLAB)(?:-.+)?$", families=(PlatformFamily.CEOS_LAB,)),
     _system_rule(PlatformType.VIRTUAL, r"^(?:VEOS-LAB|VEOSLAB)(?:-.+)?$", families=(PlatformFamily.VEOS_LAB,)),
-    _system_rule(PlatformType.APPLIANCE, r"^CLOUDVISION EXCHANGE$", families=(PlatformFamily.CLOUDVISION_EXCHANGE,)),
+    # TODO(platform-cvx-cloudeos): Newer CloudEOS releases also report "vEOS".
+    # Find an additional device property that distinguishes them before relying
+    # on the model string alone for CVX versus CloudEOS classification.
+    _system_rule(PlatformType.VIRTUAL, r"^VEOS$", families=(PlatformFamily.CVX,)),
 )
 
 
 MODULE_PLATFORM_FAMILY_RULES: dict[PlatformFamily, tuple[_ModuleFamilyRule, ...]] = {
+    PlatformFamily.SERIES_750: (
+        _module_rule(PlatformComponentRole.SUPERVISOR, r"^CCS-750-SUP(?:25|100)(?:-CLK)?$"),
+        _module_rule(PlatformComponentRole.SWITCH_CARD, r"^CCS-75[58]-X3-SC$"),
+        _module_rule(PlatformComponentRole.LINE_CARD, r"^CCS-750X(?:M|PM)?-.*-LC$"),
+    ),
+    PlatformFamily.SERIES_750_X: (
+        _module_rule(PlatformComponentRole.SUPERVISOR, r"^CCS-750-SUP(?:25|100)(?:-CLK)?$"),
+        _module_rule(PlatformComponentRole.SWITCH_CARD, r"^CCS-75[58]-X3-SC$"),
+        _module_rule(PlatformComponentRole.LINE_CARD, r"^CCS-750X(?:M|PM)?-.*-LC$"),
+    ),
     PlatformFamily.SERIES_7289_R3A: (_module_rule(PlatformComponentRole.SWITCH_CARD, r"^(?:DCS-)?7289R3A[A-Z]*-SC$"),),
     PlatformFamily.SERIES_7300_X: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7300X(?!\d)-.*-LC$"),),
     PlatformFamily.SERIES_7300_X3: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7300X3-.*-LC$"),),
+    PlatformFamily.SERIES_7320_X: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7320X-.*-LC$"),),
     PlatformFamily.SERIES_7358_X4: (_module_rule(PlatformComponentRole.SWITCH_CARD, r"^(?:DCS-)?7358X4-SC$"),),
     PlatformFamily.SERIES_7368_X4: (_module_rule(PlatformComponentRole.SWITCH_CARD, r"^(?:DCS-)?7368X4-SC$"),),
     PlatformFamily.SERIES_7388_X5: (_module_rule(PlatformComponentRole.SWITCH_CARD, r"^(?:DCS-)?7388X5-SC$"),),
     PlatformFamily.SERIES_7500_E: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7500E-.*-LC$"),),
-    PlatformFamily.SERIES_7500_R: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7500R(?!\d)-.*-LC$"),),
+    PlatformFamily.SERIES_7500_R: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7500R(?!\d)[A-Z]*-.*-LC$"),),
     PlatformFamily.SERIES_7500_R2: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7500R2[A-Z]*-.*-LC$"),),
     PlatformFamily.SERIES_7500_R3: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7500R3[A-Z]*-.*-LC$"),),
     PlatformFamily.SERIES_7800_R3: (_module_rule(PlatformComponentRole.LINE_CARD, r"^(?:DCS-)?7800R3[A-Z]*-.*-LC$"),),

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/cli/utils.py

@@ -63,14 +63,14 @@ def parse_tags(_ctx: click.Context, _param: Option, value: str | None) -> set[st
 def exit_with_code(ctx: click.Context) -> None:
     """Exit the Click application with an exit code.
 
-    This function determines the global test status to be either `unset`, `skipped`, `success`, `inconclusive`, `failure`, or `error`
+    This function determines the global test status to be either `unset`, `skipped`, `success`, `failure` or `error`
     from the `ResultManager` instance.
     If flag `ignore_error` is set, the `error` status will be ignored in all the tests.
     If flag `ignore_status` is set, the exit code will always be 0.
     Exit the application with the following exit code:
         * 0 if `ignore_status` is `True` or global test status is `unset`, `skipped` or `success`
-        * 4 if status is `inconclusive` or `failure`
-        * 3 if status is `error`.
+        * 3 if status is `error`
+        * 4 if status is `failure`.
 
     Parameters
     ----------
@@ -86,7 +86,7 @@ def exit_with_code(ctx: click.Context) -> None:
 
     if status in {"unset", "skipped", "success"}:
         ctx.exit(ExitCode.OK)
-    if status in {"inconclusive", "failure"}:
+    if status == "failure":
         ctx.exit(ExitCode.TESTS_FAILED)
     if status == "error":
         ctx.exit(ExitCode.TESTS_ERROR)
@@ -133,7 +133,7 @@ def result_options(f: Callable[..., R]) -> Callable[..., R]:
         default=None,
         type=click.Choice(_HIDE_STATUS, case_sensitive=False),
         multiple=True,
-        help="Hide results by type: success / inconclusive / failure / error / skipped.",
+        help="Hide results by type: success / failure / error / skipped.",
         required=False,
     )(f)
     f = click.option(

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/reporter/md_reporter.py

@@ -43,7 +43,6 @@ STATUS_MAP = {
     AntaTestStatus.FAILURE: "❌ Failure",
     AntaTestStatus.ERROR: "❗ Error",
     AntaTestStatus.SKIPPED: "⏭️ Skipped",
-    AntaTestStatus.INCONCLUSIVE: "❓ Inconclusive",
     AntaTestStatus.UNSET: "Unset",
 }
 """Mapping of `AntaTestStatus` to their string representation with icons and non-breaking spaces for Markdown."""
@@ -436,7 +435,6 @@ class SummaryTotals(MDReportBase):
         TOTAL_TESTS,
         STATUS_MAP[AntaTestStatus.SUCCESS],
         STATUS_MAP[AntaTestStatus.SKIPPED],
-        STATUS_MAP[AntaTestStatus.INCONCLUSIVE],
         STATUS_MAP[AntaTestStatus.FAILURE],
         STATUS_MAP[AntaTestStatus.ERROR],
     ]
@@ -449,7 +447,6 @@ class SummaryTotals(MDReportBase):
             f"| {self.results.get_total_results()} "
             f"| {self.results.get_total_results({AntaTestStatus.SUCCESS})} "
             f"| {self.results.get_total_results({AntaTestStatus.SKIPPED})} "
-            f"| {self.results.get_total_results({AntaTestStatus.INCONCLUSIVE})} "
             f"| {self.results.get_total_results({AntaTestStatus.FAILURE})} "
             f"| {self.results.get_total_results({AntaTestStatus.ERROR})} |\n"
         )
@@ -470,7 +467,6 @@ class SummaryTotalsDeviceUnderTest(MDReportBase):
         TOTAL_TESTS,
         STATUS_MAP[AntaTestStatus.SUCCESS],
         STATUS_MAP[AntaTestStatus.SKIPPED],
-        STATUS_MAP[AntaTestStatus.INCONCLUSIVE],
         STATUS_MAP[AntaTestStatus.FAILURE],
         STATUS_MAP[AntaTestStatus.ERROR],
         CATEGORIES_SKIPPED,
@@ -482,19 +478,11 @@ class SummaryTotalsDeviceUnderTest(MDReportBase):
     def generate_rows(self) -> Generator[str, None, None]:
         """Generate the rows of the summary totals device under test table."""
         for device, stat in self.results.device_stats.items():
-            total_tests = (
-                stat.tests_success_count
-                + stat.tests_skipped_count
-                + stat.tests_inconclusive_count
-                + stat.tests_failure_count
-                + stat.tests_error_count
-                + stat.tests_unset_count
-            )
+            total_tests = stat.tests_success_count + stat.tests_skipped_count + stat.tests_failure_count + stat.tests_error_count + stat.tests_unset_count
             categories_skipped = ", ".join(convert_categories(list(stat.categories_skipped), sort=True))
             categories_failed = ", ".join(convert_categories(list(stat.categories_failed), sort=True))
             yield (
-                f"| **{device}** | {total_tests} | {stat.tests_success_count} | {stat.tests_skipped_count} | {stat.tests_inconclusive_count} "
-                f"| {stat.tests_failure_count} | {stat.tests_error_count} "
+                f"| **{device}** | {total_tests} | {stat.tests_success_count} | {stat.tests_skipped_count} | {stat.tests_failure_count} | {stat.tests_error_count} "
                 f"| {categories_skipped or '-'} | {categories_failed or '-'} |\n"
             )
 
@@ -514,7 +502,6 @@ class SummaryTotalsPerCategory(MDReportBase):
         TOTAL_TESTS,
         STATUS_MAP[AntaTestStatus.SUCCESS],
         STATUS_MAP[AntaTestStatus.SKIPPED],
-        STATUS_MAP[AntaTestStatus.INCONCLUSIVE],
         STATUS_MAP[AntaTestStatus.FAILURE],
         STATUS_MAP[AntaTestStatus.ERROR],
     ]
@@ -525,17 +512,10 @@ class SummaryTotalsPerCategory(MDReportBase):
         """Generate the rows of the summary totals per category table."""
         for category, stat in self.results.category_stats.items():
             converted_category = convert_single_category_cached(category)
-            total_tests = (
-                stat.tests_success_count
-                + stat.tests_skipped_count
-                + stat.tests_inconclusive_count
-                + stat.tests_failure_count
-                + stat.tests_error_count
-                + stat.tests_unset_count
-            )
+            total_tests = stat.tests_success_count + stat.tests_skipped_count + stat.tests_failure_count + stat.tests_error_count + stat.tests_unset_count
             yield (
-                f"| **{converted_category}** | {total_tests} | {stat.tests_success_count} | {stat.tests_skipped_count} | {stat.tests_inconclusive_count} "
-                f"| {stat.tests_failure_count} | {stat.tests_error_count} |\n"
+                f"| **{converted_category}** | {total_tests} | {stat.tests_success_count} | {stat.tests_skipped_count} | {stat.tests_failure_count} "
+                f"| {stat.tests_error_count} |\n"
             )
 
     def generate_section(self) -> None:
@@ -619,16 +599,8 @@ class TestResults(MDReportBase):
         # Format the messages
         if is_expanded:
             total = len(result.atomic_results)
-            inconclusive = len([res for res in result.atomic_results if res.result == AntaTestStatus.INCONCLUSIVE])
-            failed = len([res for res in result.atomic_results if res.result not in {AntaTestStatus.SUCCESS, AntaTestStatus.INCONCLUSIVE}])
-            if failed > 0 and inconclusive > 0:
-                messages_str = f"{failed}/{total} checks failed; {inconclusive}/{total} checks inconclusive"
-            elif failed > 0:
-                messages_str = f"{failed}/{total} checks failed"
-            elif inconclusive > 0:
-                messages_str = f"{inconclusive}/{total} checks inconclusive"
-            else:
-                messages_str = f"All {total} checks passed"
+            failed = len([res for res in result.atomic_results if res.result != AntaTestStatus.SUCCESS])
+            messages_str = f"{failed}/{total} checks failed" if failed > 0 else f"All {total} checks passed"
         else:
             messages_str = self.safe_markdown("<br>".join(result.messages)) or "-"
 

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/reporter/table_reporter.py

@@ -43,7 +43,7 @@ class ReportTable:
         device: str = "Summary per device"
 
     @dataclass
-    class Columns:  # pylint: disable=too-many-instance-attributes
+    class Columns:
         """Column names for the table report."""
 
         device: str = "Device"
@@ -58,8 +58,6 @@ class ReportTable:
         number_of_errors: str = "# of errors"
         failed_devices: str = "List of devices with failed or errored tests"
         failed_tests: str = "List of failed or errored tests"
-        # TODO(ANTA 2.0): Group this with the other number_of_* fields when positional compatibility can be broken.
-        number_of_inconclusive: str = "# of inconclusive"
 
     def __init__(self) -> None:
         """Initialize a ReportTable instance."""
@@ -231,7 +229,6 @@ class ReportTable:
                 - `columns.test`
                 - `columns.number_of_success`
                 - `columns.number_of_skipped`
-                - `columns.number_of_inconclusive`
                 - `columns.number_of_failure`
                 - `columns.number_of_errors`
                 - `columns.failed_devices`
@@ -251,7 +248,6 @@ class ReportTable:
             self.columns.test,
             self.columns.number_of_success,
             self.columns.number_of_skipped,
-            self.columns.number_of_inconclusive,
             self.columns.number_of_failure,
             self.columns.number_of_errors,
             self.columns.failed_devices,
@@ -264,7 +260,6 @@ class ReportTable:
                     test,
                     str(stats.devices_success_count),
                     str(stats.devices_skipped_count),
-                    str(stats.devices_inconclusive_count),
                     str(stats.devices_failure_count),
                     str(stats.devices_error_count),
                     ", ".join(stats.devices_failure),
@@ -286,7 +281,6 @@ class ReportTable:
                 - `columns.device`
                 - `columns.number_of_success`
                 - `columns.number_of_skipped`
-                - `columns.number_of_inconclusive`
                 - `columns.number_of_failure`
                 - `columns.number_of_errors`
                 - `columns.failed_tests`
@@ -306,7 +300,6 @@ class ReportTable:
             self.columns.device,
             self.columns.number_of_success,
             self.columns.number_of_skipped,
-            self.columns.number_of_inconclusive,
             self.columns.number_of_failure,
             self.columns.number_of_errors,
             self.columns.failed_tests,
@@ -318,7 +311,6 @@ class ReportTable:
                     device,
                     str(stats.tests_success_count),
                     str(stats.tests_skipped_count),
-                    str(stats.tests_inconclusive_count),
                     str(stats.tests_failure_count),
                     str(stats.tests_error_count),
                     ", ".join(stats.tests_failure),
@@ -360,7 +352,7 @@ class ReportTable:
         """Create a table report with result aggregated per test.
 
         Create table with full output:
-        Test Name | # of success | # of skipped | # of inconclusive | # of failure | # of errors | List of failed or error nodes
+        Test Name | # of success | # of skipped | # of failure | # of errors | List of failed or error nodes
 
         Warnings
         --------
@@ -392,7 +384,7 @@ class ReportTable:
     ) -> Table:
         """Create a table report with result aggregated per device.
 
-        Create table with full output: Device | # of success | # of skipped | # of inconclusive | # of failure | # of errors | List of failed or error test cases
+        Create table with full output: Device | # of success | # of skipped | # of failure | # of errors | List of failed or error test cases
 
         Warnings
         --------

{anta-1.10.0.dev5 → anta-1.10.0.dev6}/anta/result_manager/__init__.py

@@ -33,21 +33,17 @@ class ResultManager:
 
     When adding a test with a status that is not `error`, the overall status is
     updated according to the following precedence:
-    `failure` > `inconclusive` > `success` > `skipped`/`unset`.
-
-    | Current Status | Added test Status                        | Updated Status |
-    | -------------- | ---------------------------------------- | -------------- |
-    | unset          | Any                                      | Any            |
-    | skipped        | unset, skipped                           | skipped        |
-    | skipped        | success                                  | success        |
-    | skipped        | inconclusive                             | inconclusive   |
-    | skipped        | failure                                  | failure        |
-    | success        | unset, skipped, success                  | success        |
-    | success        | inconclusive                             | inconclusive   |
-    | success        | failure                                  | failure        |
-    | inconclusive   | unset, skipped, success, inconclusive    | inconclusive   |
-    | inconclusive   | failure                                  | failure        |
-    | failure        | Any status except error                  | failure        |
+    `failure` > `success` > `skipped`/`unset`.
+
+    | Current Status | Added test Status                | Updated Status |
+    | -------------- | -------------------------------- | -------------- |
+    | unset          | Any                              | Any            |
+    | skipped        | unset, skipped                   | skipped        |
+    | skipped        | success                          | success        |
+    | skipped        | failure                          | failure        |
+    | success        | unset, skipped, success          | success        |
+    | success        | failure                          | failure        |
+    | failure        | Any status except error          | failure        |
 
     If the status of the added test is error, the status is untouched and the
     `error_status` attribute is set to True.