osi-dump 0.1__tar.gz → 0.1.2__tar.gz

{osi_dump-0.1 → osi_dump-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1
+Version: 0.1.2
 Summary: OpenStack instances information dump tool
 Author: TVKain
 License: Apache-2.0

{osi_dump-0.1 → osi_dump-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "osi-dump"
-version = "0.1"
+version = "0.1.2"
 description = "OpenStack instances information dump tool"
 readme = "README.md"
 authors = [{ name = "TVKain" }]

osi_dump-0.1.2/src/osi_dump/api/placement.py

@@ -0,0 +1,17 @@
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+
+
+def get_usage(connection: Connection, resource_provider_id: str):
+
+    placement_endpoint = connection.endpoint_for(
+        service_type="placement", interface="public"
+    )
+
+    url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"
+
+    response = connection.session.get(url)
+
+    data = response.json()
+
+    return data["usages"]

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -11,6 +11,8 @@ from openstack.placement.v1.resource_provider_inventory import ResourceProviderI
 from osi_dump.importer.hypervisor.hypervisor_importer import HypervisorImporter
 from osi_dump.model.hypervisor import Hypervisor
 
+from osi_dump.api.placement import get_usage
+
 logger = logging.getLogger(__name__)
 
 
@@ -61,6 +63,8 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             )
         )
 
+        usage_data = get_usage(self.connection, resource_provider_id=hypervisor.id)
+
         vcpu = rpi[0]
         memory = rpi[1]
         disk = rpi[2]
@@ -73,7 +77,10 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             status=hypervisor.status,
             local_disk_size=disk["max_unit"],
             memory_size=memory["max_unit"] + memory["reserved"],
-            vpus=vcpu["max_unit"],
+            vcpus=vcpu["max_unit"],
+            vcpus_usage=usage_data["VCPU"],
+            memory_usage=usage_data["MEMORY_MB"],
+            local_disk_usage=usage_data["DISK_GB"],
         )
 
         return ret_hypervisor

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/importer/instance/openstack_instance_importer.py

@@ -51,7 +51,8 @@ class OpenStackInstanceImporter(InstanceImporter):
 
     def _get_instance_info(self, server: Server) -> Instance:
 
-        # Lấy thông tin project
+        project_name = None
+        project_id = None
         try:
             project = self.connection.identity.get_project(server.project_id)
             project_name = project.name
@@ -60,10 +61,8 @@ class OpenStackInstanceImporter(InstanceImporter):
             logger.warn(
                 f"Unable to obtain project name for instance: {server.name}: {e}"
             )
-            project_name = None
-            project_id = None
 
-        # Lấy thông tin domain
+        domain_name = None
         try:
             domain = self.connection.identity.get_domain(project.domain_id)
             domain_name = domain.name
@@ -71,7 +70,6 @@ class OpenStackInstanceImporter(InstanceImporter):
             logger.warning(
                 f"Unable to obtain domain name for instance {server.name}: {e}"
             )
-            domain_name = None
 
         # Lấy thông tin IPv4 private
         private_v4_ips = []

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/importer/project/openstack_project_importer.py

@@ -49,12 +49,39 @@ class OpenStackProjectImporter(ProjectImporter):
         return projects
 
     def _get_project_info(self, project: OSProject) -> Project:
+
+        try:
+            compute_quotas = self.connection.compute.get_quota_set(
+                project.id, usage=True
+            )
+        except Exception as e:
+            logger.warning(f"Get compute quotas failed for {project.id} error: {e}")
+
+        try:
+            storage_quotas = self.connection.block_storage.get_quota_set(
+                project.id, usage=True
+            )
+        except Exception as e:
+            logger.warning(f"Get storage quotas failed for {project.id} error: {e}")
+
         project_ret = Project(
             project_id=project.id,
             project_name=project.name,
             domain_id=project.domain_id,
             enabled=project.is_enabled,
             parent_id=project.parent_id,
+            usage_instance=compute_quotas.usage["instances"],
+            quota_instance=compute_quotas.instances,
+            usage_ram=compute_quotas.usage["ram"],
+            quota_ram=compute_quotas.ram,
+            usage_vcpu=compute_quotas.usage["cores"],
+            quota_vcpu=compute_quotas.cores,
+            usage_volume=storage_quotas.volumes,
+            quota_volume=storage_quotas.usage["volumes"],
+            usage_snapshot=storage_quotas.snapshots,
+            quota_snapshot=storage_quotas.usage["snapshots"],
+            usage_storage=storage_quotas.gigabytes,
+            quota_storage=storage_quotas.usage["gigabytes"],
         )
 
         return project_ret

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/importer/volume/openstack_volume_importer.py

