osi-dump 0.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

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/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/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/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/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/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/model/project.py

@@ -11,3 +11,21 @@ class Project(BaseModel):
     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/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/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.dist-info → osi_dump-0.1.2.dist-info}/METADATA

@@ -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.dist-info → osi_dump-0.1.2.dist-info}/RECORD

@@ -1,6 +1,8 @@
 osi_dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/__main__.py,sha256=fCVTLFipB-P0872_4j7iOJNNosOMBj3YdHr8TH_fhRY,71
 osi_dump/cli.py,sha256=cTOQA_thCt1ON5eQ-gTA_hFUSN5uPgFPDoOttpyuTNg,3605
+osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/api/placement.py,sha256=9yADLulo1HfUnPLE7IJt4ZY8e2jRTaoeV4J4MMiKCew,455
 osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
 osi_dump/batch_handler/floating_ip_batch_handler.py,sha256=bEkT4BRi85qir-a1i7eEI_arA0LENq1gD6xHj8IdXu0,1771
 osi_dump/batch_handler/hypervisor_batch_handler.py,sha256=vkv6SAx1arPNVvFJ6RyvbJjC2F2Hes9km7dwhL4NJDY,1755
@@ -28,25 +30,25 @@ osi_dump/importer/floating_ip/floating_ip_importer.py,sha256=2_lCZYF-r2dgdL4Yzws
 osi_dump/importer/floating_ip/openstack_floating_ip_importer.py,sha256=xuALHyiyb4LdRgFN0hZvOx0pImKpGsLUtPWW_1q52gc,2286
 osi_dump/importer/hypervisor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/hypervisor/hypervisor_importer.py,sha256=JuoJBltqFYhH-Ql9TLUPHX2YurS0JFV7Augrc6bDJ5Q,206
-osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=9Y-OsjfOzCKi_DijlHeMv9sgsD_oWB_YXW_lDtVeahM,2567
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=OerUSzh4Ns7gXm5JwiLKIEGmLzXFqU7RZ5hbzIi1J3Q,2845
 osi_dump/importer/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIBPBwwANpEaWCgRsgImc,196
-osi_dump/importer/instance/openstack_instance_importer.py,sha256=h1a-ToU1Hd4KARQTRqS8T6-2QK5eLfgKxz1DTHiBEEw,3475
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=b1OB-8_7DlwvOo7TX5zUG64XXtUufKhgCc3lhgNqxaY,3394
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/project/openstack_project_importer.py,sha256=wdNJTTEhsvhnW6Wn0xLx8nAoJOhtiG9-6jGB0WnnYVU,1837
+osi_dump/importer/project/openstack_project_importer.py,sha256=OXL9KB2yOgN-8hsb0RJZDT3p8wK4fLcTeqFogdtF944,2988
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
 osi_dump/importer/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/volume/openstack_volume_importer.py,sha256=q8vDPAr9LviJLTWfjAhQU8nKu5mt66pIras2uiexA9k,1937
+osi_dump/importer/volume/openstack_volume_importer.py,sha256=Tte9fX91oxEoRcUZPJd7g6oH6izcWy8WwFCapg_ZY1M,2454
 osi_dump/importer/volume/volume_importer.py,sha256=tmDTE9L9vtl75GR79blSxa_MVsRU6LDCbR0yJk0xKwo,186
 osi_dump/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/model/authentication_info.py,sha256=02kXxtILfjh8t45_-bPM8rtyRk2cQcJK6l2d1bPih7k,257
 osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA,427
-osi_dump/model/hypervisor.py,sha256=L3FKY57HiI55-AgxNPXVT55BgkJUDwPFYIfzLprJ2VE,244
+osi_dump/model/hypervisor.py,sha256=zFJkLf4Z_vaMBnLmWR06Qaq0DjNTMCWP0sV3DEtpueU,317
 osi_dump/model/instance.py,sha256=flNywojuBj7ZyFTnWvl2rpvzL3Ju-QtuUY69DSPfPs8,464
-osi_dump/model/project.py,sha256=vh3qhR5JpQ6yxvGK9CXiJ9-HoyyYGAggKF56AEEg-tE,289
-osi_dump/model/volume.py,sha256=unb2dy7dIDi3-D6WKJAhmnPsn_DI27GZJsZCrDBh89M,335
+osi_dump/model/project.py,sha256=3fNsDcWxuRVBS96W98C_Fia82qt14InjUM7n7rBCX6E,679
+osi_dump/model/volume.py,sha256=1p5Xw0LPxfroJwSYtE-n_Gv4MsRDA_sSvc7SQY_Uo8I,371
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/os_connection/get_connections.py,sha256=_CiKot2GgQDOAJ33goN9mcwaGYQCqzCOitntz9cf3-c,1793
+osi_dump/os_connection/get_connections.py,sha256=1zeir4cEtzJOUOn53zUmlD9lWMvYXhuRr0IhI5U1DAw,1753
 osi_dump/util/__init__.py,sha256=GvhYTETVePJAsp0LfseMGtuRFWbbCc2xox-QSGQA3Us,286
 osi_dump/util/create_file.py,sha256=hcEspFD0VZDtXCaG5QtMkV37GsbAHATdxYlClTszVK8,242
 osi_dump/util/excel_autosize_column.py,sha256=zzQ6uXkQhHAqVn9fUAgNjoCH_HiNEC9Dcj4OBqHd6rw,1102
@@ -54,8 +56,8 @@ osi_dump/util/excel_sort_sheet.py,sha256=o4jXtP1ZFYtAGzkAP5S8Tym4h-SEoFBAI3j24y-
 osi_dump/util/export_data_excel.py,sha256=VYSxDBZ7dgSbTj3n_8RRPqe183tILNh6wJW-UnFvJUU,882
 osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo_AR0,111
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.dist-info/METADATA,sha256=GkknVw2jANEDf5MeFYq1OX7i7i2DdpueFVu4UFq9S44,660
-osi_dump-0.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-osi_dump-0.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.dist-info/RECORD,,
+osi_dump-0.1.2.dist-info/METADATA,sha256=PjwOdiifp-ygU1NKMtVcEQ2PUOOqyFRCUqY8mYkpj9E,662
+osi_dump-0.1.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+osi_dump-0.1.2.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.2.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.2.dist-info/RECORD,,