From 570356b459db6b3f861c55cc3e85f2cdb70887ce Mon Sep 17 00:00:00 2001 From: andronache Date: Thu, 7 Jan 2021 15:05:19 +0200 Subject: [PATCH] Changed consts in utils and repaired account profiles it testin apier/v1 --- agents/astagent.go | 2 +- agents/diam_it_test.go | 2 +- agents/diamagent.go | 2 +- agents/sipagent.go | 2 +- apier/v1/tpaccountprofiles_it_test.go | 35 ++++++++++++++++++++++++++- config/config.go | 2 +- config/config_test.go | 10 ++++---- config/diametercfg_test.go | 4 +-- config/eescfg_test.go | 2 +- config/migratorcfg_test.go | 18 +++++++------- config/sessionscfg_test.go | 2 +- config/stordbcfg_test.go | 12 ++++----- cores/core.go | 2 +- engine/storage_internal_datadb.go | 14 +++++------ engine/storage_utils.go | 2 +- engine/z_datamanager_it_test.go | 2 +- engine/z_filterindexer_it_test.go | 2 +- engine/z_onstor_it_test.go | 2 +- utils/consts.go | 10 ++++---- utils/coreutils.go | 4 +-- utils/coreutils_test.go | 2 +- 21 files changed, 83 insertions(+), 50 deletions(-) diff --git a/agents/astagent.go b/agents/astagent.go index d90b0ca3b..4465e91a5 100644 --- a/agents/astagent.go +++ b/agents/astagent.go @@ -83,7 +83,7 @@ func (sma *AsteriskAgent) connectAsterisk(stopChan <-chan struct{}) (err error) sma.astErrChan = make(chan error) sma.astConn, err = aringo.NewARInGO(fmt.Sprintf("ws://%s/ari/events?api_key=%s:%s&app=%s", connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org", - connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.VERSION), + connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.Version), sma.astEvChan, sma.astErrChan, stopChan, connCfg.ConnectAttempts, connCfg.Reconnects) return } diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index 2955f2a33..579de0148 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -226,7 +226,7 @@ func testDiamItStartEngine(t *testing.T) { func testDiamItConnectDiameterClient(t *testing.T) { diamClnt, err = NewDiameterClient(daCfg.DiameterAgentCfg().Listen, "INTEGRATION_TESTS", daCfg.DiameterAgentCfg().OriginRealm, daCfg.DiameterAgentCfg().VendorID, - daCfg.DiameterAgentCfg().ProductName, utils.DIAMETER_FIRMWARE_REVISION, + daCfg.DiameterAgentCfg().ProductName, utils.DiameterFirmwareRevision, daCfg.DiameterAgentCfg().DictionariesPath, daCfg.DiameterAgentCfg().ListenNet) if err != nil { t.Fatal(err) diff --git a/agents/diamagent.go b/agents/diamagent.go index d6f72053e..a11f42b94 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -128,7 +128,7 @@ func (da *DiameterAgent) handlers() diam.Handler { OriginRealm: datatype.DiameterIdentity(da.cgrCfg.DiameterAgentCfg().OriginRealm), VendorID: datatype.Unsigned32(da.cgrCfg.DiameterAgentCfg().VendorID), ProductName: datatype.UTF8String(da.cgrCfg.DiameterAgentCfg().ProductName), - FirmwareRevision: datatype.Unsigned32(utils.DIAMETER_FIRMWARE_REVISION), + FirmwareRevision: datatype.Unsigned32(utils.DiameterFirmwareRevision), } hosts := disectDiamListen(da.cgrCfg.DiameterAgentCfg().Listen) if len(hosts) == 0 { diff --git a/agents/sipagent.go b/agents/sipagent.go index 0720cfa09..f36ba2073 100644 --- a/agents/sipagent.go +++ b/agents/sipagent.go @@ -292,7 +292,7 @@ func (sa *SIPAgent) answerMessage(messageStr, addr string, write func(ans []byte func (sa *SIPAgent) handleMessage(sipMessage sipingo.Message, remoteHost string) (sipAnswer sipingo.Message) { if sipMessage[userAgentHeader] != "" { - sipMessage[userAgentHeader] = fmt.Sprintf("%s@%s", utils.CGRateS, utils.VERSION) + sipMessage[userAgentHeader] = fmt.Sprintf("%s@%s", utils.CGRateS, utils.Version) } sipMessageIface := make(map[string]interface{}) for k, v := range sipMessage { diff --git a/apier/v1/tpaccountprofiles_it_test.go b/apier/v1/tpaccountprofiles_it_test.go index 57c26a212..f58a8eb0a 100644 --- a/apier/v1/tpaccountprofiles_it_test.go +++ b/apier/v1/tpaccountprofiles_it_test.go @@ -133,6 +133,17 @@ func testTPAcctPrfSetTPAcctPrf(t *testing.T) { Weight: 10, Type: utils.MONETARY, Units: 14, + CostIncrement: []*utils.TPBalanceCostIncrement{ + { + FilterIDs: []string{"test_filter_id"}, + }, + }, + CostAttributes: []string{"test_cost_attribute"}, + UnitFactors: []*utils.TPBalanceUnitFactor{ + { + FilterIDs: []string{"test_filter_id"}, + }, + }, }, }, ThresholdIDs: []string{utils.META_NONE}, @@ -171,12 +182,23 @@ func testTPAcctPrfGetTPAcctPrfIDs(t *testing.T) { func testTPAcctPrfUpdateTPAcctBal(t *testing.T) { tpAcctPrf.Balances = []*utils.TPAccountBalance{ - { + &utils.TPAccountBalance{ ID: "MonetaryBalance2", FilterIDs: []string{}, Weight: 12, Type: utils.MONETARY, Units: 16, + CostIncrement: []*utils.TPBalanceCostIncrement{ + { + FilterIDs: []string{"test_filter_id2"}, + }, + }, + CostAttributes: []string{"test_cost_attribute2"}, + UnitFactors: []*utils.TPBalanceUnitFactor{ + { + FilterIDs: []string{"test_filter_id2"}, + }, + }, }, } var result string @@ -201,6 +223,17 @@ func testTPAcctPrfGetTPAcctBalAfterUpdate(t *testing.T) { Weight: 12, Type: utils.MONETARY, Units: 16, + CostIncrement: []*utils.TPBalanceCostIncrement{ + { + FilterIDs: []string{"test_filter_id"}, + }, + }, + CostAttributes: []string{"test_cost_attribute"}, + UnitFactors: []*utils.TPBalanceUnitFactor{ + { + FilterIDs: []string{"test_filter_id"}, + }, + }, }, }, ThresholdIDs: []string{utils.META_NONE}, diff --git a/config/config.go b/config/config.go index 4929fb78d..08752bdaa 100644 --- a/config/config.go +++ b/config/config.go @@ -92,7 +92,7 @@ func (dbDefaults) dbUser(dbType string, flagInput string) string { if flagInput != utils.MetaDynamic { return flagInput } - return utils.CGRATES + return utils.CGRateSLwr } func (dbDefaults) dbHost(dbType string, flagInput string) string { diff --git a/config/config_test.go b/config/config_test.go index ef7ee26b0..99605a0ae 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -979,8 +979,8 @@ func TestDbDefaultsMetaDynamic(t *testing.T) { t.Errorf("received: %+v, expecting: %+v", host, utils.LOCALHOST) } user := dbdf.dbUser(dbtype, flagInput) - if user != utils.CGRATES { - t.Errorf("received: %+v, expecting: %+v", user, utils.CGRATES) + if user != utils.CGRateSLwr { + t.Errorf("received: %+v, expecting: %+v", user, utils.CGRateSLwr) } port := dbdf.dbPort(dbtype, flagInput) if port != dbdf[dbtype]["DbPort"] { @@ -1014,9 +1014,9 @@ func TestDbDefaults(t *testing.T) { if port != "1234" { t.Errorf("Expected %+v, received %+v", "1234", port) } - name := dbdf.dbName(dbtype, utils.CGRATES) - if name != utils.CGRATES { - t.Errorf("Expected %+v, received %+v", utils.CGRATES, name) + name := dbdf.dbName(dbtype, utils.CGRateSLwr) + if name != utils.CGRateSLwr { + t.Errorf("Expected %+v, received %+v", utils.CGRateSLwr, name) } pass := dbdf.dbPass(dbtype, utils.EmptyString) if pass != utils.EmptyString { diff --git a/config/diametercfg_test.go b/config/diametercfg_test.go index 2147af84b..1311189b0 100644 --- a/config/diametercfg_test.go +++ b/config/diametercfg_test.go @@ -43,7 +43,7 @@ func TestDiameterAgentCfgloadFromJsonCfg(t *testing.T) { Forced_disconnect: utils.StringPointer("forced"), Request_processors: &[]*ReqProcessorJsnCfg{ { - ID: utils.StringPointer(utils.CGRATES), + ID: utils.StringPointer(utils.CGRateSLwr), Timezone: utils.StringPointer("Local"), }, }, @@ -162,7 +162,7 @@ func TestDiameterAgentCfgAsMapInterface(t *testing.T) { utils.VendorIDCfg: 0, utils.RequestProcessorsCfg: []map[string]interface{}{ { - utils.IDCfg: utils.CGRATES, + utils.IDCfg: utils.CGRateSLwr, utils.TenantCfg: "1", utils.FiltersCfg: []string{}, utils.FlagsCfg: []string{"1"}, diff --git a/config/eescfg_test.go b/config/eescfg_test.go index 36bb4d7f5..f1c71c08c 100644 --- a/config/eescfg_test.go +++ b/config/eescfg_test.go @@ -94,7 +94,7 @@ func TestEESClone(t *testing.T) { Opts: make(map[string]interface{}), }, { - ID: utils.CGRATES, + ID: utils.CGRateSLwr, Type: utils.META_NONE, FieldSep: ",", Synchronous: false, diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index e472415eb..cdaaf9344 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -30,14 +30,14 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { Out_dataDB_host: utils.StringPointer("127.0.0.1"), Out_dataDB_port: utils.StringPointer("6379"), Out_dataDB_name: utils.StringPointer("10"), - Out_dataDB_user: utils.StringPointer(utils.CGRATES), + Out_dataDB_user: utils.StringPointer(utils.CGRateSLwr), Out_dataDB_password: utils.StringPointer(utils.EmptyString), Out_dataDB_encoding: utils.StringPointer(utils.MSGPACK), Out_storDB_type: utils.StringPointer(utils.MYSQL), Out_storDB_host: utils.StringPointer("127.0.0.1"), Out_storDB_port: utils.StringPointer("3306"), - Out_storDB_name: utils.StringPointer(utils.CGRATES), - Out_storDB_user: utils.StringPointer(utils.CGRATES), + Out_storDB_name: utils.StringPointer(utils.CGRateSLwr), + Out_storDB_user: utils.StringPointer(utils.CGRateSLwr), Out_storDB_password: utils.StringPointer(utils.EmptyString), Out_dataDB_opts: map[string]interface{}{ utils.RedisClusterCfg: true, @@ -52,14 +52,14 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { OutDataDBHost: "127.0.0.1", OutDataDBPort: "6379", OutDataDBName: "10", - OutDataDBUser: utils.CGRATES, + OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, OutDataDBEncoding: utils.MSGPACK, OutStorDBType: utils.MYSQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", - OutStorDBName: utils.CGRATES, - OutStorDBUser: utils.CGRATES, + OutStorDBName: utils.CGRateSLwr, + OutStorDBUser: utils.CGRateSLwr, OutStorDBPassword: utils.EmptyString, OutDataDBOpts: map[string]interface{}{ utils.RedisSentinelNameCfg: utils.EmptyString, @@ -221,14 +221,14 @@ func TestMigratorCgrCfgClone(t *testing.T) { OutDataDBHost: "127.0.0.1", OutDataDBPort: "6379", OutDataDBName: "10", - OutDataDBUser: utils.CGRATES, + OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, OutDataDBEncoding: utils.MSGPACK, OutStorDBType: utils.MYSQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", - OutStorDBName: utils.CGRATES, - OutStorDBUser: utils.CGRATES, + OutStorDBName: utils.CGRateSLwr, + OutStorDBUser: utils.CGRateSLwr, OutStorDBPassword: utils.EmptyString, UsersFilters: []string{utils.AccountField}, OutDataDBOpts: map[string]interface{}{ diff --git a/config/sessionscfg_test.go b/config/sessionscfg_test.go index b74789837..a3923b417 100644 --- a/config/sessionscfg_test.go +++ b/config/sessionscfg_test.go @@ -651,7 +651,7 @@ func TestAsteriskAgentCfgloadFromJsonCfg(t *testing.T) { { Alias: utils.StringPointer("127.0.0.1:8448"), Address: utils.StringPointer("127.0.0.1:8088"), - User: utils.StringPointer(utils.CGRATES), + User: utils.StringPointer(utils.CGRateSLwr), Password: utils.StringPointer("CGRateS.org"), Connect_attempts: utils.IntPointer(3), Reconnects: utils.IntPointer(5), diff --git a/config/stordbcfg_test.go b/config/stordbcfg_test.go index 66dcbbeb2..44c071067 100644 --- a/config/stordbcfg_test.go +++ b/config/stordbcfg_test.go @@ -29,8 +29,8 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) { Db_type: utils.StringPointer(utils.MYSQL), Db_host: utils.StringPointer("127.0.0.1"), Db_port: utils.IntPointer(-1), - Db_name: utils.StringPointer(utils.CGRATES), - Db_user: utils.StringPointer(utils.CGRATES), + Db_name: utils.StringPointer(utils.CGRateSLwr), + Db_user: utils.StringPointer(utils.CGRateSLwr), Db_password: utils.StringPointer("pass123"), String_indexed_fields: &[]string{"*req.index1"}, Prefix_indexed_fields: &[]string{"*req.index1"}, @@ -56,8 +56,8 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) { Type: utils.MYSQL, Host: "127.0.0.1", Port: "-1", - Name: utils.CGRATES, - User: utils.CGRATES, + Name: utils.CGRateSLwr, + User: utils.CGRateSLwr, Password: "pass123", StringIndexedFields: []string{"*req.index1"}, PrefixIndexedFields: []string{"*req.index1"}, @@ -264,8 +264,8 @@ func TestStorDbCfgClone(t *testing.T) { Type: utils.MYSQL, Host: "127.0.0.1", Port: "-1", - Name: utils.CGRATES, - User: utils.CGRATES, + Name: utils.CGRateSLwr, + User: utils.CGRateSLwr, Password: "pass123", StringIndexedFields: []string{"*req.index1"}, PrefixIndexedFields: []string{"*req.index1"}, diff --git a/cores/core.go b/cores/core.go index 3930fdd53..acc55242c 100644 --- a/cores/core.go +++ b/cores/core.go @@ -58,7 +58,7 @@ func (cS *CoreService) Status(arg *utils.TenantWithOpts, reply *map[string]inter response[utils.NodeID] = cS.cfg.GeneralCfg().NodeID response[utils.MemoryUsage] = utils.SizeFmt(float64(memstats.HeapAlloc), "") response[utils.ActiveGoroutines] = runtime.NumGoroutine() - if response[utils.Version], err = utils.GetCGRVersion(); err != nil { + if response[utils.VersionName], err = utils.GetCGRVersion(); err != nil { utils.Logger.Err(err.Error()) err = nil } diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index 15eca3c52..d28d31c51 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -110,7 +110,7 @@ func (iDB *InternalDB) RemoveKeysForPrefix(prefix string) (err error) { } func (iDB *InternalDB) GetVersions(itm string) (vrs Versions, err error) { - x, ok := Cache.Get(utils.CacheVersions, utils.Version) + x, ok := Cache.Get(utils.CacheVersions, utils.VersionName) if !ok || x == nil { return nil, utils.ErrNotFound } @@ -130,9 +130,9 @@ func (iDB *InternalDB) SetVersions(vrs Versions, overwrite bool) (err error) { return } } - x, ok := Cache.Get(utils.CacheVersions, utils.Version) + x, ok := Cache.Get(utils.CacheVersions, utils.VersionName) if !ok || x == nil { - Cache.SetWithoutReplicate(utils.CacheVersions, utils.Version, vrs, nil, + Cache.SetWithoutReplicate(utils.CacheVersions, utils.VersionName, vrs, nil, cacheCommit(utils.NonTransactional), utils.NonTransactional) return } @@ -140,7 +140,7 @@ func (iDB *InternalDB) SetVersions(vrs Versions, overwrite bool) (err error) { for key, val := range vrs { provVrs[key] = val } - Cache.SetWithoutReplicate(utils.CacheVersions, utils.Version, provVrs, nil, + Cache.SetWithoutReplicate(utils.CacheVersions, utils.VersionName, provVrs, nil, cacheCommit(utils.NonTransactional), utils.NonTransactional) return } @@ -148,7 +148,7 @@ func (iDB *InternalDB) SetVersions(vrs Versions, overwrite bool) (err error) { func (iDB *InternalDB) RemoveVersions(vrs Versions) (err error) { if len(vrs) != 0 { var internalVersions Versions - x, ok := Cache.Get(utils.CacheVersions, utils.Version) + x, ok := Cache.Get(utils.CacheVersions, utils.VersionName) if !ok || x == nil { return utils.ErrNotFound } @@ -156,11 +156,11 @@ func (iDB *InternalDB) RemoveVersions(vrs Versions) (err error) { for key := range vrs { delete(internalVersions, key) } - Cache.SetWithoutReplicate(utils.CacheVersions, utils.Version, internalVersions, nil, + Cache.SetWithoutReplicate(utils.CacheVersions, utils.VersionName, internalVersions, nil, cacheCommit(utils.NonTransactional), utils.NonTransactional) return } - Cache.RemoveWithoutReplicate(utils.CacheVersions, utils.Version, + Cache.RemoveWithoutReplicate(utils.CacheVersions, utils.VersionName, cacheCommit(utils.NonTransactional), utils.NonTransactional) return } diff --git a/engine/storage_utils.go b/engine/storage_utils.go index 781d1965f..f77917b3f 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -59,7 +59,7 @@ func NewDataDBConn(dbType, host, port, name, user, return } d, err = NewRedisStorage(host, dbNo, user, pass, marshaler, - utils.REDIS_MAX_CONNS, utils.IfaceAsString(opts[utils.RedisSentinelNameCfg]), + utils.RedisMaxConns, utils.IfaceAsString(opts[utils.RedisSentinelNameCfg]), isCluster, clusterSync, clusterOnDownDelay, hasTlsConn, utils.IfaceAsString(opts[utils.RedisClientCertificate]), utils.IfaceAsString(opts[utils.RedisClientKey]), diff --git a/engine/z_datamanager_it_test.go b/engine/z_datamanager_it_test.go index 4cfe6a9a8..c97586168 100644 --- a/engine/z_datamanager_it_test.go +++ b/engine/z_datamanager_it_test.go @@ -53,7 +53,7 @@ func TestDMitinitDB(t *testing.T) { dataDB, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, - utils.REDIS_MAX_CONNS, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) + utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index fe0ad04ee..012007602 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -80,7 +80,7 @@ func TestFilterIndexerIT(t *testing.T) { redisDB, err := NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, - utils.REDIS_MAX_CONNS, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) + utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 0a5cedb4e..afa3321e9 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -93,7 +93,7 @@ func TestOnStorIT(t *testing.T) { rdsITdb, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, - utils.REDIS_MAX_CONNS, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) + utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } diff --git a/utils/consts.go b/utils/consts.go index 39baa27d0..4c246293c 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -257,10 +257,10 @@ var ( const ( CGRateS = "CGRateS" - VERSION = "v0.11.0~dev" - DIAMETER_FIRMWARE_REVISION = 918 - REDIS_MAX_CONNS = 10 - CGRATES = "cgrates" + Version = "v0.11.0~dev" + DiameterFirmwareRevision = 918 + RedisMaxConns = 10 + CGRateSLwr = "cgrates" POSTGRES = "postgres" MYSQL = "mysql" MONGO = "mongo" @@ -792,7 +792,7 @@ const ( TCP = "tcp" UDP = "udp" CGRDebitInterval = "CGRDebitInterval" - Version = "Version" + VersionName = "Version" MetaTenant = "*tenant" ResourceUsage = "ResourceUsage" MetaDuration = "*duration" diff --git a/utils/coreutils.go b/utils/coreutils.go index ce14ff570..b6fcd2b45 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -687,7 +687,7 @@ func (slc Int64Slice) Less(i, j int) bool { } func GetCGRVersion() (vers string, err error) { - vers = fmt.Sprintf("%s@%s", CGRateS, VERSION) + vers = fmt.Sprintf("%s@%s", CGRateS, Version) if GitLastLog == "" { return vers, nil } @@ -724,7 +724,7 @@ func GetCGRVersion() (vers string, err error) { return vers, fmt.Errorf("Cannot find commitHash or commitDate information") } //CGRateS@v0.11.0~dev-20200110075344-7572e7b11e00 - return fmt.Sprintf("%s@%s-%s-%s", CGRateS, VERSION, commitDate.UTC().Format("20060102150405"), commitHash[:12]), nil + return fmt.Sprintf("%s@%s-%s-%s", CGRateS, Version, commitDate.UTC().Format("20060102150405"), commitHash[:12]), nil } func NewTenantID(tntID string) *TenantID { diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index 04aa5e1c3..250e7ce7c 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -1176,7 +1176,7 @@ Date: Fri Dec 30 19:48:09 2016 +0100 Fixes for db driver to avoid returning new values in case of errors ` - expVers := "CGRateS@" + VERSION + expVers := "CGRateS@" + Version eVers := expVers + "-20161230184809-73014daa0c1d" if vers, err := GetCGRVersion(); err != nil { t.Error(err)