starlingx
/
fault
Code Issues Proposed changes

Merge "Remove dcorch-snmp"

This commit is contained in:
Zuul 2020-04-08 13:09:12 +00:00 committed by Gerrit Code Review
parent 2b0d4d0a11 2b08423378
commit 428940fad1
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fm-common/sources/fmSnmpConstants.h
View File

@ -64,7 +64,3 @@ const std::string SCOPE = "::";
const std::string STR_TYPE = " s ";
const std::string INT_TYPE = " i ";
const std::string OPTION_COMM = " -c ";
const std::string DC_COMM_STR = "dcorchAlarmAggregator";
const std::string CONF_PATH_ENV = "SNMPCONFPATH=";
const std::string CONF_DIR = "/etc/snmp";

9
fm-common/sources/fmSnmpUtils.cpp
View File

@ -125,14 +125,7 @@ static std::string format_trap_cmd(int type, SFmAlarmDataT &data,
objtype = mib + SCOPE + get_trap_objtype(type);
if (comm.compare(DC_COMM_STR) == 0){
env = CONF_PATH_ENV + CONF_DIR + SEP;
}
else {
env = "";
}
cmd = env + TRAP_CMD + OPTION_COMM + comm + SEP + ip + SEP + s + objtype + SEP;
cmd = TRAP_CMD + OPTION_COMM + comm + SEP + ip + SEP + s + objtype + SEP;
std::string operation_type =get_trap_objtype(type);
if (operation_type == ALARM_CLEAR){