Remove Rates

migrator/migrator.go

@@ -219,9 +219,6 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
 			if err := m.migrateThresholds(); err != nil {
 				log.Print("ERROR: ", utils.MetaThresholds, " ", err)
 			}
-			if err := m.migrateRouteProfiles(); err != nil {
-				log.Print("ERROR: ", utils.MetaRoutes, " ", err)
-			}
 			if err := m.migrateAttributeProfile(); err != nil {
 				log.Print("ERROR: ", utils.MetaAttributes, " ", err)
 			}

migrator/migrator_datadb.go

@@ -83,7 +83,6 @@ type MigratorDataDB interface {
 
 	getV1ChargerProfile() (v1chrPrf *engine.ChargerProfile, err error)
 	getV1DispatcherProfile() (v1chrPrf *engine.DispatcherProfile, err error)
-	getV1RouteProfile() (v1chrPrf *engine.RouteProfile, err error)
 
 	getV3Stats() (v1st *engine.StatQueueProfile, err error)
 	getV3ThresholdProfile() (v2T *engine.ThresholdProfile, err error)

migrator/routes.go

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package migrator
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 
@@ -137,67 +136,6 @@ func (m *Migrator) migrateCurrentRouteProfile() (err error) {
 	return
 }
 
-func (m *Migrator) migrateRouteProfiles() (err error) {
-	var vrs engine.Versions
-	current := engine.CurrentDataDBVersions()
-	if vrs, err = m.getVersions(utils.ActionTriggers); err != nil {
-		return
-	}
-	routeVersion, has := vrs[utils.Routes]
-	if !has {
-		if vrs[utils.RQF] != current[utils.RQF] {
-			return fmt.Errorf("please migrate the filters before migrating the routes")
-		}
-		if err = m.migrateFromSupplierToRoute(); err != nil {
-			return
-		}
-	}
-	migrated := true
-	var v2 *engine.RouteProfile
-	for {
-		version := routeVersion
-		for {
-			switch version {
-			default:
-				return fmt.Errorf("Unsupported version %v", version)
-			case current[utils.Routes]:
-				migrated = false
-				if m.sameDataDB {
-					break
-				}
-				if err = m.migrateCurrentRouteProfile(); err != nil {
-					return err
-				}
-			case 1:
-				if v2, err = m.migrateV1ToV2Routes(); err != nil && err != utils.ErrNoMoreData {
-					return
-				} else if err == utils.ErrNoMoreData {
-					break
-				}
-				version = 2
-			}
-			if version == current[utils.Routes] || err == utils.ErrNoMoreData {
-				break
-			}
-		}
-		if err == utils.ErrNoMoreData || !migrated {
-			break
-		}
-		if !m.dryRun {
-			if err = m.dmIN.DataManager().SetRouteProfile(v2, true); err != nil {
-				return
-			}
-		}
-		m.stats[utils.Routes]++
-	}
-	// All done, update version wtih current one
-	if err = m.setVersions(utils.Routes); err != nil {
-		return
-	}
-
-	return m.ensureIndexesDataDB(engine.ColRts)
-}
-
 func convertSupplierToRoute(spp *SupplierProfile) (route *engine.RouteProfile) {
 	route = &engine.RouteProfile{
 		Tenant:             spp.Tenant,
@@ -224,16 +162,3 @@ func convertSupplierToRoute(spp *SupplierProfile) (route *engine.RouteProfile) {
 	}
 	return
 }
-
-func (m *Migrator) migrateV1ToV2Routes() (v4Cpp *engine.RouteProfile, err error) {
-	v4Cpp, err = m.dmIN.getV1RouteProfile()
-	if err != nil {
-		return nil, err
-	} else if v4Cpp == nil {
-		return nil, errors.New("Dispatcher NIL")
-	}
-	if v4Cpp.FilterIDs, err = migrateInlineFilterV4(v4Cpp.FilterIDs); err != nil {
-		return nil, err
-	}
-	return
-}

migrator/storage_mongo_datadb.go

@@ -852,22 +852,3 @@ func (v1ms *mongoMigrator) getV1DispatcherProfile() (v1dppPrf *engine.Dispatcher
 	}
 	return
 }
-
-func (v1ms *mongoMigrator) getV1RouteProfile() (v1dppPrf *engine.RouteProfile, err error) {
-	if v1ms.cursor == nil {
-		v1ms.cursor, err = v1ms.mgoDB.DB().Collection(engine.ColRpp).Find(v1ms.mgoDB.GetContext(), bson.D{})
-		if err != nil {
-			return nil, err
-		}
-	}
-	if !(*v1ms.cursor).Next(v1ms.mgoDB.GetContext()) {
-		(*v1ms.cursor).Close(v1ms.mgoDB.GetContext())
-		v1ms.cursor = nil
-		return nil, utils.ErrNoMoreData
-	}
-	v1dppPrf = new(engine.RouteProfile)
-	if err := (*v1ms.cursor).Decode(v1dppPrf); err != nil {
-		return nil, err
-	}
-	return
-}