Skip to content

Commit eb7562f

Browse files
oci-dex-release-botoci-dex-release-bot
authored
Releasing version 2.131.1
Releasing version 2.131.1
2 parents bf77ff7 + d75d1a2 commit eb7562f

37 files changed

+779
-132
lines changed

‎CHANGELOG.rst

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,22 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
66
====================
7-
2.131.0 - 09/16/2023
7+
2.131.1 - 2024-08-13
8+
====================
9+
10+
Added
11+
-----
12+
* Support for calling Oracle Cloud Infrastructure services in the me-abudhabi-4 region
13+
* Support for viewing subscription limits in the Limits service
14+
* Support for TCP idle timeout on network load balancer create and update operations in the Network Load Balancing service
15+
* Support for creating integration instances of type Healthcare in the Integration Cloud service
16+
17+
Changed
18+
-------
19+
* The upper-bound for the circuitbreaker library was updated from `2.0.0` to `3.0.0` for Python versions 3.7 and above
20+
21+
====================
22+
2.131.0 - 2024-08-06
823
====================
924

1025
Added

‎examples/showoci/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
66

7+
=====================
8+
24.08.06 - 24.08.06
9+
=====================
10+
* subscription id attribute in Cloud Exadata Infrastructure and Cloud VM Clusters in the Database service and additional parameters
11+
712
=====================
813
24.07.09 - 24.07.09
914
=====================

‎examples/showoci/showoci.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
import os
129129
import time
130130

131-
version = "24.07.09"
131+
version = "24.08.06"
132132

133133
##########################################################################
134134
# check OCI version

‎examples/showoci/showoci_data.py

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
class ShowOCIData(object):
23-
version = "24.07.09"
23+
version = "24.08.06"
2424

2525
############################################
2626
# ShowOCIService - Service object to query
@@ -2508,6 +2508,25 @@ def __get_database_db_exadata(self, region_name, compartment):
25082508
'lifecycle_state': dbs['lifecycle_state'],
25092509
'lifecycle_details': dbs['lifecycle_details'],
25102510
'availability_domain': dbs['availability_domain'],
2511+
# Added 7/29/2024
2512+
'cluster_placement_group_id': dbs['cluster_placement_group_id'],
2513+
'subscription_id': dbs['subscription_id'],
2514+
'cpu_count': dbs['cpu_count'],
2515+
'max_cpu_count': dbs['max_cpu_count'],
2516+
'memory_size_in_gbs': dbs['memory_size_in_gbs'],
2517+
'db_node_storage_size_in_gbs': dbs['db_node_storage_size_in_gbs'],
2518+
'max_db_node_storage_in_gbs': dbs['max_db_node_storage_in_gbs'],
2519+
'data_storage_size_in_tbs': dbs['data_storage_size_in_tbs'],
2520+
'max_data_storage_in_tbs': dbs['max_data_storage_in_tbs'],
2521+
'additional_storage_count': dbs['additional_storage_count'],
2522+
'activated_storage_count': dbs['activated_storage_count'],
2523+
'storage_server_version': dbs['storage_server_version'],
2524+
'db_server_version': dbs['db_server_version'],
2525+
'monthly_storage_server_version': dbs['monthly_storage_server_version'],
2526+
'monthly_db_server_version': dbs['monthly_db_server_version'],
2527+
'customer_contacts': dbs['customer_contacts'],
2528+
'defined_file_system_configurations': dbs['defined_file_system_configurations'],
2529+
# End Added 7/29/2024
25112530
'compute_count': dbs['compute_count'],
25122531
'storage_count': dbs['storage_count'],
25132532
'total_storage_size_in_gbs': dbs['total_storage_size_in_gbs'],
@@ -2579,6 +2598,16 @@ def __get_database_db_exadata(self, region_name, compartment):
25792598
'vip_ids': vm['vip_ids'],
25802599
'vip_ips': vm['vip_ips'],
25812600
'scan_dns_record_id': vm['scan_dns_record_id'],
2601+
# Added 7/29/2024
2602+
'subscription_id': vm['subscription_id'],
2603+
'is_diagnostics_events_enabled': vm['is_diagnostics_events_enabled'],
2604+
'is_health_monitoring_enabled': vm['is_health_monitoring_enabled'],
2605+
'is_incident_logs_enabled': vm['is_incident_logs_enabled'],
2606+
'gi_software_image_id': vm['gi_software_image_id'],
2607+
'scan_listener_port_tcp_ssl': vm['scan_listener_port_tcp_ssl'],
2608+
'scan_listener_port_tcp': vm['scan_listener_port_tcp'],
2609+
'file_system_configuration_details': vm['file_system_configuration_details'],
2610+
# End Added 7/29/2024
25822611
'defined_tags': vm['defined_tags'],
25832612
'freeform_tags': vm['freeform_tags'],
25842613
'sum_info': 'Database ExaCS VMCluster - ' + dbs['shape'] + " - " + vm['license_model'],
@@ -2587,8 +2616,8 @@ def __get_database_db_exadata(self, region_name, compartment):
25872616
'patches': self.__get_database_db_patches(vm['patches']),
25882617
'db_homes': self.__get_database_db_homes(vm['db_homes']),
25892618
'db_nodes': [] if not db_nodes else sorted(db_nodes, key=lambda i: i['desc']),
2590-
'zone_id': vm['zone_id'],
25912619
'scan_dns_name': vm['scan_dns_name'],
2620+
'zone_id': vm['zone_id'],
25922621
'compartment_name': vm['compartment_name'],
25932622
'compartment_path': vm['compartment_path'],
25942623
'region_name': vm['region_name']

‎examples/showoci/showoci_output.py

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
class ShowOCIOutput(object):
25-
version = "24.07.09"
25+
version = "24.08.06"
2626

2727
##########################################################################
2828
# spaces for align
@@ -6672,23 +6672,36 @@ def __csv_database_db_exadata(self, region_name, list_exa):
66726672
'shape': dbs['shape'],
66736673
'time_zone': "",
66746674
'cpus_enabled': "",
6675-
'max_cpu_count': dbs['shape_ocpu'],
6676-
'memory_size_in_gbs': "",
66776675
'max_memory_in_gbs': dbs['shape_memory_gb'],
6678-
'db_node_storage_size_in_gbs': "",
66796676
'max_db_node_storage_in_g_bs': "",
6680-
'data_storage_size_in_tbs': "",
66816677
'max_data_storage_in_t_bs': dbs['shape_storage_tb'],
66826678
'total_storage_size_in_gbs': dbs['total_storage_size_in_gbs'],
66836679
'available_storage_size_in_gbs': dbs['available_storage_size_in_gbs'],
66846680
'storage_count': dbs['storage_count'],
6685-
'additional_storage_count': "",
6686-
'activated_storage_count': "",
66876681
'compute_count': dbs['compute_count'],
66886682
'dns_server': "",
66896683
'ntp_server': "",
66906684
'csi_number': "",
66916685
'node_count': "",
6686+
# Added 7/29/2024
6687+
'cluster_placement_group_id': dbs['cluster_placement_group_id'],
6688+
'subscription_id': dbs['subscription_id'],
6689+
'cpu_count': dbs['cpu_count'],
6690+
'max_cpu_count': dbs['max_cpu_count'],
6691+
'memory_size_in_gbs': dbs['memory_size_in_gbs'],
6692+
'db_node_storage_size_in_gbs': dbs['db_node_storage_size_in_gbs'],
6693+
'max_db_node_storage_in_gbs': dbs['max_db_node_storage_in_gbs'],
6694+
'data_storage_size_in_tbs': dbs['data_storage_size_in_tbs'],
6695+
'max_data_storage_in_tbs': dbs['max_data_storage_in_tbs'],
6696+
'additional_storage_count': dbs['additional_storage_count'],
6697+
'activated_storage_count': dbs['activated_storage_count'],
6698+
'storage_server_version': dbs['storage_server_version'],
6699+
'db_server_version': dbs['db_server_version'],
6700+
'monthly_storage_server_version': dbs['monthly_storage_server_version'],
6701+
'monthly_db_server_version': dbs['monthly_db_server_version'],
6702+
'customer_contacts': str(dbs['customer_contacts']),
6703+
'defined_file_system_configurations': str(dbs['defined_file_system_configurations']),
6704+
# End Added 7/29/2024
66926705
'db_servers': str(', '.join(x['desc'] for x in dbs['db_servers'])),
66936706
'db_servers_ids': str(', '.join(x['id'] for x in dbs['db_servers'])),
66946707
'cluster_count': len(dbs['vm_clusters']),
@@ -6740,6 +6753,16 @@ def __csv_database_db_exadata(self, region_name, list_exa):
67406753
'cluster_name': vm['cluster_name'],
67416754
'time_created': vm['time_created'][0:16],
67426755
'domain': vm['domain'],
6756+
# Added 7/29/2024
6757+
'subscription_id': vm['subscription_id'],
6758+
'is_diagnostics_events_enabled': vm['is_diagnostics_events_enabled'],
6759+
'is_health_monitoring_enabled': vm['is_health_monitoring_enabled'],
6760+
'is_incident_logs_enabled': vm['is_incident_logs_enabled'],
6761+
'gi_software_image_id': vm['gi_software_image_id'],
6762+
'scan_listener_port_tcp_ssl': vm['scan_listener_port_tcp_ssl'],
6763+
'scan_listener_port_tcp': vm['scan_listener_port_tcp'],
6764+
'file_system_configuration_details': str(vm['file_system_configuration_details']),
6765+
# End Added 7/29/2024
67436766
'db_nodes': str(', '.join(x['desc'] for x in vm['db_nodes'])),
67446767
'db_homes': str(', '.join(x['home'] for x in vm['db_homes'])),
67456768
'freeform_tags': self.__get_freeform_tags(vm['freeform_tags']),

