cfg: update ips opts

removed units and renamed usageID -> allocationID
This commit is contained in:
ionutboangiu
2025-11-24 21:05:04 +02:00
committed by Dan Christian Bogos
parent eab21e5d8d
commit 3889e9d91e
6 changed files with 17 additions and 34 deletions

View File

@@ -603,7 +603,7 @@ func (s *IPService) V1GetIPsForEvent(ctx *context.Context, args *utils.CGREvent,
if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
}
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.UsageID, utils.OptsIPsUsageID)
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.AllocationID, utils.OptsIPsUsageID)
if usageID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.UsageID)
}
@@ -653,7 +653,7 @@ func (s *IPService) V1AuthorizeIPs(ctx *context.Context, args *utils.CGREvent, r
if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
}
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.UsageID, utils.OptsIPsUsageID)
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.AllocationID, utils.OptsIPsUsageID)
if usageID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.UsageID)
}
@@ -692,11 +692,6 @@ func (s *IPService) V1AuthorizeIPs(ctx *context.Context, args *utils.CGREvent, r
}
defer ips.unlock()
if _, err = utils.GetFloat64Opts(args, s.cfg.IPsCfg().Opts.Units,
utils.OptsIPsUnits); err != nil {
return
}
/*
authorize logic
...
@@ -714,7 +709,7 @@ func (s *IPService) V1AllocateIPs(ctx *context.Context, args *utils.CGREvent, re
if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
}
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.UsageID, utils.OptsIPsUsageID)
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.AllocationID, utils.OptsIPsUsageID)
if usageID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.UsageID)
}
@@ -754,11 +749,6 @@ func (s *IPService) V1AllocateIPs(ctx *context.Context, args *utils.CGREvent, re
}
defer ips.unlock()
if _, err = utils.GetFloat64Opts(args, s.cfg.IPsCfg().Opts.Units,
utils.OptsIPsUnits); err != nil {
return
}
/*
allocate logic
...
@@ -780,7 +770,7 @@ func (s *IPService) V1ReleaseIPs(ctx *context.Context, args *utils.CGREvent, rep
if missing := utils.MissingStructFields(args, []string{utils.ID, utils.Event}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
}
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.UsageID, utils.OptsIPsUsageID)
usageID := utils.GetStringOpts(args, s.cfg.IPsCfg().Opts.AllocationID, utils.OptsIPsUsageID)
if usageID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.UsageID)
}