osi-dump 0.1.3.2.3__py3-none-any.whl → 0.1.3.2.5__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. osi_dump/importer/role_assignment/openstack_role_assignment_importer.py +12 -0
  2. osi_dump/model/role_assignment.py +2 -0
  3. {osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/METADATA +2 -2
  4. {osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/RECORD +7 -7
  5. {osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/WHEEL +0 -0
  6. {osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/entry_points.txt +0 -0
  7. {osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/top_level.txt +0 -0
osi_dump/importer/role_assignment/openstack_role_assignment_importer.py CHANGED
@@ -71,6 +71,17 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
71
71
  except Exception as e:
72
72
  logger.warning(f"Can not get role id: {e}")
73
73
 
74
+ """
75
+ - Added enabled field to Role Assignment sheet
76
+ - Should be removed in the future when User Sheet is added
77
+ """
78
+ user_enabled = None
79
+ try:
80
+ user = self.connection.identity.get_user(user=user_id)
81
+ user_enabled = user.is_enabled
82
+ except Exception as e:
83
+ logger.warning(f"Can not get user_enabled: {e}")
84
+
74
85
  user_name = None
75
86
  role_name = None
76
87
 
@@ -93,6 +104,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
93
104
  user_id=user_id,
94
105
  user_name=user_name,
95
106
  role_id=role_id,
107
+ user_enabled=user_enabled,
96
108
  role_name=role_name,
97
109
  scope=role_assignment.scope,
98
110
  )
osi_dump/model/role_assignment.py CHANGED
@@ -9,6 +9,8 @@ class RoleAssignment(BaseModel):
9
9
  user_id: Optional[str]
10
10
 
11
11
  user_name: Optional[str]
12
+
13
+ user_enabled: Optional[bool]
12
14
 
13
15
  role_id: Optional[str]
14
16
 
{osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: osi-dump
3
- Version: 0.1.3.2.3
3
+ Version: 0.1.3.2.5
4
4
  Summary: OpenStack information dump tool
5
5
  Author: TVKain
6
6
  License: Apache-2.0
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: Apache Software License
8
8
  Requires-Python: >=3.10
9
9
  Description-Content-Type: text/markdown
10
10
  Requires-Dist: typer
11
- Requires-Dist: openstacksdk
11
+ Requires-Dist: openstacksdk ==3.3.0
12
12
  Requires-Dist: pydantic
13
13
  Requires-Dist: pandas
14
14
  Requires-Dist: openpyxl
{osi_dump-0.1.3.2.3.dist-info → osi_dump-0.1.3.2.5.dist-info}/RECORD RENAMED
@@ -76,7 +76,7 @@ osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
76
76
  osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
77
77
  osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
78
78
  osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
79
- osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
79
+ osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=fWGwjgK7Gfau4oxFjw2PSH_lx_ecxi7xgJ81qbGBJKE,3435
80
80
  osi_dump/importer/role_assignment/role_assignment_importer.py,sha256=Faorx0qsgdXjv5y2t-7obpV3wFfbmByx_-8b9yBr7L8,228
81
81
  osi_dump/importer/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
82
82
  osi_dump/importer/router/openstack_router_importer.py,sha256=T_Wr45nJrCcp2OOdRawmdQkNBDzczA-3DPx9dlewd4g,2781
@@ -94,7 +94,7 @@ osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
94
94
  osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
95
95
  osi_dump/model/load_balancer.py,sha256=x8mTvdXa5FmuJLwx4qu2DJqPQISoO-0A3a76Ki_jy34,413
96
96
  osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
97
- osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
97
+ osi_dump/model/role_assignment.py,sha256=kc5eUx4NBYaD0wnYk2FcaFAbfkoe22durmOmwLi2WA8,348
98
98
  osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
99
99
  osi_dump/model/volume.py,sha256=C1WdZ_GwlL-iaBqrFpgPMfIQZj3ST2KQHzwXceYxRZg,423
100
100
  osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -108,8 +108,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
108
108
  osi_dump/util/openstack_util.py,sha256=PmoGlXNJqCQAbZBBHj-BM5JdY5g9FHERXtOn4Lv0p3k,1299
109
109
  osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
110
110
  osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
111
- osi_dump-0.1.3.2.3.dist-info/METADATA,sha256=dzxvfqhGDUONet8v93VLUT-zS6mZovOTttwI61Nhvg0,677
112
- osi_dump-0.1.3.2.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
113
- osi_dump-0.1.3.2.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
114
- osi_dump-0.1.3.2.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
115
- osi_dump-0.1.3.2.3.dist-info/RECORD,,
111
+ osi_dump-0.1.3.2.5.dist-info/METADATA,sha256=MuxbNizSk_BpLT4KhiGqkpnWj2_WohHwo9UbQJnhj6I,685
112
+ osi_dump-0.1.3.2.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
113
+ osi_dump-0.1.3.2.5.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
114
+ osi_dump-0.1.3.2.5.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
115
+ osi_dump-0.1.3.2.5.dist-info/RECORD,,