starlingx
/
fault
Code Issues Proposed changes

Merge "Fix indentation and style issues in fmAlarmUtils"

This commit is contained in:
Zuul 2019-09-18 13:47:39 +00:00 committed by Gerrit Code Review
parent d238f60b54 c905ae2c55
commit 8c2ff87e57
2 changed files with 597 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

975
fm-common/sources/fmAlarmUtils.cpp
View File

File diff suppressed because it is too large Load Diff

112
fm-common/sources/fmAlarmUtils.h
View File

@ -15,72 +15,80 @@
#include <vector> #include <vector>
enum EFmAlarmIndexMap { enum EFmAlarmIndexMap {
FM_ALM_IX_UUID=0, FM_ALM_IX_UUID=0,
FM_ALM_IX_ALARM_ID, FM_ALM_IX_ALARM_ID,
FM_ALM_IX_ALARM_STATE, FM_ALM_IX_ALARM_STATE,
FM_ALM_IX_ENTITY_ID, FM_ALM_IX_ENTITY_ID,
FM_ALM_IX_INSTANCE_ID, FM_ALM_IX_INSTANCE_ID,
FM_ALM_IX_TIMESTAMP, FM_ALM_IX_TIMESTAMP,
FM_ALM_IX_SEVERITY, FM_ALM_IX_SEVERITY,
FM_ALM_IX_REASON, FM_ALM_IX_REASON,
FM_ALM_IX_ALARM_TYPE, FM_ALM_IX_ALARM_TYPE,
FM_ALM_IX_PROBABLE_CAUSE, FM_ALM_IX_PROBABLE_CAUSE,
FM_ALM_IX_REPAIR_ACTION, FM_ALM_IX_REPAIR_ACTION,
FM_ALM_IX_SERVICE_AFFECT, FM_ALM_IX_SERVICE_AFFECT,
FM_ALM_IX_SUPPRESSION, FM_ALM_IX_SUPPRESSION,
FM_ALM_IX_INHIBIT_ALARM, FM_ALM_IX_INHIBIT_ALARM,
FM_ALM_IX_MAX FM_ALM_IX_MAX
}; };
enum EFmLogIndexMap { enum EFmLogIndexMap {
FM_LOG_IX_UUID=0, FM_LOG_IX_UUID=0,
FM_LOG_IX_LOG_ID, FM_LOG_IX_LOG_ID,
FM_LOG_IX_ENTITY_ID, FM_LOG_IX_ENTITY_ID,
FM_LOG_IX_INSTANCE_ID, FM_LOG_IX_INSTANCE_ID,
FM_LOG_IX_TIMESTAMP, FM_LOG_IX_TIMESTAMP,
FM_LOG_IX_SEVERITY, FM_LOG_IX_SEVERITY,
FM_LOG_IX_REASON, FM_LOG_IX_REASON,
FM_LOG_IX_LOG_TYPE, FM_LOG_IX_LOG_TYPE,
FM_LOG_IX_PROBABLE_CAUSE, FM_LOG_IX_PROBABLE_CAUSE,
FM_LOG_IX_SERVICE_AFFECT, FM_LOG_IX_SERVICE_AFFECT,
FM_LOG_IX_MAX FM_LOG_IX_MAX
}; };
enum EFmEventLogIndexMap { enum EFmEventLogIndexMap {
FM_EVENT_LOG_IX_UUID=0, FM_EVENT_LOG_IX_UUID=0,
FM_EVENT_LOG_IX_EVENT_ID, FM_EVENT_LOG_IX_EVENT_ID,
FM_EVENT_LOG_IX_STATE, FM_EVENT_LOG_IX_STATE,
FM_EVENT_LOG_IX_ENTITY_ID, FM_EVENT_LOG_IX_ENTITY_ID,
FM_EVENT_LOG_IX_INSTANCE_ID, FM_EVENT_LOG_IX_INSTANCE_ID,
FM_EVENT_LOG_IX_TIMESTAMP, FM_EVENT_LOG_IX_TIMESTAMP,
FM_EVENT_LOG_IX_SEVERITY, FM_EVENT_LOG_IX_SEVERITY,
FM_EVENT_LOG_IX_REASON, FM_EVENT_LOG_IX_REASON,
FM_EVENT_LOG_IX_EVENT_TYPE, FM_EVENT_LOG_IX_EVENT_TYPE,
FM_EVENT_LOG_IX_PROBABLE_CAUSE, FM_EVENT_LOG_IX_PROBABLE_CAUSE,
FM_EVENT_LOG_IX_REPAIR_ACTION, FM_EVENT_LOG_IX_REPAIR_ACTION,
FM_EVENT_LOG_IX_SERVICE_AFFECT, FM_EVENT_LOG_IX_SERVICE_AFFECT,
FM_EVENT_LOG_IX_SUPPRESSION, FM_EVENT_LOG_IX_SUPPRESSION,
FM_EVENT_LOG_IX_MAX FM_EVENT_LOG_IX_MAX
}; };
bool fm_alarm_set_field(EFmAlarmIndexMap field, SFmAlarmDataT *a, std::string &val);
bool fm_alarm_get_field(EFmAlarmIndexMap field, const SFmAlarmDataT *a, std::string &val);
bool fm_log_set_field(EFmLogIndexMap field, SFmAlarmDataT *a, std::string &val);
bool fm_event_log_set_field(EFmEventLogIndexMap field, SFmAlarmDataT *a, std::string &val);
void fm_formatted_str_to_vector(const std::string &s, std::vector<std::string> &alarm); bool fm_alarm_set_field(EFmAlarmIndexMap field, SFmAlarmDataT *a,
std::string &val);
bool fm_alarm_to_string(const SFmAlarmDataT *alarm, std::string &str); bool fm_alarm_get_field(EFmAlarmIndexMap field, const SFmAlarmDataT *a,
bool fm_alarm_from_string(const std::string &str,SFmAlarmDataT *alarm); std::string &val);
bool fm_log_set_field(EFmLogIndexMap field, SFmAlarmDataT *a,
std::string &val);
bool fm_event_log_set_field(EFmEventLogIndexMap field, SFmAlarmDataT *a,
std::string &val);
void fm_formatted_str_to_vector(const std::string &s,
std::vector<std::string> &alarm);
bool fm_alarm_to_string(const SFmAlarmDataT *alarm,
std::string &str);
bool fm_alarm_from_string(const std::string &str,
SFmAlarmDataT *alarm);
/** /**
* This will create an alarm list from an alarm - will translate to string. * This will create an alarm list from an alarm - will translate to string.
* The indexes of this API are based on EFmAlarmIndexMap * The indexes of this API are based on EFmAlarmIndexMap
*/ */
void fm_alarm_to_list(const SFmAlarmDataT *a, std::vector<std::string> &list); void fm_alarm_to_list(const SFmAlarmDataT *a,
std::vector<std::string> &list);
bool fm_alarm_filter_to_string(const AlarmFilter *alarm, std::string &str); bool fm_alarm_filter_to_string(const AlarmFilter *alarm,
bool fm_alarm_filter_from_string(const std::string &str, AlarmFilter *alarm); std::string &str);
bool fm_alarm_filter_from_string(const std::string &str,
AlarmFilter *alarm);
/** /**
* Generate a FM UUID * Generate a FM UUID