osi-dump 0.1.3.1.9__py3-none-any.whl → 0.1.3.2.1__py3-none-any.whl

osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -110,8 +110,8 @@ class OpenStackHypervisorImporter(HypervisorImporter):
                     }
                 )
 
-            if aggregate.availability_zone != None:
-                az = aggregate.availability_zone
+                if aggregate.availability_zone != None:
+                    az = aggregate.availability_zone
 
         aggregates_ret = [
             dict(sorted(aggregate.items())) for aggregate in aggregates_ret

osi_dump/importer/project/openstack_project_importer.py

@@ -64,10 +64,18 @@ class OpenStackProjectImporter(ProjectImporter):
         except Exception as e:
             logger.warning(f"Get storage quotas failed for {project.id} error: {e}")
 
+        domain_name = None
+        try:
+            domain = self.connection.identity.get_domain(project.domain_id)
+            domain_name = domain.name
+        except Exception as e:
+            logger.warning(f"Get domain failed for {project.domain_id} error: {e}")
+
         project_ret = Project(
             project_id=project.id,
             project_name=project.name,
             domain_id=project.domain_id,
+            domain_name=domain_name,
             enabled=project.is_enabled,
             parent_id=project.parent_id,
             usage_instance=compute_quotas.usage["instances"],

osi_dump/model/project.py

@@ -9,6 +9,7 @@ class Project(BaseModel):
     project_id: str
     project_name: Optional[str]
     domain_id: Optional[str]
+    domain_name: Optional[str]
     enabled: bool
     parent_id: Optional[str]
 

{osi_dump-0.1.3.1.9.dist-info → osi_dump-0.1.3.2.1.dist-info}/METADATA

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

{osi_dump-0.1.3.1.9.dist-info → osi_dump-0.1.3.2.1.dist-info}/RECORD

@@ -62,7 +62,7 @@ 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=zyAwuERJQxRyTNtaT7w-5EXmizo18qBr4jMgMBDROLk,3915
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=lVxVGWKNlNAPhEHC_nWg9cxIGz8Lv6AVQXwIgQsWnP0,3923
 osi_dump/importer/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/image/image_importer.py,sha256=6zwAMnS58S2HGwARwebqf4VE9IBQBv5Ot6nmcn9H4fY,181
 osi_dump/importer/image/openstack_image_importer.py,sha256=ffc13qnIGu07OXnIPaKiVxGdufep82RfQoKqLb1bwHc,2455
@@ -73,7 +73,7 @@ osi_dump/importer/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 osi_dump/importer/load_balancer/load_balancer_importer.py,sha256=fzInBlkscqlbhCATeQYXvufc-WHq2pbofTJJifN0zaY,218
 osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=9yj60y4MEIHV10e9tStR2B7S0LAOR-jzd4BSshLbG-8,2596
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/project/openstack_project_importer.py,sha256=K8Si2uaC88L2CxXi68A4ML9mlWKwnZp1ABDiufFUZ8g,2988
+osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
 osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
@@ -93,7 +93,7 @@ osi_dump/model/hypervisor.py,sha256=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
 osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
-osi_dump/model/project.py,sha256=3fNsDcWxuRVBS96W98C_Fia82qt14InjUM7n7rBCX6E,679
+osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
 osi_dump/model/volume.py,sha256=C1WdZ_GwlL-iaBqrFpgPMfIQZj3ST2KQHzwXceYxRZg,423
@@ -108,8 +108,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
 osi_dump/util/openstack_util.py,sha256=mPWLoVdSg4mukqtX87fN0Q9aDcRicJIqIsIOIIu1PnY,591
 osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.1.9.dist-info/METADATA,sha256=Vhl2agmL6Kpk7LOxX8VuAHkYA7c_UlZdJIXV7ABUIUo,677
-osi_dump-0.1.3.1.9.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-osi_dump-0.1.3.1.9.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.1.9.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.1.9.dist-info/RECORD,,
+osi_dump-0.1.3.2.1.dist-info/METADATA,sha256=PgoG_qZZ3C_EDSl6xRQ733hGybg3QKmiHhivQD_KnX0,677
+osi_dump-0.1.3.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+osi_dump-0.1.3.2.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.2.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.2.1.dist-info/RECORD,,

{osi_dump-0.1.3.1.9.dist-info → osi_dump-0.1.3.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any