‎examples/showoci/showoci_service.py

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
# class ShowOCIService
4040
##########################################################################
4141
class ShowOCIService(object):
42-
version = "24.07.09"
43-
oci_compatible_version = "2.125.0"
42+
version = "24.08.06"
43+
oci_compatible_version = "2.129.4"
4444
thread_lock = threading.Lock()
4545
collection_ljust = 40
4646

@@ -9409,33 +9409,58 @@ def __load_database_exadata_infrastructure(self, database_client, virtual_networ
94099409
if not self.check_lifecycle_state_active(dbs.lifecycle_state):
94109410
continue
94119411

9412-
value = {'id': str(dbs.id),
9413-
'display_name': str(dbs.display_name),
9414-
'shape': str(dbs.shape),
9415-
'shape_ocpu': 0,
9416-
'shape_memory_gb': 0,
9417-
'shape_storage_tb': 0,
9418-
'version': 'XP',
9419-
'lifecycle_state': str(dbs.lifecycle_state),
9420-
'lifecycle_details': str(dbs.lifecycle_details),
9421-
'availability_domain': str(dbs.availability_domain),
9422-
'storage_count': str(dbs.storage_count) if dbs.storage_count else "",
9423-
'compute_count': str(dbs.compute_count) if dbs.compute_count else "",
9424-
'total_storage_size_in_gbs': str(dbs.total_storage_size_in_gbs),
9425-
'available_storage_size_in_gbs': str(dbs.available_storage_size_in_gbs),
9426-
'compartment_name': str(compartment['name']),
9427-
'compartment_path': str(compartment['path']),
9428-
'compartment_id': str(compartment['id']),
9429-
'time_created': str(dbs.time_created),
9430-
'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
9431-
'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
9432-
'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window),
9433-
'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags,
9434-
'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags,
9435-
'region_name': str(self.config['region']),
9436-
'vm_clusters': [],
9437-
'db_servers': self.__load_database_exacc_dbservers(database_client, compartment, dbs.id)
9438-
}
9412+
value = {
9413+
'id': self.get_value(dbs.id),
9414+
'display_name': self.get_value(dbs.display_name),
9415+
'shape': self.get_value(dbs.shape),
9416+
'shape_ocpu': 0,
9417+
'shape_memory_gb': 0,
9418+
'shape_storage_tb': 0,
9419+
'version': 'XP',
9420+
'lifecycle_state': self.get_value(dbs.lifecycle_state),
9421+
'lifecycle_details': self.get_value(dbs.lifecycle_details),
9422+
'availability_domain': self.get_value(dbs.availability_domain),
9423+
'storage_count': self.get_value(dbs.storage_count),
9424+
'compute_count': self.get_value(dbs.compute_count),
9425+
'total_storage_size_in_gbs': self.get_value(dbs.total_storage_size_in_gbs),
9426+
'available_storage_size_in_gbs': self.get_value(dbs.available_storage_size_in_gbs),
9427+
'time_created': self.get_value(dbs.time_created),
9428+
# Added 7/29/2024
9429+
'cluster_placement_group_id': self.get_value(dbs.cluster_placement_group_id),
9430+
'subscription_id': self.get_value(dbs.subscription_id),
9431+
'cpu_count': self.get_value(dbs.cpu_count),
9432+
'max_cpu_count': self.get_value(dbs.max_cpu_count),
9433+
'memory_size_in_gbs': self.get_value(dbs.memory_size_in_gbs),
9434+
'db_node_storage_size_in_gbs': self.get_value(dbs.db_node_storage_size_in_gbs),
9435+
'max_db_node_storage_in_gbs': self.get_value(dbs.max_db_node_storage_in_gbs),
9436+
'data_storage_size_in_tbs': self.get_value(dbs.data_storage_size_in_tbs),
9437+
'max_data_storage_in_tbs': self.get_value(dbs.max_data_storage_in_tbs),
9438+
'additional_storage_count': self.get_value(dbs.additional_storage_count),
9439+
'activated_storage_count': self.get_value(dbs.activated_storage_count),
9440+
'storage_server_version': self.get_value(dbs.storage_server_version),
9441+
'db_server_version': self.get_value(dbs.db_server_version),
9442+
'monthly_storage_server_version': self.get_value(dbs.monthly_storage_server_version),
9443+
'monthly_db_server_version': self.get_value(dbs.monthly_db_server_version),
9444+
'customer_contacts': [x.email for x in dbs.customer_contacts] if dbs.customer_contacts else [],
9445+
'defined_file_system_configurations': [{
9446+
'mount_point': self.get_value(x.mount_point),
9447+
'min_size_gb': self.get_value(x.min_size_gb),
9448+
'is_resizable': self.get_value(x.is_resizable),
9449+
'is_backup_partition': self.get_value(x.is_backup_partition)
9450+
} for x in dbs.defined_file_system_configurations] if dbs.defined_file_system_configurations else [],
9451+
# End Added 7/29/2024
9452+
'compartment_name': str(compartment['name']),
9453+
'compartment_path': str(compartment['path']),
9454+
'compartment_id': str(compartment['id']),
9455+
'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
9456+
'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
9457+
'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window),
9458+
'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags,
9459+
'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags,
9460+
'region_name': str(self.config['region']),
9461+
'vm_clusters': [],
9462+
'db_servers': self.__load_database_exacc_dbservers(database_client, compartment, dbs.id)
9463+
}
94399464

94409465
# get shape
94419466
if dbs.shape:
@@ -9568,6 +9593,19 @@ def __load_database_exadata_vm_clusters(self, database_client, virtual_network,
95689593
'scan_ip_ids': self.get_value(arr.scan_ip_ids),
95699594
'vip_ids': self.get_value(arr.vip_ids),
95709595
'scan_dns_record_id': self.get_value(arr.scan_dns_record_id),
9596+
# Added 7/29/2024
9597+
'subscription_id': self.get_value(arr.subscription_id),
9598+
'is_diagnostics_events_enabled': self.get_value(arr.data_collection_options.is_diagnostics_events_enabled) if arr.data_collection_options else "",
9599+
'is_health_monitoring_enabled': self.get_value(arr.data_collection_options.is_health_monitoring_enabled) if arr.data_collection_options else "",
9600+
'is_incident_logs_enabled': self.get_value(arr.data_collection_options.is_incident_logs_enabled) if arr.data_collection_options else "",
9601+
'gi_software_image_id': self.get_value(arr.gi_software_image_id),
9602+
'scan_listener_port_tcp_ssl': self.get_value(arr.scan_listener_port_tcp_ssl),
9603+
'scan_listener_port_tcp': self.get_value(arr.scan_listener_port_tcp),
9604+
'file_system_configuration_details': [{
9605+
'mount_point': self.get_value(x.mount_point),
9606+
'file_system_size_gb': self.get_value(x.file_system_size_gb)
9607+
} for x in arr.file_system_configuration_details] if arr.file_system_configuration_details else [],
9608+
# End Added 7/29/2024
95719609
'defined_tags': [] if arr.defined_tags is None else arr.defined_tags,
95729610
'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags,
95739611
'patches': [],

‎requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ tox==3.14.3
1616
virtualenv==16.7.9
1717
vcrpy==2.0.1
1818
wheel<=0.39.0
19-
circuitbreaker>=1.3.1,<2.0.0
19+
circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'
20+
circuitbreaker>=1.3.1,<3.0.0; python_version >= '3.7'
2021
docutils<0.18
2122
Jinja2<3.1

‎setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def open_relative(*path):
3636
"pyOpenSSL>=17.5.0,<25.0.0",
3737
"python-dateutil>=2.5.3,<3.0.0",
3838
"pytz>=2016.10",
39-
"circuitbreaker>=1.3.1,< 2.0.0"
39+
"circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'",
40+
"circuitbreaker>=1.3.1,<3.0.0; python_version >= '3.7'"
4041
]
4142

4243
setup(

0 commit comments

Comments
 (0)