commit 963e842d76719f5ca740ba03afabdb7aacea542e
author Souvik Roy <souvikroyofficial10@gmail.com> Mon May 05 02:18:22 2025 -0500
committer SunnySrivastava <sunnsr25@in.ibm.com> Tue May 13 16:11:53 2025 +0000
tree 32361f1049a342c82167ef1aa3b202a16c7ad799
parent 410d96ca32a937940f5eb07211728272dedadf53

Clear dump directory during manufacturing clean

This commit clears the vpd dump directory in case of manufacturing
clean.The vpd dump directory contains invalid vpd files found during
parsing. These files need to be deleted when manufacturing clean is
executed.

Test:
```
1. Ensure vpd-manager has dumped 3 bad VPD files in the VPD dump
   directory.
2. Execute vpd-tool --mfgClean --yes
3. After manufacturing clean is done, check return code, should be 0.
4. After manufacturing clean is done, check the VPD dump directory in
   /var/lib/vpd. There should be no dumps directory inside.
```

Change-Id: Ic8079013e8b6608b2365b3ce874f0950bf50d77a
Signed-off-by: Souvik Roy <souvikroyofficial10@gmail.com>

vpd-tool/include/tool_constants.hpp

diff --git a/vpd-tool/include/tool_constants.hpp b/vpd-tool/include/tool_constants.hpp
index 3201755..b813933 100644
--- a/vpd-tool/include/tool_constants.hpp
+++ b/vpd-tool/include/tool_constants.hpp
@@ -54,6 +54,7 @@
     "xyz.openbmc_project.BIOSConfig.Manager";
 
 constexpr auto KwdIM = "IM";
+constexpr auto badVpdPath = "/var/lib/vpd/dumps";
 
 // Valid IM values list.
 static std::vector<std::string> validImValues{

vpd-tool/include/vpd_tool.hpp

diff --git a/vpd-tool/include/vpd_tool.hpp b/vpd-tool/include/vpd_tool.hpp
index ed2aa00..3a8e85a 100644
--- a/vpd-tool/include/vpd_tool.hpp
+++ b/vpd-tool/include/vpd_tool.hpp
@@ -363,5 +363,13 @@
      * @return On success returns 0, otherwise returns -1.
      */
     int resetVpdOnDbus();
+
+    /**
+     * @brief API to clear vpd dump directory
+     *
+     * This API deletes all the files inside vpd dump directory and then deletes
+     * the directory from the filesystem
+     */
+    void clearVpdDumpDir() const noexcept;
 };
 } // namespace vpd

vpd-tool/src/vpd_tool.cpp

diff --git a/vpd-tool/src/vpd_tool.cpp b/vpd-tool/src/vpd_tool.cpp
index 786af8c..c275509 100644
--- a/vpd-tool/src/vpd_tool.cpp
+++ b/vpd-tool/src/vpd_tool.cpp
@@ -1540,4 +1540,22 @@
     }
     return l_result;
 }
+
+void VpdTool::clearVpdDumpDir() const noexcept
+{
+    try
+    {
+        if (std::filesystem::exists(constants::badVpdPath))
+        {
+            std::filesystem::remove_all(constants::badVpdPath);
+        }
+    }
+    catch (const std::exception& l_ex)
+    {
+        std::cerr << "Failed to clear VPD dump path:[" +
+                         std::string(constants::badVpdPath) + "]. Error: "
+                  << l_ex.what() << std::endl;
+    }
+}
+
 } // namespace vpd

vpd-tool/src/vpd_tool_main.cpp

diff --git a/vpd-tool/src/vpd_tool_main.cpp b/vpd-tool/src/vpd_tool_main.cpp
index 152cfca..e0bbf7a 100644
--- a/vpd-tool/src/vpd_tool_main.cpp
+++ b/vpd-tool/src/vpd_tool_main.cpp
@@ -62,6 +62,10 @@
     }
 
     vpd::VpdTool l_vpdToolObj;
+
+    // delete the vpd dump directory
+    l_vpdToolObj.clearVpdDumpDir();
+
     return l_vpdToolObj.cleanSystemVpd(!i_syncBiosAttributesFlag->empty());
 }