commit 1bc8ed300efbf5d49ef01679fa99bb437c40ccaa
author Ratan Gupta <ratagupt@in.ibm.com> Tue Jul 25 22:34:19 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Sun Aug 13 11:32:50 2017 +0000
tree d2e5d47da9696eabd36f5849baee409f15581e5a
parent bc8862927b05030b249175891dc338d044eb17dd

Remove vlan device files during factory reset

Change-Id: I7ef2adcb7c29bcc22c53b8cb7ba73d5c8cc90602
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

network_manager.cpp

diff --git a/network_manager.cpp b/network_manager.cpp
index 6ae3bfb..73d76d3 100644
--- a/network_manager.cpp
+++ b/network_manager.cpp
@@ -124,31 +124,22 @@
 
 void Manager::reset()
 {
-    const std::string networkConfig = "/etc/systemd/network/";
-    bool filesExist, interfacesMapped = false;
+    const std::string networkConfig = confDir.string();
+    bool interfacesMapped = false;
 
     if(fs::is_directory(networkConfig))
     {
         for(auto& file : fs::directory_iterator(networkConfig))
         {
-            std::string filename = file.path().filename().c_str();
-
-            if(filename.substr(filename.find_last_of(".") + 1) == "network")
-            {
-                fs::remove(file.path());
-                filesExist = true;
-            }
-        }
-
-        if(!filesExist)
-        {
-            log<level::INFO>("No existing network configuration was found.");
+            fs::remove(file.path());
         }
 
         for (auto& intf : interfaces)
         {
-            std::string filename = networkConfig + "00-bmc-" + intf.first +
-                    ".network";
+            std::string filename = networkConfig +
+                                   systemd::config::networkFilePrefix +
+                                   intf.first +
+                                   systemd::config::networkFileSuffix;
 
             bmc::writeDHCPDefault(filename, intf.first);
             interfacesMapped = true;