Skip to content

Commit 4f3410a

Browse files
Releasing version 2.74.0
Releasing version 2.74.0
2 parents 8641d8c + 3a2efc7 commit 4f3410a

File tree

6 files changed

+93
-38
lines changed

6 files changed

+93
-38
lines changed

CHANGELOG.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ Change Log
33
All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
6+
====================
7+
2.74.0 - 2022-07-05
8+
====================
9+
10+
Added
11+
-----
12+
* Support for backup policies returned as part of the database system list operation in the MySQL Database service
13+
14+
Breaking
15+
--------
16+
* Support for retries by default on some operations of the Bastion service
17+
618
====================
719
2.73.0 - 2022-06-27
820
====================

src/oci/bastion/bastion_client.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class BastionClient(object):
2020
"""
21-
Oracle Cloud Infrastructure Bastion provides restricted and time-limited access to target resources that don't have public endpoints. Through the configuration of a bastion, you can let authorized users connect from specific IP addresses to target resources by way of Secure Shell (SSH) sessions hosted on the bastion.
21+
Use the Bastion API to provide restricted and time-limited access to target resources that don't have public endpoints. Bastions let authorized users connect from specific IP addresses to target resources using Secure Shell (SSH) sessions. For more information, see [the Bastion documentation](/iaas/Content/Bastion/home.htm).
2222
"""
2323

