Skip to content

Commit

Permalink
Releasing version 2.131.1
Browse files Browse the repository at this point in the history 
Releasing version 2.131.1
  • Loading branch information
@oci-dex-release-bot
oci-dex-release-bot authored Aug 13, 2024
2 parents bf77ff7 + d75d1a2 commit eb7562f
Show file tree
Hide file tree
Showing 37 changed files with 779 additions and 132 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,22 @@ All notable changes to this project will be documented in this file.

The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
====================
2.131.0 - 09/16/2023
2.131.1 - 2024-08-13
====================

Added
-----
* Support for calling Oracle Cloud Infrastructure services in the me-abudhabi-4 region
* Support for viewing subscription limits in the Limits service
* Support for TCP idle timeout on network load balancer create and update operations in the Network Load Balancing service
* Support for creating integration instances of type Healthcare in the Integration Cloud service

Changed
-------
* The upper-bound for the circuitbreaker library was updated from `2.0.0` to `3.0.0` for Python versions 3.7 and above

====================
2.131.0 - 2024-08-06
====================

Added
Expand Down
5 changes: 5 additions & 0 deletions examples/showoci/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.

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

=====================
24.08.06 - 24.08.06
=====================
* subscription id attribute in Cloud Exadata Infrastructure and Cloud VM Clusters in the Database service and additional parameters

=====================
24.07.09 - 24.07.09
=====================
Expand Down
2 changes: 1 addition & 1 deletion examples/showoci/showoci.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
import os
import time

version = "24.07.09"
version = "24.08.06"

##########################################################################
# check OCI version
Expand Down
33 changes: 31 additions & 2 deletions examples/showoci/showoci_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


class ShowOCIData(object):
version = "24.07.09"
version = "24.08.06"

############################################
# ShowOCIService - Service object to query
Expand Down Expand Up @@ -2508,6 +2508,25 @@ def __get_database_db_exadata(self, region_name, compartment):
'lifecycle_state': dbs['lifecycle_state'],
'lifecycle_details': dbs['lifecycle_details'],
'availability_domain': dbs['availability_domain'],
# Added 7/29/2024
'cluster_placement_group_id': dbs['cluster_placement_group_id'],
'subscription_id': dbs['subscription_id'],
'cpu_count': dbs['cpu_count'],
'max_cpu_count': dbs['max_cpu_count'],
'memory_size_in_gbs': dbs['memory_size_in_gbs'],
'db_node_storage_size_in_gbs': dbs['db_node_storage_size_in_gbs'],
'max_db_node_storage_in_gbs': dbs['max_db_node_storage_in_gbs'],
'data_storage_size_in_tbs': dbs['data_storage_size_in_tbs'],
'max_data_storage_in_tbs': dbs['max_data_storage_in_tbs'],
'additional_storage_count': dbs['additional_storage_count'],
'activated_storage_count': dbs['activated_storage_count'],
'storage_server_version': dbs['storage_server_version'],
'db_server_version': dbs['db_server_version'],
'monthly_storage_server_version': dbs['monthly_storage_server_version'],
'monthly_db_server_version': dbs['monthly_db_server_version'],
'customer_contacts': dbs['customer_contacts'],
'defined_file_system_configurations': dbs['defined_file_system_configurations'],
# End Added 7/29/2024
'compute_count': dbs['compute_count'],
'storage_count': dbs['storage_count'],
'total_storage_size_in_gbs': dbs['total_storage_size_in_gbs'],
Expand Down Expand Up @@ -2579,6 +2598,16 @@ def __get_database_db_exadata(self, region_name, compartment):
'vip_ids': vm['vip_ids'],
'vip_ips': vm['vip_ips'],
'scan_dns_record_id': vm['scan_dns_record_id'],
# Added 7/29/2024
'subscription_id': vm['subscription_id'],
'is_diagnostics_events_enabled': vm['is_diagnostics_events_enabled'],
'is_health_monitoring_enabled': vm['is_health_monitoring_enabled'],
'is_incident_logs_enabled': vm['is_incident_logs_enabled'],
'gi_software_image_id': vm['gi_software_image_id'],
'scan_listener_port_tcp_ssl': vm['scan_listener_port_tcp_ssl'],
'scan_listener_port_tcp': vm['scan_listener_port_tcp'],
'file_system_configuration_details': vm['file_system_configuration_details'],
# End Added 7/29/2024
'defined_tags': vm['defined_tags'],
'freeform_tags': vm['freeform_tags'],
'sum_info': 'Database ExaCS VMCluster - ' + dbs['shape'] + " - " + vm['license_model'],
Expand All @@ -2587,8 +2616,8 @@ def __get_database_db_exadata(self, region_name, compartment):
'patches': self.__get_database_db_patches(vm['patches']),
'db_homes': self.__get_database_db_homes(vm['db_homes']),
'db_nodes': [] if not db_nodes else sorted(db_nodes, key=lambda i: i['desc']),
'zone_id': vm['zone_id'],
'scan_dns_name': vm['scan_dns_name'],
'zone_id': vm['zone_id'],
'compartment_name': vm['compartment_name'],
'compartment_path': vm['compartment_path'],
'region_name': vm['region_name']
Expand Down
37 changes: 30 additions & 7 deletions examples/showoci/showoci_output.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


