commit 991a8e81324f24644bdc417db1a383c5c9fffba2
author William A. Kennington III <wak@google.com> Tue Oct 11 15:02:47 2022 -0700
committer William A. Kennington III <wak@google.com> Tue Oct 25 03:24:34 2022 -0700
tree 0672808d42ddcd862a5dffa025bbba78b8b871fe
parent e25f8b49141fddb32b823ed9175d0d2e7678fb45

ethernet_interface: Refactor object hashing

Change-Id: Ic1022410fea18be5508c8fa08a27e4ae1a2d51e0
Signed-off-by: William A. Kennington III <wak@google.com>

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index 4f2b204..497eaa0 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -9,10 +9,11 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
+#include <charconv>
 #include <exception>
-#include <fstream>
 #include <sdbusplus/bus.hpp>
 #include <stdplus/gtest/tmp.hpp>
+#include <string_view>
 
 #include <gtest/gtest.h>
 
@@ -21,6 +22,8 @@
 namespace network
 {
 
+using std::literals::string_view_literals::operator""sv;
+
 class TestEthernetInterface : public stdplus::gtest::TestWithTmp
 {
   public:
@@ -132,20 +135,19 @@
     uint8_t prefix = 16;
     IP::AddressOrigin origin = IP::AddressOrigin::Static;
 
-    std::string expectedObjectPath = "/xyz/openbmc_test/network/test0/ipv4/";
-    std::stringstream hexId;
+    auto path = getObjectPath(ipaddress, prefix, origin);
+    auto pathsv = std::string_view(path);
+    constexpr auto expectedPrefix = "/xyz/openbmc_test/network/test0/ipv4/"sv;
+    EXPECT_TRUE(pathsv.starts_with(expectedPrefix));
+    pathsv.remove_prefix(expectedPrefix.size());
+    uint32_t val;
+    auto [ptr, res] = std::from_chars(pathsv.begin(), pathsv.end(), val, 16);
+    EXPECT_EQ(res, std::errc());
+    EXPECT_EQ(ptr, pathsv.end());
 
-    std::string hashString = ipaddress;
-    hashString += std::to_string(prefix);
-    hashString += convertForMessage(origin);
-
-    hexId << std::hex << ((std::hash<std::string>{}(hashString)) & 0xFFFFFFFF);
-    expectedObjectPath += hexId.str();
-
-    EXPECT_EQ(expectedObjectPath, getObjectPath(ipaddress, prefix, origin));
-
+    EXPECT_EQ(path, getObjectPath(ipaddress, prefix, origin));
     origin = IP::AddressOrigin::DHCP;
-    EXPECT_NE(expectedObjectPath, getObjectPath(ipaddress, prefix, origin));
+    EXPECT_NE(path, getObjectPath(ipaddress, prefix, origin));
 }
 
 TEST_F(TestEthernetInterface, addStaticNameServers)