Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@ Change Log
All notable changes to this project will be documented in this file.

The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
====================
2.10.0 - 2020-01-14
====================

Added
-----
* Support for a description field on route rules and security rules in the Networking service
* Support for starting and stopping Digital Assistant instances in the Digital Assistant service
* Support for shared database homes on Exadata, bare metal, and virtual machine instances in the Database service
* Support for tracking a number of Database service operations through the Work Requests service

Breaking
--------
* Field `db_home_id` in `list_databases` from database service is changed from required to optional

====================
2.9.0 - 2020-01-07
====================
Expand Down
2 changes: 2 additions & 0 deletions docs/api/database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Database
oci.database.models.CreateDataGuardAssociationDetails
oci.database.models.CreateDataGuardAssociationToExistingDbSystemDetails
oci.database.models.CreateDataGuardAssociationWithNewDbSystemDetails
oci.database.models.CreateDatabaseBase
oci.database.models.CreateDatabaseDetails
oci.database.models.CreateDatabaseFromBackupDetails
oci.database.models.CreateDbHomeBase
Expand All @@ -74,6 +75,7 @@ Database
oci.database.models.CreateExadataInfrastructureDetails
oci.database.models.CreateExternalBackupJobDetails
oci.database.models.CreateNFSBackupDestinationDetails
oci.database.models.CreateNewDatabaseDetails
oci.database.models.CreateRecoveryApplianceBackupDestinationDetails
oci.database.models.CreateVmClusterDetails
oci.database.models.DataGuardAssociation
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CreateDatabaseBase
==================

.. currentmodule:: oci.database.models

.. autoclass:: CreateDatabaseBase
:show-inheritance:
:special-members: __init__
:members:
:undoc-members:
:inherited-members:
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CreateNewDatabaseDetails
========================

.. currentmodule:: oci.database.models