class ShowOCIOutput(object):
version = "24.07.09"
version = "24.08.06"

##########################################################################
# spaces for align
Expand Down Expand Up @@ -6672,23 +6672,36 @@ def __csv_database_db_exadata(self, region_name, list_exa):
'shape': dbs['shape'],
'time_zone': "",
'cpus_enabled': "",
'max_cpu_count': dbs['shape_ocpu'],
'memory_size_in_gbs': "",
'max_memory_in_gbs': dbs['shape_memory_gb'],
'db_node_storage_size_in_gbs': "",
'max_db_node_storage_in_g_bs': "",
'data_storage_size_in_tbs': "",
'max_data_storage_in_t_bs': dbs['shape_storage_tb'],
'total_storage_size_in_gbs': dbs['total_storage_size_in_gbs'],
'available_storage_size_in_gbs': dbs['available_storage_size_in_gbs'],
'storage_count': dbs['storage_count'],
'additional_storage_count': "",
'activated_storage_count': "",
'compute_count': dbs['compute_count'],
'dns_server': "",
'ntp_server': "",
'csi_number': "",
'node_count': "",
# Added 7/29/2024
'cluster_placement_group_id': dbs['cluster_placement_group_id'],
'subscription_id': dbs['subscription_id'],
'cpu_count': dbs['cpu_count'],
'max_cpu_count': dbs['max_cpu_count'],
'memory_size_in_gbs': dbs['memory_size_in_gbs'],
'db_node_storage_size_in_gbs': dbs['db_node_storage_size_in_gbs'],
'max_db_node_storage_in_gbs': dbs['max_db_node_storage_in_gbs'],
'data_storage_size_in_tbs': dbs['data_storage_size_in_tbs'],
'max_data_storage_in_tbs': dbs['max_data_storage_in_tbs'],
'additional_storage_count': dbs['additional_storage_count'],
'activated_storage_count': dbs['activated_storage_count'],
'storage_server_version': dbs['storage_server_version'],
'db_server_version': dbs['db_server_version'],
'monthly_storage_server_version': dbs['monthly_storage_server_version'],
'monthly_db_server_version': dbs['monthly_db_server_version'],
'customer_contacts': str(dbs['customer_contacts']),
'defined_file_system_configurations': str(dbs['defined_file_system_configurations']),
# End Added 7/29/2024
'db_servers': str(', '.join(x['desc'] for x in dbs['db_servers'])),
'db_servers_ids': str(', '.join(x['id'] for x in dbs['db_servers'])),
'cluster_count': len(dbs['vm_clusters']),
Expand Down Expand Up @@ -6740,6 +6753,16 @@ def __csv_database_db_exadata(self, region_name, list_exa):
'cluster_name': vm['cluster_name'],
'time_created': vm['time_created'][0:16],
'domain': vm['domain'],
# Added 7/29/2024
'subscription_id': vm['subscription_id'],
'is_diagnostics_events_enabled': vm['is_diagnostics_events_enabled'],
'is_health_monitoring_enabled': vm['is_health_monitoring_enabled'],
'is_incident_logs_enabled': vm['is_incident_logs_enabled'],
'gi_software_image_id': vm['gi_software_image_id'],
'scan_listener_port_tcp_ssl': vm['scan_listener_port_tcp_ssl'],
'scan_listener_port_tcp': vm['scan_listener_port_tcp'],
'file_system_configuration_details': str(vm['file_system_configuration_details']),
# End Added 7/29/2024
'db_nodes': str(', '.join(x['desc'] for x in vm['db_nodes'])),
'db_homes': str(', '.join(x['home'] for x in vm['db_homes'])),
'freeform_tags': self.__get_freeform_tags(vm['freeform_tags']),
Expand Down
96 changes: 67 additions & 29 deletions examples/showoci/showoci_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
# class ShowOCIService
##########################################################################
class ShowOCIService(object):
version = "24.07.09"
oci_compatible_version = "2.125.0"
version = "24.08.06"
oci_compatible_version = "2.129.4"
thread_lock = threading.Lock()
collection_ljust = 40

