Fix bad calculwation of dediacted vm

outscale · Feb 12, 2024 · 9c9d35a · 9c9d35a
1 parent a33f9f5
commit 9c9d35a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "osc-cost"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 authors = ["OpenSource Team <[email protected]>"]
 license = "BSD-3-Clause"

diff --git a/docs/README.md b/docs/README.md
@@ -19,7 +19,7 @@ Read license for more details.
   - Volumes
   - Public Ips
   - Snapshots (🚨 Warning: snapshot computation is currently known to be over-priced.)
-  - Dedicated Vm (🚨 Warning: dedicated vm computation can be overpriced depending on the situation (Look at example of Pricing for Dedicated VMs [Getting the Price of Your Resources](https://docs.outscale.com/en/userguide/Getting-the-Price-of-Your-Resources.html#_calculating_the_price_of_dedicated_vms)) .)
+  - Dedicated Vm
   - Load Balancers
   - Flexible GPU
   - VPN Connections

diff --git a/helm/osccost/Chart.yaml b/helm/osccost/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.4.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0"
+appVersion: "0.5.1"
diff --git a/helm/osccost/README.md b/helm/osccost/README.md
@@ -1,6 +1,6 @@
 # osccost
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.1](https://img.shields.io/badge/AppVersion-0.5.1-informational?style=flat-square)
 
 Exporter prometheus to allow Outscale users to estimate their cloud costs.
 

diff --git a/src/oapi/vms.rs b/src/oapi/vms.rs
@@ -419,10 +419,11 @@ impl VmSpecs {
     }
 
     fn parse_dedicated_instance_additional_prices(mut self, input: &Input) -> Option<VmSpecs> {
+        // dedicated_vm_additional is expressed as a percent
         let dedicated_vm_additional =
             input.catalog_entry("TinaOS-FCU", "DedicatedInstanceSurplus", "RunInstances")?;
         self.factor_vm_additional_cost = match self.tenancy.as_str() {
-            "dedicated" => 1.0 + ((dedicated_vm_additional * 10000.0) / 100.0),
+            "dedicated" => 1.0 + (dedicated_vm_additional * 100.0),
             "default" => 1.0,
             unkown_tenancy => {
                 error!(