Merge pull request #33 from SpareCores/DEV-396

DEV-396 UpCloud
SpareCores · Dec 10, 2024 · e469c88 · e469c88
2 parents f148743 + 5341712
commit e469c88
Show file tree

Hide file tree

Showing 6 changed files with 483 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## v0.3.x (development version)
 
+New vendor(s):
+
+- UpCloud
+
 New benchmark(s):
 
 - PassMark.

diff --git a/docs/add_vendor.md b/docs/add_vendor.md
@@ -72,6 +72,8 @@ def inventory_regions(vendor):
     #             "vendor_id": vendor.vendor_id,
     #             "region_id": "",
     #             "name": "",
+    #             "api_reference": "",
+    #             "display_name": "",
     #             "aliases": [],
     #             "country_id": "",
     #             "state": None,
@@ -95,6 +97,8 @@ def inventory_zones(vendor):
     #         "region_id": "",
     #         "zone_id": "",
     #         "name": "",
+    #         "api_reference": "",
+    #         "display_name": "",
     #     })
     return items
 
@@ -107,7 +111,10 @@ def inventory_servers(vendor):
     #             "vendor_id": vendor.vendor_id,
     #             "server_id": ,
     #             "name": ,
+    #             "api_reference": ,
+    #             "display_name": ,
     #             "description": None,
+    #             "family": None,
     #             "vcpus": ,
     #             "hypervisor": None,
     #             "cpu_allocation": CpuAllocation....,
@@ -117,10 +124,10 @@ def inventory_servers(vendor):
     #             "cpu_manufacturer": None,
     #             "cpu_family": None,
     #             "cpu_model": None,
-    #             "cpu_l1_cache: None,
-    #             "cpu_l2_cache: None,
-    #             "cpu_l3_cache: None,
-    #             "cpu_flags: [],
+    #             "cpu_l1_cache": None,
+    #             "cpu_l2_cache": None,
+    #             "cpu_l3_cache": None,
+    #             "cpu_flags": [],
     #             "cpus": [],
     #             "memory_amount": ,
     #             "memory_generation": None,
@@ -229,7 +236,7 @@ def inventory_ipv4_prices(vendor):
     #             "region_id": ,
     #             "price": ,
     #             "currency": "USD",
-    #             "unit": PriceUnit.HOUR,
+    #             "unit": PriceUnit.MONTH,
     #         }
     #     )
     return items

diff --git a/pyproject.toml b/pyproject.toml
@@ -56,11 +56,13 @@ aws = ["boto3"]
 hcloud = ["hcloud"]
 gcp = ["google-cloud", "google-cloud-compute", "google-cloud-billing"]
 azure = ["azure-identity", "azure-mgmt-resource", "azure-mgmt-compute"]
+upcloud = ["upcloud-api"]
 vendors = [
   "sparecores-crawler[aws]",
   "sparecores-crawler[hcloud]",
   "sparecores-crawler[gcp]",
   "sparecores-crawler[azure]",
+  "sparecores-crawler[upcloud]",
 ]
 all = ["sparecores-crawler[testing]", "sparecores-crawler[vendors]"]
 

diff --git a/src/sc_crawler/vendors/__init__.py b/src/sc_crawler/vendors/__init__.py
@@ -1,3 +1,3 @@
 """Helper methods for each cloud compute resource provider."""
 
-from .vendors import aws, azure, gcp, hcloud  # noqa: F401
+from .vendors import aws, azure, gcp, hcloud, upcloud  # noqa: F401