Merge branch 'stg-2.409'

[stg.git] / include / stg / tariff.h

diff --git a/include/stg/tariff.h b/include/stg/tariff.h
index 135c687397eed4239d2d74b109ac4652c24380a0..4f5b4166a11a11d41383007fe6377fb237b4d13d 100644 (file)
--- a/include/stg/tariff.h
+++ b/include/stg/tariff.h
@@ -59,6 +59,7 @@ public:
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;
     virtual CHANGE_POLICY GetChangePolicy() const = 0;
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;
     virtual CHANGE_POLICY GetChangePolicy() const = 0;

+    virtual time_t  GetChangePolicyTimeout() const = 0;

 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;
 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;


@@ -67,7 +68,7 @@ public:
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;

-    virtual std::string TariffChangelsAllowed(const TARIFF & to) const = 0;
+    virtual std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const = 0;

 };
 
 inline
 };
 
 inline