validate_sof_install.py: add VERSION column after STATUS in summary table

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Author: lrgirdwo

validate_sof_install.py

@@ -11,6 +11,7 @@
 - Offline rootfs / NFS rootfs validation (--target-root /srv/nfs/spider-rootfs)
 - Remote SSH target validation (--ssh root@spider)
 - Mismatch detection against historical SOF releases
+- Displays version of installed files in summary table
 - Fix mode (--fix, --dry-run) to automatically sync/repair installed files
 - Platform filtering (-p tgl, -p mtl, -p ptl, etc.)
 - Component filtering (-c fw, -c llext, -c tplg, -c tools)
@@ -51,6 +52,8 @@ class ValidationRecord:
     component: str  # fw, llext, tplg, tools
     platform: str  # tgl, mtl, ptl, generic, etc.
     rel_path: str  # relative to fw_dest (or tools_dest)
+    expected_version: str = ""  # target version requested e.g. v2.14.1
+    installed_version: Optional[str] = None  # version found on host e.g. v2.12, v2.14.1, unknown
     source_path: Optional[str] = None  # in sof-bin
     target_path: Optional[str] = None  # on host
     is_symlink: bool = False
@@ -71,6 +74,8 @@ def to_dict(self) -> Dict[str, Any]:
             "component": self.component,
             "platform": self.platform,
             "rel_path": self.rel_path,
+            "expected_version": self.expected_version,
+            "installed_version": self.installed_version,
             "source_path": self.source_path,
             "target_path": self.target_path,
             "is_symlink": self.is_symlink,