@@ -29,7 +29,9 @@ class OpenStackVolumeImporter(VolumeImporter):
         logger.info(f"Importing volumes for {self.connection.auth['auth_url']}")
 
         try:
-            osvolumes: list[OSVolume] = list(self.connection.list_volumes())
+            osvolumes: list[OSVolume] = list(
+                self.connection.block_storage.volumes(details=True, all_projects=True)
+            )
         except Exception as e:
             raise Exception(
                 f"Can not fetch volumes for {self.connection.auth['auth_url']}"
@@ -50,6 +52,19 @@ class OpenStackVolumeImporter(VolumeImporter):
 
     def _get_volume_info(self, volume: OSVolume) -> Volume:
 
+        snapshots = []
+        try:
+            snapshots = list(
+                self.connection.block_storage.snapshots(
+                    details=False, all_projects=True, volume_id=volume.id
+                )
+            )
+
+            snapshots = [snapshot["id"] for snapshot in snapshots]
+
+        except Exception as e:
+            logger.warning(f"Fetching snapshots failed for {volume.id} error: {e}")
+
         ret_volume = Volume(
             volume_id=volume.id,
             project_id=volume.project_id,
@@ -57,6 +72,7 @@ class OpenStackVolumeImporter(VolumeImporter):
             attachments=[att["server_id"] for att in volume.attachments],
             type=volume.volume_type,
             size=volume.size,
+            snapshots=snapshots,
             updated_at=volume.updated_at,
             created_at=volume.created_at,
         )

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/model/hypervisor.py

@@ -7,6 +7,12 @@ class Hypervisor(BaseModel):
     name: str
     state: str
     status: str
-    local_disk_size: int
+
+    vcpus: int
+    vcpus_usage: int
+
     memory_size: int
-    vpus: int
+    memory_usage: int
+
+    local_disk_usage: int
+    local_disk_size: int

osi_dump-0.1.2/src/osi_dump/model/project.py

@@ -0,0 +1,31 @@
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, ValidationError
+
+
+class Project(BaseModel):
+    model_config = ConfigDict(strict=True)
+
+    project_id: str
+    project_name: Optional[str]
+    domain_id: Optional[str]
+    enabled: bool
+    parent_id: Optional[str]
+
+    usage_instance: Optional[int]
+    quota_instance: Optional[int]
+
+    usage_vcpu: Optional[int]
+    quota_vcpu: Optional[int]
+
+    usage_ram: Optional[int]
+    quota_ram: Optional[int]
+
+    usage_volume: Optional[int]
+    quota_volume: Optional[int]
+
+    usage_snapshot: Optional[int]
+    quota_snapshot: Optional[int]
+
+    usage_storage: Optional[int]
+    quota_storage: Optional[int]

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/model/volume.py

@@ -17,5 +17,7 @@ class Volume(BaseModel):
     type: str
     size: int
 
+    snapshots: Optional[list[str]]
+
     updated_at: str
     created_at: str

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump/os_connection/get_connections.py

@@ -33,7 +33,6 @@ def get_connections(file_path) -> list[Connection]:
                 password=auth.password,
                 project_domain_name=auth.project_domain_name,
                 user_domain_name=auth.user_domain_name,
-                timeout=TIMEOUT_SECOND,
             )
 
             connections.append(connection)

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1
+Version: 0.1.2
 Summary: OpenStack instances information dump tool
 Author: TVKain
 License: Apache-2.0

{osi_dump-0.1 → osi_dump-0.1.2}/src/osi_dump.egg-info/SOURCES.txt

@@ -9,6 +9,8 @@ src/osi_dump.egg-info/dependency_links.txt
 src/osi_dump.egg-info/entry_points.txt
 src/osi_dump.egg-info/requires.txt
 src/osi_dump.egg-info/top_level.txt
+src/osi_dump/api/__init__.py
+src/osi_dump/api/placement.py
 src/osi_dump/batch_handler/__init__.py
 src/osi_dump/batch_handler/floating_ip_batch_handler.py
 src/osi_dump/batch_handler/hypervisor_batch_handler.py

osi_dump-0.1/src/osi_dump/model/project.py

@@ -1,13 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, ConfigDict, ValidationError
-
-
-class Project(BaseModel):
-    model_config = ConfigDict(strict=True)
-
-    project_id: str
-    project_name: Optional[str]
-    domain_id: Optional[str]
-    enabled: bool
-    parent_id: Optional[str]