Use network interface name as channel name
Use network interface name as channel name for the LAN
channels. Mapper related to convert IPMI LAN reference to
network interface is not needed anymore, and the same has been
removed.
Unit-test:
verified ipmitool channel info for channel 1 & 2 and made sure
it works fine as expected.
Change-Id: Id87e2924a2a21a846507d6378b1b615000280f06
Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
diff --git a/user_channel/channel_layer.cpp b/user_channel/channel_layer.cpp
index 4cab58f..12b10c9 100644
--- a/user_channel/channel_layer.cpp
+++ b/user_channel/channel_layer.cpp
@@ -28,9 +28,9 @@
// TODO: This is not the reliable way to find the device
// associated with ethernet interface as the channel number to
// eth association is not done. Need to revisit later
- struct stat fileStat;
- std::string devName("/sys/class/net/eth");
- devName += std::to_string(chNum - 1);
+ struct stat fileStat = {0};
+ std::string devName("/sys/class/net/" +
+ getChannelConfigObject().getChannelName(chNum));
if (stat(devName.data(), &fileStat) != 0)
{
diff --git a/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp
index 574b058..20e58b0 100644
--- a/user_channel/channel_mgmt.cpp
+++ b/user_channel/channel_mgmt.cpp
@@ -111,7 +111,7 @@
static std::unordered_map<EInterfaceIndex, std::string> interfaceMap = {
{interfaceKCS, "SMS"},
- {interfaceLAN1, "LAN1"},
+ {interfaceLAN1, "eth0"},
{interfaceUnknown, "unknown"}};
static std::unordered_map<std::string, EChannelProtocolType> protocolTypeMap = {
@@ -137,33 +137,6 @@
"priv-reserved", "priv-callback", "priv-user",
"priv-operator", "priv-admin", "priv-oem"};
-static constexpr const char* LAN1_STR = "LAN1";
-static constexpr const char* LAN2_STR = "LAN2";
-static constexpr const char* LAN3_STR = "LAN3";
-static constexpr const char* ETH0_STR = "eth0";
-static constexpr const char* ETH1_STR = "eth1";
-static constexpr const char* ETH2_STR = "eth2";
-
-static std::unordered_map<std::string, std::string> channelToInterfaceMap = {
- {LAN1_STR, ETH0_STR}, {LAN2_STR, ETH1_STR}, {LAN3_STR, ETH2_STR}};
-
-static std::unordered_map<std::string, std::string> interfaceToChannelMap = {
- {ETH0_STR, LAN1_STR}, {ETH1_STR, LAN2_STR}, {ETH2_STR, LAN3_STR}};
-
-std::string convertToChannelName(const std::string& intfName)
-{
-
- auto it = interfaceToChannelMap.find(intfName);
- if (it == interfaceToChannelMap.end())
- {
- log<level::ERR>("Invalid network interface.",
- entry("INTF:%s", intfName.c_str()));
- throw std::invalid_argument("Invalid network interface");
- }
-
- return it->second;
-}
-
std::string getNetIntfFromPath(const std::string& path)
{
std::size_t pos = path.find(networkIntfObjectBasePath);
@@ -182,10 +155,10 @@
const DbusChObjProperties& chProperties)
{
// Get interface name from path. ex: '/xyz/openbmc_project/network/eth0'
- std::string intfName;
+ std::string channelName;
try
{
- intfName = getNetIntfFromPath(path);
+ channelName = getNetIntfFromPath(path);
}
catch (const std::invalid_argument& e)
{
@@ -215,17 +188,15 @@
if (intfPrivStr.empty())
{
log<level::ERR>("Invalid privilege string.",
- entry("INTF:%s", intfName.c_str()));
+ entry("INTF:%s", channelName.c_str()));
return;
}
uint8_t intfPriv = 0;
- std::string channelName;
try
{
intfPriv =
static_cast<uint8_t>(chConfig.convertToPrivLimitIndex(intfPrivStr));
- channelName = convertToChannelName(intfName);
}
catch (const std::invalid_argument& e)
{
@@ -411,6 +382,11 @@
return true;
}
+std::string ChannelConfig::getChannelName(const uint8_t chNum)
+{
+ return channelData[chNum].chName;
+}
+
int ChannelConfig::getChannelActiveSessions(const uint8_t chNum)
{
// TODO: TEMPORARY FIX
@@ -624,18 +600,18 @@
if (setFlag & setPrivLimit)
{
// Send Update to network channel config interfaces over dbus
- std::string intfName = convertToNetInterface(channelData[chNum].chName);
std::string privStr = convertToPrivLimitString(chAccessData.privLimit);
- std::string networkIntfObj =
- std::string(networkIntfObjectBasePath) + "/" + intfName;
+ std::string networkIntfObj = std::string(networkIntfObjectBasePath) +
+ "/" + channelData[chNum].chName;
try
{
if (0 != setDbusProperty(bus, networkIntfServiceName,
networkIntfObj, networkChConfigIntfName,
privilegePropertyString, privStr))
{
- log<level::DEBUG>("Network interface does not exist",
- entry("INTERFACE:%s", intfName.c_str()));
+ log<level::DEBUG>(
+ "Network interface does not exist",
+ entry("INTERFACE:%s", channelData[chNum].chName.c_str()));
return IPMI_CC_UNSPECIFIED_ERROR;
}
}
@@ -841,19 +817,6 @@
return ((chNum == currentChNum) ? curChannel : chNum);
}
-std::string ChannelConfig::convertToNetInterface(const std::string& value)
-{
- auto it = channelToInterfaceMap.find(value);
- if (it == channelToInterfaceMap.end())
- {
- log<level::DEBUG>("Invalid channel name.",
- entry("NAME:%s", value.c_str()));
- throw std::invalid_argument("Invalid channel name.");
- }
-
- return it->second;
-}
-
Json ChannelConfig::readJsonFile(const std::string& configFile)
{
std::ifstream jsonFile(configFile);
@@ -1347,10 +1310,9 @@
std::string intfPrivStr;
try
{
- std::string intfName =
- convertToNetInterface(channelData[chNum].chName);
std::string networkIntfObj =
- std::string(networkIntfObjectBasePath) + "/" + intfName;
+ std::string(networkIntfObjectBasePath) + "/" +
+ channelData[chNum].chName;
DbusVariant variant;
if (0 != getDbusProperty(bus, networkIntfServiceName,
networkIntfObj,
@@ -1358,7 +1320,8 @@
privilegePropertyString, variant))
{
log<level::DEBUG>("Network interface does not exist",
- entry("INTERFACE:%s", intfName.c_str()));
+ entry("INTERFACE:%s",
+ channelData[chNum].chName.c_str()));
continue;
}
intfPrivStr = variant_ns::get<std::string>(variant);
diff --git a/user_channel/channel_mgmt.hpp b/user_channel/channel_mgmt.hpp
index 3de5fa8..02f951b 100644
--- a/user_channel/channel_mgmt.hpp
+++ b/user_channel/channel_mgmt.hpp
@@ -97,6 +97,14 @@
*/
bool isValidAuthType(const uint8_t chNum, const EAuthType& authType);
+ /** @brief function to get channel name from channel number
+ *
+ * @param[in] chNum - channel number index
+ *
+ * @return network channel interface name
+ */
+ std::string getChannelName(const uint8_t chNum);
+
/** @brief determines supported session type of a channel
*
* @param[in] chNum - channel number
@@ -396,14 +404,6 @@
* @return channel protocol type
*/
EChannelProtocolType convertToProtocolTypeIndex(const std::string& value);
-
- /** @brief function to convert channel name to network interface name
- *
- * @param[in] value - channel interface name - ipmi centric
- *
- * @return network channel interface name
- */
- std::string convertToNetInterface(const std::string& value);
};
} // namespace ipmi