.. autoclass:: CreateNewDatabaseDetails
:show-inheritance:
:special-members: __init__
:members:
:undoc-members:
:inherited-members:
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ autodocsumm==0.1.11
certifi
configparser==3.5.0
coverage==4.5.2
cryptography==2.5
cryptography==2.8
flake8==3.6.0
mock==2.0.0
pyOpenSSL==18.0.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def open_relative(*path):
requires = [
"certifi",
"configparser>=3.5.0b1",
"cryptography>=2.1.4",
"cryptography==2.8",
"pyOpenSSL>=17.5.0",
"python-dateutil>=2.5.3,<3.0.0",
"pytz>=2016.10",
Expand Down
2 changes: 1 addition & 1 deletion src/oci/analytics/analytics_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/announcements_service/announcement_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/apigateway/deployment_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/apigateway/gateway_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/apigateway/work_requests_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/audit/audit_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/autoscaling/auto_scaling_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
6 changes: 5 additions & 1 deletion src/oci/base_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ def utc_now():
STREAM_RESPONSE_TYPE = 'stream'
BYTES_RESPONSE_TYPE = 'bytes'

# Default timeout value(second)
DEFAULT_CONNECTION_TIMEOUT = 10.0
DEFAULT_READ_TIMEOUT = 60.0

# The keys here correspond to the Swagger collection format values described here: https://swagger.io/docs/specification/2-0/describing-parameters/
# and the values represent delimiters we'll use between values of the collection when placing those values in the query string.
#
Expand Down Expand Up @@ -124,7 +128,7 @@ def __init__(self, service, config, signer, type_mapping, **kwargs):
self.complex_type_mappings = type_mapping
self.type_mappings = merge_type_mappings(self.primitive_type_map, type_mapping)
self.session = requests.Session()
self.timeout = kwargs.get('timeout')
self.timeout = kwargs.get('timeout', (DEFAULT_CONNECTION_TIMEOUT, DEFAULT_READ_TIMEOUT))
self.user_agent = build_user_agent(get_config_value_or_default(config, "additional_user_agent"))

self.logger = logging.getLogger("{}.{}".format(__name__, id(self)))
Expand Down
2 changes: 1 addition & 1 deletion src/oci/budget/budget_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/container_engine/container_engine_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
2 changes: 1 addition & 1 deletion src/oci/core/blockstorage_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
22 changes: 11 additions & 11 deletions src/oci/core/compute_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down Expand Up @@ -183,7 +183,7 @@ def attach_boot_volume(self, attach_boot_volume_details, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.BootVolumeAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/bootVolumeAttachments/"
resource_path = "/bootVolumeAttachments"
method = "POST"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -256,7 +256,7 @@ def attach_vnic(self, attach_vnic_details, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.VnicAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/vnicAttachments/"
resource_path = "/vnicAttachments"
method = "POST"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -325,7 +325,7 @@ def attach_volume(self, attach_volume_details, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.VolumeAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/volumeAttachments/"
resource_path = "/volumeAttachments"
method = "POST"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -410,7 +410,7 @@ def capture_console_history(self, capture_console_history_details, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.ConsoleHistory`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/instanceConsoleHistories/"
resource_path = "/instanceConsoleHistories"
method = "POST"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -2826,7 +2826,7 @@ def launch_instance(self, launch_instance_details, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.Instance`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/instances/"
resource_path = "/instances"
method = "POST"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -3259,7 +3259,7 @@ def list_boot_volume_attachments(self, availability_domain, compartment_id, **kw
:return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.BootVolumeAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/bootVolumeAttachments/"
resource_path = "/bootVolumeAttachments"
method = "GET"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -3379,7 +3379,7 @@ def list_console_histories(self, compartment_id, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.ConsoleHistory`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/instanceConsoleHistories/"
resource_path = "/instanceConsoleHistories"
method = "GET"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -4450,7 +4450,7 @@ def list_instances(self, compartment_id, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.Instance`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/instances/"
resource_path = "/instances"
method = "GET"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -4677,7 +4677,7 @@ def list_vnic_attachments(self, compartment_id, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.VnicAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/vnicAttachments/"
resource_path = "/vnicAttachments"
method = "GET"

# Don't accept unknown kwargs
Expand Down Expand Up @@ -4782,7 +4782,7 @@ def list_volume_attachments(self, compartment_id, **kwargs):
:return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.VolumeAttachment`
:rtype: :class:`~oci.response.Response`
"""
resource_path = "/volumeAttachments/"
resource_path = "/volumeAttachments"
method = "GET"

# Don't accept unknown kwargs
Expand Down
2 changes: 1 addition & 1 deletion src/oci/core/compute_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, config, **kwargs):
need to specify a service endpoint.

:param timeout: (optional)
The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided
The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided
as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If
a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout.
:type timeout: float or tuple(float, float)
Expand Down
35 changes: 33 additions & 2 deletions src/oci/core/models/egress_security_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ def __init__(self, **kwargs):
The value to assign to the udp_options property of this EgressSecurityRule.
:type udp_options: UdpOptions

:param description:
The value to assign to the description property of this EgressSecurityRule.
:type description: str

"""
self.swagger_types = {
'destination': 'str',
Expand All @@ -63,7 +67,8 @@ def __init__(self, **kwargs):
'is_stateless': 'bool',
'protocol': 'str',
'tcp_options': 'TcpOptions',
'udp_options': 'UdpOptions'
'udp_options': 'UdpOptions',
'description': 'str'
}

self.attribute_map = {
Expand All @@ -73,7 +78,8 @@ def __init__(self, **kwargs):
'is_stateless': 'isStateless',
'protocol': 'protocol',
'tcp_options': 'tcpOptions',
'udp_options': 'udpOptions'
'udp_options': 'udpOptions',
'description': 'description'
}

self._destination = None
Expand All @@ -83,6 +89,7 @@ def __init__(self, **kwargs):
self._protocol = None
self._tcp_options = None
self._udp_options = None
self._description = None

@property
def destination(self):
Expand Down Expand Up @@ -342,6 +349,30 @@ def udp_options(self, udp_options):
"""
self._udp_options = udp_options

@property
def description(self):
"""
Gets the description of this EgressSecurityRule.
An optional description of your choice for the rule.


:return: The description of this EgressSecurityRule.
:rtype: str
"""
return self._description

@description.setter
def description(self, description):
"""
Sets the description of this EgressSecurityRule.
An optional description of your choice for the rule.


:param description: The description of this EgressSecurityRule.
:type: str
"""
self._description = description

def __repr__(self):
return formatted_flat_dict(self)

Expand Down
Loading