From 10b02ba4e1a038fa9c290218638f7500e236da58 Mon Sep 17 00:00:00 2001 From: bhagwatvyas Date: Tue, 11 May 2021 17:39:31 +0000 Subject: [PATCH] Releasing version 2.38.2 --- CHANGELOG.rst | 17 ++++ docs/known-issues.rst | 12 ++- examples/copy_boot_volume_backup_example.py | 91 +++++++++++++++++++ examples/copy_volume_backup_example.py | 2 +- .../ai_language/ai_service_language_client.py | 3 +- src/oci/analytics/analytics_client.py | 3 +- .../announcement_client.py | 3 +- .../announcements_preferences_client.py | 3 +- src/oci/apigateway/api_gateway_client.py | 3 +- src/oci/apigateway/deployment_client.py | 3 +- src/oci/apigateway/gateway_client.py | 3 +- src/oci/apigateway/work_requests_client.py | 3 +- .../apm_control_plane/apm_domain_client.py | 3 +- .../apm_synthetics/apm_synthetic_client.py | 3 +- src/oci/apm_traces/query_client.py | 3 +- src/oci/apm_traces/trace_client.py | 3 +- .../application_migration_client.py | 3 +- src/oci/artifacts/artifacts_client.py | 3 +- src/oci/audit/audit_client.py | 3 +- src/oci/autoscaling/auto_scaling_client.py | 3 +- src/oci/base_client.py | 4 +- src/oci/bds/bds_client.py | 3 +- .../blockchain/blockchain_platform_client.py | 3 +- src/oci/budget/budget_client.py | 3 +- src/oci/cims/incident_client.py | 3 +- src/oci/cims/user_client.py | 3 +- src/oci/cloud_guard/cloud_guard_client.py | 3 +- .../compute_instance_agent_client.py | 3 +- .../compute_instance_agent/plugin_client.py | 3 +- .../pluginconfig_client.py | 3 +- .../container_engine_client.py | 3 +- src/oci/core/blockstorage_client.py | 3 +- src/oci/core/compute_client.py | 3 +- src/oci/core/compute_management_client.py | 3 +- src/oci/core/virtual_network_client.py | 3 +- src/oci/data_catalog/data_catalog_client.py | 3 +- src/oci/data_flow/data_flow_client.py | 3 +- .../data_integration_client.py | 3 +- src/oci/data_safe/data_safe_client.py | 3 +- src/oci/data_science/data_science_client.py | 18 ++-- ...ata_science_client_composite_operations.py | 7 +- src/oci/database/database_client.py | 3 +- src/oci/database/models/maintenance_run.py | 82 ++++++++++++++++- .../models/maintenance_run_summary.py | 82 ++++++++++++++++- .../models/update_maintenance_run_details.py | 52 ++++++++++- .../db_management_client.py | 3 +- .../database_migration_client.py | 3 +- src/oci/dns/dns_client.py | 3 +- src/oci/dts/appliance_export_job_client.py | 3 +- src/oci/dts/shipping_vendors_client.py | 3 +- src/oci/dts/transfer_appliance_client.py | 3 +- .../transfer_appliance_entitlement_client.py | 3 +- src/oci/dts/transfer_device_client.py | 3 +- src/oci/dts/transfer_job_client.py | 3 +- src/oci/dts/transfer_package_client.py | 3 +- src/oci/email/email_client.py | 3 +- src/oci/events/events_client.py | 3 +- src/oci/file_storage/file_storage_client.py | 3 +- src/oci/functions/functions_invoke_client.py | 3 +- .../functions/functions_management_client.py | 3 +- src/oci/golden_gate/golden_gate_client.py | 3 +- src/oci/healthchecks/health_checks_client.py | 3 +- src/oci/identity/identity_client.py | 3 +- .../integration_instance_client.py | 3 +- src/oci/key_management/kms_crypto_client.py | 3 +- .../key_management/kms_management_client.py | 3 +- src/oci/key_management/kms_vault_client.py | 3 +- src/oci/limits/limits_client.py | 3 +- src/oci/limits/quotas_client.py | 3 +- src/oci/load_balancer/load_balancer_client.py | 3 +- src/oci/log_analytics/log_analytics_client.py | 3 +- src/oci/logging/logging_management_client.py | 3 +- src/oci/loggingingestion/logging_client.py | 3 +- src/oci/loggingsearch/log_search_client.py | 3 +- .../management_agent_client.py | 3 +- .../management_dashboard/dashx_apis_client.py | 3 +- src/oci/marketplace/marketplace_client.py | 3 +- src/oci/monitoring/monitoring_client.py | 3 +- src/oci/mysql/channels_client.py | 3 +- src/oci/mysql/db_backups_client.py | 3 +- src/oci/mysql/db_system_client.py | 3 +- src/oci/mysql/mysqlaas_client.py | 3 +- src/oci/mysql/work_requests_client.py | 3 +- .../network_load_balancer_client.py | 3 +- src/oci/nosql/nosql_client.py | 3 +- .../object_storage/object_storage_client.py | 3 +- .../transfer/internal/buffered_part_reader.py | 15 ++- src/oci/oce/oce_instance_client.py | 3 +- src/oci/ocvp/esxi_host_client.py | 3 +- src/oci/ocvp/sddc_client.py | 3 +- src/oci/ocvp/work_request_client.py | 3 +- src/oci/oda/oda_client.py | 3 +- .../ons/notification_control_plane_client.py | 3 +- src/oci/ons/notification_data_plane_client.py | 3 +- .../access_requests_client.py | 3 +- .../operator_actions_client.py | 3 +- .../operator_control_assignment_client.py | 3 +- .../operator_control_client.py | 3 +- src/oci/opsi/operations_insights_client.py | 3 +- src/oci/optimizer/optimizer_client.py | 3 +- src/oci/os_management/os_management_client.py | 3 +- .../resource_manager_client.py | 3 +- .../resource_search/resource_search_client.py | 3 +- src/oci/rover/rover_cluster_client.py | 3 +- src/oci/rover/rover_entitlement_client.py | 3 +- src/oci/rover/rover_node_client.py | 3 +- src/oci/sch/service_connector_client.py | 3 +- src/oci/secrets/secrets_client.py | 3 +- .../service_catalog/service_catalog_client.py | 3 +- src/oci/streaming/stream_admin_client.py | 3 +- src/oci/streaming/stream_client.py | 3 +- .../domain_client.py | 3 +- .../domain_governance_client.py | 3 +- .../link_client.py | 3 +- .../recipient_invitation_client.py | 3 +- .../sender_invitation_client.py | 3 +- .../work_request_client.py | 3 +- src/oci/usage_api/usageapi_client.py | 3 +- src/oci/vault/vaults_client.py | 3 +- src/oci/version.py | 2 +- .../vulnerability_scanning_client.py | 3 +- src/oci/waas/redirect_client.py | 3 +- src/oci/waas/waas_client.py | 3 +- src/oci/work_requests/work_request_client.py | 3 +- 124 files changed, 583 insertions(+), 137 deletions(-) create mode 100644 examples/copy_boot_volume_backup_example.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cb82a32353..7193f22c5e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,23 @@ Change Log All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +2.38.2 - 2021-05-11 +==================== + +Added +----- +* Support for creating notebook sessions with larger block volumes in the Data Science service +* Support for database maintenance run patch modes in the Database service + +Fixed +----- +* Fixed a bug where `timeout=None` was not respected when passed to clients. The older versions of the SDK still use the default connection timeout(10s) and read timeout(60s) when initialized with `timeout=None` + +Changed +------- +* Improvement in the performance of Upload Manager for parallel uploads. This is achieved by overriding the default read size of Python HTTP client from 8192 bytes to 64 kb. + ==================== 2.38.1 - 2021-05-04 ==================== diff --git a/docs/known-issues.rst b/docs/known-issues.rst index aa76da43ab..ef3041fc69 100644 --- a/docs/known-issues.rst +++ b/docs/known-issues.rst @@ -63,4 +63,14 @@ Potential data corruption with Python SDK on binary upload (versions 2.8.0 and b Default timeout not getting set in the clients (versions 2.17.2 and below) ========================================================================== -The default timeout values (connect timeout = 10 secs and read timeout = 60 secs) we not getting set in the clients and remained None (infinite timeout). This has been fixed in v2.18.0. \ No newline at end of file +The default timeout values (connect timeout = 10 secs and read timeout = 60 secs) we not getting set in the clients and remained None (infinite timeout). This has been fixed in v2.18.0. + +Some BlockStorage composite operations throw a 404/NotAuthorizedOrNotFound for Cross Region operations +====================================================================================================== +**Details:** The copy_boot_volume_backup_and_wait_for_state() and copy_volume_backup_and_wait_for_state() from the BlockStorage Client Composite operations throw a 404/NotAuthorizedOrNotFound when copying a backup from one region to another even though the operation succeeds eventually. + +**Impacted Versions:** All + +**Workaround:** Instead of using the composite operations, use two different clients for this operation; one client in the Source Region to send the request for copying the backup from Region A to Region B, and a second client in Destination region to wait for the backup to become available. See `this `_ for an example. + +**Direct link to this issue:** `Some BlockStorage composite operations throw a 404/NotAuthorizedOrNotFound for Cross Region operations `_ \ No newline at end of file diff --git a/examples/copy_boot_volume_backup_example.py b/examples/copy_boot_volume_backup_example.py new file mode 100644 index 0000000000..ad83f48aaa --- /dev/null +++ b/examples/copy_boot_volume_backup_example.py @@ -0,0 +1,91 @@ +# coding: utf-8 +# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# This example demonstrates how to copy boot volume backups to a different region and wait on the copy status. +# +# # USAGE: +# `python examples/copy_boot_volume_backup_example.py \ +# --volume-backup-id 'foo' \ +# --destination-region '' \ +# --display_name 'bar' \ +# --kms-key-id 'baz'` +# +# Example (copying from us-phoenix-1 to eu-frankfurt-1 : +# `python examples/copy_boot_volume_backup_example.py \ +# --boot-volume-backup-id 'ocid1.bootvolumebackup.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \ +# --destination-region 'us-ashburn-1' +# --display-name 'copied backup from phoenix' \ +# --kms-key-id 'ocid1.key.oc1.iad.aaaaaaaaaaaaa.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'` +# +# This script accepts up to for arguments: +# - boot-volume-backup-id: is the OCID of the boot volume backup to copy. +# - destination-region: is the name of the region to copy the boot volume backup to. +# - display_name (optional): is the new display name of the copied boot volume backup. +# If omitted, the copied boot volume backup will have the same display name as the source backup. +# - kms-key-id (optional): is the OCID of the kms key to use in the destination region to encrypt +# the copied backup with. If not specified, a platform ad-master key will be used. + + +import oci +import argparse + +# parse arguments +parser = argparse.ArgumentParser() +parser.add_argument('--boot-volume-backup-id', + help='the OCID of the boot volume backup to copy', + required=True + ) +parser.add_argument('--destination-region', + help='the name of the destination region to copy the backup to', + required=True + ) + +parser.add_argument('--display-name', + help='the display name of the copied boot volume backup. If not specified, ' + 'defaults to the same as the original backup\'s display name', + required=False + ) + +parser.add_argument('--kms-key-id', + help='the OCID of the kms key in the destination region to encrypt the copied boot volume backup', + required=False + ) +args = parser.parse_args() + +source_backup_id = args.boot_volume_backup_id +destination_region = args.destination_region +kms_key_id = args.kms_key_id +display_name = args.display_name + +# load config and create clients (one for the source region and one for the destination region). +source_config = oci.config.from_file() +destination_config = source_config.copy() +destination_config["region"] = destination_region +source_blockstorage_client = oci.core.BlockstorageClient(source_config) +destination_blockstorage_client = oci.core.BlockstorageClient(destination_config) + +print('Copying boot volume backup with ID {} from {} to {} using new display name: {} and kms key id: {} \n'.format( + source_backup_id, source_config["region"], destination_region, display_name, kms_key_id)) +result = source_blockstorage_client.copy_boot_volume_backup( + source_backup_id, + oci.core.models.CopyBootVolumeBackupDetails( + destination_region=destination_region, + display_name=display_name, + kms_key_id=kms_key_id + ) +) + +print('Copy boot volume backup response status: {}, copied backup: {}\n'.format(result.status, result.data)) +print('Waiting for the copied backup to be in available state...') + +# query the destination region for the copied' backup's status and wait for it to be available. +copied_backup = oci.wait_until( + destination_blockstorage_client, + destination_blockstorage_client.get_boot_volume_backup(result.data.id), + 'lifecycle_state', + 'AVAILABLE' +).data + +print('Backup successfully copied: {}'.format(copied_backup)) +print('Example script done') diff --git a/examples/copy_volume_backup_example.py b/examples/copy_volume_backup_example.py index 88552c0352..22feb81cae 100644 --- a/examples/copy_volume_backup_example.py +++ b/examples/copy_volume_backup_example.py @@ -15,7 +15,7 @@ # `python examples/copy_volume_backup_example.py \ # --volume-backup-id 'ocid1.volumebackup.oc1.phx.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \ # --destination-region 'eu-frankfurt-1' -# --display_name 'copied backup from phoenix' \ +# --display-name 'copied backup from phoenix' \ # --kms-key-id 'ocid1.key.oc1.fra.aaaaaaaaaaaaa.bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'` # # This script accepts up to for arguments: diff --git a/src/oci/ai_language/ai_service_language_client.py b/src/oci/ai_language/ai_service_language_client.py index e02a048640..c03c9f0344 100644 --- a/src/oci/ai_language/ai_service_language_client.py +++ b/src/oci/ai_language/ai_service_language_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20210101', 'service_endpoint_template': 'https://language.aiservice.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("ai_service_language", config, signer, ai_language_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/analytics/analytics_client.py b/src/oci/analytics/analytics_client.py index 6ab1c3894c..b4f69deec7 100644 --- a/src/oci/analytics/analytics_client.py +++ b/src/oci/analytics/analytics_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190331', 'service_endpoint_template': 'https://analytics.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("analytics", config, signer, analytics_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/announcements_service/announcement_client.py b/src/oci/announcements_service/announcement_client.py index 63b2730db0..845816d641 100644 --- a/src/oci/announcements_service/announcement_client.py +++ b/src/oci/announcements_service/announcement_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180904', 'service_endpoint_template': 'https://announcements.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("announcement", config, signer, announcements_service_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/announcements_service/announcements_preferences_client.py b/src/oci/announcements_service/announcements_preferences_client.py index 9f2b8ccd7b..0f20dc19d5 100644 --- a/src/oci/announcements_service/announcements_preferences_client.py +++ b/src/oci/announcements_service/announcements_preferences_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180904', 'service_endpoint_template': 'https://announcements.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("announcements_preferences", config, signer, announcements_service_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apigateway/api_gateway_client.py b/src/oci/apigateway/api_gateway_client.py index a6ae623025..caf15a3e55 100644 --- a/src/oci/apigateway/api_gateway_client.py +++ b/src/oci/apigateway/api_gateway_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190501', 'service_endpoint_template': 'https://apigateway.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("api_gateway", config, signer, apigateway_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apigateway/deployment_client.py b/src/oci/apigateway/deployment_client.py index 23aeed96a3..a891836765 100644 --- a/src/oci/apigateway/deployment_client.py +++ b/src/oci/apigateway/deployment_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190501', 'service_endpoint_template': 'https://apigateway.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("deployment", config, signer, apigateway_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apigateway/gateway_client.py b/src/oci/apigateway/gateway_client.py index a3e1a169a7..f4a9425a50 100644 --- a/src/oci/apigateway/gateway_client.py +++ b/src/oci/apigateway/gateway_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190501', 'service_endpoint_template': 'https://apigateway.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("gateway", config, signer, apigateway_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apigateway/work_requests_client.py b/src/oci/apigateway/work_requests_client.py index 6f8fe8198c..a2a2b91f1f 100644 --- a/src/oci/apigateway/work_requests_client.py +++ b/src/oci/apigateway/work_requests_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190501', 'service_endpoint_template': 'https://apigateway.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("work_requests", config, signer, apigateway_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apm_control_plane/apm_domain_client.py b/src/oci/apm_control_plane/apm_domain_client.py index 9d728f9004..9e655d3b35 100644 --- a/src/oci/apm_control_plane/apm_domain_client.py +++ b/src/oci/apm_control_plane/apm_domain_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://apm-cp.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("apm_domain", config, signer, apm_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apm_synthetics/apm_synthetic_client.py b/src/oci/apm_synthetics/apm_synthetic_client.py index 4e2942236f..1be2b1ca27 100644 --- a/src/oci/apm_synthetics/apm_synthetic_client.py +++ b/src/oci/apm_synthetics/apm_synthetic_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://apm-synthetic.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("apm_synthetic", config, signer, apm_synthetics_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apm_traces/query_client.py b/src/oci/apm_traces/query_client.py index d9a25a0c85..0ccb09fffe 100644 --- a/src/oci/apm_traces/query_client.py +++ b/src/oci/apm_traces/query_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://apm-trace.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("query", config, signer, apm_traces_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/apm_traces/trace_client.py b/src/oci/apm_traces/trace_client.py index 72e84f3937..85f660bd26 100644 --- a/src/oci/apm_traces/trace_client.py +++ b/src/oci/apm_traces/trace_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://apm-trace.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("trace", config, signer, apm_traces_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/application_migration/application_migration_client.py b/src/oci/application_migration/application_migration_client.py index 8fd692576c..37782f01c9 100644 --- a/src/oci/application_migration/application_migration_client.py +++ b/src/oci/application_migration/application_migration_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20191031', 'service_endpoint_template': 'https://applicationmigration.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("application_migration", config, signer, application_migration_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/artifacts/artifacts_client.py b/src/oci/artifacts/artifacts_client.py index 6007f4c21e..ca3c4b7874 100644 --- a/src/oci/artifacts/artifacts_client.py +++ b/src/oci/artifacts/artifacts_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://artifacts.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("artifacts", config, signer, artifacts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/audit/audit_client.py b/src/oci/audit/audit_client.py index 95b9b602e8..1aa2b93d8c 100644 --- a/src/oci/audit/audit_client.py +++ b/src/oci/audit/audit_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190901', 'service_endpoint_template': 'https://audit.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("audit", config, signer, audit_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/autoscaling/auto_scaling_client.py b/src/oci/autoscaling/auto_scaling_client.py index 2d6c987136..3be2ab4d18 100644 --- a/src/oci/autoscaling/auto_scaling_client.py +++ b/src/oci/autoscaling/auto_scaling_client.py @@ -82,11 +82,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181001', 'service_endpoint_template': 'https://autoscaling.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("auto_scaling", config, signer, autoscaling_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/base_client.py b/src/oci/base_client.py index 29f8864dc7..d7b75a16dd 100644 --- a/src/oci/base_client.py +++ b/src/oci/base_client.py @@ -151,8 +151,8 @@ def __init__(self, service, config, signer, type_mapping, **kwargs): self.type_mappings = merge_type_mappings(self.primitive_type_map, type_mapping) self.session = requests.Session() - timeout_value_in_kwargs = kwargs.get('timeout') - self.timeout = timeout_value_in_kwargs if timeout_value_in_kwargs else (DEFAULT_CONNECTION_TIMEOUT, DEFAULT_READ_TIMEOUT) + # If the user doesn't specify timeout explicitly we would use default timeout. + self.timeout = kwargs.get('timeout') if 'timeout' in kwargs else (DEFAULT_CONNECTION_TIMEOUT, DEFAULT_READ_TIMEOUT) self.user_agent = build_user_agent(get_config_value_or_default(config, "additional_user_agent")) diff --git a/src/oci/bds/bds_client.py b/src/oci/bds/bds_client.py index 74e3fdec0a..6e341e8f05 100644 --- a/src/oci/bds/bds_client.py +++ b/src/oci/bds/bds_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190531', 'service_endpoint_template': 'https://bigdataservice.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("bds", config, signer, bds_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/blockchain/blockchain_platform_client.py b/src/oci/blockchain/blockchain_platform_client.py index ea2bdfe2cb..1cb86a4d7e 100644 --- a/src/oci/blockchain/blockchain_platform_client.py +++ b/src/oci/blockchain/blockchain_platform_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20191010', 'service_endpoint_template': 'https://blockchain.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("blockchain_platform", config, signer, blockchain_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/budget/budget_client.py b/src/oci/budget/budget_client.py index c7c75b4000..37763cd9a3 100644 --- a/src/oci/budget/budget_client.py +++ b/src/oci/budget/budget_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190111', 'service_endpoint_template': 'https://usage.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("budget", config, signer, budget_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/cims/incident_client.py b/src/oci/cims/incident_client.py index 3d61a8f2f4..06904d5dae 100644 --- a/src/oci/cims/incident_client.py +++ b/src/oci/cims/incident_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181231', 'service_endpoint_template': 'https://incidentmanagement.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("incident", config, signer, cims_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/cims/user_client.py b/src/oci/cims/user_client.py index c47e320943..4f4473022a 100644 --- a/src/oci/cims/user_client.py +++ b/src/oci/cims/user_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181231', 'service_endpoint_template': 'https://incidentmanagement.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("user", config, signer, cims_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/cloud_guard/cloud_guard_client.py b/src/oci/cloud_guard/cloud_guard_client.py index 4b228bc1de..ff00345c19 100644 --- a/src/oci/cloud_guard/cloud_guard_client.py +++ b/src/oci/cloud_guard/cloud_guard_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200131', 'service_endpoint_template': 'https://cloudguard-cp-api.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("cloud_guard", config, signer, cloud_guard_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/compute_instance_agent/compute_instance_agent_client.py b/src/oci/compute_instance_agent/compute_instance_agent_client.py index 8f6fd2fb1d..f85581c6ed 100644 --- a/src/oci/compute_instance_agent/compute_instance_agent_client.py +++ b/src/oci/compute_instance_agent/compute_instance_agent_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180530', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("compute_instance_agent", config, signer, compute_instance_agent_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/compute_instance_agent/plugin_client.py b/src/oci/compute_instance_agent/plugin_client.py index 1bf298e0a4..f3e989e3af 100644 --- a/src/oci/compute_instance_agent/plugin_client.py +++ b/src/oci/compute_instance_agent/plugin_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180530', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("plugin", config, signer, compute_instance_agent_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/compute_instance_agent/pluginconfig_client.py b/src/oci/compute_instance_agent/pluginconfig_client.py index 96e5b7cd90..82c8e82bd1 100644 --- a/src/oci/compute_instance_agent/pluginconfig_client.py +++ b/src/oci/compute_instance_agent/pluginconfig_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180530', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("pluginconfig", config, signer, compute_instance_agent_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/container_engine/container_engine_client.py b/src/oci/container_engine/container_engine_client.py index dce9e82dfe..4d08aaad88 100644 --- a/src/oci/container_engine/container_engine_client.py +++ b/src/oci/container_engine/container_engine_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180222', 'service_endpoint_template': 'https://containerengine.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("container_engine", config, signer, container_engine_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/core/blockstorage_client.py b/src/oci/core/blockstorage_client.py index 5309fd4495..d3a174b155 100644 --- a/src/oci/core/blockstorage_client.py +++ b/src/oci/core/blockstorage_client.py @@ -81,11 +81,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("blockstorage", config, signer, core_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') self._config = config diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index ff684a4ca7..03269f44ac 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -81,11 +81,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("compute", config, signer, core_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') self._config = config diff --git a/src/oci/core/compute_management_client.py b/src/oci/core/compute_management_client.py index 7faae34e68..5ce3eab152 100644 --- a/src/oci/core/compute_management_client.py +++ b/src/oci/core/compute_management_client.py @@ -81,11 +81,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("compute_management", config, signer, core_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') self._config = config diff --git a/src/oci/core/virtual_network_client.py b/src/oci/core/virtual_network_client.py index bd36e1d2a3..de4c102a03 100644 --- a/src/oci/core/virtual_network_client.py +++ b/src/oci/core/virtual_network_client.py @@ -81,11 +81,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("virtual_network", config, signer, core_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') self._config = config diff --git a/src/oci/data_catalog/data_catalog_client.py b/src/oci/data_catalog/data_catalog_client.py index 7b847a3946..6b937d168e 100644 --- a/src/oci/data_catalog/data_catalog_client.py +++ b/src/oci/data_catalog/data_catalog_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190325', 'service_endpoint_template': 'https://datacatalog.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("data_catalog", config, signer, data_catalog_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/data_flow/data_flow_client.py b/src/oci/data_flow/data_flow_client.py index 608db8511b..42dd506d1f 100644 --- a/src/oci/data_flow/data_flow_client.py +++ b/src/oci/data_flow/data_flow_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200129', 'service_endpoint_template': 'https://dataflow.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("data_flow", config, signer, data_flow_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/data_integration/data_integration_client.py b/src/oci/data_integration/data_integration_client.py index 9fe90e5445..59f448d808 100644 --- a/src/oci/data_integration/data_integration_client.py +++ b/src/oci/data_integration/data_integration_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200430', 'service_endpoint_template': 'https://dataintegration.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("data_integration", config, signer, data_integration_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/data_safe/data_safe_client.py b/src/oci/data_safe/data_safe_client.py index 9fa69c6900..ba1672e636 100644 --- a/src/oci/data_safe/data_safe_client.py +++ b/src/oci/data_safe/data_safe_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://datasafe.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("data_safe", config, signer, data_safe_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/data_science/data_science_client.py b/src/oci/data_science/data_science_client.py index 341e6c72e1..29dc17e99a 100644 --- a/src/oci/data_science/data_science_client.py +++ b/src/oci/data_science/data_science_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190101', 'service_endpoint_template': 'https://datascience.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("data_science", config, signer, data_science_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') @@ -3772,10 +3773,10 @@ def update_model(self, model_id, update_model_details, **kwargs): def update_model_deployment(self, model_deployment_id, update_model_deployment_details, **kwargs): """ - Updates the properties of a model deployment. You can update the `displayName`. - When the model deployment is in the ACTIVE lifecycle state, you can update `modelDeploymentConfigurationDetails` and change `instanceShapeName` and `modelId`. Any update to - `bandwidthMbps` or `instanceCount` can be done when the model deployment is in the INACTIVE lifecycle state. Changes to the `bandwidthMbps` or `instanceCount` will take effect - the next time the `ActivateModelDeployment` action is invoked on the model deployment resource. + Updates the properties of a model deployment. Some of the properties of `modelDeploymentConfigurationDetails` or `CategoryLogDetails` can also be updated with zero down time when + the model deployment's lifecycle state is ACTIVE i.e `instanceShapeName` can be updated along with `modelId`, similarly `logId` can be updated along with `logGroupId`. But + `instanceShapeName` or `modelId` cannot be updated along with `logId` or `logGroupId`. All of the fields can be updated when the deployment is in the INACTIVE lifecycle state. + Changes will take effect the next time the model deployment is activated. :param str model_deployment_id: (required) @@ -3784,9 +3785,10 @@ def update_model_deployment(self, model_deployment_id, update_model_deployment_d __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.data_science.models.UpdateModelDeploymentDetails update_model_deployment_details: (required) - Details for updating a model deployment. You can update `modelDeploymentConfigurationDetails` and change `instanceShapeName` and `modelId` when the model deployment is in - the ACTIVE lifecycle state. The `bandwidthMbps` or `instanceCount` can only be updated while the model deployment is in the `INACTIVE` state. Changes to the `bandwidthMbps` - or `instanceCount` will take effect the next time the `ActivateModelDeployment` action is invoked on the model deployment resource. + Details for updating a model deployment. Some of the properties of `modelDeploymentConfigurationDetails` or `CategoryLogDetails` can also be updated with zero down time when + the model deployment's lifecycle state is ACTIVE i.e `instanceShapeName` can be updated along with `modelId`, similarly `logId` can be updated along with `logGroupId`. But + `instanceShapeName` or `modelId` cannot be updated along with `logId` or `logGroupId`. All of the fields can be updated when the deployment is in the INACTIVE lifecycle state. + Changes will take effect the next time the model deployment is activated. :param str if_match: (optional) For optimistic concurrency control. In the PUT or DELETE call diff --git a/src/oci/data_science/data_science_client_composite_operations.py b/src/oci/data_science/data_science_client_composite_operations.py index 360ad19d6b..606ff85310 100644 --- a/src/oci/data_science/data_science_client_composite_operations.py +++ b/src/oci/data_science/data_science_client_composite_operations.py @@ -662,9 +662,10 @@ def update_model_deployment_and_wait_for_state(self, model_deployment_id, update __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.data_science.models.UpdateModelDeploymentDetails update_model_deployment_details: (required) - Details for updating a model deployment. You can update `modelDeploymentConfigurationDetails` and change `instanceShapeName` and `modelId` when the model deployment is in - the ACTIVE lifecycle state. The `bandwidthMbps` or `instanceCount` can only be updated while the model deployment is in the `INACTIVE` state. Changes to the `bandwidthMbps` - or `instanceCount` will take effect the next time the `ActivateModelDeployment` action is invoked on the model deployment resource. + Details for updating a model deployment. Some of the properties of `modelDeploymentConfigurationDetails` or `CategoryLogDetails` can also be updated with zero down time when + the model deployment's lifecycle state is ACTIVE i.e `instanceShapeName` can be updated along with `modelId`, similarly `logId` can be updated along with `logGroupId`. But + `instanceShapeName` or `modelId` cannot be updated along with `logId` or `logGroupId`. All of the fields can be updated when the deployment is in the INACTIVE lifecycle state. + Changes will take effect the next time the model deployment is activated. :param list[str] wait_for_states: An array of states to wait on. These should be valid values for :py:attr:`~oci.data_science.models.WorkRequest.status` diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index f23b21c513..50eef51e02 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://database.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("database", config, signer, database_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') self._config = config diff --git a/src/oci/database/models/maintenance_run.py b/src/oci/database/models/maintenance_run.py index 15c4d372be..7e65813463 100644 --- a/src/oci/database/models/maintenance_run.py +++ b/src/oci/database/models/maintenance_run.py @@ -105,6 +105,14 @@ class MaintenanceRun(object): #: This constant has a value of "ONEOFF" MAINTENANCE_SUBTYPE_ONEOFF = "ONEOFF" + #: A constant which can be used with the patching_mode property of a MaintenanceRun. + #: This constant has a value of "ROLLING" + PATCHING_MODE_ROLLING = "ROLLING" + + #: A constant which can be used with the patching_mode property of a MaintenanceRun. + #: This constant has a value of "NONROLLING" + PATCHING_MODE_NONROLLING = "NONROLLING" + def __init__(self, **kwargs): """ Initializes a new MaintenanceRun object with values from keyword arguments. @@ -178,6 +186,16 @@ def __init__(self, **kwargs): The value to assign to the peer_maintenance_run_id property of this MaintenanceRun. :type peer_maintenance_run_id: str + :param patching_mode: + The value to assign to the patching_mode property of this MaintenanceRun. + Allowed values for this property are: "ROLLING", "NONROLLING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type patching_mode: str + + :param patch_failure_count: + The value to assign to the patch_failure_count property of this MaintenanceRun. + :type patch_failure_count: int + """ self.swagger_types = { 'id': 'str', @@ -194,7 +212,9 @@ def __init__(self, **kwargs): 'maintenance_type': 'str', 'patch_id': 'str', 'maintenance_subtype': 'str', - 'peer_maintenance_run_id': 'str' + 'peer_maintenance_run_id': 'str', + 'patching_mode': 'str', + 'patch_failure_count': 'int' } self.attribute_map = { @@ -212,7 +232,9 @@ def __init__(self, **kwargs): 'maintenance_type': 'maintenanceType', 'patch_id': 'patchId', 'maintenance_subtype': 'maintenanceSubtype', - 'peer_maintenance_run_id': 'peerMaintenanceRunId' + 'peer_maintenance_run_id': 'peerMaintenanceRunId', + 'patching_mode': 'patchingMode', + 'patch_failure_count': 'patchFailureCount' } self._id = None @@ -230,6 +252,8 @@ def __init__(self, **kwargs): self._patch_id = None self._maintenance_subtype = None self._peer_maintenance_run_id = None + self._patching_mode = None + self._patch_failure_count = None @property def id(self): @@ -619,6 +643,60 @@ def peer_maintenance_run_id(self, peer_maintenance_run_id): """ self._peer_maintenance_run_id = peer_maintenance_run_id + @property + def patching_mode(self): + """ + Gets the patching_mode of this MaintenanceRun. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + Allowed values for this property are: "ROLLING", "NONROLLING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The patching_mode of this MaintenanceRun. + :rtype: str + """ + return self._patching_mode + + @patching_mode.setter + def patching_mode(self, patching_mode): + """ + Sets the patching_mode of this MaintenanceRun. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + + :param patching_mode: The patching_mode of this MaintenanceRun. + :type: str + """ + allowed_values = ["ROLLING", "NONROLLING"] + if not value_allowed_none_or_none_sentinel(patching_mode, allowed_values): + patching_mode = 'UNKNOWN_ENUM_VALUE' + self._patching_mode = patching_mode + + @property + def patch_failure_count(self): + """ + Gets the patch_failure_count of this MaintenanceRun. + Contain the patch failure count. + + + :return: The patch_failure_count of this MaintenanceRun. + :rtype: int + """ + return self._patch_failure_count + + @patch_failure_count.setter + def patch_failure_count(self, patch_failure_count): + """ + Sets the patch_failure_count of this MaintenanceRun. + Contain the patch failure count. + + + :param patch_failure_count: The patch_failure_count of this MaintenanceRun. + :type: int + """ + self._patch_failure_count = patch_failure_count + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database/models/maintenance_run_summary.py b/src/oci/database/models/maintenance_run_summary.py index 7e76394418..6f22d369e7 100644 --- a/src/oci/database/models/maintenance_run_summary.py +++ b/src/oci/database/models/maintenance_run_summary.py @@ -105,6 +105,14 @@ class MaintenanceRunSummary(object): #: This constant has a value of "ONEOFF" MAINTENANCE_SUBTYPE_ONEOFF = "ONEOFF" + #: A constant which can be used with the patching_mode property of a MaintenanceRunSummary. + #: This constant has a value of "ROLLING" + PATCHING_MODE_ROLLING = "ROLLING" + + #: A constant which can be used with the patching_mode property of a MaintenanceRunSummary. + #: This constant has a value of "NONROLLING" + PATCHING_MODE_NONROLLING = "NONROLLING" + def __init__(self, **kwargs): """ Initializes a new MaintenanceRunSummary object with values from keyword arguments. @@ -178,6 +186,16 @@ def __init__(self, **kwargs): The value to assign to the peer_maintenance_run_id property of this MaintenanceRunSummary. :type peer_maintenance_run_id: str + :param patching_mode: + The value to assign to the patching_mode property of this MaintenanceRunSummary. + Allowed values for this property are: "ROLLING", "NONROLLING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type patching_mode: str + + :param patch_failure_count: + The value to assign to the patch_failure_count property of this MaintenanceRunSummary. + :type patch_failure_count: int + """ self.swagger_types = { 'id': 'str', @@ -194,7 +212,9 @@ def __init__(self, **kwargs): 'maintenance_type': 'str', 'patch_id': 'str', 'maintenance_subtype': 'str', - 'peer_maintenance_run_id': 'str' + 'peer_maintenance_run_id': 'str', + 'patching_mode': 'str', + 'patch_failure_count': 'int' } self.attribute_map = { @@ -212,7 +232,9 @@ def __init__(self, **kwargs): 'maintenance_type': 'maintenanceType', 'patch_id': 'patchId', 'maintenance_subtype': 'maintenanceSubtype', - 'peer_maintenance_run_id': 'peerMaintenanceRunId' + 'peer_maintenance_run_id': 'peerMaintenanceRunId', + 'patching_mode': 'patchingMode', + 'patch_failure_count': 'patchFailureCount' } self._id = None @@ -230,6 +252,8 @@ def __init__(self, **kwargs): self._patch_id = None self._maintenance_subtype = None self._peer_maintenance_run_id = None + self._patching_mode = None + self._patch_failure_count = None @property def id(self): @@ -619,6 +643,60 @@ def peer_maintenance_run_id(self, peer_maintenance_run_id): """ self._peer_maintenance_run_id = peer_maintenance_run_id + @property + def patching_mode(self): + """ + Gets the patching_mode of this MaintenanceRunSummary. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + Allowed values for this property are: "ROLLING", "NONROLLING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The patching_mode of this MaintenanceRunSummary. + :rtype: str + """ + return self._patching_mode + + @patching_mode.setter + def patching_mode(self, patching_mode): + """ + Sets the patching_mode of this MaintenanceRunSummary. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + + :param patching_mode: The patching_mode of this MaintenanceRunSummary. + :type: str + """ + allowed_values = ["ROLLING", "NONROLLING"] + if not value_allowed_none_or_none_sentinel(patching_mode, allowed_values): + patching_mode = 'UNKNOWN_ENUM_VALUE' + self._patching_mode = patching_mode + + @property + def patch_failure_count(self): + """ + Gets the patch_failure_count of this MaintenanceRunSummary. + Contain the patch failure count. + + + :return: The patch_failure_count of this MaintenanceRunSummary. + :rtype: int + """ + return self._patch_failure_count + + @patch_failure_count.setter + def patch_failure_count(self, patch_failure_count): + """ + Sets the patch_failure_count of this MaintenanceRunSummary. + Contain the patch failure count. + + + :param patch_failure_count: The patch_failure_count of this MaintenanceRunSummary. + :type: int + """ + self._patch_failure_count = patch_failure_count + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database/models/update_maintenance_run_details.py b/src/oci/database/models/update_maintenance_run_details.py index ac26156a4e..1667366894 100644 --- a/src/oci/database/models/update_maintenance_run_details.py +++ b/src/oci/database/models/update_maintenance_run_details.py @@ -13,6 +13,14 @@ class UpdateMaintenanceRunDetails(object): Describes the modification parameters for the maintenance run. """ + #: A constant which can be used with the patching_mode property of a UpdateMaintenanceRunDetails. + #: This constant has a value of "ROLLING" + PATCHING_MODE_ROLLING = "ROLLING" + + #: A constant which can be used with the patching_mode property of a UpdateMaintenanceRunDetails. + #: This constant has a value of "NONROLLING" + PATCHING_MODE_NONROLLING = "NONROLLING" + def __init__(self, **kwargs): """ Initializes a new UpdateMaintenanceRunDetails object with values from keyword arguments. @@ -34,25 +42,33 @@ def __init__(self, **kwargs): The value to assign to the patch_id property of this UpdateMaintenanceRunDetails. :type patch_id: str + :param patching_mode: + The value to assign to the patching_mode property of this UpdateMaintenanceRunDetails. + Allowed values for this property are: "ROLLING", "NONROLLING" + :type patching_mode: str + """ self.swagger_types = { 'is_enabled': 'bool', 'time_scheduled': 'datetime', 'is_patch_now_enabled': 'bool', - 'patch_id': 'str' + 'patch_id': 'str', + 'patching_mode': 'str' } self.attribute_map = { 'is_enabled': 'isEnabled', 'time_scheduled': 'timeScheduled', 'is_patch_now_enabled': 'isPatchNowEnabled', - 'patch_id': 'patchId' + 'patch_id': 'patchId', + 'patching_mode': 'patchingMode' } self._is_enabled = None self._time_scheduled = None self._is_patch_now_enabled = None self._patch_id = None + self._patching_mode = None @property def is_enabled(self): @@ -154,6 +170,38 @@ def patch_id(self, patch_id): """ self._patch_id = patch_id + @property + def patching_mode(self): + """ + Gets the patching_mode of this UpdateMaintenanceRunDetails. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + Allowed values for this property are: "ROLLING", "NONROLLING" + + + :return: The patching_mode of this UpdateMaintenanceRunDetails. + :rtype: str + """ + return self._patching_mode + + @patching_mode.setter + def patching_mode(self, patching_mode): + """ + Sets the patching_mode of this UpdateMaintenanceRunDetails. + Maintenance method, it will be either \"ROLLING\" or \"NONROLLING\". Default value is ROLLING. + + + :param patching_mode: The patching_mode of this UpdateMaintenanceRunDetails. + :type: str + """ + allowed_values = ["ROLLING", "NONROLLING"] + if not value_allowed_none_or_none_sentinel(patching_mode, allowed_values): + raise ValueError( + "Invalid value for `patching_mode`, must be None or one of {0}" + .format(allowed_values) + ) + self._patching_mode = patching_mode + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/db_management_client.py b/src/oci/database_management/db_management_client.py index f51a892a9e..ad0df904ea 100644 --- a/src/oci/database_management/db_management_client.py +++ b/src/oci/database_management/db_management_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20201101', 'service_endpoint_template': 'https://dbmgmt.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("db_management", config, signer, database_management_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/database_migration/database_migration_client.py b/src/oci/database_migration/database_migration_client.py index 05f6d1a978..253549a6f2 100644 --- a/src/oci/database_migration/database_migration_client.py +++ b/src/oci/database_migration/database_migration_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200720', 'service_endpoint_template': 'https://odms.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("database_migration", config, signer, database_migration_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dns/dns_client.py b/src/oci/dns/dns_client.py index b1bd0ad56d..a733a9d6bf 100644 --- a/src/oci/dns/dns_client.py +++ b/src/oci/dns/dns_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180115', 'service_endpoint_template': 'https://dns.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("dns", config, signer, dns_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/appliance_export_job_client.py b/src/oci/dts/appliance_export_job_client.py index 1d97cf064e..b1f827b32c 100644 --- a/src/oci/dts/appliance_export_job_client.py +++ b/src/oci/dts/appliance_export_job_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("appliance_export_job", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/shipping_vendors_client.py b/src/oci/dts/shipping_vendors_client.py index c0cb67f300..9670412c7e 100644 --- a/src/oci/dts/shipping_vendors_client.py +++ b/src/oci/dts/shipping_vendors_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("shipping_vendors", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/transfer_appliance_client.py b/src/oci/dts/transfer_appliance_client.py index cf4ff461ac..12c7cc34f4 100644 --- a/src/oci/dts/transfer_appliance_client.py +++ b/src/oci/dts/transfer_appliance_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("transfer_appliance", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/transfer_appliance_entitlement_client.py b/src/oci/dts/transfer_appliance_entitlement_client.py index c320d05d18..964744f23f 100644 --- a/src/oci/dts/transfer_appliance_entitlement_client.py +++ b/src/oci/dts/transfer_appliance_entitlement_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("transfer_appliance_entitlement", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/transfer_device_client.py b/src/oci/dts/transfer_device_client.py index 3408fb6166..15721af482 100644 --- a/src/oci/dts/transfer_device_client.py +++ b/src/oci/dts/transfer_device_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("transfer_device", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/transfer_job_client.py b/src/oci/dts/transfer_job_client.py index ee06a89b4f..ba92b237db 100644 --- a/src/oci/dts/transfer_job_client.py +++ b/src/oci/dts/transfer_job_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("transfer_job", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/dts/transfer_package_client.py b/src/oci/dts/transfer_package_client.py index d839c2224f..a03572a002 100644 --- a/src/oci/dts/transfer_package_client.py +++ b/src/oci/dts/transfer_package_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171001', 'service_endpoint_template': 'https://datatransfer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("transfer_package", config, signer, dts_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/email/email_client.py b/src/oci/email/email_client.py index 51702d0bbe..d7bcd9c2b2 100644 --- a/src/oci/email/email_client.py +++ b/src/oci/email/email_client.py @@ -81,11 +81,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20170907', 'service_endpoint_template': 'https://email.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("email", config, signer, email_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/events/events_client.py b/src/oci/events/events_client.py index b83502737a..aba51fec80 100644 --- a/src/oci/events/events_client.py +++ b/src/oci/events/events_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://events.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("events", config, signer, events_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/file_storage/file_storage_client.py b/src/oci/file_storage/file_storage_client.py index bcf3396889..d68ddbd862 100644 --- a/src/oci/file_storage/file_storage_client.py +++ b/src/oci/file_storage/file_storage_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20171215', 'service_endpoint_template': 'https://filestorage.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("file_storage", config, signer, file_storage_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/functions/functions_invoke_client.py b/src/oci/functions/functions_invoke_client.py index 3d8d1f9512..6a4c3e2061 100644 --- a/src/oci/functions/functions_invoke_client.py +++ b/src/oci/functions/functions_invoke_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://functions.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("functions_invoke", config, signer, functions_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/functions/functions_management_client.py b/src/oci/functions/functions_management_client.py index 92ad89afe3..5770ef7d82 100644 --- a/src/oci/functions/functions_management_client.py +++ b/src/oci/functions/functions_management_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://functions.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("functions_management", config, signer, functions_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/golden_gate/golden_gate_client.py b/src/oci/golden_gate/golden_gate_client.py index 19c2de053b..ca5d345203 100644 --- a/src/oci/golden_gate/golden_gate_client.py +++ b/src/oci/golden_gate/golden_gate_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200407', 'service_endpoint_template': 'https://goldengate.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("golden_gate", config, signer, golden_gate_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/healthchecks/health_checks_client.py b/src/oci/healthchecks/health_checks_client.py index c3ecfe6004..672fbc5c00 100644 --- a/src/oci/healthchecks/health_checks_client.py +++ b/src/oci/healthchecks/health_checks_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180501', 'service_endpoint_template': 'https://healthchecks.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("health_checks", config, signer, healthchecks_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/identity/identity_client.py b/src/oci/identity/identity_client.py index a944466fbf..b3fff94491 100644 --- a/src/oci/identity/identity_client.py +++ b/src/oci/identity/identity_client.py @@ -77,10 +77,11 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("identity", config, signer, identity_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/integration/integration_instance_client.py b/src/oci/integration/integration_instance_client.py index 185e851e36..6cab6d0491 100644 --- a/src/oci/integration/integration_instance_client.py +++ b/src/oci/integration/integration_instance_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190131', 'service_endpoint_template': 'https://integration.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("integration_instance", config, signer, integration_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/key_management/kms_crypto_client.py b/src/oci/key_management/kms_crypto_client.py index 5a7bd14cea..243eb3f8e4 100644 --- a/src/oci/key_management/kms_crypto_client.py +++ b/src/oci/key_management/kms_crypto_client.py @@ -76,11 +76,12 @@ def __init__(self, config, service_endpoint, **kwargs): base_client_init_kwargs = { 'regional_client': False, 'service_endpoint': service_endpoint, - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://kms.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("kms_crypto", config, signer, key_management_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/key_management/kms_management_client.py b/src/oci/key_management/kms_management_client.py index 8cc4033314..ca206b39e5 100644 --- a/src/oci/key_management/kms_management_client.py +++ b/src/oci/key_management/kms_management_client.py @@ -77,11 +77,12 @@ def __init__(self, config, service_endpoint, **kwargs): base_client_init_kwargs = { 'regional_client': False, 'service_endpoint': service_endpoint, - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://kms.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("kms_management", config, signer, key_management_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/key_management/kms_vault_client.py b/src/oci/key_management/kms_vault_client.py index 7638b4354b..02e589e98e 100644 --- a/src/oci/key_management/kms_vault_client.py +++ b/src/oci/key_management/kms_vault_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://kms.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("kms_vault", config, signer, key_management_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/limits/limits_client.py b/src/oci/limits/limits_client.py index 5f5e5c5267..9a127afe53 100644 --- a/src/oci/limits/limits_client.py +++ b/src/oci/limits/limits_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://limits.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("limits", config, signer, limits_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/limits/quotas_client.py b/src/oci/limits/quotas_client.py index 5da01c1ca5..c14cf140ba 100644 --- a/src/oci/limits/quotas_client.py +++ b/src/oci/limits/quotas_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://limits.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("quotas", config, signer, limits_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/load_balancer/load_balancer_client.py b/src/oci/load_balancer/load_balancer_client.py index fb3f6eb667..d6ab84abae 100644 --- a/src/oci/load_balancer/load_balancer_client.py +++ b/src/oci/load_balancer/load_balancer_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20170115', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("load_balancer", config, signer, load_balancer_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/log_analytics/log_analytics_client.py b/src/oci/log_analytics/log_analytics_client.py index 111641af8b..c476edf5ce 100644 --- a/src/oci/log_analytics/log_analytics_client.py +++ b/src/oci/log_analytics/log_analytics_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200601', 'service_endpoint_template': 'https://loganalytics.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("log_analytics", config, signer, log_analytics_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/logging/logging_management_client.py b/src/oci/logging/logging_management_client.py index 6182f5227a..80f84cf050 100644 --- a/src/oci/logging/logging_management_client.py +++ b/src/oci/logging/logging_management_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200531', 'service_endpoint_template': 'https://logging.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("logging_management", config, signer, logging_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/loggingingestion/logging_client.py b/src/oci/loggingingestion/logging_client.py index 47b60ed5bf..89e9c501bf 100644 --- a/src/oci/loggingingestion/logging_client.py +++ b/src/oci/loggingingestion/logging_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200831', 'service_endpoint_template': 'https://ingestion.logging.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("logging", config, signer, loggingingestion_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/loggingsearch/log_search_client.py b/src/oci/loggingsearch/log_search_client.py index ef92cae149..b7006da292 100644 --- a/src/oci/loggingsearch/log_search_client.py +++ b/src/oci/loggingsearch/log_search_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190909', 'service_endpoint_template': 'https://logging.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("log_search", config, signer, loggingsearch_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/management_agent/management_agent_client.py b/src/oci/management_agent/management_agent_client.py index b14f903ac9..7334d4855e 100644 --- a/src/oci/management_agent/management_agent_client.py +++ b/src/oci/management_agent/management_agent_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200202', 'service_endpoint_template': 'https://management-agent.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("management_agent", config, signer, management_agent_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/management_dashboard/dashx_apis_client.py b/src/oci/management_dashboard/dashx_apis_client.py index 2fca2871dc..d0110c9e03 100644 --- a/src/oci/management_dashboard/dashx_apis_client.py +++ b/src/oci/management_dashboard/dashx_apis_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200901', 'service_endpoint_template': 'https://managementdashboard.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("dashx_apis", config, signer, management_dashboard_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/marketplace/marketplace_client.py b/src/oci/marketplace/marketplace_client.py index 0ee374f7ea..3fa1a23e2a 100644 --- a/src/oci/marketplace/marketplace_client.py +++ b/src/oci/marketplace/marketplace_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181001', 'service_endpoint_template': 'https://marketplace.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("marketplace", config, signer, marketplace_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/monitoring/monitoring_client.py b/src/oci/monitoring/monitoring_client.py index bf3b943e76..28b9821cff 100644 --- a/src/oci/monitoring/monitoring_client.py +++ b/src/oci/monitoring/monitoring_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180401', 'service_endpoint_template': 'https://telemetry.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("monitoring", config, signer, monitoring_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/mysql/channels_client.py b/src/oci/mysql/channels_client.py index f4632f04a9..df7aead906 100644 --- a/src/oci/mysql/channels_client.py +++ b/src/oci/mysql/channels_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190415', 'service_endpoint_template': 'https://mysql.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("channels", config, signer, mysql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/mysql/db_backups_client.py b/src/oci/mysql/db_backups_client.py index 30698a8867..b14379daa5 100644 --- a/src/oci/mysql/db_backups_client.py +++ b/src/oci/mysql/db_backups_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190415', 'service_endpoint_template': 'https://mysql.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("db_backups", config, signer, mysql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/mysql/db_system_client.py b/src/oci/mysql/db_system_client.py index 6b5b23931e..192fffcc3d 100644 --- a/src/oci/mysql/db_system_client.py +++ b/src/oci/mysql/db_system_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190415', 'service_endpoint_template': 'https://mysql.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("db_system", config, signer, mysql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/mysql/mysqlaas_client.py b/src/oci/mysql/mysqlaas_client.py index 0cb1643e6e..af5dd33e97 100644 --- a/src/oci/mysql/mysqlaas_client.py +++ b/src/oci/mysql/mysqlaas_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190415', 'service_endpoint_template': 'https://mysql.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("mysqlaas", config, signer, mysql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/mysql/work_requests_client.py b/src/oci/mysql/work_requests_client.py index e89825391a..18513d05eb 100644 --- a/src/oci/mysql/work_requests_client.py +++ b/src/oci/mysql/work_requests_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190415', 'service_endpoint_template': 'https://mysql.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("work_requests", config, signer, mysql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/network_load_balancer/network_load_balancer_client.py b/src/oci/network_load_balancer/network_load_balancer_client.py index 6b0652dc42..cf61ab8534 100644 --- a/src/oci/network_load_balancer/network_load_balancer_client.py +++ b/src/oci/network_load_balancer/network_load_balancer_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200501', 'service_endpoint_template': 'https://network-load-balancer-api.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("network_load_balancer", config, signer, network_load_balancer_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/nosql/nosql_client.py b/src/oci/nosql/nosql_client.py index 02f7f07f65..16e12b57d1 100644 --- a/src/oci/nosql/nosql_client.py +++ b/src/oci/nosql/nosql_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190828', 'service_endpoint_template': 'https://nosql.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("nosql", config, signer, nosql_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/object_storage/object_storage_client.py b/src/oci/object_storage/object_storage_client.py index e0f23a611d..4ec9a524f9 100644 --- a/src/oci/object_storage/object_storage_client.py +++ b/src/oci/object_storage/object_storage_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/', 'service_endpoint_template': 'https://objectstorage.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("object_storage", config, signer, object_storage_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/object_storage/transfer/internal/buffered_part_reader.py b/src/oci/object_storage/transfer/internal/buffered_part_reader.py index 6623e5d1db..f9a35c25d7 100644 --- a/src/oci/object_storage/transfer/internal/buffered_part_reader.py +++ b/src/oci/object_storage/transfer/internal/buffered_part_reader.py @@ -4,9 +4,16 @@ import io +# Currently Python HTTP client sends data to the server in blocksize +# of 8192 bytes. This causes a lot of reads and execution of CPU bound +# code between sends. This hampers the advantages of parallel threads +# and hence throughput for multipart uploads drops beyond 3-4 threads. +# Adding a force read size of 64KB +FORCED_READ_SIZE = 64 * 1024 # 64KB + class BufferedPartReader(io.IOBase): - def __init__(self, file_object, start, size): + def __init__(self, file_object, start, size, forced_read_size=FORCED_READ_SIZE): """ Build an object that will act like a BufferedReader object, but constrained to a predetermined part of the file_object. @@ -20,6 +27,7 @@ def __init__(self, file_object, start, size): self.file = file_object self.bytes_read = 0 self.start = start + self.forced_read_size = forced_read_size # Seek to the end of the file to see how many bytes remain # from the start of the part. @@ -53,7 +61,7 @@ def tell(self): """ return self.file.tell() - self.start - def read(self, n): + def read(self, n=-1): """ Read data from the part, but make the end of the part look like the end of file has been reached. @@ -61,7 +69,8 @@ def read(self, n): :param n: Bytes to read :return: Memoryview of the bytes read from the part """ - buf = bytearray(n) + # Use bytearray of forced_read_size for any n less than forced_read_size + buf = bytearray(n) if n == -1 or n == 0 or n > self.forced_read_size else bytearray(self.forced_read_size) read = 0 if self.bytes_read < self.size: read = self.file.readinto(buf) diff --git a/src/oci/oce/oce_instance_client.py b/src/oci/oce/oce_instance_client.py index c7762c5152..7365a8ff3c 100644 --- a/src/oci/oce/oce_instance_client.py +++ b/src/oci/oce/oce_instance_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190912', 'service_endpoint_template': 'https://cp.oce.{region}.ocp.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("oce_instance", config, signer, oce_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/ocvp/esxi_host_client.py b/src/oci/ocvp/esxi_host_client.py index fad9319c1a..f5392adb8a 100644 --- a/src/oci/ocvp/esxi_host_client.py +++ b/src/oci/ocvp/esxi_host_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200501', 'service_endpoint_template': 'https://ocvps.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("esxi_host", config, signer, ocvp_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/ocvp/sddc_client.py b/src/oci/ocvp/sddc_client.py index e77247c0e4..6972087d80 100644 --- a/src/oci/ocvp/sddc_client.py +++ b/src/oci/ocvp/sddc_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200501', 'service_endpoint_template': 'https://ocvps.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("sddc", config, signer, ocvp_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/ocvp/work_request_client.py b/src/oci/ocvp/work_request_client.py index 6c41b8ee1a..8ecc466e13 100644 --- a/src/oci/ocvp/work_request_client.py +++ b/src/oci/ocvp/work_request_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200501', 'service_endpoint_template': 'https://ocvps.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("work_request", config, signer, ocvp_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/oda/oda_client.py b/src/oci/oda/oda_client.py index edf7aad0a2..7697b09b9c 100644 --- a/src/oci/oda/oda_client.py +++ b/src/oci/oda/oda_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190506', 'service_endpoint_template': 'https://digitalassistant-api.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("oda", config, signer, oda_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/ons/notification_control_plane_client.py b/src/oci/ons/notification_control_plane_client.py index cb02ef807b..6987f88c30 100644 --- a/src/oci/ons/notification_control_plane_client.py +++ b/src/oci/ons/notification_control_plane_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://notification.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("notification_control_plane", config, signer, ons_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/ons/notification_data_plane_client.py b/src/oci/ons/notification_data_plane_client.py index f389296b4d..1bbd3ebf77 100644 --- a/src/oci/ons/notification_data_plane_client.py +++ b/src/oci/ons/notification_data_plane_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181201', 'service_endpoint_template': 'https://notification.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("notification_data_plane", config, signer, ons_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/operator_access_control/access_requests_client.py b/src/oci/operator_access_control/access_requests_client.py index fed0862c5c..5989be3c05 100644 --- a/src/oci/operator_access_control/access_requests_client.py +++ b/src/oci/operator_access_control/access_requests_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://operator-access-control.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("access_requests", config, signer, operator_access_control_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/operator_access_control/operator_actions_client.py b/src/oci/operator_access_control/operator_actions_client.py index ce93b8b46e..43315ee0de 100644 --- a/src/oci/operator_access_control/operator_actions_client.py +++ b/src/oci/operator_access_control/operator_actions_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://operator-access-control.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("operator_actions", config, signer, operator_access_control_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/operator_access_control/operator_control_assignment_client.py b/src/oci/operator_access_control/operator_control_assignment_client.py index 81a742dc38..e56efe8e50 100644 --- a/src/oci/operator_access_control/operator_control_assignment_client.py +++ b/src/oci/operator_access_control/operator_control_assignment_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://operator-access-control.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("operator_control_assignment", config, signer, operator_access_control_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/operator_access_control/operator_control_client.py b/src/oci/operator_access_control/operator_control_client.py index f6bd375341..5660b0d1ee 100644 --- a/src/oci/operator_access_control/operator_control_client.py +++ b/src/oci/operator_access_control/operator_control_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://operator-access-control.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("operator_control", config, signer, operator_access_control_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/opsi/operations_insights_client.py b/src/oci/opsi/operations_insights_client.py index ab0de76907..e8a8187f7e 100644 --- a/src/oci/opsi/operations_insights_client.py +++ b/src/oci/opsi/operations_insights_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200630', 'service_endpoint_template': 'https://operationsinsights.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("operations_insights", config, signer, opsi_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/optimizer/optimizer_client.py b/src/oci/optimizer/optimizer_client.py index 8875e71bf5..84efcd4e07 100644 --- a/src/oci/optimizer/optimizer_client.py +++ b/src/oci/optimizer/optimizer_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200606', 'service_endpoint_template': 'https://optimizer.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("optimizer", config, signer, optimizer_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/os_management/os_management_client.py b/src/oci/os_management/os_management_client.py index b55688902d..35bc541a7b 100644 --- a/src/oci/os_management/os_management_client.py +++ b/src/oci/os_management/os_management_client.py @@ -78,11 +78,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190801', 'service_endpoint_template': 'https://osms.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("os_management", config, signer, os_management_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/resource_manager/resource_manager_client.py b/src/oci/resource_manager/resource_manager_client.py index 4393403704..c1a3c6cc4f 100644 --- a/src/oci/resource_manager/resource_manager_client.py +++ b/src/oci/resource_manager/resource_manager_client.py @@ -80,11 +80,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180917', 'service_endpoint_template': 'https://resourcemanager.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("resource_manager", config, signer, resource_manager_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/resource_search/resource_search_client.py b/src/oci/resource_search/resource_search_client.py index 96f05021da..b4eafabc70 100644 --- a/src/oci/resource_search/resource_search_client.py +++ b/src/oci/resource_search/resource_search_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180409', 'service_endpoint_template': 'https://query.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("resource_search", config, signer, resource_search_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/rover/rover_cluster_client.py b/src/oci/rover/rover_cluster_client.py index 478d60d4c2..fe116bbe49 100644 --- a/src/oci/rover/rover_cluster_client.py +++ b/src/oci/rover/rover_cluster_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20201210', 'service_endpoint_template': 'https://rover.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("rover_cluster", config, signer, rover_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/rover/rover_entitlement_client.py b/src/oci/rover/rover_entitlement_client.py index a6bacdd8cc..08d2205cc6 100644 --- a/src/oci/rover/rover_entitlement_client.py +++ b/src/oci/rover/rover_entitlement_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20201210', 'service_endpoint_template': 'https://rover.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("rover_entitlement", config, signer, rover_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/rover/rover_node_client.py b/src/oci/rover/rover_node_client.py index 267b241823..c2d6fa0edb 100644 --- a/src/oci/rover/rover_node_client.py +++ b/src/oci/rover/rover_node_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20201210', 'service_endpoint_template': 'https://rover.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("rover_node", config, signer, rover_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/sch/service_connector_client.py b/src/oci/sch/service_connector_client.py index d57b926660..72687bb8c7 100644 --- a/src/oci/sch/service_connector_client.py +++ b/src/oci/sch/service_connector_client.py @@ -79,11 +79,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200909', 'service_endpoint_template': 'https://service-connector-hub.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("service_connector", config, signer, sch_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/secrets/secrets_client.py b/src/oci/secrets/secrets_client.py index cb335365bf..01444d67cf 100644 --- a/src/oci/secrets/secrets_client.py +++ b/src/oci/secrets/secrets_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20190301', 'service_endpoint_template': 'https://secrets.vaults.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("secrets", config, signer, secrets_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/service_catalog/service_catalog_client.py b/src/oci/service_catalog/service_catalog_client.py index 9bec0554af..651174f234 100644 --- a/src/oci/service_catalog/service_catalog_client.py +++ b/src/oci/service_catalog/service_catalog_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20210527', 'service_endpoint_template': 'https://service-catalog.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("service_catalog", config, signer, service_catalog_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/streaming/stream_admin_client.py b/src/oci/streaming/stream_admin_client.py index 64fccd9b5b..0145c1298a 100644 --- a/src/oci/streaming/stream_admin_client.py +++ b/src/oci/streaming/stream_admin_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180418', 'service_endpoint_template': 'https://streaming.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("stream_admin", config, signer, streaming_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/streaming/stream_client.py b/src/oci/streaming/stream_client.py index 8a79716236..4078c591bd 100644 --- a/src/oci/streaming/stream_client.py +++ b/src/oci/streaming/stream_client.py @@ -75,11 +75,12 @@ def __init__(self, config, service_endpoint, **kwargs): base_client_init_kwargs = { 'regional_client': False, 'service_endpoint': service_endpoint, - 'timeout': kwargs.get('timeout'), 'base_path': '/20180418', 'service_endpoint_template': 'https://streaming.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("stream", config, signer, streaming_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/domain_client.py b/src/oci/tenant_manager_control_plane/domain_client.py index e1288c0d2a..73cfff5a1f 100644 --- a/src/oci/tenant_manager_control_plane/domain_client.py +++ b/src/oci/tenant_manager_control_plane/domain_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("domain", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/domain_governance_client.py b/src/oci/tenant_manager_control_plane/domain_governance_client.py index d6a6f63b3c..c9e0ecfe48 100644 --- a/src/oci/tenant_manager_control_plane/domain_governance_client.py +++ b/src/oci/tenant_manager_control_plane/domain_governance_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("domain_governance", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/link_client.py b/src/oci/tenant_manager_control_plane/link_client.py index d750ddf803..bb8a15323c 100644 --- a/src/oci/tenant_manager_control_plane/link_client.py +++ b/src/oci/tenant_manager_control_plane/link_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("link", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/recipient_invitation_client.py b/src/oci/tenant_manager_control_plane/recipient_invitation_client.py index 45474fdea0..826aaa8df6 100644 --- a/src/oci/tenant_manager_control_plane/recipient_invitation_client.py +++ b/src/oci/tenant_manager_control_plane/recipient_invitation_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("recipient_invitation", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/sender_invitation_client.py b/src/oci/tenant_manager_control_plane/sender_invitation_client.py index 79d838727d..d15afa198d 100644 --- a/src/oci/tenant_manager_control_plane/sender_invitation_client.py +++ b/src/oci/tenant_manager_control_plane/sender_invitation_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("sender_invitation", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/tenant_manager_control_plane/work_request_client.py b/src/oci/tenant_manager_control_plane/work_request_client.py index 7729b2f4ca..d62a5adaa1 100644 --- a/src/oci/tenant_manager_control_plane/work_request_client.py +++ b/src/oci/tenant_manager_control_plane/work_request_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200801', 'service_endpoint_template': 'https://organizations.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("work_request", config, signer, tenant_manager_control_plane_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/usage_api/usageapi_client.py b/src/oci/usage_api/usageapi_client.py index ef2b9f3c71..d25f04745a 100644 --- a/src/oci/usage_api/usageapi_client.py +++ b/src/oci/usage_api/usageapi_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20200107', 'service_endpoint_template': 'https://usageapi.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("usageapi", config, signer, usage_api_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/vault/vaults_client.py b/src/oci/vault/vaults_client.py index c46970f2e4..73236a64cc 100644 --- a/src/oci/vault/vaults_client.py +++ b/src/oci/vault/vaults_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20180608', 'service_endpoint_template': 'https://vaults.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("vaults", config, signer, vault_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/version.py b/src/oci/version.py index 28321e6ab6..975aaf999b 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -2,4 +2,4 @@ # Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -__version__ = "2.38.1" +__version__ = "2.38.2" diff --git a/src/oci/vulnerability_scanning/vulnerability_scanning_client.py b/src/oci/vulnerability_scanning/vulnerability_scanning_client.py index 829bb62459..2dbdce5211 100644 --- a/src/oci/vulnerability_scanning/vulnerability_scanning_client.py +++ b/src/oci/vulnerability_scanning/vulnerability_scanning_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20210215', 'service_endpoint_template': 'https://vss-cp-api.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("vulnerability_scanning", config, signer, vulnerability_scanning_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/waas/redirect_client.py b/src/oci/waas/redirect_client.py index bc13e6b746..1e9bd544b3 100644 --- a/src/oci/waas/redirect_client.py +++ b/src/oci/waas/redirect_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181116', 'service_endpoint_template': 'https://waas.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("redirect", config, signer, waas_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/waas/waas_client.py b/src/oci/waas/waas_client.py index 9325e0f345..eaa0f0c50e 100644 --- a/src/oci/waas/waas_client.py +++ b/src/oci/waas/waas_client.py @@ -77,11 +77,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20181116', 'service_endpoint_template': 'https://waas.{region}.oci.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("waas", config, signer, waas_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') diff --git a/src/oci/work_requests/work_request_client.py b/src/oci/work_requests/work_request_client.py index 32d9e74843..271891da92 100644 --- a/src/oci/work_requests/work_request_client.py +++ b/src/oci/work_requests/work_request_client.py @@ -82,11 +82,12 @@ def __init__(self, config, **kwargs): base_client_init_kwargs = { 'regional_client': True, 'service_endpoint': kwargs.get('service_endpoint'), - 'timeout': kwargs.get('timeout'), 'base_path': '/20160918', 'service_endpoint_template': 'https://iaas.{region}.{secondLevelDomain}', 'skip_deserialization': kwargs.get('skip_deserialization', False) } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') self.base_client = BaseClient("work_request", config, signer, work_requests_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy')