diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/ems/boco/data/aaa.txt b/ems/boco/data/aaa.txt deleted file mode 100644 index e69de29..0000000 --- a/ems/boco/data/aaa.txt +++ /dev/null diff --git a/ems/boco/data/bbb.txt b/ems/boco/data/bbb.txt deleted file mode 100644 index 458aab0..0000000 --- a/ems/boco/data/bbb.txt +++ /dev/null @@ -1 +0,0 @@ -test abc
\ No newline at end of file diff --git a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/TaskThread.java b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/TaskThread.java index 2e8656d..3b20f2c 100644 --- a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/TaskThread.java +++ b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/TaskThread.java @@ -51,6 +51,7 @@ public class TaskThread implements Runnable { private String resultPath = Constant.SYS_DATA_RESULT; private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); private SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final String PORT_STRING = "] port=["; public TaskThread(CollectMsg data) { this.data = data; @@ -567,7 +568,7 @@ public class TaskThread implements Runnable { ftpClient.login(ip, Integer.parseInt(port), ftpUser, ftpPassword, "GBK", Boolean.parseBoolean(ftpPassive), 5 * 60 * 1000); } catch (Exception e) { - log.error("login fail,ip=[" + ip + "] port=[" + port + "] user=[" + log.error("login fail,ip=[" + ip + PORT_STRING + port + "] user=[" + ftpUser + "]pwd=[" + ftpPassword + "]" + StringUtil.getStackTrace(e)); return; @@ -740,12 +741,12 @@ public class TaskThread implements Runnable { // login try { - log.info("ftp login ,ip=[" + ip + "] port=[" + port + "] user=[" + log.info("ftp login ,ip=[" + ip + PORT_STRING + port + "] user=[" + user + /* "]password=[" + password + */"]"); ftpClient.login(ip, Integer.parseInt(port), user, password, "GBK", Boolean.parseBoolean(passivemode), 5 * 60 * 1000); } catch (Exception e) { - log.error("login fail,ip=[" + ip + "] port=[" + port + "] user=[" + log.error("login fail,ip=[" + ip + PORT_STRING + port + "] user=[" + user + /* "]password=[" + password + */"]" + StringUtil.getStackTrace(e)); return fileList; diff --git a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/alarm/AlarmManager.java b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/alarm/AlarmManager.java index b14645b..3d4caaa 100644 --- a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/alarm/AlarmManager.java +++ b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/collector/alarm/AlarmManager.java @@ -17,7 +17,6 @@ package org.onap.vfc.nfvo.emsdriver.collector.alarm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.onap.vfc.nfvo.emsdriver.collector.CollectMsgReceiverThread; import org.onap.vfc.nfvo.emsdriver.commons.constant.Constant; import org.onap.vfc.nfvo.emsdriver.commons.model.CollectVo; import org.onap.vfc.nfvo.emsdriver.commons.model.EMSInfo; diff --git a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java index fdab8bf..37a8d82 100644 --- a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java +++ b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java @@ -50,6 +50,7 @@ public class NorthMessageMgr extends DriverThread { private boolean threadStop = false; private Level level = Level.DEBUG; + private final String RMUID = "rmUID"; @Override public void dispose() { @@ -331,7 +332,7 @@ public class NorthMessageMgr extends DriverThread { private EvelScalingMeasurement resultEvelScalingMeasurement(Map<String, String> reMap) { String evname = "Mfvs_" + reMap.get("ElementType") + reMap.get("ObjectType"); - String evid = reMap.get("StartTime") + reMap.get("ObjectType") + reMap.get("rmUID"); + String evid = reMap.get("StartTime") + reMap.get("ObjectType") + reMap.get(RMUID); int period = Integer.parseInt(reMap.get("Period") != null ? reMap.get("Period") : "15"); EvelScalingMeasurement sm = new EvelScalingMeasurement(period, evname, evid); @@ -343,7 +344,7 @@ public class NorthMessageMgr extends DriverThread { sm.evel_nfcnamingcode_set(""); sm.evel_nfnamingcode_set(""); sm.evel_header_type_set("applicationVnf"); - String rmUID = reMap.get("rmUID"); + String rmUID = reMap.get(RMUID); sm.evel_reporting_entity_id_set(rmUID.substring(0, 9));// String dn = reMap.get("Dn"); if (dn != null) @@ -365,8 +366,8 @@ public class NorthMessageMgr extends DriverThread { sm.evel_start_epoch_set(StartTimeD.getTime()*1000); sm.evel_last_epoch_set(StartTimeD.getTime()*1000); - sm.evel_header_set_sourceid(true, reMap.get("rmUID")); - sm.evel_header_set_source_name(reMap.get("rmUID")); + sm.evel_header_set_sourceid(true, reMap.get(RMUID)); + sm.evel_header_set_source_name(reMap.get(RMUID)); sm.evel_header_set_priority(EvelHeader.PRIORITIES.EVEL_PRIORITY_NORMAL); return sm; |