@@ -298,7 +303,6 @@ def lookup_md5(self, md5_hash: Optional[str], target_filename: Optional[str] = N
         if not matches:
             return None
 
-        # Prioritize matching filename if provided
         filtered = matches
         if target_filename:
             same_name = [m for m in matches if m["filename"] == target_filename]
@@ -307,13 +311,12 @@ def lookup_md5(self, md5_hash: Optional[str], target_filename: Optional[str] = N
 
         descriptions = []
         for m in filtered:
-            # Extract clean release name e.g. v2.12 or v2.11.1
             comp = m["component"]
             ver_match = re.search(r"v\d+(\.\d+)*(-[a-zA-Z0-9]+)?", comp)
             ver_label = ver_match.group(0) if ver_match else m["version_dir"]
             descriptions.append(f"{ver_label} ({comp})")
 
-        return ", ".join(dict.fromkeys(descriptions))  # unique preserved
+        return ", ".join(dict.fromkeys(descriptions))
 
 
 class HostTarget:
@@ -333,7 +336,6 @@ def fix_file(
         symlink_target: Optional[str],
         dry_run: bool = False,
     ) -> Tuple[bool, str]:
-        """Fix a file or symlink on the target host."""
         raise NotImplementedError
 
 
@@ -403,7 +405,6 @@ def fix_file(
 
         try:
             real_tgt.parent.mkdir(parents=True, exist_ok=True)
-            # Remove existing file or broken link if it exists
             if real_tgt.exists() or real_tgt.is_symlink():
                 real_tgt.unlink()
 
@@ -653,14 +654,16 @@ def should_include(self, component: str, platform: str, rel_path: str) -> bool:
 
         return True
 
-    def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationRecord]:
+    def scan_source_components(self, comp_dirs: Dict[str, Path], target_version: str) -> List[ValidationRecord]:
         records: List[ValidationRecord] = []
 
         # 1. Firmware
         if "fw" in comp_dirs and "fw" in self.component_filter:
             fw_dir = comp_dirs["fw"]
             is_ipc4 = "ipc4" in fw_dir.name
             radix = "sof-ipc4" if is_ipc4 else "sof"
+            ver_match = re.search(r"v\d+(\.\d+)*(-[a-zA-Z0-9]+)?", fw_dir.name)
+            fw_ver = ver_match.group(0) if ver_match else target_version
 
             for root, _, files in os.walk(fw_dir):
                 for f in files:
@@ -682,6 +685,7 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
                         component="fw",
                         platform=platform,
                         rel_path=rel_install,
+                        expected_version=fw_ver,
                         source_path=str(src_p),
                         is_symlink=is_sym,
                         symlink_target_expected=sym_tgt,
@@ -692,6 +696,9 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
         # 2. LLEXT
         if "llext" in comp_dirs and "llext" in self.component_filter:
             lib_dir = comp_dirs["llext"]
+            ver_match = re.search(r"v\d+(\.\d+)*(-[a-zA-Z0-9]+)?", lib_dir.name)
+            lib_ver = ver_match.group(0) if ver_match else target_version
+
             for root, _, files in os.walk(lib_dir):
                 for f in files:
                     src_p = Path(root) / f
@@ -712,6 +719,7 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
                         component="llext",
                         platform=platform,
                         rel_path=rel_install,
+                        expected_version=lib_ver,
                         source_path=str(src_p),
                         is_symlink=is_sym,
                         symlink_target_expected=sym_tgt,
@@ -724,6 +732,8 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
             tplg_dir = comp_dirs["tplg"]
             is_ipc4 = "ipc4" in tplg_dir.name or "ace" in tplg_dir.name
             radix = "sof-ipc4-tplg" if is_ipc4 else "sof-tplg"
+            ver_match = re.search(r"v\d+(\.\d+)*(-[a-zA-Z0-9]+)?", tplg_dir.name)
+            tplg_ver = ver_match.group(0) if ver_match else target_version
 
             for root, _, files in os.walk(tplg_dir):
                 for f in files:
@@ -745,6 +755,7 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
                         component="tplg",
                         platform=platform,
                         rel_path=rel_install,
+                        expected_version=tplg_ver,
                         source_path=str(src_p),
                         is_symlink=is_sym,
                         symlink_target_expected=sym_tgt,
@@ -755,6 +766,9 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
         # 4. Tools
         if "tools" in comp_dirs and "tools" in self.component_filter:
             tools_dir = comp_dirs["tools"]
+            ver_match = re.search(r"v\d+(\.\d+)*(-[a-zA-Z0-9]+)?", tools_dir.name)
+            tools_ver = ver_match.group(0) if ver_match else target_version
+
             for root, _, files in os.walk(tools_dir):
                 for f in files:
                     src_p = Path(root) / f
@@ -775,6 +789,7 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
                         component="tools",
                         platform=platform,
                         rel_path=rel_install,
+                        expected_version=tools_ver,
                         source_path=str(src_p),
                         is_symlink=is_sym,
                         symlink_target_expected=sym_tgt,
@@ -786,7 +801,7 @@ def scan_source_components(self, comp_dirs: Dict[str, Path]) -> List[ValidationR
 
     def validate_installation(self, version: str) -> List[ValidationRecord]:
         comp_dirs = self.repo.resolve_version_components(version)
-        records = self.scan_source_components(comp_dirs)
+        records = self.scan_source_components(comp_dirs, target_version=version)
 
         target_path_map: Dict[str, str] = {}
         for rec in records:
@@ -812,19 +827,21 @@ def validate_installation(self, version: str) -> List[ValidationRecord]:
 
             if not exists:
                 rec.status = Status.MISSING
+                rec.installed_version = "-"
                 rec.message = f"File not found on target: {tgt_p}"
                 continue
 
             if rec.is_symlink:
                 if not is_sym:
                     if actual_md5 and rec.expected_md5 and actual_md5.lower() == rec.expected_md5.lower():
                         rec.status = Status.MATCH
+                        rec.installed_version = rec.expected_version
                         rec.message = f"Installed as regular file matching MD5 (expected symlink -> {rec.symlink_target_expected})"
                     else:
                         rec.status = Status.MISMATCH
-                        # Match against historical releases
                         matched_rel = self.repo.lookup_md5(actual_md5, Path(rec.rel_path).name)
                         rec.matched_release = matched_rel
+                        rec.installed_version = matched_rel.split()[0] if matched_rel else "unknown"
                         match_info = f" (installed file matches {matched_rel})" if matched_rel else ""
                         rec.message = f"Expected symlink -> {rec.symlink_target_expected}, found regular file with MD5 mismatch{match_info}"
                 else:
@@ -833,43 +850,54 @@ def validate_installation(self, version: str) -> List[ValidationRecord]:
                     if norm_exp and norm_act and (norm_exp == norm_act or norm_exp.endswith(norm_act) or norm_act.endswith(norm_exp)):
                         if actual_md5 and rec.expected_md5 and actual_md5.lower() == rec.expected_md5.lower():
                             rec.status = Status.SYMLINK_MATCH
+                            rec.installed_version = rec.expected_version
                             rec.message = f"Symlink matches -> {sym_target} (resolved MD5 OK)"
                         elif actual_md5 is None:
                             rec.status = Status.BROKEN_SYMLINK
+                            rec.installed_version = "broken"
                             rec.message = f"Broken symlink on target: {tgt_p} -> {sym_target} (target missing)"
                         else:
                             rec.status = Status.MISMATCH
                             matched_rel = self.repo.lookup_md5(actual_md5, Path(rec.rel_path).name)
                             rec.matched_release = matched_rel
+                            rec.installed_version = matched_rel.split()[0] if matched_rel else "unknown"
                             match_info = f" (target matches {matched_rel})" if matched_rel else ""
                             rec.message = f"Symlink target {sym_target} has MD5 mismatch: expected {rec.expected_md5}, got {actual_md5}{match_info}"
                     else:
                         rec.status = Status.SYMLINK_MISMATCH
+                        matched_rel = self.repo.lookup_md5(actual_md5, Path(rec.rel_path).name)
+                        rec.matched_release = matched_rel
+                        rec.installed_version = matched_rel.split()[0] if matched_rel else "target mismatch"
                         rec.message = f"Symlink target mismatch: expected '{rec.symlink_target_expected}', got '{sym_target}'"
             else:
                 if is_sym:
                     if actual_md5 and rec.expected_md5 and actual_md5.lower() == rec.expected_md5.lower():
                         rec.status = Status.MATCH
+                        rec.installed_version = rec.expected_version
                         rec.message = f"Symlink resolved to valid file (MD5 match: {actual_md5})"
                     else:
                         rec.status = Status.MISMATCH
                         matched_rel = self.repo.lookup_md5(actual_md5, Path(rec.rel_path).name)
                         rec.matched_release = matched_rel
+                        rec.installed_version = matched_rel.split()[0] if matched_rel else "unknown"
                         match_info = f" (target matches {matched_rel})" if matched_rel else ""
                         rec.message = f"Symlink resolved to mismatched file: expected {rec.expected_md5}, got {actual_md5}{match_info}"
                 else:
                     if actual_md5 and rec.expected_md5:
                         if actual_md5.lower() == rec.expected_md5.lower():
                             rec.status = Status.MATCH
+                            rec.installed_version = rec.expected_version
                             rec.message = "MD5 checksum matched"
                         else:
                             rec.status = Status.MISMATCH
                             matched_rel = self.repo.lookup_md5(actual_md5, Path(rec.rel_path).name)
                             rec.matched_release = matched_rel
+                            rec.installed_version = matched_rel.split()[0] if matched_rel else "unknown"
                             match_info = f" (installed file matches {matched_rel})" if matched_rel else ""
                             rec.message = f"MD5 mismatch: expected {rec.expected_md5}, got {actual_md5}{match_info}"
                     else:
                         rec.status = Status.ERROR
+                        rec.installed_version = "error"
                         rec.message = "Could not compute MD5 checksum on target"
 
         return records
@@ -904,38 +932,43 @@ def format_table(records: List[ValidationRecord], colorize: bool = True) -> str:
     RESET = "\033[0m" if colorize else ""
 
     lines = []
-    lines.append(f"{BOLD}{'COMPONENT':<8} {'PLATFORM':<12} {'STATUS':<16} {'MD5 / MATCHED VERSION':<38} {'FILE':<40}{RESET}")
-    lines.append("-" * 120)
+    lines.append(f"{BOLD}{'COMPONENT':<8} {'PLATFORM':<10} {'STATUS':<16} {'VERSION':<14} {'MD5 CHECKSUM':<34} {'FILE':<40}{RESET}")
+    lines.append("-" * 125)
 
     status_counts: Dict[str, int] = {}
 
     for r in records:
         status_name = r.status.value
         status_counts[status_name] = status_counts.get(status_name, 0) + 1
 
+        ver_display = r.installed_version or "-"
+
         if r.status in (Status.MATCH, Status.SYMLINK_MATCH):
             c_status = f"{GREEN}{status_name:<16}{RESET}"
+            c_ver = f"{GREEN}{ver_display:<14}{RESET}"
             md5_display = (r.actual_md5 or "--------------------------------")[:32]
-        elif r.status in (Status.MISMATCH, Status.SYMLINK_MISMATCH, Status.BROKEN_SYMLINK):
+        elif r.status in (Status.MISMATCH, Status.SYMLINK_MISMATCH):
             c_status = f"{RED}{status_name:<16}{RESET}"
-            if r.matched_release:
-                md5_display = f"{MAGENTA}matches {r.matched_release[:26]}{RESET}"
-            elif r.expected_md5 and r.actual_md5:
-                md5_display = f"{r.actual_md5[:8]} != {r.expected_md5[:8]}"
-            else:
-                md5_display = (r.actual_md5 or "--------------------------------")[:32]
+            c_ver = f"{MAGENTA}{ver_display:<14}{RESET}"
+            md5_display = (r.actual_md5 or "--------------------------------")[:32]
+        elif r.status == Status.BROKEN_SYMLINK:
+            c_status = f"{RED}{status_name:<16}{RESET}"
+            c_ver = f"{RED}{ver_display:<14}{RESET}"
+            md5_display = (r.actual_md5 or "--------------------------------")[:32]
         elif r.status == Status.MISSING:
             c_status = f"{YELLOW}{status_name:<16}{RESET}"
+            c_ver = f"{YELLOW}{'-':<14}{RESET}"
             md5_display = f"{YELLOW}MISSING{RESET}"
         else:
             c_status = f"{CYAN}{status_name:<16}{RESET}"
+            c_ver = f"{CYAN}{ver_display:<14}{RESET}"
             md5_display = (r.actual_md5 or "--------------------------------")[:32]
 
         lines.append(
-            f"{r.component:<8} {r.platform:<12} {c_status} {md5_display:<38} {r.rel_path}"
+            f"{r.component:<8} {r.platform:<10} {c_status} {c_ver} {md5_display:<34} {r.rel_path}"
         )
 
-    lines.append("=" * 120)
+    lines.append("=" * 125)
     total = len(records)
     passed = status_counts.get(Status.MATCH.value, 0) + status_counts.get(Status.SYMLINK_MATCH.value, 0)
     failed = status_counts.get(Status.MISMATCH.value, 0) + status_counts.get(Status.SYMLINK_MISMATCH.value, 0) + status_counts.get(Status.BROKEN_SYMLINK.value, 0)