Adjust savings plan rate to match cost and usage

Author: esebesto

Diff for: nise/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.6.9"
+__version__ = "4.6.10"
 
 
 VERSION = __version__.split(".")

Diff for: nise/generators/aws/data_transfer_generator.py

@@ -116,7 +116,7 @@ def _update_data(self, row, start, end, **kwargs):
         row["pricing/term"] = "OnDemand"
         row["pricing/unit"] = "GB"
         row["savingsPlan/SavingsPlanEffectiveCost"] = str(saving)
-        row["savingsPlan/SavingsPlanRate"] = str(saving)
+        row["savingsPlan/SavingsPlanRate"] = str(round(float(saving) / amount, 4)) if saving else str(saving)
 
         # Overwrite lineItem/LineItemType for items with applied Savings plan
         if saving is not None:

Diff for: nise/generators/aws/ec2_generator.py

@@ -198,7 +198,7 @@ def _update_data(self, row, start, end, **kwargs):
         row["pricing/term"] = "OnDemand"
         row["pricing/unit"] = "Hrs"
         row["savingsPlan/SavingsPlanEffectiveCost"] = saving
-        row["savingsPlan/SavingsPlanRate"] = saving
+        row["savingsPlan/SavingsPlanRate"] = round(float(saving) / float(amount), 5) if saving and amount else saving
 
         # Overwrite lineItem/LineItemType for items with applied Savings plan
         if saving is not None: