mirrors/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2026-01-22 14:22:19 +08:00
Code Issues Packages Projects Releases 2 Wiki Activity

nm: Refactor to get rid of magic numbers in cmd

Browse Source 
Replace all magic numbers for nm commands with enum values.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2019-02-25 18:58:06 +03:00
parent 67928205e7
commit 161bb88c6e
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/ipmi_nm.c
View File

@ -46,17 +46,32 @@
/* Primary Node Manager commands */ /* Primary Node Manager commands */
/* clang-format off */ /* clang-format off */
/* NM commands (local, not from the specification */
enum {
NM_DISCOVER,
NM_CAPAB,
NM_POL_CTRL,
NM_POL_ADD_RM,
NM_STATS,
NM_POWER,
NM_SUSPEND,
NM_RESET,
NM_ALERT,
NM_THRESHOLD
};
const struct dcmi_cmd nm_cmd_vals[] = { const struct dcmi_cmd nm_cmd_vals[] = {
{ 0x00, "discover", "Discover Node Manager" }, { NM_DISCOVER, "discover", "Discover Node Manager" },
{ 0x01, "capability", "Get Node Manager Capabilities" }, { NM_CAPAB, "capability", "Get Node Manager Capabilities" },
{ 0x02, "control", "Enable/Disable Policy Control" }, { NM_POL_CTRL, "control", "Enable/Disable Policy Control" },
{ 0x03, "policy", "Add/Remove Policies" }, { NM_POL_ADD_RM, "policy", "Add/Remove Policies" },
{ 0x04, "statistics", "Get Statistics" }, { NM_STATS, "statistics", "Get Statistics" },
{ 0x05, "power", "Set Power Draw Range" }, { NM_POWER, "power", "Set Power Draw Range" },
{ 0x06, "suspend", "Set/Get Policy suspend periods" }, { NM_SUSPEND, "suspend", "Set/Get Policy suspend periods" },
{ 0x07, "reset", "Reset Statistics" }, { NM_RESET, "reset", "Reset Statistics" },
{ 0x08, "alert", "Set/Get/Clear Alert destination" }, { NM_ALERT, "alert", "Set/Get/Clear Alert destination" },
{ 0x09, "threshold", "Set/Get Alert Thresholds" }, { NM_THRESHOLD, "threshold", "Set/Get Alert Thresholds" },
DCMI_CMD_END(0xFF), DCMI_CMD_END(0xFF),
}; };
@ -1750,7 +1765,7 @@ ipmi_nm_main(struct ipmi_intf *intf, int argc, char **argv)
switch (dcmi_str2val(argv[0], nm_cmd_vals)) { switch (dcmi_str2val(argv[0], nm_cmd_vals)) {
/* discover */ /* discover */
case 0x00: case NM_DISCOVER:
if (_ipmi_nm_discover(intf, &disc)) if (_ipmi_nm_discover(intf, &disc))
return -1; return -1;
printf(" Node Manager Version %s\n", printf(" Node Manager Version %s\n",
@ -1759,47 +1774,47 @@ ipmi_nm_main(struct ipmi_intf *intf, int argc, char **argv)
disc.minor_rev >> 4, disc.minor_rev & 0xf, disc.patch_version); disc.minor_rev >> 4, disc.minor_rev & 0xf, disc.patch_version);
break; break;
/* capability */ /* capability */
case 0x01: case NM_CAPAB:
if (ipmi_nm_getcapabilities(intf, argc, argv)) if (ipmi_nm_getcapabilities(intf, argc, argv))
return -1; return -1;
break; break;
/* policy control enable-disable */ /* policy control enable-disable */
case 0x02: case NM_POL_CTRL:
if (ipmi_nm_control(intf, argc, argv)) if (ipmi_nm_control(intf, argc, argv))
return -1; return -1;
break; break;
/* policy */ /* policy */
case 0x03: case NM_POL_ADD_RM:
if (ipmi_nm_policy(intf, argc, argv)) if (ipmi_nm_policy(intf, argc, argv))
return -1; return -1;
break; break;
/* Get statistics */ /* Get statistics */
case 0x04: case NM_STATS:
if (ipmi_nm_get_statistics(intf, argc, argv)) if (ipmi_nm_get_statistics(intf, argc, argv))
return -1; return -1;
break; break;
/* set power draw range */ /* set power draw range */
case 0x05: case NM_POWER:
if (ipmi_nm_set_range(intf, argc, argv)) if (ipmi_nm_set_range(intf, argc, argv))
return -1; return -1;
break; break;
/* set/get suspend periods */ /* set/get suspend periods */
case 0x06: case NM_SUSPEND:
if (ipmi_nm_suspend(intf, argc, argv)) if (ipmi_nm_suspend(intf, argc, argv))
return -1; return -1;
break; break;
/* reset statistics */ /* reset statistics */
case 0x07: case NM_RESET:
if (ipmi_nm_reset_statistics(intf, argc, argv)) if (ipmi_nm_reset_statistics(intf, argc, argv))
return -1; return -1;
break; break;
/* set/get alert destination */ /* set/get alert destination */
case 0x08: case NM_ALERT:
if (ipmi_nm_alert(intf, argc, argv)) if (ipmi_nm_alert(intf, argc, argv))
return -1; return -1;
break; break;
/* set/get alert thresholds */ /* set/get alert thresholds */
case 0x09: case NM_THRESHOLD:
if (ipmi_nm_thresh(intf, argc, argv)) if (ipmi_nm_thresh(intf, argc, argv))
return -1; return -1;
break; break;