diff options
| author | Sumedh Sathaye <sumedh.sathaye@calxeda.com> | 2013-05-31 12:12:51 -0500 |
|---|---|---|
| committer | Sumedh Sathaye <sumedh.sathaye@calxeda.com> | 2013-05-31 15:33:46 -0500 |
| commit | 22de48f460df2abe5a006b160a3eae4b74f23782 (patch) | |
| tree | 41da1aca9145e9a491128b33851b010c3289118d | |
| parent | 8d26ae97e7ee978a662a4900861e0703c11de589 (diff) | |
| download | ipmitool-22de48f460df2abe5a006b160a3eae4b74f23782.tar.gz | |
SW-2137: Mapping of MACs to uplinks should available through IPMI command
Example:
$ ipmitool -H 192.168.100.33 -U admin -P admin cxoem fabric get uplink_info
Node 2: eth0 63, eth1 0, mgmt 0
| -rwxr-xr-x | lib/ipmi_cxoem.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ipmi_cxoem.c b/lib/ipmi_cxoem.c index fe4dd3b..e4c58e0 100755 --- a/lib/ipmi_cxoem.c +++ b/lib/ipmi_cxoem.c @@ -1369,7 +1369,8 @@ cx_fabric_cmd_t get_cmd = { IPMI_CMD_OEM_FABRIC_PARAMETER_LINKSPEED_POLICY, IPMI_CMD_OEM_FABRIC_PARAMETER_CUSTOMER_MACADDR, IPMI_CMD_OEM_FABRIC_PARAMETER_LINK_USERS_FACTOR, - IPMI_CMD_OEM_FABRIC_PARAMETER_UPLINK_SPEED}, + IPMI_CMD_OEM_FABRIC_PARAMETER_UPLINK_SPEED, + IPMI_CMD_OEM_FABRIC_PARAMETER_UPLINK_INFO}, {IPMI_CMD_OEM_FABRIC_SPECIFIER_NODE, IPMI_CMD_OEM_FABRIC_SPECIFIER_INTERFACE, IPMI_CMD_OEM_FABRIC_SPECIFIER_LINK, @@ -1519,7 +1520,7 @@ typedef uint8_t mac_address_t[MAC_ADDRESS_SIZE]; #define IPV4_ADDRESS_SIZE 4 typedef uint8_t ipv4_address_t[IPV4_ADDRESS_SIZE]; -#define MAX_VAL_STRING 20 +#define MAX_VAL_STRING 32 #define MAX_VAL_BITMAP 25 typedef union { uint8_t scalar[4]; @@ -1751,6 +1752,14 @@ cx_fabric_param_t uplink_speed_param = { cx_fabric_scalar_printer }; +cx_fabric_param_t uplink_info_param = { + "uplink_info", + IPMI_CMD_OEM_FABRIC_PARAMETER_UPLINK_INFO, + {0, 0, 0, 0, 0}, + Cx_Fabric_Arg_Value_String, MAX_VAL_STRING, + cx_fabric_string_printer +}; + cx_fabric_param_t uplink_param = { "uplink", IPMI_CMD_OEM_FABRIC_PARAMETER_UPLINK, @@ -2114,6 +2123,7 @@ cx_fabric_arg_t cx_fabric_main_arg[] = { {"lu_factor", Cx_Fabric_Arg_Parameter, (void *)&link_users_factor_param}, {"uplink_speed", Cx_Fabric_Arg_Parameter, (void *)&uplink_speed_param}, + {"uplink_info", Cx_Fabric_Arg_Parameter, (void *)&uplink_info_param}, {"linkmap", Cx_Fabric_Arg_Parameter, (void *)&linkmap_param}, {"depth_chart", Cx_Fabric_Arg_Parameter, (void *)&depth_chart_param}, {"routing_table", Cx_Fabric_Arg_Parameter, (void *)&routing_table_param}, |