osi-dump 0.1.3.2.7__tar.gz → 0.1.3.2.8__tar.gz

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 (120) hide show
  1. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/PKG-INFO +1 -1
  2. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/pyproject.toml +1 -1
  3. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/external_port/openstack_external_port_importer.py +15 -1
  4. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/instance/openstack_instance_importer.py +6 -1
  5. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/external_port.py +2 -0
  6. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/instance.py +3 -0
  7. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/PKG-INFO +1 -1
  8. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/README.md +0 -0
  9. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/setup.cfg +0 -0
  10. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/__init__.py +0 -0
  11. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/__main__.py +0 -0
  12. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/api/__init__.py +0 -0
  13. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/api/neutron.py +0 -0
  14. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/api/octavia.py +0 -0
  15. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/api/placement.py +0 -0
  16. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/__init__.py +0 -0
  17. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/external_port_batch_handler.py +0 -0
  18. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/flavor_batch_handler.py +0 -0
  19. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/floating_ip_batch_handler.py +0 -0
  20. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/hypervisor_batch_handler.py +0 -0
  21. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/image_batch_handler.py +0 -0
  22. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/instance_batch_handler.py +0 -0
  23. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/load_balancer_batch_handler.py +0 -0
  24. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/project_batch_handler.py +0 -0
  25. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/role_assignment_batch_handler.py +0 -0
  26. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/router_batch_handler.py +0 -0
  27. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/batch_handler/volume_batch_handler.py +0 -0
  28. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/cli.py +0 -0
  29. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/__init__.py +0 -0
  30. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/external_port/__init__.py +0 -0
  31. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/external_port/excel_external_port_exporter.py +0 -0
  32. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/external_port/external_port_exporter.py +0 -0
  33. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/flavor/__init__.py +0 -0
  34. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/flavor/excel_flavor_exporter.py +0 -0
  35. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/flavor/flavor_exporter.py +0 -0
  36. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/floating_ip/__init__.py +0 -0
  37. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/floating_ip/excel_floating_ip_exporter.py +0 -0
  38. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/floating_ip/floating_ip_exporter.py +0 -0
  39. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/hypervisor/__init__.py +0 -0
  40. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/hypervisor/excel_hypervisor_exporter.py +0 -0
  41. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/hypervisor/hypervisor_exporter.py +0 -0
  42. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/image/__init__.py +0 -0
  43. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/image/excel_image_exporter.py +0 -0
  44. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/image/image_exporter.py +0 -0
  45. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/instance/__init__.py +0 -0
  46. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/instance/excel_instance_exporter.py +0 -0
  47. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/instance/instance_exporter.py +0 -0
  48. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/load_balancer/__init__.py +0 -0
  49. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py +0 -0
  50. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/load_balancer/load_balancer_exporter.py +0 -0
  51. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/project/__init__.py +0 -0
  52. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/project/excel_project_exporter.py +0 -0
  53. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/project/project_exporter.py +0 -0
  54. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/role_assignment/__init__.py +0 -0
  55. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/role_assignment/excel_role_assignment_exporter.py +0 -0
  56. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/role_assignment/role_assignment_exporter.py +0 -0
  57. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/router/__init__.py +0 -0
  58. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/router/excel_router_exporter.py +0 -0
  59. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/router/router_exporter.py +0 -0
  60. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/volume/__init__.py +0 -0
  61. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/volume/excel_volume_exporter.py +0 -0
  62. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/exporter/volume/volume_exporter.py +0 -0
  63. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/external_port/__init__.py +0 -0
  64. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/external_port/external_port_importer.py +0 -0
  65. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/flavor/__init__.py +0 -0
  66. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/flavor/flavor_importer.py +0 -0
  67. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/flavor/openstack_flavor_importer.py +0 -0
  68. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/floating_ip/__init__.py +0 -0
  69. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/floating_ip/floating_ip_importer.py +0 -0
  70. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/floating_ip/openstack_floating_ip_importer.py +0 -0
  71. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/hypervisor/__init__.py +0 -0
  72. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/hypervisor/hypervisor_importer.py +0 -0
  73. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/hypervisor/openstack_hypervisor_importer.py +0 -0
  74. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/image/__init__.py +0 -0
  75. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/image/image_importer.py +0 -0
  76. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/image/openstack_image_importer.py +0 -0
  77. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/instance/__init__.py +0 -0
  78. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/instance/instance_importer.py +0 -0
  79. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/load_balancer/__init__.py +0 -0
  80. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/load_balancer/load_balancer_importer.py +0 -0
  81. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/load_balancer/openstack_load_balancer_importer.py +0 -0
  82. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/project/__init__.py +0 -0
  83. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/project/openstack_project_importer.py +0 -0
  84. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/project/project_importer.py +0 -0
  85. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/role_assignment/__init__.py +0 -0
  86. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py +0 -0
  87. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/role_assignment/role_assignment_importer.py +0 -0
  88. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/router/__init__.py +0 -0
  89. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/router/openstack_router_importer.py +0 -0
  90. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/router/router_importer.py +0 -0
  91. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/volume/__init__.py +0 -0
  92. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/volume/openstack_volume_importer.py +0 -0
  93. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/volume/volume_importer.py +0 -0
  94. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/__init__.py +0 -0
  95. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/authentication_info.py +0 -0
  96. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/flavor.py +0 -0
  97. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/floating_ip.py +0 -0
  98. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/hypervisor.py +0 -0
  99. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/image.py +0 -0
  100. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/load_balancer.py +0 -0
  101. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/project.py +0 -0
  102. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/role_assignment.py +0 -0
  103. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/router.py +0 -0
  104. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/volume.py +0 -0
  105. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/os_connection/__init__.py +0 -0
  106. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/os_connection/get_connections.py +0 -0
  107. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/__init__.py +0 -0
  108. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/create_file.py +0 -0
  109. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/excel_autosize_column.py +0 -0
  110. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/excel_sort_sheet.py +0 -0
  111. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/export_data_excel.py +0 -0
  112. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/extract_hostname.py +0 -0
  113. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/openstack_util.py +0 -0
  114. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/panda_excel.py +0 -0
  115. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/util/validate_dir_path.py +0 -0
  116. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/SOURCES.txt +0 -0
  117. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/dependency_links.txt +0 -0
  118. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/entry_points.txt +0 -0
  119. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/requires.txt +0 -0
  120. {osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/top_level.txt +0 -0
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: osi-dump
3
- Version: 0.1.3.2.7
3
+ Version: 0.1.3.2.8
4
4
  Summary: OpenStack information dump tool
5
5
  Author: TVKain
6
6
  License: Apache-2.0
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/pyproject.toml RENAMED
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "osi-dump"
3
- version = "0.1.3.2.7"
3
+ version = "0.1.3.2.8"
4
4
  description = "OpenStack information dump tool"
5
5
  readme = "README.md"
6
6
  authors = [{ name = "TVKain" }]
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/external_port/openstack_external_port_importer.py RENAMED
@@ -11,6 +11,7 @@ from openstack.network.v2.port import Port as OSPort
11
11
  from openstack.network.v2.subnet import Subnet as OSSubnet
12
12
  from openstack.network.v2.floating_ip import FloatingIP as OSFloatingIP
13
13
  from openstack.network.v2.router import Router as OSRouter
14
+ from openstack.network.v2.network import Network as OSNetwork
14
15
 
15
16
  from osi_dump.importer.external_port.external_port_importer import ExternalPortImporter
16
17
  from osi_dump.model.external_port import ExternalPort
@@ -122,7 +123,19 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
122
123
  device_id=external_port.device_id,
123
124
  )
