[NETD-TC#9] Clean up dependency between InterfaceController and

TrafficController.

Test: m; flash; boot
Test: atest InterfaceControllerTest TrafficControllerTest
Test: atest XfrmControllerTest netd_integration_test
Change-Id: I0dd7e2a94743ac03235db35f4e40338c19fd5403

1 files changed, 7 insertions, 4 deletions

diff --git a/server/InterfaceControllerTest.cpp b/server/InterfaceControllerTest.cpp
index 78d507f2..006018d7 100644
--- a/server/InterfaceControllerTest.cpp
+++ b/server/InterfaceControllerTest.cpp
@@ -22,6 +22,7 @@
 #include <gtest/gtest.h>
 
 #include <netdutils/MockSyscalls.h>
+#include <netdutils/Utils.h>
 
 #include "InterfaceController.h"
 
@@ -36,14 +37,16 @@ namespace net {
 namespace {
 
 using netdutils::Fd;
+using netdutils::getIfaceList;
+using netdutils::getIfaceNames;
+using netdutils::makeSlice;
 using netdutils::ScopedMockSyscalls;
 using netdutils::Slice;
 using netdutils::Status;
+using netdutils::statusFromErrno;
 using netdutils::StatusOr;
 using netdutils::UniqueFd;
-using netdutils::makeSlice;
 using netdutils::status::ok;
-using netdutils::statusFromErrno;
 
 constexpr Fd kDevRandomFd(777);
 constexpr Fd kStableSecretFd(9999);
@@ -179,7 +182,7 @@ TEST_F(StablePrivacyTest, ExistingPropertyWriteFail) {
 class GetIfaceListTest : public testing::Test {};
 
 TEST_F(GetIfaceListTest, IfaceNames) {
-    StatusOr<std::vector<std::string>> ifaceNames = InterfaceController::getIfaceNames();
+    StatusOr<std::vector<std::string>> ifaceNames = getIfaceNames();
     EXPECT_EQ(ok, ifaceNames.status());
     struct ifaddrs *ifaddr, *ifa;
     EXPECT_EQ(0, getifaddrs(&ifaddr));
@@ -192,7 +195,7 @@ TEST_F(GetIfaceListTest, IfaceNames) {
 }
 
 TEST_F(GetIfaceListTest, IfaceExist) {
-    StatusOr<std::map<std::string, uint32_t>> ifaceMap = InterfaceController::getIfaceList();
+    StatusOr<std::map<std::string, uint32_t>> ifaceMap = getIfaceList();
     EXPECT_EQ(ok, ifaceMap.status());
     struct ifaddrs *ifaddr, *ifa;
     EXPECT_EQ(0, getifaddrs(&ifaddr));