diff --git a/fm-common/sources/fmSnmpConstants.h b/fm-common/sources/fmSnmpConstants.h index 452b63ec..b6d38bb4 100644 --- a/fm-common/sources/fmSnmpConstants.h +++ b/fm-common/sources/fmSnmpConstants.h @@ -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"; diff --git a/fm-common/sources/fmSnmpUtils.cpp b/fm-common/sources/fmSnmpUtils.cpp index 6f650749..9177a028 100644 --- a/fm-common/sources/fmSnmpUtils.cpp +++ b/fm-common/sources/fmSnmpUtils.cpp @@ -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){