commit ed5d7ff7c36b1de56e650341056e3dedfd3f3df7
author Ratan Gupta <ratagupt@in.ibm.com> Fri Mar 23 00:27:52 2018 +0530
committer Ratan Gupta <ratagupt@in.ibm.com> Thu Apr 05 20:18:43 2018 +0530
tree 6e431c965ca6f4e03597dd6babed5971f4dc1781
parent aac603e46d8f9241eac911e28b3ac349ed425efc

ncsi: implement the main function

This commit adds the functionality to
call the specific function depends on the
command given.

eg: Force a channel to be used.
ncsi-netlink --set -x 2 -p 0 -c 0
x: Interface Index
p: Package number
c: channel number

eg: Gets the info of a given interface
ncsi-netlink --info -x 2 -p 0
x: Interface Index
p: Package number

eg: Clear all the package/channel
ncsi-netlink --clear -x 2
x: Interface Index

This commit also removes the unnecessary
console messages.

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

ncsi_util.cpp

diff --git a/ncsi_util.cpp b/ncsi_util.cpp
index bf19ee3..77224f7 100644
--- a/ncsi_util.cpp
+++ b/ncsi_util.cpp
@@ -19,8 +19,6 @@
 using namespace phosphor::logging;
 using namespace sdbusplus::xyz::openbmc_project::Common::Error;
 
-constexpr auto DEFAULT_VALUE = -1;
-constexpr auto NONE = 0;
 using CallBack = int(*)(struct nl_msg* msg, void* arg);
 
 namespace internal
@@ -131,21 +129,20 @@
                 }
                 else
                 {
-                    log<level::DEBUG>("Channel not Active",
-                            entry("CHANNEL=%x", channel));
-
+                    log<level::DEBUG>("Channel Not Active",
+                                      entry("CHANNEL=%x", channel));
                 }
 
                 if (channeltb[NCSI_CHANNEL_ATTR_FORCED])
                 {
                     log<level::DEBUG>("Channel is forced");
                 }
-
             }
             else
             {
                 log<level::DEBUG>("Channel with no ID");
             }
+
             if (channeltb[NCSI_CHANNEL_ATTR_VERSION_MAJOR])
             {
                 auto major = nla_get_u32(channeltb[NCSI_CHANNEL_ATTR_VERSION_MAJOR]);
@@ -166,9 +163,10 @@
             }
             if (channeltb[NCSI_CHANNEL_ATTR_LINK_STATE])
             {
+
                 auto link = nla_get_u32(channeltb[NCSI_CHANNEL_ATTR_LINK_STATE]);
                 log<level::DEBUG>("Channel Link State",
-                                  entry("STATE=%d", link));
+                                  entry("STATE=%x", link));
             }
             if (channeltb[NCSI_CHANNEL_ATTR_VLAN_LIST])
             {
@@ -181,7 +179,6 @@
                     auto id = nla_get_u16(vid);
                     log<level::DEBUG>("VID",
                                       entry("VID=%d", id));
-
                     vid = nla_next(vid, &len);
                 }
             }
@@ -287,18 +284,27 @@
 
 int setChannel(int ifindex, int package, int channel)
 {
+    log<level::DEBUG>("Set Channel",
+                      entry("CHANNEL=%x", channel),
+                      entry("PACKAGE=%x", package),
+                      entry("IFINDEX=%x", ifindex));
     return internal::applyCmd(ifindex, ncsi_nl_commands::NCSI_CMD_SET_INTERFACE,
                               package, channel);
 }
 
 int clearInterface(int ifindex)
 {
+    log<level::DEBUG>("ClearInterface",
+                      entry("IFINDEX=%x", ifindex));
     return internal::applyCmd(ifindex,
                               ncsi_nl_commands::NCSI_CMD_CLEAR_INTERFACE);
 }
 
 int getInfo(int ifindex, int package)
 {
+    log<level::DEBUG>("Get Info",
+                      entry("PACKAGE=%x", package),
+                      entry("IFINDEX=%x", ifindex));
     if (package == DEFAULT_VALUE)
     {
         return internal::applyCmd(ifindex, ncsi_nl_commands::NCSI_CMD_PKG_INFO,