osi-dump 0.1.3.3.3.2__py3-none-any.whl → 0.1.3.3.3.4__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 (9) hide show
  1. osi_dump/api/octavia.py +1 -1
  2. osi_dump/importer/load_balancer/openstack_load_balancer_importer.py +1 -0
  3. osi_dump/importer/project/openstack_project_importer.py +38 -12
  4. osi_dump/model/load_balancer.py +1 -0
  5. {osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/METADATA +2 -2
  6. {osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/RECORD +9 -9
  7. {osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/WHEEL +1 -1
  8. {osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/entry_points.txt +0 -0
  9. {osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/top_level.txt +0 -0
osi_dump/api/octavia.py CHANGED
@@ -48,7 +48,7 @@ def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
48
48
 
49
49
  for endpoint in octavia_endpoints:
50
50
  try:
51
- url = f"{endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor"
51
+ url = f"{endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor&fields=role"
52
52
  response = connection.session.get(url)
53
53
  if response.status_code == 200:
54
54
  break
osi_dump/importer/load_balancer/openstack_load_balancer_importer.py CHANGED
@@ -81,6 +81,7 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
81
81
  created_at=load_balancer["created_at"],
82
82
  updated_at=load_balancer["updated_at"],
83
83
  amphoraes=amphoraes,
84
+ vip=load_balancer["vip_address"]
84
85
  )
85
86
 
86
87
  return load_balancer_ret
osi_dump/importer/project/openstack_project_importer.py CHANGED
@@ -49,18 +49,44 @@ class OpenStackProjectImporter(ProjectImporter):
49
49
  return projects
50
50
 
51
51
  def _get_project_info(self, project: OSProject) -> Project:
52
+
53
+ usage_instance=None
54
+ quota_instance=None
55
+ usage_ram=None
56
+ quota_ram=None
57
+ usage_vcpu=None
58
+ quota_vcpu=None
52
59
 
53
60
  try:
54
61
  compute_quotas = self.connection.compute.get_quota_set(
55
62
  project.id, usage=True
56
63
  )
64
+
65
+ usage_instance=compute_quotas.usage["instances"]
66
+ quota_instance=compute_quotas.instances
67
+ usage_ram=compute_quotas.usage["ram"]
68
+ quota_ram=compute_quotas.ram
69
+ usage_vcpu=compute_quotas.usage["cores"]
70
+ quota_vcpu=compute_quotas.cores
57
71
  except Exception as e:
58
72
  logger.warning(f"Get compute quotas failed for {project.id} error: {e}")
59
73
 
74
+ usage_volume=None
75
+ quota_volume=None
76
+ usage_snapshot=None
77
+ quota_snapshot=None
78
+ usage_storage=None
79
+ quota_storage=None
60
80
  try:
61
81
  storage_quotas = self.connection.block_storage.get_quota_set(
62
82
  project.id, usage=True
63
83
  )
84
+ usage_volume=storage_quotas.usage["volumes"],
85
+ quota_volume=storage_quotas.volumes,
86
+ usage_snapshot=storage_quotas.usage["snapshots"],
87
+ quota_snapshot=storage_quotas.snapshots,
88
+ usage_storage=storage_quotas.usage["gigabytes"],
89
+ quota_storage=storage_quotas.gigabytes,
64
90
  except Exception as e:
65
91
  logger.warning(f"Get storage quotas failed for {project.id} error: {e}")
66
92
 
@@ -78,18 +104,18 @@ class OpenStackProjectImporter(ProjectImporter):
78
104
  domain_name=domain_name,
79
105
  enabled=project.is_enabled,
80
106
  parent_id=project.parent_id,
81
- usage_instance=compute_quotas.usage["instances"],
82
- quota_instance=compute_quotas.instances,
83
- usage_ram=compute_quotas.usage["ram"],
84
- quota_ram=compute_quotas.ram,
85
- usage_vcpu=compute_quotas.usage["cores"],
86
- quota_vcpu=compute_quotas.cores,
87
- usage_volume=storage_quotas.usage["volumes"],
88
- quota_volume=storage_quotas.volumes,
89
- usage_snapshot=storage_quotas.usage["snapshots"],
90
- quota_snapshot=storage_quotas.snapshots,
91
- usage_storage=storage_quotas.usage["gigabytes"],
92
- quota_storage=storage_quotas.gigabytes,
107
+ usage_instance=usage_instance,
108
+ quota_instance=quota_instance,
109
+ usage_ram=usage_ram,
110
+ quota_ram=quota_ram,
111
+ usage_vcpu=usage_vcpu,
112
+ quota_vcpu=quota_vcpu,
113
+ usage_volume=usage_volume,
114
+ quota_volume=quota_volume,
115
+ usage_snapshot=usage_snapshot,
116
+ quota_snapshot=quota_snapshot,
117
+ usage_storage=usage_storage,
118
+ quota_storage=quota_storage
93
119
  )
94
120
 
95
121
  return project_ret
osi_dump/model/load_balancer.py CHANGED
@@ -15,6 +15,7 @@ class LoadBalancer(BaseModel):
15
15
  operating_status: Optional[str]
16
16
 
17
17
  amphoraes: list[dict]
18
+ vip: Optional[str]
18
19
 
19
20
  project_id: Optional[str]
20
21
 
{osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: osi-dump
3
- Version: 0.1.3.3.3.2
3
+ Version: 0.1.3.3.3.4
4
4
  Summary: OpenStack information dump tool
5
5
  Author: TVKain
6
6
  License: Apache-2.0
@@ -14,7 +14,7 @@ Requires-Dist: pandas
14
14
  Requires-Dist: openpyxl
15
15
  Requires-Dist: numpy
16
16
  Provides-Extra: test
17
- Requires-Dist: pytest ; extra == 'test'
17
+ Requires-Dist: pytest; extra == "test"
18
18
 
19
19
  # OpenStack Information Dump
20
20
 
{osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
4
4
  osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
5
5
  osi_dump/api/keystone.py,sha256=3oCqzf1cHKs3THOiq6t39_OXNHHTVK9hwCnLVlP8FYg,1446
6
6
  osi_dump/api/neutron.py,sha256=pag_d6MsxA1gOUit4bvVUaTiTrPqLJjwz9KU_QSpxwM,1788
7
- osi_dump/api/octavia.py,sha256=Cgzz9Pf26YFETqbXSXYSHUA_PWDy_3V4zPm0RZ8QKBo,1905
7
+ osi_dump/api/octavia.py,sha256=WM8_7911CIWU-x1FiN_5kX_CUgXwqG4VloJp7AsGFsI,1917
8
8
  osi_dump/api/placement.py,sha256=yoWzg39b8nK2E1nrxDhLxLsa7FcBTw57gfy8b5F5ijc,1096
9
9
  osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
10
10
  osi_dump/batch_handler/external_port_batch_handler.py,sha256=iGm0htGbLkpTX5RFPcrvXrVVn0eeTpavN3u4s58Z_pE,1783
@@ -72,9 +72,9 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
72
72
  osi_dump/importer/instance/openstack_instance_importer.py,sha256=HvA1hYLAneY0KtDTk7nz6TWXNGO5s6EOp7Hrm7-FxHI,4249
73
73
  osi_dump/importer/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
74
74
  osi_dump/importer/load_balancer/load_balancer_importer.py,sha256=fzInBlkscqlbhCATeQYXvufc-WHq2pbofTJJifN0zaY,218
75
- osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=8Wa-obk9WygQ-4G5aNqa6yhIPyjTxc__vDq9Ix5TC8E,3156
75
+ osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=tTcZAWEMstRvDAWrmFlRYI1mIc27egaEAeNLsh-htRM,3205
76
76
  osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
77
- osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
77
+ osi_dump/importer/project/openstack_project_importer.py,sha256=0Idzf-bgQEdgSlM85iNwSRZdknibeWXScRJKBdoIuqg,4080
78
78
  osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
79
79
  osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
80
80
  osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=p7Ocn27Esh-QipqNyQCviO6xt4TTWuIbqiNQ8oAPVpY,3557
@@ -93,7 +93,7 @@ osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA
93
93
  osi_dump/model/hypervisor.py,sha256=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,455
94
94
  osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
95
95
  osi_dump/model/instance.py,sha256=8puhIKWWfoAaTURXb7XUpjG0lQ4nb0UwrsrTQdDaFbs,639
96
- osi_dump/model/load_balancer.py,sha256=x8mTvdXa5FmuJLwx4qu2DJqPQISoO-0A3a76Ki_jy34,413
96
+ osi_dump/model/load_balancer.py,sha256=cInZ_JH8kzZpnJsxejI-nze4nACtK3Yk20pfyl28lLo,436
97
97
  osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
98
98
  osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
99
99
  osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
@@ -109,8 +109,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
109
109
  osi_dump/util/openstack_util.py,sha256=_o8LiRmQKtxQ8hU3rbrMNwIAxt0-aWD2rjq-NvVdK9E,1299
110
110
  osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
111
111
  osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
112
- osi_dump-0.1.3.3.3.2.dist-info/METADATA,sha256=mrCAboJm8Gv9jHz5qPXzMt643tKOWzz2LlC2zOE1Ilc,679
113
- osi_dump-0.1.3.3.3.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
114
- osi_dump-0.1.3.3.3.2.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
115
- osi_dump-0.1.3.3.3.2.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
116
- osi_dump-0.1.3.3.3.2.dist-info/RECORD,,
112
+ osi_dump-0.1.3.3.3.4.dist-info/METADATA,sha256=aDqD7WalTunfBVE43PF9AUMtJg2Qxhhgp_snbor7VQs,678
113
+ osi_dump-0.1.3.3.3.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
114
+ osi_dump-0.1.3.3.3.4.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
115
+ osi_dump-0.1.3.3.3.4.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
116
+ osi_dump-0.1.3.3.3.4.dist-info/RECORD,,
{osi_dump-0.1.3.3.3.2.dist-info → osi_dump-0.1.3.3.3.4.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (75.3.0)
2
+ Generator: setuptools (75.6.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5