Expand Down Expand Up @@ -9409,33 +9409,58 @@ def __load_database_exadata_infrastructure(self, database_client, virtual_networ
if not self.check_lifecycle_state_active(dbs.lifecycle_state):
continue

value = {'id': str(dbs.id),
'display_name': str(dbs.display_name),
'shape': str(dbs.shape),
'shape_ocpu': 0,
'shape_memory_gb': 0,
'shape_storage_tb': 0,
'version': 'XP',
'lifecycle_state': str(dbs.lifecycle_state),
'lifecycle_details': str(dbs.lifecycle_details),
'availability_domain': str(dbs.availability_domain),
'storage_count': str(dbs.storage_count) if dbs.storage_count else "",
'compute_count': str(dbs.compute_count) if dbs.compute_count else "",
'total_storage_size_in_gbs': str(dbs.total_storage_size_in_gbs),
'available_storage_size_in_gbs': str(dbs.available_storage_size_in_gbs),
'compartment_name': str(compartment['name']),
'compartment_path': str(compartment['path']),
'compartment_id': str(compartment['id']),
'time_created': str(dbs.time_created),
'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window),
'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags,
'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags,
'region_name': str(self.config['region']),
'vm_clusters': [],
'db_servers': self.__load_database_exacc_dbservers(database_client, compartment, dbs.id)
}
value = {
'id': self.get_value(dbs.id),
'display_name': self.get_value(dbs.display_name),
'shape': self.get_value(dbs.shape),
'shape_ocpu': 0,
'shape_memory_gb': 0,
'shape_storage_tb': 0,
'version': 'XP',
'lifecycle_state': self.get_value(dbs.lifecycle_state),
'lifecycle_details': self.get_value(dbs.lifecycle_details),
'availability_domain': self.get_value(dbs.availability_domain),
'storage_count': self.get_value(dbs.storage_count),
'compute_count': self.get_value(dbs.compute_count),
'total_storage_size_in_gbs': self.get_value(dbs.total_storage_size_in_gbs),
'available_storage_size_in_gbs': self.get_value(dbs.available_storage_size_in_gbs),
'time_created': self.get_value(dbs.time_created),
# Added 7/29/2024
'cluster_placement_group_id': self.get_value(dbs.cluster_placement_group_id),
'subscription_id': self.get_value(dbs.subscription_id),
'cpu_count': self.get_value(dbs.cpu_count),
'max_cpu_count': self.get_value(dbs.max_cpu_count),
'memory_size_in_gbs': self.get_value(dbs.memory_size_in_gbs),
'db_node_storage_size_in_gbs': self.get_value(dbs.db_node_storage_size_in_gbs),
'max_db_node_storage_in_gbs': self.get_value(dbs.max_db_node_storage_in_gbs),
'data_storage_size_in_tbs': self.get_value(dbs.data_storage_size_in_tbs),
'max_data_storage_in_tbs': self.get_value(dbs.max_data_storage_in_tbs),
'additional_storage_count': self.get_value(dbs.additional_storage_count),
'activated_storage_count': self.get_value(dbs.activated_storage_count),
'storage_server_version': self.get_value(dbs.storage_server_version),
'db_server_version': self.get_value(dbs.db_server_version),
'monthly_storage_server_version': self.get_value(dbs.monthly_storage_server_version),
'monthly_db_server_version': self.get_value(dbs.monthly_db_server_version),
'customer_contacts': [x.email for x in dbs.customer_contacts] if dbs.customer_contacts else [],
'defined_file_system_configurations': [{
'mount_point': self.get_value(x.mount_point),
'min_size_gb': self.get_value(x.min_size_gb),
'is_resizable': self.get_value(x.is_resizable),
'is_backup_partition': self.get_value(x.is_backup_partition)
} for x in dbs.defined_file_system_configurations] if dbs.defined_file_system_configurations else [],
# End Added 7/29/2024
'compartment_name': str(compartment['name']),
'compartment_path': str(compartment['path']),
'compartment_id': str(compartment['id']),
'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)),
'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window),
'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags,
'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags,
'region_name': str(self.config['region']),
'vm_clusters': [],
'db_servers': self.__load_database_exacc_dbservers(database_client, compartment, dbs.id)
}

# get shape
if dbs.shape:
Expand Down Expand Up @@ -9568,6 +9593,19 @@ def __load_database_exadata_vm_clusters(self, database_client, virtual_network,
'scan_ip_ids': self.get_value(arr.scan_ip_ids),
'vip_ids': self.get_value(arr.vip_ids),
'scan_dns_record_id': self.get_value(arr.scan_dns_record_id),
# Added 7/29/2024
'subscription_id': self.get_value(arr.subscription_id),
'is_diagnostics_events_enabled': self.get_value(arr.data_collection_options.is_diagnostics_events_enabled) if arr.data_collection_options else "",
'is_health_monitoring_enabled': self.get_value(arr.data_collection_options.is_health_monitoring_enabled) if arr.data_collection_options else "",
'is_incident_logs_enabled': self.get_value(arr.data_collection_options.is_incident_logs_enabled) if arr.data_collection_options else "",
'gi_software_image_id': self.get_value(arr.gi_software_image_id),
'scan_listener_port_tcp_ssl': self.get_value(arr.scan_listener_port_tcp_ssl),
'scan_listener_port_tcp': self.get_value(arr.scan_listener_port_tcp),
'file_system_configuration_details': [{
'mount_point': self.get_value(x.mount_point),
'file_system_size_gb': self.get_value(x.file_system_size_gb)
} for x in arr.file_system_configuration_details] if arr.file_system_configuration_details else [],
# End Added 7/29/2024
'defined_tags': [] if arr.defined_tags is None else arr.defined_tags,
'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags,
'patches': [],
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ tox==3.14.3
virtualenv==16.7.9
vcrpy==2.0.1
wheel<=0.39.0
circuitbreaker>=1.3.1,<2.0.0
circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'
circuitbreaker>=1.3.1,<3.0.0; python_version >= '3.7'
docutils<0.18
Jinja2<3.1
3 changes: 2 additions & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ def open_relative(*path):
"pyOpenSSL>=17.5.0,<25.0.0",
"python-dateutil>=2.5.3,<3.0.0",
"pytz>=2016.10",
"circuitbreaker>=1.3.1,< 2.0.0"
"circuitbreaker>=1.3.1,<2.0.0; python_version <= '3.6'",
"circuitbreaker>=1.3.1,<3.0.0; python_version >= '3.7'"
]

setup(
Expand Down
Loading

0 comments on commit eb7562f

Please sign in to comment.