2424
def __init__(self, config, **kwargs):
@@ -604,7 +604,7 @@ def get_bastion(self, bastion_id, **kwargs):
604604
:param obj retry_strategy: (optional)
605605
A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level.
606606
607-
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it.
607+
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided.
608608
The specifics of the default retry strategy are described `here <https://docs.oracle.com/en-us/iaas/tools/python/latest/sdk_behaviors/retries.html>`__.
609609
610610
To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`.
@@ -656,6 +656,8 @@ def get_bastion(self, bastion_id, **kwargs):
656656
operation_retry_strategy=kwargs.get('retry_strategy'),
657657
client_retry_strategy=self.retry_strategy
658658
)
659+
if retry_strategy is None:
660+
retry_strategy = retry.DEFAULT_RETRY_STRATEGY
659661

660662
if retry_strategy:
661663
if not isinstance(retry_strategy, retry.NoneRetryStrategy):
@@ -696,7 +698,7 @@ def get_session(self, session_id, **kwargs):
696698
:param obj retry_strategy: (optional)
697699
A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level.
698700
699-
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it.
701+
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided.
700702
The specifics of the default retry strategy are described `here <https://docs.oracle.com/en-us/iaas/tools/python/latest/sdk_behaviors/retries.html>`__.
701703
702704
To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`.
@@ -748,6 +750,8 @@ def get_session(self, session_id, **kwargs):
748750
operation_retry_strategy=kwargs.get('retry_strategy'),
749751
client_retry_strategy=self.retry_strategy
750752
)
753+
if retry_strategy is None:
754+
retry_strategy = retry.DEFAULT_RETRY_STRATEGY
751755

752756
if retry_strategy:
753757
if not isinstance(retry_strategy, retry.NoneRetryStrategy):
@@ -1501,7 +1505,7 @@ def update_bastion(self, bastion_id, update_bastion_details, **kwargs):
15011505
:param obj retry_strategy: (optional)
15021506
A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level.
15031507
1504-
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it.
1508+
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided.
15051509
The specifics of the default retry strategy are described `here <https://docs.oracle.com/en-us/iaas/tools/python/latest/sdk_behaviors/retries.html>`__.
15061510
15071511
To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`.
@@ -1555,6 +1559,8 @@ def update_bastion(self, bastion_id, update_bastion_details, **kwargs):
15551559
operation_retry_strategy=kwargs.get('retry_strategy'),
15561560
client_retry_strategy=self.retry_strategy
15571561
)
1562+
if retry_strategy is None:
1563+
retry_strategy = retry.DEFAULT_RETRY_STRATEGY
15581564

15591565
if retry_strategy:
15601566
if not isinstance(retry_strategy, retry.NoneRetryStrategy):
@@ -1605,7 +1611,7 @@ def update_session(self, session_id, update_session_details, **kwargs):
16051611
:param obj retry_strategy: (optional)
16061612
A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level.
16071613
1608-
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it.
1614+
This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided.
16091615
The specifics of the default retry strategy are described `here <https://docs.oracle.com/en-us/iaas/tools/python/latest/sdk_behaviors/retries.html>`__.
16101616
16111617
To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`.
@@ -1659,6 +1665,8 @@ def update_session(self, session_id, update_session_details, **kwargs):
16591665
operation_retry_strategy=kwargs.get('retry_strategy'),
16601666
client_retry_strategy=self.retry_strategy
16611667
)
1668+
if retry_strategy is None:
1669+
retry_strategy = retry.DEFAULT_RETRY_STRATEGY
16621670

16631671
if retry_strategy:
16641672
if not isinstance(retry_strategy, retry.NoneRetryStrategy):

src/oci/mysql/models/db_system_summary.py

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ def __init__(self, **kwargs):
106106
The value to assign to the defined_tags property of this DbSystemSummary.
107107
:type defined_tags: dict(str, dict(str, object))
108108
109+
:param backup_policy:
110+
The value to assign to the backup_policy property of this DbSystemSummary.
111+
:type backup_policy: oci.mysql.models.BackupPolicy
112+
113+
:param shape_name:
114+
The value to assign to the shape_name property of this DbSystemSummary.
115+
:type shape_name: str
116+
109117
:param crash_recovery:
110118
The value to assign to the crash_recovery property of this DbSystemSummary.
111119
Allowed values for this property are: "ENABLED", "DISABLED", 'UNKNOWN_ENUM_VALUE'.
@@ -134,6 +142,8 @@ def __init__(self, **kwargs):
134142
'deletion_policy': 'DeletionPolicyDetails',
135143
'freeform_tags': 'dict(str, str)',
136144
'defined_tags': 'dict(str, dict(str, object))',
145+
'backup_policy': 'BackupPolicy',
146+
'shape_name': 'str',
137147
'crash_recovery': 'str'
138148
}
139149

@@ -158,6 +168,8 @@ def __init__(self, **kwargs):
158168
'deletion_policy': 'deletionPolicy',
159169
'freeform_tags': 'freeformTags',
160170
'defined_tags': 'definedTags',
171+
'backup_policy': 'backupPolicy',
172+
'shape_name': 'shapeName',
161173
'crash_recovery': 'crashRecovery'
162174
}
163175

@@ -181,6 +193,8 @@ def __init__(self, **kwargs):
181193
self._deletion_policy = None
182194
self._freeform_tags = None
183195
self._defined_tags = None
196+
self._backup_policy = None
197+
self._shape_name = None
184198
self._crash_recovery = None
185199

186200
@property
@@ -677,6 +691,58 @@ def defined_tags(self, defined_tags):
677691
"""
678692
self._defined_tags = defined_tags
679693

694+
@property
695+
def backup_policy(self):
696+
"""
697+
Gets the backup_policy of this DbSystemSummary.
698+
699+
:return: The backup_policy of this DbSystemSummary.
700+
:rtype: oci.mysql.models.BackupPolicy
701+
"""
702+
return self._backup_policy
703+
704+
@backup_policy.setter
705+
def backup_policy(self, backup_policy):
706+
"""
707+
Sets the backup_policy of this DbSystemSummary.
708+
709+
:param backup_policy: The backup_policy of this DbSystemSummary.
710+
:type: oci.mysql.models.BackupPolicy
711+
"""
712+
self._backup_policy = backup_policy
713+
714+
@property
715+
def shape_name(self):
716+
"""
717+
Gets the shape_name of this DbSystemSummary.
718+
The shape of the primary instances of the DB System. The shape
719+
determines resources allocated to a DB System - CPU cores
720+
and memory for VM shapes; CPU cores, memory and storage for non-VM
721+
(or bare metal) shapes. To get a list of shapes, use (the
722+
:func:`list_shapes` operation.
723+
724+
725+
:return: The shape_name of this DbSystemSummary.
726+
:rtype: str
727+
"""
728+
return self._shape_name
729+
730+
@shape_name.setter
731+
def shape_name(self, shape_name):
732+
"""
733+
Sets the shape_name of this DbSystemSummary.
734+
The shape of the primary instances of the DB System. The shape
735+
determines resources allocated to a DB System - CPU cores
736+
and memory for VM shapes; CPU cores, memory and storage for non-VM
737+
(or bare metal) shapes. To get a list of shapes, use (the
738+
:func:`list_shapes` operation.
739+
740+
741+
:param shape_name: The shape_name of this DbSystemSummary.
742+
:type: str
743+
"""
744+
self._shape_name = shape_name
745+
680746
@property
681747
def crash_recovery(self):
682748
"""

src/oci/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
33
# 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.
44

5-
__version__ = "2.73.0"
5+
__version__ = "2.74.0"

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py36, py37, py38, py39, flake8
2+
envlist = py36, py37, py38, py39, flake8
33

44
[testenv]
55
passenv = PYTHON_TESTS_ADMIN_PASS_PHRASE OCI_PYSDK*

wercker.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,3 @@
1-
build-py27:
2-
box: python:2.7
3-
steps:
4-
# Does a pip install -r requirements.txt to install dependencies
5-
- pip-install
6-
7-
# Install the SDK via pip install -e .
8-
- pip-install:
9-
requirements_file: ""
10-
extra_args: "-e ."
11-
12-
# Verify via our script
13-
- script:
14-
name: import OCI and run basic command
15-
code: |
16-
python --version
17-
python scripts/wercker_validate.py
18-
19-
build-py35:
20-
box: python:3.5
21-
steps:
22-
- pip-install
23-
- pip-install:
24-
requirements_file: ""
25-
extra_args: "-e ."
26-
- script:
27-
name: import OCI and run basic command
28-
code: |
29-
python --version
30-
python scripts/wercker_validate.py
31-
321
build-py36:
332
box: python:3.6
343
steps:

0 commit comments

Comments
 (0)