diff --git a/config/mml_map/http_mml_map.json b/config/mml_map/http_mml_map.json index 2e4272ea..8e8ec408 100644 --- a/config/mml_map/http_mml_map.json +++ b/config/mml_map/http_mml_map.json @@ -839,7 +839,7 @@ "end": "(Number of results = %d)\n\n" } -"northbound_cm": { +"nbi_cm": { "retFmt": "GetDB", "retMsg": "RetCode = %d operation succeeded\n\n", "errMsg": "ErrorCode = %d operation failed: %s\n\n", diff --git a/crontask/db.go b/crontask/db.go index 49d0d92a..886e3ddc 100644 --- a/crontask/db.go +++ b/crontask/db.go @@ -211,18 +211,18 @@ func XormGetNorthboundPm(date string, index int, neType string, pms *[]Northboun log.Debug("XormGetNorthboundPm processing... ") pm := new(NorthboundPm) - rows, err := dbClient.xEngine.Table("northbound_pm"). + rows, err := dbClient.xEngine.Table("nbi_pm"). Where("`ne_type` = ? AND `date` = ? AND `index` = ?", neType, date, index). Rows(pm) if err != nil { - log.Error("Failed to get table northbound_pm from database:", err) + log.Error("Failed to get table nbi_pm from database:", err) return nil, err } defer rows.Close() for rows.Next() { err := rows.Scan(pm) if err != nil { - log.Error("Failed to get table northbound_pm from database:", err) + log.Error("Failed to get table nbi_pm from database:", err) return nil, err } *pms = append(*pms, *pm) diff --git a/crontask/genpmxml.go b/crontask/genpmxml.go index 19255221..0f681b7c 100644 --- a/crontask/genpmxml.go +++ b/crontask/genpmxml.go @@ -82,7 +82,7 @@ func (t *TaskFunc) GenNFPMXmlFile(neType string) error { var pmResults []NorthboundPm _, err = XormGetNorthboundPm(date, index, neType, &pmResults) if err != nil { - log.Error("Failed to get northbound_pm:", err) + log.Error("Failed to get nbi_pm:", err) return err } diff --git a/lib/dborm/dborm.go b/lib/dborm/dborm.go index 7455aea4..36768b38 100644 --- a/lib/dborm/dborm.go +++ b/lib/dborm/dborm.go @@ -1777,21 +1777,21 @@ func XormGetNorthboundCm(neType string, cmResults *[]NorthboundCm) error { log.Info("XormGetNorthboundCm processing... ") cmResult := new(NorthboundCm) - rows, err := xEngine.Table("northbound_cm"). + rows, err := xEngine.Table("nbi_cm"). Distinct("object_type"). Where("`ne_type` = ?", neType). Desc("timestamp"). Cols("*"). Rows(cmResult) if err != nil { - log.Error("Failed to get table northbound_cm:", err) + log.Error("Failed to get table nbi_cm:", err) return err } defer rows.Close() for rows.Next() { err := rows.Scan(cmResult) if err != nil { - log.Error("Failed to get table northbound_cm:", err) + log.Error("Failed to get table nbi_cm:", err) return err } *cmResults = append(*cmResults, *cmResult) @@ -1803,14 +1803,14 @@ func XormGetNorthboundCmLatestObject(neType, neID, objectType string) (*Northbou log.Info("XormGetNorthboundCmLatestObject processing... ") cmResult := new(NorthboundCm) - _, err := xEngine.Table("northbound_cm"). + _, err := xEngine.Table("nbi_cm"). Where("`ne_type`=? and `ne_id`=? and `object_type`=?", neType, neID, objectType). Desc("timestamp"). Cols("*"). Limit(1). Get(cmResult) if err != nil { - log.Error("Failed to get table northbound_cm:", err) + log.Error("Failed to get table nbi_cm:", err) return nil, err }