124
125
  )
125
-
126
+
127
+ network: OSNetwork = self.connection.get_network(name_or_id=external_port.network_id)
128
+
129
+ vlan_id = None
130
+
131
+ try:
132
+ if not network.segments:
133
+ vlan_id = network.provider_segmentation_id
134
+ else:
135
+ logger.warning(f"Multiple segments mapped for net id {network.id}")
136
+ except Exception as e:
137
+ logger.warning(f"Can not get vlan ID for external port {external_port.id}, net id {network.id}")
138
+
126
139
  external_port_ret = ExternalPort(
127
140
  port_id=external_port.id,
128
141
  project_id=project_id,
@@ -134,6 +147,7 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
134
147
  device_id=external_port.device_id,
135
148
  device_owner=external_port.device_owner,
136
149
  status=external_port.status,
150
+ vlan_id=vlan_id
137
151
  )
138
152
 
139
153
  return external_port_ret
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/importer/instance/openstack_instance_importer.py RENAMED
@@ -108,7 +108,10 @@ class OpenStackInstanceImporter(InstanceImporter):
108
108
 
109
109
  except Exception as e:
110
110
  pass
111
-
111
+
112
+ image_id = server.image["id"]
113
+ flavor_id = server.flavor["id"]
114
+
112
115
  instance = Instance(
113
116
  instance_id=server.id,
114
117
  instance_name=server.name,
@@ -126,6 +129,8 @@ class OpenStackInstanceImporter(InstanceImporter):
126
129
  user_id=server.user_id,
127
130
  vgpus=vgpus,
128
131
  vgpu_type=vgpu_type,
132
+ image_id=image_id,
133
+ flavor_id=flavor_id
129
134
  )
130
135
 
131
136
  return instance
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/external_port.py RENAMED
@@ -25,3 +25,5 @@ class ExternalPort(BaseModel):
25
25
  device_owner: Optional[str]
26
26
 
27
27
  status: Optional[str]
28
+
29
+ vlan_id: Optional[str]
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump/model/instance.py RENAMED
@@ -21,6 +21,9 @@ class Instance(BaseModel):
21
21
  hypervisor: Optional[str]
22
22
 
23
23
  user_id: Optional[str]
24
+
25
+ image_id: Optional[str]
26
+ flavor_id: Optional[str]
24
27
 
25
28
  created_at: str
26
29
  updated_at: str
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/src/osi_dump.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: osi-dump
3
- Version: 0.1.3.2.7
3
+ Version: 0.1.3.2.8
4
4
  Summary: OpenStack information dump tool
5
5
  Author: TVKain
6
6
  License: Apache-2.0
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/README.md RENAMED
File without changes
{osi_dump-0.1.3.2.7 → osi_dump-0.1.3.2.8}/setup.cfg RENAMED
File without changes