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
12 changes: 12 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.

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

====================
2.6.4 - 2019-11-12
====================

Added
-----
* Support for access to APEX and SQL Dev features on autonomous transaction processing and autonomous data warehouse resources in the Database service
* Support for registering / deregistering autonomous transaction processing and autonomous data warehouse resources with Data Safe in the Database service
* Support for redirecting HTTP / HTTPS request URIs to different URIs in the Load Balancing service
* Support for specifying compartments on options APIs in the Container Engine for Kubernetes service
* Support for volume performance units on block volumes in the Block Storage service

====================
2.6.3 - 2019-11-05
====================
Expand Down
3 changes: 3 additions & 0 deletions docs/api/load_balancer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ Load Balancer
oci.load_balancer.models.LoadBalancerPolicy
oci.load_balancer.models.LoadBalancerProtocol
oci.load_balancer.models.LoadBalancerShape
oci.load_balancer.models.PathMatchCondition
oci.load_balancer.models.PathMatchType
oci.load_balancer.models.PathRoute
oci.load_balancer.models.PathRouteSet
oci.load_balancer.models.PathRouteSetDetails
oci.load_balancer.models.RedirectRule
oci.load_balancer.models.RedirectUri
oci.load_balancer.models.RemoveHttpRequestHeaderRule
oci.load_balancer.models.RemoveHttpResponseHeaderRule
oci.load_balancer.models.Rule
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
PathMatchCondition
==================

.. currentmodule:: oci.load_balancer.models

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

.. currentmodule:: oci.load_balancer.models

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

.. currentmodule:: oci.load_balancer.models

.. autoclass:: RedirectUri
:show-inheritance:
:special-members: __init__
:members:
:undoc-members:
:inherited-members:
22 changes: 22 additions & 0 deletions src/oci/container_engine/container_engine_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,9 @@ def get_cluster_options(self, cluster_option_id, **kwargs):
:param str cluster_option_id: (required)
The id of the option set to retrieve. Only \"all\" is supported.

:param str compartment_id: (optional)
The OCID of the compartment.

:param str opc_request_id: (optional)
Unique Oracle-assigned identifier for the request. If you need to contact
Oracle about a particular request, please provide the request ID.
Expand All @@ -643,6 +646,7 @@ def get_cluster_options(self, cluster_option_id, **kwargs):
# Don't accept unknown kwargs
expected_kwargs = [
"retry_strategy",
"compartment_id",
"opc_request_id"
]
extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs]
Expand All @@ -660,6 +664,11 @@ def get_cluster_options(self, cluster_option_id, **kwargs):
if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0):
raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k))

query_params = {
"compartmentId": kwargs.get("compartment_id", missing)
}
query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None}

header_params = {
"accept": "application/json",
"content-type": "application/json",
Expand All @@ -677,13 +686,15 @@ def get_cluster_options(self, cluster_option_id, **kwargs):
resource_path=resource_path,
method=method,
path_params=path_params,
query_params=query_params,
header_params=header_params,
response_type="ClusterOptions")
else:
return self.base_client.call_api(
resource_path=resource_path,
method=method,
path_params=path_params,
query_params=query_params,
header_params=header_params,
response_type="ClusterOptions")

Expand Down Expand Up @@ -770,6 +781,9 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs):
:param str node_pool_option_id: (required)
The id of the option set to retrieve. Use \"all\" get all options, or use a cluster ID to get options specific to the provided cluster.

:param str compartment_id: (optional)
The OCID of the compartment.

:param str opc_request_id: (optional)
Unique Oracle-assigned identifier for the request. If you need to contact
Oracle about a particular request, please provide the request ID.
Expand All @@ -791,6 +805,7 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs):
# Don't accept unknown kwargs
expected_kwargs = [
"retry_strategy",
"compartment_id",
"opc_request_id"
]
extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs]
Expand All @@ -808,6 +823,11 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs):
if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0):
raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k))

query_params = {
"compartmentId": kwargs.get("compartment_id", missing)
}
query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None}

header_params = {
"accept": "application/json",
"content-type": "application/json",
Expand All @@ -825,13 +845,15 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs):
resource_path=resource_path,
method=method,
path_params=path_params,
query_params=query_params,
header_params=header_params,
response_type="NodePoolOptions")
else:
return self.base_client.call_api(
resource_path=resource_path,
method=method,
path_params=path_params,
query_params=query_params,
header_params=header_params,
response_type="NodePoolOptions")

Expand Down
62 changes: 31 additions & 31 deletions src/oci/container_engine/models/node_pool_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,30 @@ def __init__(self, **kwargs):
The value to assign to the kubernetes_versions property of this NodePoolOptions.
:type kubernetes_versions: list[str]

:param images:
The value to assign to the images property of this NodePoolOptions.
:type images: list[str]

