diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1758bbc35d..8d749da862 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +1.4.1 - 2018-05-31 +==================== + +Added +----- +* Support for the "soft shutdown" instance action in the Compute service +* Support for Auth Token management in the Identity service + +Changed +------- +* Bumped required version of python-dateutil to 2.7.3 + ==================== 1.4.0 - 2018-05-17 ==================== diff --git a/docs/api/identity.rst b/docs/api/identity.rst index 17ade3d657..97eeb28865 100644 --- a/docs/api/identity.rst +++ b/docs/api/identity.rst @@ -20,9 +20,11 @@ Identity oci.identity.models.AddUserToGroupDetails oci.identity.models.ApiKey + oci.identity.models.AuthToken oci.identity.models.AvailabilityDomain oci.identity.models.Compartment oci.identity.models.CreateApiKeyDetails + oci.identity.models.CreateAuthTokenDetails oci.identity.models.CreateCompartmentDetails oci.identity.models.CreateCustomerSecretKeyDetails oci.identity.models.CreateDynamicGroupDetails @@ -56,6 +58,7 @@ Identity oci.identity.models.TagSummary oci.identity.models.Tenancy oci.identity.models.UIPassword + oci.identity.models.UpdateAuthTokenDetails oci.identity.models.UpdateCompartmentDetails oci.identity.models.UpdateCustomerSecretKeyDetails oci.identity.models.UpdateDynamicGroupDetails diff --git a/docs/api/identity/models/oci.identity.models.AuthToken.rst b/docs/api/identity/models/oci.identity.models.AuthToken.rst new file mode 100644 index 0000000000..d7a028c86a --- /dev/null +++ b/docs/api/identity/models/oci.identity.models.AuthToken.rst @@ -0,0 +1,11 @@ +AuthToken +========= + +.. currentmodule:: oci.identity.models + +.. autoclass:: AuthToken + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/identity/models/oci.identity.models.CreateAuthTokenDetails.rst b/docs/api/identity/models/oci.identity.models.CreateAuthTokenDetails.rst new file mode 100644 index 0000000000..13d56f3207 --- /dev/null +++ b/docs/api/identity/models/oci.identity.models.CreateAuthTokenDetails.rst @@ -0,0 +1,11 @@ +CreateAuthTokenDetails +====================== + +.. currentmodule:: oci.identity.models + +.. autoclass:: CreateAuthTokenDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/identity/models/oci.identity.models.UpdateAuthTokenDetails.rst b/docs/api/identity/models/oci.identity.models.UpdateAuthTokenDetails.rst new file mode 100644 index 0000000000..05eb4da22c --- /dev/null +++ b/docs/api/identity/models/oci.identity.models.UpdateAuthTokenDetails.rst @@ -0,0 +1,11 @@ +UpdateAuthTokenDetails +====================== + +.. currentmodule:: oci.identity.models + +.. autoclass:: UpdateAuthTokenDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/src/oci/audit/audit_client.py b/src/oci/audit/audit_client.py index 675e46083d..aec997d51a 100644 --- a/src/oci/audit/audit_client.py +++ b/src/oci/audit/audit_client.py @@ -110,7 +110,7 @@ def get_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -198,14 +198,14 @@ def list_events(self, compartment_id, start_time, end_time, **kwargs): "endTime": end_time, "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -262,7 +262,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", diff --git a/src/oci/core/blockstorage_client.py b/src/oci/core/blockstorage_client.py index 3cfbd70b76..fa9e484b2d 100644 --- a/src/oci/core/blockstorage_client.py +++ b/src/oci/core/blockstorage_client.py @@ -140,7 +140,7 @@ def create_volume(self, create_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -216,7 +216,7 @@ def create_volume_backup(self, create_volume_backup_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -345,7 +345,7 @@ def create_volume_group(self, create_volume_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -414,7 +414,7 @@ def create_volume_group_backup(self, create_volume_group_backup_details, **kwarg "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -496,7 +496,7 @@ def delete_boot_volume(self, boot_volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -574,7 +574,7 @@ def delete_volume(self, volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -647,7 +647,7 @@ def delete_volume_backup(self, volume_backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -720,7 +720,7 @@ def delete_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs) "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -793,7 +793,7 @@ def delete_volume_group(self, volume_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -866,7 +866,7 @@ def delete_volume_group_backup(self, volume_group_backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1191,7 +1191,7 @@ def get_volume_backup_policy_asset_assignment(self, asset_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1468,7 +1468,7 @@ def list_boot_volumes(self, availability_domain, compartment_id, **kwargs): "page": kwargs.get("page", missing), "volumeGroupId": kwargs.get("volume_group_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1538,7 +1538,7 @@ def list_volume_backup_policies(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1672,7 +1672,7 @@ def list_volume_backups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1792,7 +1792,7 @@ def list_volume_group_backups(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1928,7 +1928,7 @@ def list_volume_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2069,7 +2069,7 @@ def list_volumes(self, compartment_id, **kwargs): "volumeGroupId": kwargs.get("volume_group_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2152,7 +2152,7 @@ def update_boot_volume(self, boot_volume_id, update_boot_volume_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2233,7 +2233,7 @@ def update_volume(self, volume_id, update_volume_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2314,7 +2314,7 @@ def update_volume_backup(self, volume_backup_id, update_volume_backup_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2396,7 +2396,7 @@ def update_volume_group(self, volume_group_id, update_volume_group_details, **kw "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2476,7 +2476,7 @@ def update_volume_group_backup(self, volume_group_backup_id, update_volume_group "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index 916bbe525d..64b806c4de 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -123,7 +123,7 @@ def attach_boot_volume(self, attach_boot_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -196,7 +196,7 @@ def attach_vnic(self, attach_vnic_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -265,7 +265,7 @@ def attach_volume(self, attach_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -350,7 +350,7 @@ def capture_console_history(self, capture_console_history_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -446,7 +446,7 @@ def create_image(self, create_image_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -521,7 +521,7 @@ def create_instance_console_connection(self, create_instance_console_connection_ "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -598,7 +598,7 @@ def delete_console_history(self, instance_console_history_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -671,7 +671,7 @@ def delete_image(self, image_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -744,7 +744,7 @@ def delete_instance_console_connection(self, instance_console_connection_id, **k "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -820,7 +820,7 @@ def detach_boot_volume(self, boot_volume_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -904,7 +904,7 @@ def detach_vnic(self, vnic_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -980,7 +980,7 @@ def detach_volume(self, volume_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1079,7 +1079,7 @@ def export_image(self, image_id, export_image_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1291,7 +1291,7 @@ def get_console_history_content(self, instance_console_history_id, **kwargs): "offset": kwargs.get("offset", missing), "length": kwargs.get("length", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1708,7 +1708,7 @@ def get_windows_instance_initial_credentials(self, instance_id, **kwargs): def instance_action(self, instance_id, action, **kwargs): """ InstanceAction - Performs one of the power actions (start, stop, softreset, or reset) + Performs one of the power actions (start, stop, softreset, softstop, or reset) on the specified instance. **start** - power on @@ -1717,6 +1717,8 @@ def instance_action(self, instance_id, action, **kwargs): **softreset** - ACPI shutdown and power on + **softstop** - signal the instance operating system to shutdown gracefully + **reset** - power off and power on For more information see `Stopping and Starting an Instance`__. @@ -1730,7 +1732,7 @@ def instance_action(self, instance_id, action, **kwargs): :param str action: (required) The action to perform on the instance. - Allowed values are: "STOP", "START", "SOFTRESET", "RESET" + Allowed values are: "STOP", "START", "SOFTRESET", "RESET", "SOFTSTOP" :param str opc_retry_token: (optional) A token that uniquely identifies a request so it can be retried in case of a timeout or @@ -1782,7 +1784,7 @@ def instance_action(self, instance_id, action, **kwargs): query_params = { "action": action } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1790,7 +1792,7 @@ def instance_action(self, instance_id, action, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1896,7 +1898,7 @@ def launch_instance(self, launch_instance_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1984,7 +1986,7 @@ def list_boot_volume_attachments(self, availability_domain, compartment_id, **kw "instanceId": kwargs.get("instance_id", missing), "bootVolumeId": kwargs.get("boot_volume_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2120,7 +2122,7 @@ def list_console_histories(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2274,7 +2276,7 @@ def list_images(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2357,7 +2359,7 @@ def list_instance_console_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2495,7 +2497,7 @@ def list_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2582,7 +2584,7 @@ def list_shapes(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "imageId": kwargs.get("image_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2675,7 +2677,7 @@ def list_vnic_attachments(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "vnicId": kwargs.get("vnic_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2770,7 +2772,7 @@ def list_volume_attachments(self, compartment_id, **kwargs): "instanceId": kwargs.get("instance_id", missing), "volumeId": kwargs.get("volume_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2860,14 +2862,14 @@ def terminate_instance(self, instance_id, **kwargs): query_params = { "preserveBootVolume": kwargs.get("preserve_boot_volume", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2945,7 +2947,7 @@ def update_console_history(self, instance_console_history_id, update_console_his "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3034,7 +3036,7 @@ def update_image(self, image_id, update_image_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3126,7 +3128,7 @@ def update_instance(self, instance_id, update_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/core/compute_client_composite_operations.py b/src/oci/core/compute_client_composite_operations.py index 69c513626d..c12b8d87a9 100644 --- a/src/oci/core/compute_client_composite_operations.py +++ b/src/oci/core/compute_client_composite_operations.py @@ -494,7 +494,7 @@ def instance_action_and_wait_for_state(self, instance_id, action, wait_for_state :param str action: (required) The action to perform on the instance. - Allowed values are: "STOP", "START", "SOFTRESET", "RESET" + Allowed values are: "STOP", "START", "SOFTRESET", "RESET", "SOFTSTOP" :param list[str] wait_for_states: An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.Instance.lifecycle_state` diff --git a/src/oci/core/virtual_network_client.py b/src/oci/core/virtual_network_client.py index eb8d02a3ff..dc927f52e5 100644 --- a/src/oci/core/virtual_network_client.py +++ b/src/oci/core/virtual_network_client.py @@ -434,7 +434,7 @@ def create_cpe(self, create_cpe_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -525,7 +525,7 @@ def create_cross_connect(self, create_cross_connect_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -612,7 +612,7 @@ def create_cross_connect_group(self, create_cross_connect_group_details, **kwarg "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -695,7 +695,7 @@ def create_dhcp_options(self, create_dhcp_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -779,7 +779,7 @@ def create_drg(self, create_drg_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -861,7 +861,7 @@ def create_drg_attachment(self, create_drg_attachment_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -954,7 +954,7 @@ def create_internet_gateway(self, create_internet_gateway_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1053,7 +1053,7 @@ def create_ip_sec_connection(self, create_ip_sec_connection_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1122,7 +1122,7 @@ def create_local_peering_gateway(self, create_local_peering_gateway_details, **k "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1195,7 +1195,7 @@ def create_private_ip(self, create_private_ip_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1285,7 +1285,7 @@ def create_public_ip(self, create_public_ip_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1354,7 +1354,7 @@ def create_remote_peering_connection(self, create_remote_peering_connection_deta "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1442,7 +1442,7 @@ def create_route_table(self, create_route_table_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1529,7 +1529,7 @@ def create_security_list(self, create_security_list_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1637,7 +1637,7 @@ def create_subnet(self, create_subnet_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1741,7 +1741,7 @@ def create_vcn(self, create_vcn_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1835,7 +1835,7 @@ def create_virtual_circuit(self, create_virtual_circuit_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1914,7 +1914,7 @@ def delete_cpe(self, cpe_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1988,7 +1988,7 @@ def delete_cross_connect(self, cross_connect_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2063,7 +2063,7 @@ def delete_cross_connect_group(self, cross_connect_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2140,7 +2140,7 @@ def delete_dhcp_options(self, dhcp_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2216,7 +2216,7 @@ def delete_drg(self, drg_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2291,7 +2291,7 @@ def delete_drg_attachment(self, drg_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2368,7 +2368,7 @@ def delete_internet_gateway(self, ig_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2448,7 +2448,7 @@ def delete_ip_sec_connection(self, ipsc_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2524,7 +2524,7 @@ def delete_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2609,7 +2609,7 @@ def delete_private_ip(self, private_ip_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2692,7 +2692,7 @@ def delete_public_ip(self, public_ip_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2768,7 +2768,7 @@ def delete_remote_peering_connection(self, remote_peering_connection_id, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2845,7 +2845,7 @@ def delete_route_table(self, rt_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2922,7 +2922,7 @@ def delete_security_list(self, security_list_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2997,7 +2997,7 @@ def delete_subnet(self, subnet_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3072,7 +3072,7 @@ def delete_vcn(self, vcn_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3149,7 +3149,7 @@ def delete_virtual_circuit(self, virtual_circuit_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4884,7 +4884,7 @@ def list_cpes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5013,7 +5013,7 @@ def list_cross_connect_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5088,7 +5088,7 @@ def list_cross_connect_locations(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5223,7 +5223,7 @@ def list_cross_connects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5299,7 +5299,7 @@ def list_crossconnect_port_speed_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5434,7 +5434,7 @@ def list_dhcp_options(self, compartment_id, vcn_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5519,7 +5519,7 @@ def list_drg_attachments(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5593,7 +5593,7 @@ def list_drgs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5675,7 +5675,7 @@ def list_fast_connect_provider_services(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5763,7 +5763,7 @@ def list_fast_connect_provider_virtual_circuit_bandwidth_shapes(self, provider_s "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5898,7 +5898,7 @@ def list_internet_gateways(self, compartment_id, vcn_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -5983,7 +5983,7 @@ def list_ip_sec_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6062,7 +6062,7 @@ def list_local_peering_gateways(self, compartment_id, vcn_id, **kwargs): "page": kwargs.get("page", missing), "vcnId": vcn_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6161,7 +6161,7 @@ def list_private_ips(self, **kwargs): "subnetId": kwargs.get("subnet_id", missing), "vnicId": kwargs.get("vnic_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6269,7 +6269,7 @@ def list_public_ips(self, scope, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6349,7 +6349,7 @@ def list_remote_peering_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6484,7 +6484,7 @@ def list_route_tables(self, compartment_id, vcn_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6617,7 +6617,7 @@ def list_security_lists(self, compartment_id, vcn_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6750,7 +6750,7 @@ def list_subnets(self, compartment_id, vcn_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6879,7 +6879,7 @@ def list_vcns(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -6953,7 +6953,7 @@ def list_virtual_circuit_bandwidth_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -7040,7 +7040,7 @@ def list_virtual_circuit_public_prefixes(self, virtual_circuit_id, **kwargs): query_params = { "verificationState": kwargs.get("verification_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -7171,7 +7171,7 @@ def list_virtual_circuits(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -7255,7 +7255,7 @@ def update_cpe(self, cpe_id, update_cpe_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7335,7 +7335,7 @@ def update_cross_connect(self, cross_connect_id, update_cross_connect_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7416,7 +7416,7 @@ def update_cross_connect_group(self, cross_connect_group_id, update_cross_connec "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7499,7 +7499,7 @@ def update_dhcp_options(self, dhcp_id, update_dhcp_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7579,7 +7579,7 @@ def update_drg(self, drg_id, update_drg_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7660,7 +7660,7 @@ def update_drg_attachment(self, drg_attachment_id, update_drg_attachment_details "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7744,7 +7744,7 @@ def update_internet_gateway(self, ig_id, update_internet_gateway_details, **kwar "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7825,7 +7825,7 @@ def update_ip_sec_connection(self, ipsc_id, update_ip_sec_connection_details, ** "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7905,7 +7905,7 @@ def update_local_peering_gateway(self, local_peering_gateway_id, update_local_pe "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -7994,7 +7994,7 @@ def update_private_ip(self, private_ip_id, update_private_ip_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8114,7 +8114,7 @@ def update_public_ip(self, public_ip_id, update_public_ip_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8194,7 +8194,7 @@ def update_remote_peering_connection(self, remote_peering_connection_id, update_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8277,7 +8277,7 @@ def update_route_table(self, rt_id, update_route_table_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8361,7 +8361,7 @@ def update_security_list(self, security_list_id, update_security_list_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8441,7 +8441,7 @@ def update_subnet(self, subnet_id, update_subnet_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8522,7 +8522,7 @@ def update_vcn(self, vcn_id, update_vcn_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8627,7 +8627,7 @@ def update_virtual_circuit(self, virtual_circuit_id, update_virtual_circuit_deta "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -8707,7 +8707,7 @@ def update_vnic(self, vnic_id, update_vnic_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index b2882cfc38..f4a6f4be08 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -123,7 +123,7 @@ def create_backup(self, create_backup_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -217,7 +217,7 @@ def create_data_guard_association(self, database_id, create_data_guard_associati "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -288,7 +288,7 @@ def create_db_home(self, create_db_home_with_db_system_id_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -392,7 +392,7 @@ def db_node_action(self, db_node_id, action, **kwargs): query_params = { "action": action } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -400,7 +400,7 @@ def db_node_action(self, db_node_id, action, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -479,7 +479,7 @@ def delete_backup(self, backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -556,14 +556,14 @@ def delete_db_home(self, db_home_id, **kwargs): query_params = { "performFinalBackup": kwargs.get("perform_final_backup", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -653,7 +653,7 @@ def failover_data_guard_association(self, database_id, data_guard_association_id "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1414,7 +1414,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1489,7 +1489,7 @@ def list_backups(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1572,7 +1572,7 @@ def list_data_guard_associations(self, database_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1654,7 +1654,7 @@ def list_databases(self, compartment_id, db_home_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1737,7 +1737,7 @@ def list_db_home_patch_history_entries(self, db_home_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1822,7 +1822,7 @@ def list_db_home_patches(self, db_home_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1904,7 +1904,7 @@ def list_db_homes(self, compartment_id, db_system_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1984,7 +1984,7 @@ def list_db_nodes(self, compartment_id, db_system_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2067,7 +2067,7 @@ def list_db_system_patch_history_entries(self, db_system_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2152,7 +2152,7 @@ def list_db_system_patches(self, db_system_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2232,7 +2232,7 @@ def list_db_system_shapes(self, availability_domain, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2311,7 +2311,7 @@ def list_db_systems(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "backupId": kwargs.get("backup_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2395,7 +2395,7 @@ def list_db_versions(self, compartment_id, **kwargs): "dbSystemShape": kwargs.get("db_system_shape", missing), "dbSystemId": kwargs.get("db_system_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2486,7 +2486,7 @@ def reinstate_data_guard_association(self, database_id, data_guard_association_i "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2568,7 +2568,7 @@ def restore_database(self, database_id, restore_database_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2659,7 +2659,7 @@ def switchover_data_guard_association(self, database_id, data_guard_association_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2738,7 +2738,7 @@ def terminate_db_system(self, db_system_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2816,7 +2816,7 @@ def update_database(self, database_id, update_database_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2898,7 +2898,7 @@ def update_db_home(self, db_home_id, update_db_home_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2980,7 +2980,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/dns/dns_client.py b/src/oci/dns/dns_client.py index 0c4ebf05ef..c9bd0bc084 100644 --- a/src/oci/dns/dns_client.py +++ b/src/oci/dns/dns_client.py @@ -118,7 +118,7 @@ def create_zone(self, create_zone_details, **kwargs): 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} + 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", @@ -215,7 +215,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): 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} + 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", @@ -223,7 +223,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -317,7 +317,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): 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} + 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", @@ -325,7 +325,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -412,7 +412,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): 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} + 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", @@ -420,7 +420,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -561,7 +561,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -569,7 +569,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "If-Modified-Since": kwargs.get("if_modified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -679,7 +679,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "zoneVersion": kwargs.get("zone_version", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -687,7 +687,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "If-Modified-Since": kwargs.get("if_modified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -774,7 +774,7 @@ def get_zone(self, zone_name_or_id, **kwargs): 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} + 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", @@ -782,7 +782,7 @@ def get_zone(self, zone_name_or_id, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "If-Modified-Since": kwargs.get("if_modified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -935,7 +935,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -943,7 +943,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "If-Modified-Since": kwargs.get("if_modified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1097,7 +1097,7 @@ def list_zones(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1195,7 +1195,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det 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} + 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", @@ -1203,7 +1203,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1304,7 +1304,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **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} + 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", @@ -1312,7 +1312,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1408,7 +1408,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar 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} + 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", @@ -1416,7 +1416,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1518,7 +1518,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d 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} + 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", @@ -1526,7 +1526,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1627,7 +1627,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * 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} + 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", @@ -1635,7 +1635,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1732,7 +1732,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): 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} + 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", @@ -1740,7 +1740,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1837,7 +1837,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw 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} + 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", @@ -1845,7 +1845,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "If-Match": kwargs.get("if_match", missing), "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/email/email_client.py b/src/oci/email/email_client.py index d96a3fadbd..b0ad0d1970 100644 --- a/src/oci/email/email_client.py +++ b/src/oci/email/email_client.py @@ -537,7 +537,7 @@ def list_senders(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -672,7 +672,7 @@ def list_suppressions(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", diff --git a/src/oci/file_storage/file_storage_client.py b/src/oci/file_storage/file_storage_client.py index 22396cc3e3..39b86b26db 100644 --- a/src/oci/file_storage/file_storage_client.py +++ b/src/oci/file_storage/file_storage_client.py @@ -124,7 +124,7 @@ def create_export(self, create_export_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -221,7 +221,7 @@ def create_file_system(self, create_file_system_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -324,7 +324,7 @@ def create_mount_target(self, create_mount_target_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -394,7 +394,7 @@ def create_snapshot(self, create_snapshot_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -473,7 +473,7 @@ def delete_export(self, export_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -550,7 +550,7 @@ def delete_file_system(self, file_system_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -626,7 +626,7 @@ def delete_mount_target(self, mount_target_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -701,7 +701,7 @@ def delete_snapshot(self, snapshot_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1154,7 +1154,7 @@ def list_export_sets(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1294,7 +1294,7 @@ def list_exports(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1434,7 +1434,7 @@ def list_file_systems(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1579,7 +1579,7 @@ def list_mount_targets(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1689,7 +1689,7 @@ def list_snapshots(self, file_system_id, **kwargs): "id": kwargs.get("id", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -1774,7 +1774,7 @@ def update_export_set(self, export_set_id, update_export_set_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1857,7 +1857,7 @@ def update_file_system(self, file_system_id, update_file_system_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1939,7 +1939,7 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/identity/identity_client.py b/src/oci/identity/identity_client.py index 024b552efa..bb2fc71566 100644 --- a/src/oci/identity/identity_client.py +++ b/src/oci/identity/identity_client.py @@ -126,7 +126,7 @@ def add_user_to_group(self, add_user_to_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -150,6 +150,101 @@ def add_user_to_group(self, add_user_to_group_details, **kwargs): body=add_user_to_group_details, response_type="UserGroupMembership") + def create_auth_token(self, create_auth_token_details, user_id, **kwargs): + """ + CreateAuthToken + Creates a new auth token for the specified user. For information about what auth tokens are for, see + `Managing User Credentials`__. + + You must specify a *description* for the auth token (although it can be an empty string). It does not + have to be unique, and you can change it anytime with + :func:`update_auth_token`. + + Every user has permission to create an auth token for *their own user ID*. An administrator in your organization + does not need to write a policy to give users this ability. To compare, administrators who have permission to the + tenancy can use this operation to create an auth token for any user, including themselves. + + __ https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/managingcredentials.htm + + + :param CreateAuthTokenDetails create_auth_token_details: (required) + Request object for creating a new auth token. + + :param str user_id: (required) + The OCID of the user. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (e.g., if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.identity.models.AuthToken` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/users/{userId}/authTokens/" + method = "POST" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "opc_retry_token" + ] + extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "create_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "userId": user_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + 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)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=create_auth_token_details, + response_type="AuthToken") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=create_auth_token_details, + response_type="AuthToken") + def create_compartment(self, create_compartment_details, **kwargs): """ CreateCompartment @@ -216,7 +311,7 @@ def create_compartment(self, create_compartment_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -310,7 +405,7 @@ def create_customer_secret_key(self, create_customer_secret_key_details, user_id "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -401,7 +496,7 @@ def create_dynamic_group(self, create_dynamic_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -493,7 +588,7 @@ def create_group(self, create_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -582,7 +677,7 @@ def create_identity_provider(self, create_identity_provider_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -665,7 +760,7 @@ def create_idp_group_mapping(self, create_idp_group_mapping_details, identity_pr "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -758,7 +853,7 @@ def create_or_reset_ui_password(self, user_id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -847,7 +942,7 @@ def create_policy(self, create_policy_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -929,7 +1024,7 @@ def create_region_subscription(self, create_region_subscription_details, tenancy "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1016,7 +1111,7 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1045,6 +1140,8 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar def create_swift_password(self, create_swift_password_details, user_id, **kwargs): """ CreateSwiftPassword + **Deprecated. Use :func:`create_auth_token` instead.** + Creates a new Swift password for the specified user. For information about what Swift passwords are for, see `Managing User Credentials`__. @@ -1111,7 +1208,7 @@ def create_swift_password(self, create_swift_password_details, user_id, **kwargs "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1206,7 +1303,7 @@ def create_tag(self, tag_namespace_id, create_tag_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1295,7 +1392,7 @@ def create_tag_namespace(self, create_tag_namespace_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1402,7 +1499,7 @@ def create_user(self, create_user_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1488,7 +1585,84 @@ def delete_api_key(self, user_id, fingerprint, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params) + + def delete_auth_token(self, user_id, auth_token_id, **kwargs): + """ + DeleteAuthToken + Deletes the specified auth token for the specified user. + + + :param str user_id: (required) + The OCID of the user. + + :param str auth_token_id: (required) + The OCID of the auth token. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/users/{userId}/authTokens/{authTokenId}" + method = "DELETE" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "if_match" + ] + extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "delete_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "userId": user_id, + "authTokenId": auth_token_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + 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)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1565,7 +1739,7 @@ def delete_customer_secret_key(self, user_id, customer_secret_key_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1638,7 +1812,7 @@ def delete_dynamic_group(self, dynamic_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1711,7 +1885,7 @@ def delete_group(self, group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1785,7 +1959,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1862,7 +2036,7 @@ def delete_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1935,7 +2109,7 @@ def delete_policy(self, policy_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2012,7 +2186,7 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2035,6 +2209,8 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): def delete_swift_password(self, user_id, swift_password_id, **kwargs): """ DeleteSwiftPassword + **Deprecated. Use :func:`delete_auth_token` instead.** + Deletes the specified Swift password for the specified user. @@ -2089,7 +2265,7 @@ def delete_swift_password(self, user_id, swift_password_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2162,7 +2338,7 @@ def delete_user(self, user_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2972,6 +3148,71 @@ def list_api_keys(self, user_id, **kwargs): header_params=header_params, response_type="list[ApiKey]") + def list_auth_tokens(self, user_id, **kwargs): + """ + ListAuthTokens + Lists the auth tokens for the specified user. The returned object contains the token's OCID, but not + the token itself. The actual token is returned only upon creation. + + + :param str user_id: (required) + The OCID of the user. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.identity.models.AuthToken` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/users/{userId}/authTokens/" + method = "GET" + + expected_kwargs = ["retry_strategy"] + extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "list_auth_tokens got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "userId": user_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + 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)) + + header_params = { + "accept": "application/json", + "content-type": "application/json" + } + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="list[AuthToken]") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="list[AuthToken]") + def list_availability_domains(self, compartment_id, **kwargs): """ ListAvailabilityDomains @@ -3008,7 +3249,7 @@ def list_availability_domains(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3084,7 +3325,7 @@ def list_compartments(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3225,7 +3466,7 @@ def list_dynamic_groups(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3301,7 +3542,7 @@ def list_groups(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3384,7 +3625,7 @@ def list_identity_providers(self, protocol, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3465,7 +3706,7 @@ def list_idp_group_mappings(self, identity_provider_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3545,7 +3786,7 @@ def list_policies(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3753,6 +3994,8 @@ def list_smtp_credentials(self, user_id, **kwargs): def list_swift_passwords(self, user_id, **kwargs): """ ListSwiftPasswords + **Deprecated. Use :func:`list_auth_tokens` instead.** + Lists the Swift passwords for the specified user. The returned object contains the password's OCID, but not the password itself. The actual password is returned only upon creation. @@ -3866,7 +4109,7 @@ def list_tag_namespaces(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "includeSubcompartments": kwargs.get("include_subcompartments", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -3947,7 +4190,7 @@ def list_tags(self, tag_namespace_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -4042,7 +4285,7 @@ def list_user_group_memberships(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -4118,7 +4361,7 @@ def list_users(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -4198,7 +4441,7 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4218,6 +4461,90 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): path_params=path_params, header_params=header_params) + def update_auth_token(self, user_id, auth_token_id, update_auth_token_details, **kwargs): + """ + UpdateAuthToken + Updates the specified auth token's description. + + + :param str user_id: (required) + The OCID of the user. + + :param str auth_token_id: (required) + The OCID of the auth token. + + :param UpdateAuthTokenDetails update_auth_token_details: (required) + Request object for updating an auth token. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.identity.models.AuthToken` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/users/{userId}/authTokens/{authTokenId}" + method = "PUT" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "if_match" + ] + extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "update_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "userId": user_id, + "authTokenId": auth_token_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + 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)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_auth_token_details, + response_type="AuthToken") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_auth_token_details, + response_type="AuthToken") + def update_compartment(self, compartment_id, update_compartment_details, **kwargs): """ UpdateCompartment @@ -4274,7 +4601,7 @@ def update_compartment(self, compartment_id, update_compartment_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4358,7 +4685,7 @@ def update_customer_secret_key(self, user_id, customer_secret_key_id, update_cus "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4438,7 +4765,7 @@ def update_dynamic_group(self, dynamic_group_id, update_dynamic_group_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4518,7 +4845,7 @@ def update_group(self, group_id, update_group_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4598,7 +4925,7 @@ def update_identity_provider(self, identity_provider_id, update_identity_provide "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4682,7 +5009,7 @@ def update_idp_group_mapping(self, identity_provider_id, mapping_id, update_idp_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4764,7 +5091,7 @@ def update_policy(self, policy_id, update_policy_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4848,7 +5175,7 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -4875,6 +5202,8 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden def update_swift_password(self, user_id, swift_password_id, update_swift_password_details, **kwargs): """ UpdateSwiftPassword + **Deprecated. Use :func:`update_auth_token` instead.** + Updates the specified Swift password's description. @@ -4932,7 +5261,7 @@ def update_swift_password(self, user_id, swift_password_id, update_swift_passwor "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -5164,7 +5493,7 @@ def update_user(self, user_id, update_user_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -5244,7 +5573,7 @@ def update_user_state(self, user_id, update_state_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -5340,7 +5669,7 @@ def upload_api_key(self, user_id, create_api_key_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): diff --git a/src/oci/identity/models/__init__.py b/src/oci/identity/models/__init__.py index 907014df28..6338293f20 100644 --- a/src/oci/identity/models/__init__.py +++ b/src/oci/identity/models/__init__.py @@ -5,9 +5,11 @@ from .add_user_to_group_details import AddUserToGroupDetails from .api_key import ApiKey +from .auth_token import AuthToken from .availability_domain import AvailabilityDomain from .compartment import Compartment from .create_api_key_details import CreateApiKeyDetails +from .create_auth_token_details import CreateAuthTokenDetails from .create_compartment_details import CreateCompartmentDetails from .create_customer_secret_key_details import CreateCustomerSecretKeyDetails from .create_dynamic_group_details import CreateDynamicGroupDetails @@ -41,6 +43,7 @@ from .tag_summary import TagSummary from .tenancy import Tenancy from .ui_password import UIPassword +from .update_auth_token_details import UpdateAuthTokenDetails from .update_compartment_details import UpdateCompartmentDetails from .update_customer_secret_key_details import UpdateCustomerSecretKeyDetails from .update_dynamic_group_details import UpdateDynamicGroupDetails @@ -62,9 +65,11 @@ identity_type_mapping = { "AddUserToGroupDetails": AddUserToGroupDetails, "ApiKey": ApiKey, + "AuthToken": AuthToken, "AvailabilityDomain": AvailabilityDomain, "Compartment": Compartment, "CreateApiKeyDetails": CreateApiKeyDetails, + "CreateAuthTokenDetails": CreateAuthTokenDetails, "CreateCompartmentDetails": CreateCompartmentDetails, "CreateCustomerSecretKeyDetails": CreateCustomerSecretKeyDetails, "CreateDynamicGroupDetails": CreateDynamicGroupDetails, @@ -98,6 +103,7 @@ "TagSummary": TagSummary, "Tenancy": Tenancy, "UIPassword": UIPassword, + "UpdateAuthTokenDetails": UpdateAuthTokenDetails, "UpdateCompartmentDetails": UpdateCompartmentDetails, "UpdateCustomerSecretKeyDetails": UpdateCustomerSecretKeyDetails, "UpdateDynamicGroupDetails": UpdateDynamicGroupDetails, diff --git a/src/oci/identity/models/auth_token.py b/src/oci/identity/models/auth_token.py new file mode 100644 index 0000000000..ebb6303fa7 --- /dev/null +++ b/src/oci/identity/models/auth_token.py @@ -0,0 +1,339 @@ +# coding: utf-8 +# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class AuthToken(object): + """ + An `AuthToken` is an Oracle-generated token string that you can use to authenticate with third-party APIs + that do not support Oracle Cloud Infrastructure's signature-based authentication. For example, use an `AuthToken` + to authenticate with a Swift client with the Object Storage Service. + + The auth token is associated with the user's Console login. Auth tokens never expire. A user can have up to two + auth tokens at a time. + + **Note:** The token is always an Oracle-generated string; you can't change it to a string of your choice. + + For more information, see `Managing User Credentials`__. + + __ https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/managingcredentials.htm + """ + + #: A constant which can be used with the lifecycle_state property of a AuthToken. + #: This constant has a value of "CREATING" + LIFECYCLE_STATE_CREATING = "CREATING" + + #: A constant which can be used with the lifecycle_state property of a AuthToken. + #: This constant has a value of "ACTIVE" + LIFECYCLE_STATE_ACTIVE = "ACTIVE" + + #: A constant which can be used with the lifecycle_state property of a AuthToken. + #: This constant has a value of "INACTIVE" + LIFECYCLE_STATE_INACTIVE = "INACTIVE" + + #: A constant which can be used with the lifecycle_state property of a AuthToken. + #: This constant has a value of "DELETING" + LIFECYCLE_STATE_DELETING = "DELETING" + + #: A constant which can be used with the lifecycle_state property of a AuthToken. + #: This constant has a value of "DELETED" + LIFECYCLE_STATE_DELETED = "DELETED" + + def __init__(self, **kwargs): + """ + Initializes a new AuthToken object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param token: + The value to assign to the token property of this AuthToken. + :type token: str + + :param id: + The value to assign to the id property of this AuthToken. + :type id: str + + :param user_id: + The value to assign to the user_id property of this AuthToken. + :type user_id: str + + :param description: + The value to assign to the description property of this AuthToken. + :type description: str + + :param time_created: + The value to assign to the time_created property of this AuthToken. + :type time_created: datetime + + :param time_expires: + The value to assign to the time_expires property of this AuthToken. + :type time_expires: datetime + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this AuthToken. + Allowed values for this property are: "CREATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type lifecycle_state: str + + :param inactive_status: + The value to assign to the inactive_status property of this AuthToken. + :type inactive_status: int + + """ + self.swagger_types = { + 'token': 'str', + 'id': 'str', + 'user_id': 'str', + 'description': 'str', + 'time_created': 'datetime', + 'time_expires': 'datetime', + 'lifecycle_state': 'str', + 'inactive_status': 'int' + } + + self.attribute_map = { + 'token': 'token', + 'id': 'id', + 'user_id': 'userId', + 'description': 'description', + 'time_created': 'timeCreated', + 'time_expires': 'timeExpires', + 'lifecycle_state': 'lifecycleState', + 'inactive_status': 'inactiveStatus' + } + + self._token = None + self._id = None + self._user_id = None + self._description = None + self._time_created = None + self._time_expires = None + self._lifecycle_state = None + self._inactive_status = None + + @property + def token(self): + """ + Gets the token of this AuthToken. + The auth token. The value is available only in the response for `CreateAuthToken`, and not + for `ListAuthTokens` or `UpdateAuthToken`. + + + :return: The token of this AuthToken. + :rtype: str + """ + return self._token + + @token.setter + def token(self, token): + """ + Sets the token of this AuthToken. + The auth token. The value is available only in the response for `CreateAuthToken`, and not + for `ListAuthTokens` or `UpdateAuthToken`. + + + :param token: The token of this AuthToken. + :type: str + """ + self._token = token + + @property + def id(self): + """ + Gets the id of this AuthToken. + The OCID of the auth token. + + + :return: The id of this AuthToken. + :rtype: str + """ + return self._id + + @id.setter + def id(self, id): + """ + Sets the id of this AuthToken. + The OCID of the auth token. + + + :param id: The id of this AuthToken. + :type: str + """ + self._id = id + + @property + def user_id(self): + """ + Gets the user_id of this AuthToken. + The OCID of the user the auth token belongs to. + + + :return: The user_id of this AuthToken. + :rtype: str + """ + return self._user_id + + @user_id.setter + def user_id(self, user_id): + """ + Sets the user_id of this AuthToken. + The OCID of the user the auth token belongs to. + + + :param user_id: The user_id of this AuthToken. + :type: str + """ + self._user_id = user_id + + @property + def description(self): + """ + Gets the description of this AuthToken. + The description you assign to the auth token. Does not have to be unique, and it's changeable. + + + :return: The description of this AuthToken. + :rtype: str + """ + return self._description + + @description.setter + def description(self, description): + """ + Sets the description of this AuthToken. + The description you assign to the auth token. Does not have to be unique, and it's changeable. + + + :param description: The description of this AuthToken. + :type: str + """ + self._description = description + + @property + def time_created(self): + """ + Gets the time_created of this AuthToken. + Date and time the `AuthToken` object was created, in the format defined by RFC3339. + + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_created of this AuthToken. + :rtype: datetime + """ + return self._time_created + + @time_created.setter + def time_created(self, time_created): + """ + Sets the time_created of this AuthToken. + Date and time the `AuthToken` object was created, in the format defined by RFC3339. + + Example: `2016-08-25T21:10:29.600Z` + + + :param time_created: The time_created of this AuthToken. + :type: datetime + """ + self._time_created = time_created + + @property + def time_expires(self): + """ + Gets the time_expires of this AuthToken. + Date and time when this auth token will expire, in the format defined by RFC3339. + Null if it never expires. + + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_expires of this AuthToken. + :rtype: datetime + """ + return self._time_expires + + @time_expires.setter + def time_expires(self, time_expires): + """ + Sets the time_expires of this AuthToken. + Date and time when this auth token will expire, in the format defined by RFC3339. + Null if it never expires. + + Example: `2016-08-25T21:10:29.600Z` + + + :param time_expires: The time_expires of this AuthToken. + :type: datetime + """ + self._time_expires = time_expires + + @property + def lifecycle_state(self): + """ + Gets the lifecycle_state of this AuthToken. + The token's current state. After creating an auth token, make sure its `lifecycleState` changes from + CREATING to ACTIVE before using it. + + Allowed values for this property are: "CREATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The lifecycle_state of this AuthToken. + :rtype: str + """ + return self._lifecycle_state + + @lifecycle_state.setter + def lifecycle_state(self, lifecycle_state): + """ + Sets the lifecycle_state of this AuthToken. + The token's current state. After creating an auth token, make sure its `lifecycleState` changes from + CREATING to ACTIVE before using it. + + + :param lifecycle_state: The lifecycle_state of this AuthToken. + :type: str + """ + allowed_values = ["CREATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED"] + if not value_allowed_none_or_none_sentinel(lifecycle_state, allowed_values): + lifecycle_state = 'UNKNOWN_ENUM_VALUE' + self._lifecycle_state = lifecycle_state + + @property + def inactive_status(self): + """ + Gets the inactive_status of this AuthToken. + The detailed status of INACTIVE lifecycleState. + + + :return: The inactive_status of this AuthToken. + :rtype: int + """ + return self._inactive_status + + @inactive_status.setter + def inactive_status(self, inactive_status): + """ + Sets the inactive_status of this AuthToken. + The detailed status of INACTIVE lifecycleState. + + + :param inactive_status: The inactive_status of this AuthToken. + :type: int + """ + self._inactive_status = inactive_status + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/identity/models/create_auth_token_details.py b/src/oci/identity/models/create_auth_token_details.py new file mode 100644 index 0000000000..fb29e1e9d9 --- /dev/null +++ b/src/oci/identity/models/create_auth_token_details.py @@ -0,0 +1,69 @@ +# coding: utf-8 +# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CreateAuthTokenDetails(object): + """ + CreateAuthTokenDetails model. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateAuthTokenDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param description: + The value to assign to the description property of this CreateAuthTokenDetails. + :type description: str + + """ + self.swagger_types = { + 'description': 'str' + } + + self.attribute_map = { + 'description': 'description' + } + + self._description = None + + @property + def description(self): + """ + **[Required]** Gets the description of this CreateAuthTokenDetails. + The description you assign to the auth token during creation. Does not have to be unique, and it's changeable. + + + :return: The description of this CreateAuthTokenDetails. + :rtype: str + """ + return self._description + + @description.setter + def description(self, description): + """ + Sets the description of this CreateAuthTokenDetails. + The description you assign to the auth token during creation. Does not have to be unique, and it's changeable. + + + :param description: The description of this CreateAuthTokenDetails. + :type: str + """ + self._description = description + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/identity/models/swift_password.py b/src/oci/identity/models/swift_password.py index 59ef0354af..32ba816df4 100644 --- a/src/oci/identity/models/swift_password.py +++ b/src/oci/identity/models/swift_password.py @@ -9,8 +9,10 @@ @init_model_state_from_kwargs class SwiftPassword(object): """ + **Deprecated. Use :class:`AuthToken` instead.** + Swift is the OpenStack object storage service. A `SwiftPassword` is an Oracle-provided password for using a - Swift client with the Oracle Cloud Infrastructure Object Storage Service. This password is associated with + Swift client with the Object Storage Service. This password is associated with the user's Console login. Swift passwords never expire. A user can have up to two Swift passwords at a time. **Note:** The password is always an Oracle-generated string; you can't change it to a string of your choice. diff --git a/src/oci/identity/models/update_auth_token_details.py b/src/oci/identity/models/update_auth_token_details.py new file mode 100644 index 0000000000..b5fd7ce080 --- /dev/null +++ b/src/oci/identity/models/update_auth_token_details.py @@ -0,0 +1,69 @@ +# coding: utf-8 +# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class UpdateAuthTokenDetails(object): + """ + UpdateAuthTokenDetails model. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateAuthTokenDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param description: + The value to assign to the description property of this UpdateAuthTokenDetails. + :type description: str + + """ + self.swagger_types = { + 'description': 'str' + } + + self.attribute_map = { + 'description': 'description' + } + + self._description = None + + @property + def description(self): + """ + Gets the description of this UpdateAuthTokenDetails. + The description you assign to the auth token. Does not have to be unique, and it's changeable. + + + :return: The description of this UpdateAuthTokenDetails. + :rtype: str + """ + return self._description + + @description.setter + def description(self, description): + """ + Sets the description of this UpdateAuthTokenDetails. + The description you assign to the auth token. Does not have to be unique, and it's changeable. + + + :param description: The description of this UpdateAuthTokenDetails. + :type: str + """ + self._description = description + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/identity/models/user.py b/src/oci/identity/models/user.py index 6a794f6331..d63bf0312f 100644 --- a/src/oci/identity/models/user.py +++ b/src/oci/identity/models/user.py @@ -12,7 +12,8 @@ class User(object): An individual employee or system that needs to manage or use your company's Oracle Cloud Infrastructure resources. Users might need to launch instances, manage remote disks, work with your cloud network, etc. Users have one or more IAM Service credentials (:class:`ApiKey`, - :class:`UIPassword`, and :class:`SwiftPassword`). + :class:`UIPassword`, :class:`SwiftPassword` and + :class:`AuthToken`). For more information, see `User Credentials`__). End users of your application are not typically IAM Service users. For conceptual information about users and other IAM Service components, see `Overview of the IAM Service`__. diff --git a/src/oci/load_balancer/load_balancer_client.py b/src/oci/load_balancer/load_balancer_client.py index 855460d56b..00aceedbe0 100644 --- a/src/oci/load_balancer/load_balancer_client.py +++ b/src/oci/load_balancer/load_balancer_client.py @@ -150,7 +150,7 @@ def create_backend(self, create_backend_details, load_balancer_id, backend_set_n "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -240,7 +240,7 @@ def create_backend_set(self, create_backend_set_details, load_balancer_id, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -330,7 +330,7 @@ def create_certificate(self, create_certificate_details, load_balancer_id, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -423,7 +423,7 @@ def create_hostname(self, create_hostname_details, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -513,7 +513,7 @@ def create_listener(self, create_listener_details, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -619,7 +619,7 @@ def create_load_balancer(self, create_load_balancer_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -710,7 +710,7 @@ def create_path_route_set(self, create_path_route_set_details, load_balancer_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -800,7 +800,7 @@ def delete_backend(self, load_balancer_id, backend_set_name, backend_name, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -882,7 +882,7 @@ def delete_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -963,7 +963,7 @@ def delete_certificate(self, load_balancer_id, certificate_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1043,7 +1043,7 @@ def delete_hostname(self, load_balancer_id, name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1123,7 +1123,7 @@ def delete_listener(self, load_balancer_id, listener_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1197,7 +1197,7 @@ def delete_load_balancer(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1280,7 +1280,7 @@ def delete_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs) "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1366,7 +1366,7 @@ def get_backend(self, load_balancer_id, backend_set_name, backend_name, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1454,7 +1454,7 @@ def get_backend_health(self, load_balancer_id, backend_set_name, backend_name, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1536,7 +1536,7 @@ def get_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1618,7 +1618,7 @@ def get_backend_set_health(self, load_balancer_id, backend_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1700,7 +1700,7 @@ def get_health_checker(self, load_balancer_id, backend_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1782,7 +1782,7 @@ def get_hostname(self, load_balancer_id, name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1858,7 +1858,7 @@ def get_load_balancer(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1934,7 +1934,7 @@ def get_load_balancer_health(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2016,7 +2016,7 @@ def get_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2092,7 +2092,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2168,7 +2168,7 @@ def list_backend_sets(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2250,7 +2250,7 @@ def list_backends(self, load_balancer_id, backend_set_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2327,7 +2327,7 @@ def list_certificates(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2404,7 +2404,7 @@ def list_hostnames(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2482,14 +2482,14 @@ def list_load_balancer_healths(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2626,14 +2626,14 @@ def list_load_balancers(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2710,7 +2710,7 @@ def list_path_route_sets(self, load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2788,14 +2788,14 @@ def list_policies(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2873,14 +2873,14 @@ def list_protocols(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2958,14 +2958,14 @@ def list_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3052,14 +3052,14 @@ def list_work_requests(self, load_balancer_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3161,7 +3161,7 @@ def update_backend(self, update_backend_details, load_balancer_id, backend_set_n "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3257,7 +3257,7 @@ def update_backend_set(self, update_backend_set_details, load_balancer_id, backe "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3353,7 +3353,7 @@ def update_health_checker(self, health_checker, load_balancer_id, backend_set_na "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3442,7 +3442,7 @@ def update_hostname(self, update_hostname_details, load_balancer_id, name, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3536,7 +3536,7 @@ def update_listener(self, update_listener_details, load_balancer_id, listener_na "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3626,7 +3626,7 @@ def update_load_balancer(self, update_load_balancer_details, load_balancer_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -3727,7 +3727,7 @@ def update_path_route_set(self, update_path_route_set_details, load_balancer_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if 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 d6c1d0980a..9d56011863 100644 --- a/src/oci/object_storage/object_storage_client.py +++ b/src/oci/object_storage/object_storage_client.py @@ -140,14 +140,14 @@ def abort_multipart_upload(self, namespace_name, bucket_name, object_name, uploa query_params = { "uploadId": upload_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -244,7 +244,7 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo query_params = { "uploadId": upload_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -253,7 +253,7 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -331,7 +331,7 @@ def create_bucket(self, namespace_name, create_bucket_details, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -426,7 +426,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -509,7 +509,7 @@ def create_preauthenticated_request(self, namespace_name, bucket_name, create_pr "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -595,7 +595,7 @@ def delete_bucket(self, namespace_name, bucket_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -682,7 +682,7 @@ def delete_object(self, namespace_name, bucket_name, object_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -763,7 +763,7 @@ def delete_preauthenticated_request(self, namespace_name, bucket_name, par_id, * "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -851,7 +851,7 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -912,7 +912,7 @@ def get_namespace(self, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -988,7 +988,7 @@ def get_namespace_metadata(self, namespace_name, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1091,7 +1091,7 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc-client-request-id": kwargs.get("opc_client_request_id", missing), "range": kwargs.get("range", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1174,7 +1174,7 @@ def get_preauthenticated_request(self, namespace_name, bucket_name, par_id, **kw "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1264,7 +1264,7 @@ def head_bucket(self, namespace_name, bucket_name, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1357,7 +1357,7 @@ def head_object(self, namespace_name, bucket_name, object_name, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1463,14 +1463,14 @@ def list_buckets(self, namespace_name, compartment_id, **kwargs): "page": kwargs.get("page", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'csv') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1566,14 +1566,14 @@ def list_multipart_upload_parts(self, namespace_name, bucket_name, object_name, "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1660,14 +1660,14 @@ def list_multipart_uploads(self, namespace_name, bucket_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1789,14 +1789,14 @@ def list_objects(self, namespace_name, bucket_name, **kwargs): "delimiter": kwargs.get("delimiter", missing), "fields": kwargs.get("fields", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -1888,14 +1888,14 @@ def list_preauthenticated_requests(self, namespace_name, bucket_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2033,7 +2033,7 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, } for key, value in six.iteritems(kwargs.get("opc_meta", {})): header_params["opc-meta-" + key] = value - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} if (not isinstance(put_object_body, (six.binary_type, six.string_types)) and not hasattr(put_object_body, "read")): @@ -2124,7 +2124,7 @@ def rename_object(self, namespace_name, bucket_name, rename_object_details, **kw "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2206,7 +2206,7 @@ def restore_objects(self, namespace_name, bucket_name, restore_objects_details, "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2293,7 +2293,7 @@ def update_bucket(self, namespace_name, bucket_name, update_bucket_details, **kw "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2374,7 +2374,7 @@ def update_namespace_metadata(self, namespace_name, update_namespace_metadata_de "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} retry_strategy = self.retry_strategy if kwargs.get('retry_strategy'): @@ -2489,7 +2489,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "uploadId": upload_id, "uploadPartNum": upload_part_num } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not 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", @@ -2500,7 +2500,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "Content-Length": kwargs.get("content_length", missing), "Content-MD5": kwargs.get("content_md5", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing} + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} if (not isinstance(upload_part_body, (six.binary_type, six.string_types)) and not hasattr(upload_part_body, "read")): diff --git a/src/oci/version.py b/src/oci/version.py index 1b9a8b76bd..d74530f2a4 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -1,4 +1,4 @@ # coding: utf-8 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. -__version__ = "1.4.0" +__version__ = "1.4.1"