:param shapes:
The value to assign to the shapes property of this NodePoolOptions.
:type shapes: list[str]

:param images:
The value to assign to the images property of this NodePoolOptions.
:type images: list[str]

"""
self.swagger_types = {
'kubernetes_versions': 'list[str]',
'images': 'list[str]',
'shapes': 'list[str]'
'shapes': 'list[str]',
'images': 'list[str]'
}

self.attribute_map = {
'kubernetes_versions': 'kubernetesVersions',
'images': 'images',
'shapes': 'shapes'
'shapes': 'shapes',
'images': 'images'
}

self._kubernetes_versions = None
self._images = None
self._shapes = None
self._images = None

@property
def kubernetes_versions(self):
Expand All @@ -71,52 +71,52 @@ def kubernetes_versions(self, kubernetes_versions):
self._kubernetes_versions = kubernetes_versions

@property
def images(self):
def shapes(self):
"""
Gets the images of this NodePoolOptions.
Available image names.
Gets the shapes of this NodePoolOptions.
Available shapes for nodes.


:return: The images of this NodePoolOptions.
:return: The shapes of this NodePoolOptions.
:rtype: list[str]
"""
return self._images
return self._shapes

@images.setter
def images(self, images):
@shapes.setter
def shapes(self, shapes):
"""
Sets the images of this NodePoolOptions.
Available image names.
Sets the shapes of this NodePoolOptions.
Available shapes for nodes.


:param images: The images of this NodePoolOptions.
:param shapes: The shapes of this NodePoolOptions.
:type: list[str]
"""
self._images = images
self._shapes = shapes

@property
def shapes(self):
def images(self):
"""
Gets the shapes of this NodePoolOptions.
Available shapes for nodes.
Gets the images of this NodePoolOptions.
Available image names.


:return: The shapes of this NodePoolOptions.
:return: The images of this NodePoolOptions.
:rtype: list[str]
"""
return self._shapes
return self._images

@shapes.setter
def shapes(self, shapes):
@images.setter
def images(self, images):
"""
Sets the shapes of this NodePoolOptions.
Available shapes for nodes.
Sets the images of this NodePoolOptions.
Available image names.


:param shapes: The shapes of this NodePoolOptions.
:param images: The images of this NodePoolOptions.
:type: list[str]
"""
self._shapes = shapes
self._images = images

def __repr__(self):
return formatted_flat_dict(self)
Expand Down
31 changes: 31 additions & 0 deletions src/oci/core/models/boot_volume.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ def __init__(self, **kwargs):
The value to assign to the is_hydrated property of this BootVolume.
:type is_hydrated: bool

:param vpus_per_gb:
The value to assign to the vpus_per_gb property of this BootVolume.
:type vpus_per_gb: int

:param lifecycle_state:
The value to assign to the lifecycle_state property of this BootVolume.
Allowed values for this property are: "PROVISIONING", "RESTORING", "AVAILABLE", "TERMINATING", "TERMINATED", "FAULTY", 'UNKNOWN_ENUM_VALUE'.
Expand Down Expand Up @@ -129,6 +133,7 @@ def __init__(self, **kwargs):
'id': 'str',
'image_id': 'str',
'is_hydrated': 'bool',
'vpus_per_gb': 'int',
'lifecycle_state': 'str',
'size_in_gbs': 'int',
'size_in_mbs': 'int',
Expand All @@ -148,6 +153,7 @@ def __init__(self, **kwargs):
'id': 'id',
'image_id': 'imageId',
'is_hydrated': 'isHydrated',
'vpus_per_gb': 'vpusPerGB',
'lifecycle_state': 'lifecycleState',
'size_in_gbs': 'sizeInGBs',
'size_in_mbs': 'sizeInMBs',
Expand All @@ -166,6 +172,7 @@ def __init__(self, **kwargs):
self._id = None
self._image_id = None
self._is_hydrated = None
self._vpus_per_gb = None
self._lifecycle_state = None
self._size_in_gbs = None
self._size_in_mbs = None
Expand Down Expand Up @@ -418,6 +425,30 @@ def is_hydrated(self, is_hydrated):
"""
self._is_hydrated = is_hydrated

@property
def vpus_per_gb(self):
"""
Gets the vpus_per_gb of this BootVolume.
The number of Volume Performance Units that will be applied to this boot volume per GB.


:return: The vpus_per_gb of this BootVolume.
:rtype: int
"""
return self._vpus_per_gb

@vpus_per_gb.setter
def vpus_per_gb(self, vpus_per_gb):
"""
Sets the vpus_per_gb of this BootVolume.
The number of Volume Performance Units that will be applied to this boot volume per GB.


:param vpus_per_gb: The vpus_per_gb of this BootVolume.
:type: int
"""
self._vpus_per_gb = vpus_per_gb

@property
def lifecycle_state(self):
"""
Expand Down
Loading