From 448482a15fd18d3395306c354e985c5b997441f2 Mon Sep 17 00:00:00 2001 From: oci-dex-release-bot Date: Tue, 27 Feb 2024 06:36:23 +0000 Subject: [PATCH] Releasing version 2.123.0 --- CHANGELOG.rst | 30 + docs/api/core.rst | 4 + ....models.LaunchAttachIScsiVolumeDetails.rst | 11 + ....core.models.LaunchAttachVolumeDetails.rst | 11 + ....core.models.LaunchCreateVolumeDetails.rst | 11 + ...odels.LaunchCreateVolumeFromAttributes.rst | 11 + docs/api/data_catalog.rst | 2 + ...els.AsynchronousExportDataAssetDetails.rst | 11 + ...dels.AsynchronousExportDataAssetResult.rst | 11 + docs/api/database.rst | 2 +- ...s.DatabaseConnectionCredentialsByName.rst} | 4 +- docs/api/database_management.rst | 5 + ...odels.UpdateExternalAsmInstanceDetails.rst | 11 + ...ent.models.UpdateExternalDbHomeDetails.rst | 11 + ...pdateExternalExadataStorageGridDetails.rst | 11 + ...ateExternalExadataStorageServerDetails.rst | 11 + ...nt.models.UpdateManagedDatabaseDetails.rst | 11 + docs/api/key_management.rst | 1 + ...nagement.models.AutoKeyRotationDetails.rst | 11 + docs/api/landing.rst | 1 + docs/api/oda.rst | 21 + ....models.BulkCreateSkillEntitiesDetails.rst | 11 + .../models/oci.oda.models.CompositeEntity.rst | 11 + ...dels.CreateSkillCompositeEntityDetails.rst | 11 + ...ci.oda.models.CreateSkillEntityDetails.rst | 11 + ...dels.CreateSkillValueListEntityDetails.rst | 11 + docs/api/oda/models/oci.oda.models.Entity.rst | 11 + .../models/oci.oda.models.EntityAction.rst | 11 + .../oci.oda.models.EntityActionArgument.rst | 11 + ...tyActionArgumentNaturalLanguageMapping.rst | 11 + ...els.EntityActionNaturalLanguageMapping.rst | 11 + .../models/oci.oda.models.EntityAttribute.rst | 11 + ....EntityAttributeNaturalLanguageMapping.rst | 11 + ...da.models.EntityNaturalLanguageMapping.rst | 11 + .../models/oci.oda.models.LanguageMapping.rst | 11 + .../oda/models/oci.oda.models.NameMapping.rst | 11 + .../oci.oda.models.StaticEntityValue.rst | 11 + ...taticEntityValueNaturalLanguageMapping.rst | 11 + .../oci.oda.models.TrainSkillDetails.rst | 11 + .../oci.oda.models.TrainSkillParameter.rst | 11 + ....models.TrainSkillQueryEntityParameter.rst | 11 + .../models/oci.oda.models.ValueListEntity.rst | 11 + docs/api/operator_access_control.rst | 5 + ...r_access_control.models.ApproverDetail.rst | 11 + ...trol.models.AssignmentValidationStatus.rst | 11 + ...r_access_control.models.AuditLogReport.rst | 11 + ...tor_access_control.models.StatusDetail.rst | 11 + ...dels.ValidateOperatorAssignmentDetails.rst | 11 + docs/api/sch.rst | 10 + .../client/oci.sch.ConnectorPluginsClient.rst | 8 + ...nectorPluginsClientCompositeOperations.rst | 8 + .../models/oci.sch.models.ConnectorPlugin.rst | 11 + ...i.sch.models.ConnectorPluginCollection.rst | 11 + .../oci.sch.models.ConnectorPluginSummary.rst | 11 + .../oci.sch.models.PluginSourceDetails.rst | 11 + .../oci.sch.models.SourceConnectorPlugin.rst | 11 + ...ch.models.SourceConnectorPluginSummary.rst | 11 + .../oci.sch.models.TargetConnectorPlugin.rst | 11 + ...ch.models.TargetConnectorPluginSummary.rst | 11 + docs/api/vault.rst | 4 + ...ci.vault.models.BytesGenerationContext.rst | 11 + ...ult.models.PassphraseGenerationContext.rst | 11 + ...i.vault.models.SecretGenerationContext.rst | 11 + ...i.vault.models.SshKeyGenerationContext.rst | 11 + examples/showoci/CHANGELOG.rst | 15 +- examples/showoci/README.md | 2 +- examples/showoci/run_daily_report.sh | 0 examples/showoci/showoci.py | 118 +- examples/showoci/showoci_data.py | 98 +- examples/showoci/showoci_output.py | 328 ++- examples/showoci/showoci_service.py | 2057 +++++++++-------- examples/showoci/showoci_upgrade.sh | 0 requirements.txt | 4 +- setup.py | 4 +- .../container_instance_client.py | 14 +- src/oci/core/compute_client.py | 14 +- src/oci/core/models/__init__.py | 8 + src/oci/core/models/attach_volume_details.py | 10 +- .../launch_attach_i_scsi_volume_details.py | 203 ++ .../models/launch_attach_volume_details.py | 279 +++ .../models/launch_create_volume_details.py | 101 + .../launch_create_volume_from_attributes.py | 240 ++ .../core/models/launch_instance_details.py | 31 + src/oci/data_catalog/data_catalog_client.py | 146 +- src/oci/data_catalog/models/__init__.py | 4 + .../asynchronous_export_data_asset_details.py | 99 + .../asynchronous_export_data_asset_result.py | 196 ++ .../models/create_job_definition_details.py | 10 +- .../models/create_job_execution_details.py | 10 +- src/oci/data_catalog/models/job.py | 10 +- src/oci/data_catalog/models/job_definition.py | 10 +- .../models/job_definition_summary.py | 10 +- src/oci/data_catalog/models/job_execution.py | 10 +- .../models/job_execution_summary.py | 10 +- src/oci/data_catalog/models/job_summary.py | 10 +- src/oci/database/database_client.py | 41 +- src/oci/database/models/__init__.py | 4 +- .../models/autonomous_container_database.py | 54 +- ...ontainer_database_dataguard_association.py | 50 +- ...omous_container_database_resource_usage.py | 12 +- .../autonomous_container_database_summary.py | 54 +- .../database/models/autonomous_database.py | 123 +- .../models/autonomous_database_backup.py | 12 +- .../autonomous_database_backup_summary.py | 12 +- ...tonomous_database_dataguard_association.py | 74 +- .../autonomous_database_key_history_entry.py | 8 +- .../models/autonomous_database_summary.py | 123 +- .../autonomous_db_preview_version_summary.py | 2 +- .../database/models/autonomous_vm_cluster.py | 28 +- .../models/autonomous_vm_cluster_summary.py | 28 +- src/oci/database/models/backup.py | 12 +- src/oci/database/models/backup_summary.py | 12 +- .../models/cloud_autonomous_vm_cluster.py | 32 +- .../cloud_autonomous_vm_cluster_summary.py | 32 +- .../models/cloud_exadata_infrastructure.py | 72 + .../cloud_exadata_infrastructure_summary.py | 72 + src/oci/database/models/cloud_vm_cluster.py | 37 + .../models/cloud_vm_cluster_summary.py | 37 + .../models/compute_performance_summary.py | 4 +- ...e_autonomous_database_vault_key_details.py | 4 +- ..._database_dataguard_association_details.py | 68 +- ...e_autonomous_container_database_details.py | 12 +- .../models/create_autonomous_database_base.py | 119 +- ...reate_autonomous_database_clone_details.py | 7 - .../create_autonomous_database_details.py | 7 - ...autonomous_database_from_backup_details.py | 7 - ..._database_from_backup_timestamp_details.py | 7 - .../create_autonomous_vm_cluster_details.py | 4 +- ...ate_cloud_autonomous_vm_cluster_details.py | 12 +- ...te_cloud_exadata_infrastructure_details.py | 35 + ..._autonomous_database_data_guard_details.py | 7 - ..._cross_region_disaster_recovery_details.py | 7 - ..._association_with_new_db_system_details.py | 8 +- .../database/models/create_database_base.py | 4 +- .../models/create_database_details.py | 8 +- .../database/models/create_db_home_base.py | 4 +- ...hable_autonomous_database_clone_details.py | 7 - src/oci/database/models/database.py | 12 +- .../models/database_connection_credentials.py | 8 +- ...atabase_connection_credentials_by_name.py} | 16 +- src/oci/database/models/database_summary.py | 12 +- ...tore_type_from_oracle_key_vault_details.py | 4 +- .../database/models/launch_db_system_base.py | 4 +- .../models/migrate_vault_key_details.py | 8 +- .../update_autonomous_database_details.py | 111 +- .../update_autonomous_vm_cluster_details.py | 12 +- ...ate_cloud_autonomous_vm_cluster_details.py | 20 +- .../db_management_client.py | 652 +++++- ..._management_client_composite_operations.py | 188 ++ .../database_management/models/__init__.py | 10 + .../models/child_database.py | 82 +- ..._db_management_private_endpoint_details.py | 82 +- .../create_external_db_system_details.py | 82 +- ...te_external_db_system_discovery_details.py | 82 +- ...ternal_db_system_macs_connector_details.py | 82 +- ...external_exadata_infrastructure_details.py | 82 +- ...ernal_exadata_storage_connector_details.py | 82 +- .../create_managed_database_group_details.py | 82 +- .../models/create_named_credential_details.py | 82 +- .../models/create_sql_job_details.py | 82 +- .../models/db_management_private_endpoint.py | 82 +- .../db_management_private_endpoint_summary.py | 82 +- .../models/external_asm.py | 82 +- .../models/external_asm_instance.py | 82 +- .../models/external_asm_instance_summary.py | 82 +- .../models/external_asm_summary.py | 82 +- .../models/external_cluster.py | 82 +- .../models/external_cluster_instance.py | 82 +- .../external_cluster_instance_summary.py | 82 +- .../models/external_cluster_summary.py | 82 +- .../models/external_database_summary.py | 82 +- .../models/external_db_home.py | 82 +- .../models/external_db_home_summary.py | 82 +- .../models/external_db_node.py | 82 +- .../models/external_db_node_summary.py | 82 +- .../models/external_db_system.py | 82 +- .../external_db_system_connector_summary.py | 82 +- .../models/external_db_system_discovery.py | 82 +- .../external_db_system_discovery_summary.py | 82 +- .../external_db_system_macs_connector.py | 82 +- .../models/external_db_system_summary.py | 82 +- .../models/external_exadata_infrastructure.py | 82 +- ...external_exadata_infrastructure_summary.py | 82 +- .../external_exadata_storage_connector.py | 82 +- ...ernal_exadata_storage_connector_summary.py | 82 +- .../models/external_exadata_storage_grid.py | 82 +- .../models/external_exadata_storage_server.py | 82 +- ...external_exadata_storage_server_summary.py | 82 +- .../models/external_listener.py | 82 +- .../models/external_listener_summary.py | 82 +- .../database_management/models/job_summary.py | 82 +- .../models/managed_database.py | 113 +- .../models/managed_database_group.py | 82 +- .../models/managed_database_group_summary.py | 82 +- .../models/managed_database_summary.py | 113 +- .../models/named_credential.py | 82 +- .../models/named_credential_summary.py | 82 +- src/oci/database_management/models/sql_job.py | 82 +- ..._db_management_private_endpoint_details.py | 82 +- .../models/update_external_asm_details.py | 82 +- .../update_external_asm_instance_details.py | 119 + .../models/update_external_cluster_details.py | 82 +- ...pdate_external_cluster_instance_details.py | 82 +- .../models/update_external_db_home_details.py | 119 + .../models/update_external_db_node_details.py | 82 +- .../update_external_db_system_details.py | 82 +- ...te_external_db_system_discovery_details.py | 82 +- ...ternal_db_system_macs_connector_details.py | 82 +- ...external_exadata_infrastructure_details.py | 82 +- ...ernal_exadata_storage_connector_details.py | 82 +- ...e_external_exadata_storage_grid_details.py | 119 + ...external_exadata_storage_server_details.py | 119 + .../update_external_listener_details.py | 82 +- .../models/update_managed_database_details.py | 119 + .../update_managed_database_group_details.py | 82 +- .../models/update_named_credential_details.py | 82 +- .../models/update_sql_job_details.py | 82 +- src/oci/key_management/models/__init__.py | 2 + .../models/auto_key_rotation_details.py | 247 ++ .../models/create_key_details.py | 58 + .../models/import_key_details.py | 58 + src/oci/key_management/models/key.py | 58 + src/oci/key_management/models/key_summary.py | 35 +- src/oci/key_management/models/key_version.py | 35 +- .../models/key_version_summary.py | 35 +- .../models/update_key_details.py | 58 + src/oci/oda/management_client.py | 363 +++ .../management_client_composite_operations.py | 132 ++ src/oci/oda/models/__init__.py | 42 + src/oci/oda/models/bot.py | 31 + .../bulk_create_skill_entities_details.py | 72 + src/oci/oda/models/clone_skill_details.py | 7 + src/oci/oda/models/composite_entity.py | 154 ++ .../oda/models/create_new_skill_details.py | 7 + .../create_oda_instance_attachment_details.py | 10 +- .../create_skill_composite_entity_details.py | 147 ++ src/oci/oda/models/create_skill_details.py | 31 + .../oda/models/create_skill_entity_details.py | 140 ++ .../create_skill_value_list_entity_details.py | 89 + .../models/create_skill_version_details.py | 7 + src/oci/oda/models/digital_assistant.py | 31 + src/oci/oda/models/entity.py | 171 ++ src/oci/oda/models/entity_action.py | 161 ++ src/oci/oda/models/entity_action_argument.py | 263 +++ ...ction_argument_natural_language_mapping.py | 72 + .../entity_action_natural_language_mapping.py | 72 + src/oci/oda/models/entity_attribute.py | 345 +++ ...tity_attribute_natural_language_mapping.py | 72 + .../models/entity_natural_language_mapping.py | 72 + src/oci/oda/models/extend_skill_details.py | 7 + src/oci/oda/models/language_mapping.py | 134 ++ src/oci/oda/models/name_mapping.py | 72 + src/oci/oda/models/oda_instance_attachment.py | 10 +- .../models/oda_instance_attachment_summary.py | 10 +- src/oci/oda/models/skill.py | 31 + src/oci/oda/models/static_entity_value.py | 99 + ...c_entity_value_natural_language_mapping.py | 72 + src/oci/oda/models/train_skill_details.py | 72 + src/oci/oda/models/train_skill_parameter.py | 101 + .../train_skill_query_entity_parameter.py | 51 + src/oci/oda/models/value_list_entity.py | 96 + src/oci/oda/models/work_request.py | 18 +- .../access_requests_client.py | 109 + .../models/__init__.py | 12 +- .../models/access_request.py | 221 ++ .../models/access_request_summary.py | 35 + .../models/approver_detail.py | 235 ++ .../models/assignment_validation_status.py | 317 +++ .../models/audit_log_report.py | 193 ++ ...ate_operator_control_assignment_details.py | 31 + .../models/create_operator_control_details.py | 31 + .../models/operator_control.py | 31 + .../models/operator_control_assignment.py | 62 + .../operator_control_assignment_summary.py | 93 + .../models/operator_control_summary.py | 31 + .../models/status_detail.py | 169 ++ ...ate_operator_control_assignment_details.py | 31 + .../models/update_operator_control_details.py | 31 + .../validate_operator_assignment_details.py | 72 + .../operator_control_assignment_client.py | 218 ++ src/oci/sch/__init__.py | 4 +- src/oci/sch/connector_plugins_client.py | 386 ++++ ...tor_plugins_client_composite_operations.py | 26 + src/oci/sch/models/__init__.py | 16 + ...e_service_connector_compartment_details.py | 6 +- src/oci/sch/models/connector_plugin.py | 355 +++ .../sch/models/connector_plugin_collection.py | 72 + .../sch/models/connector_plugin_summary.py | 322 +++ .../create_service_connector_details.py | 6 +- src/oci/sch/models/dimension_details.py | 4 +- src/oci/sch/models/function_task_details.py | 4 +- .../sch/models/functions_target_details.py | 103 +- src/oci/sch/models/latest_streaming_cursor.py | 6 +- src/oci/sch/models/log_rule_task_details.py | 10 +- src/oci/sch/models/log_source.py | 4 + .../logging_analytics_target_details.py | 10 +- src/oci/sch/models/logging_source_details.py | 6 +- src/oci/sch/models/monitoring_source.py | 4 +- .../sch/models/monitoring_source_details.py | 10 +- .../monitoring_source_metric_details.py | 4 +- .../sch/models/monitoring_target_details.py | 6 +- .../models/notifications_target_details.py | 10 +- .../models/object_storage_target_details.py | 14 +- src/oci/sch/models/plugin_source_details.py | 123 + src/oci/sch/models/service_connector.py | 28 +- .../models/service_connector_collection.py | 2 +- .../sch/models/service_connector_summary.py | 22 +- src/oci/sch/models/source_connector_plugin.py | 132 ++ .../models/source_connector_plugin_summary.py | 125 + src/oci/sch/models/source_details.py | 30 +- .../sch/models/streaming_cursor_details.py | 11 +- .../sch/models/streaming_source_details.py | 6 +- .../sch/models/streaming_target_details.py | 6 +- src/oci/sch/models/target_connector_plugin.py | 99 + .../models/target_connector_plugin_summary.py | 92 + src/oci/sch/models/target_details.py | 16 +- src/oci/sch/models/task_details.py | 16 +- .../models/trim_horizon_streaming_cursor.py | 6 +- .../update_service_connector_details.py | 2 +- src/oci/sch/models/work_request.py | 4 +- src/oci/sch/service_connector_client.py | 195 +- ...e_connector_client_composite_operations.py | 14 +- src/oci/vault/models/__init__.py | 8 + .../vault/models/bytes_generation_context.py | 107 + src/oci/vault/models/create_secret_details.py | 64 +- .../models/passphrase_generation_context.py | 138 ++ src/oci/vault/models/secret.py | 62 +- .../vault/models/secret_generation_context.py | 152 ++ src/oci/vault/models/secret_summary.py | 62 +- src/oci/vault/models/secret_version.py | 35 +- .../vault/models/secret_version_summary.py | 35 +- .../models/ssh_key_generation_context.py | 111 + src/oci/vault/models/update_secret_details.py | 62 +- src/oci/version.py | 2 +- 334 files changed, 19534 insertions(+), 2159 deletions(-) create mode 100644 docs/api/core/models/oci.core.models.LaunchAttachIScsiVolumeDetails.rst create mode 100644 docs/api/core/models/oci.core.models.LaunchAttachVolumeDetails.rst create mode 100644 docs/api/core/models/oci.core.models.LaunchCreateVolumeDetails.rst create mode 100644 docs/api/core/models/oci.core.models.LaunchCreateVolumeFromAttributes.rst create mode 100644 docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetDetails.rst create mode 100644 docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetResult.rst rename docs/api/database/models/{oci.database.models.DatabaseConnectionCredentailsByName.rst => oci.database.models.DatabaseConnectionCredentialsByName.rst} (68%) create mode 100644 docs/api/database_management/models/oci.database_management.models.UpdateExternalAsmInstanceDetails.rst create mode 100644 docs/api/database_management/models/oci.database_management.models.UpdateExternalDbHomeDetails.rst create mode 100644 docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageGridDetails.rst create mode 100644 docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageServerDetails.rst create mode 100644 docs/api/database_management/models/oci.database_management.models.UpdateManagedDatabaseDetails.rst create mode 100644 docs/api/key_management/models/oci.key_management.models.AutoKeyRotationDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.BulkCreateSkillEntitiesDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.CompositeEntity.rst create mode 100644 docs/api/oda/models/oci.oda.models.CreateSkillCompositeEntityDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.CreateSkillEntityDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.CreateSkillValueListEntityDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.Entity.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityAction.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityActionArgument.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityActionArgumentNaturalLanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityActionNaturalLanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityAttribute.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityAttributeNaturalLanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.EntityNaturalLanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.LanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.NameMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.StaticEntityValue.rst create mode 100644 docs/api/oda/models/oci.oda.models.StaticEntityValueNaturalLanguageMapping.rst create mode 100644 docs/api/oda/models/oci.oda.models.TrainSkillDetails.rst create mode 100644 docs/api/oda/models/oci.oda.models.TrainSkillParameter.rst create mode 100644 docs/api/oda/models/oci.oda.models.TrainSkillQueryEntityParameter.rst create mode 100644 docs/api/oda/models/oci.oda.models.ValueListEntity.rst create mode 100644 docs/api/operator_access_control/models/oci.operator_access_control.models.ApproverDetail.rst create mode 100644 docs/api/operator_access_control/models/oci.operator_access_control.models.AssignmentValidationStatus.rst create mode 100644 docs/api/operator_access_control/models/oci.operator_access_control.models.AuditLogReport.rst create mode 100644 docs/api/operator_access_control/models/oci.operator_access_control.models.StatusDetail.rst create mode 100644 docs/api/operator_access_control/models/oci.operator_access_control.models.ValidateOperatorAssignmentDetails.rst create mode 100644 docs/api/sch/client/oci.sch.ConnectorPluginsClient.rst create mode 100644 docs/api/sch/client/oci.sch.ConnectorPluginsClientCompositeOperations.rst create mode 100644 docs/api/sch/models/oci.sch.models.ConnectorPlugin.rst create mode 100644 docs/api/sch/models/oci.sch.models.ConnectorPluginCollection.rst create mode 100644 docs/api/sch/models/oci.sch.models.ConnectorPluginSummary.rst create mode 100644 docs/api/sch/models/oci.sch.models.PluginSourceDetails.rst create mode 100644 docs/api/sch/models/oci.sch.models.SourceConnectorPlugin.rst create mode 100644 docs/api/sch/models/oci.sch.models.SourceConnectorPluginSummary.rst create mode 100644 docs/api/sch/models/oci.sch.models.TargetConnectorPlugin.rst create mode 100644 docs/api/sch/models/oci.sch.models.TargetConnectorPluginSummary.rst create mode 100644 docs/api/vault/models/oci.vault.models.BytesGenerationContext.rst create mode 100644 docs/api/vault/models/oci.vault.models.PassphraseGenerationContext.rst create mode 100644 docs/api/vault/models/oci.vault.models.SecretGenerationContext.rst create mode 100644 docs/api/vault/models/oci.vault.models.SshKeyGenerationContext.rst mode change 100755 => 100644 examples/showoci/run_daily_report.sh mode change 100755 => 100644 examples/showoci/showoci_upgrade.sh create mode 100644 src/oci/core/models/launch_attach_i_scsi_volume_details.py create mode 100644 src/oci/core/models/launch_attach_volume_details.py create mode 100644 src/oci/core/models/launch_create_volume_details.py create mode 100644 src/oci/core/models/launch_create_volume_from_attributes.py create mode 100644 src/oci/data_catalog/models/asynchronous_export_data_asset_details.py create mode 100644 src/oci/data_catalog/models/asynchronous_export_data_asset_result.py rename src/oci/database/models/{database_connection_credentails_by_name.py => database_connection_credentials_by_name.py} (91%) create mode 100644 src/oci/database_management/models/update_external_asm_instance_details.py create mode 100644 src/oci/database_management/models/update_external_db_home_details.py create mode 100644 src/oci/database_management/models/update_external_exadata_storage_grid_details.py create mode 100644 src/oci/database_management/models/update_external_exadata_storage_server_details.py create mode 100644 src/oci/database_management/models/update_managed_database_details.py create mode 100644 src/oci/key_management/models/auto_key_rotation_details.py create mode 100644 src/oci/oda/models/bulk_create_skill_entities_details.py create mode 100644 src/oci/oda/models/composite_entity.py create mode 100644 src/oci/oda/models/create_skill_composite_entity_details.py create mode 100644 src/oci/oda/models/create_skill_entity_details.py create mode 100644 src/oci/oda/models/create_skill_value_list_entity_details.py create mode 100644 src/oci/oda/models/entity.py create mode 100644 src/oci/oda/models/entity_action.py create mode 100644 src/oci/oda/models/entity_action_argument.py create mode 100644 src/oci/oda/models/entity_action_argument_natural_language_mapping.py create mode 100644 src/oci/oda/models/entity_action_natural_language_mapping.py create mode 100644 src/oci/oda/models/entity_attribute.py create mode 100644 src/oci/oda/models/entity_attribute_natural_language_mapping.py create mode 100644 src/oci/oda/models/entity_natural_language_mapping.py create mode 100644 src/oci/oda/models/language_mapping.py create mode 100644 src/oci/oda/models/name_mapping.py create mode 100644 src/oci/oda/models/static_entity_value.py create mode 100644 src/oci/oda/models/static_entity_value_natural_language_mapping.py create mode 100644 src/oci/oda/models/train_skill_details.py create mode 100644 src/oci/oda/models/train_skill_parameter.py create mode 100644 src/oci/oda/models/train_skill_query_entity_parameter.py create mode 100644 src/oci/oda/models/value_list_entity.py create mode 100644 src/oci/operator_access_control/models/approver_detail.py create mode 100644 src/oci/operator_access_control/models/assignment_validation_status.py create mode 100644 src/oci/operator_access_control/models/audit_log_report.py create mode 100644 src/oci/operator_access_control/models/status_detail.py create mode 100644 src/oci/operator_access_control/models/validate_operator_assignment_details.py create mode 100644 src/oci/sch/connector_plugins_client.py create mode 100644 src/oci/sch/connector_plugins_client_composite_operations.py create mode 100644 src/oci/sch/models/connector_plugin.py create mode 100644 src/oci/sch/models/connector_plugin_collection.py create mode 100644 src/oci/sch/models/connector_plugin_summary.py create mode 100644 src/oci/sch/models/plugin_source_details.py create mode 100644 src/oci/sch/models/source_connector_plugin.py create mode 100644 src/oci/sch/models/source_connector_plugin_summary.py create mode 100644 src/oci/sch/models/target_connector_plugin.py create mode 100644 src/oci/sch/models/target_connector_plugin_summary.py create mode 100644 src/oci/vault/models/bytes_generation_context.py create mode 100644 src/oci/vault/models/passphrase_generation_context.py create mode 100644 src/oci/vault/models/secret_generation_context.py create mode 100644 src/oci/vault/models/ssh_key_generation_context.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3ab6abb320..7d37e3154e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,36 @@ Change Log All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +2.123.0 - 2024-02-27 +==================== + +Added +----- +* Support for specifying dialog version when creating skills entities in the Digital Assistant service +* Support for bulk creation of skill entities in the Digital Assistant service +* Support for training skill query entities in the Digital Assistant service +* Support for cascading delete of skill custom entities in the Digital Assistant service +* Support for creating autonomous dataguard associations in the Database service +* Support for auto generation of secrets in the Secret Management service +* Support for cluster placement groups in Cloud Exadata Infrastructure in the Database service +* Support for retrieving previous logs of the container in the Container Instances service +* Support for queue sources in the Connector Hub service +* Support for automatic key rotation in the Key Management Service +* Support for downloading operator activity reports and assignment healthchecks in the Operator Access Control service +* Support for operator requesting access in the future time in the Operator Access Control service +* Support for forwarding hypervisor logs in the Operator Access Control service +* Support for asynchronous data asset export in the Data Catalog service +* Support for launch with multiple volumes for virtual machines in the Compute Service +* Support for tagging in Database Management service + +Breaking +-------- +* Support for default retries on operations of the Connector Hub service +* Property `max_cpu_core_count` was removed from models `UpdateAutonomousDatabaseDetails`, `CreateRefreshableAutonomousDatabaseCloneDetails`, `CreateCrossRegionDisasterRecoveryDetails`, `CreateCrossRegionAutonomousDatabaseDataGuardDetails`, `CreateAutonomousDatabaseFromBackupTimestampDetails`, `CreateAutonomousDatabaseFromBackupDetails`, `CreateAutonomousDatabaseDetails`, `CreateAutonomousDatabaseCloneDetails`, `CreateAutonomousDatabaseBase`, `AutonomousDatabase`, `AutonomousDatabaseSummary` in the Database service +* Property `key_id` in model `CreateSecretDetails` is made required in the Vault service +* Model `DatabaseConnectionCredentailsByName` was renamed to `DatabaseConnectionCredentialsByName` in the Database service + ==================== 2.122.0 - 2024-02-20 ==================== diff --git a/docs/api/core.rst b/docs/api/core.rst index 10c9b5003a..4d1fc777f3 100644 --- a/docs/api/core.rst +++ b/docs/api/core.rst @@ -397,6 +397,10 @@ Core Services oci.core.models.IpsecTunnelDrgAttachmentNetworkDetails oci.core.models.Ipv6 oci.core.models.Ipv6AddressIpv6SubnetCidrPairDetails + oci.core.models.LaunchAttachIScsiVolumeDetails + oci.core.models.LaunchAttachVolumeDetails + oci.core.models.LaunchCreateVolumeDetails + oci.core.models.LaunchCreateVolumeFromAttributes oci.core.models.LaunchInstanceAgentConfigDetails oci.core.models.LaunchInstanceAvailabilityConfigDetails oci.core.models.LaunchInstanceDetails diff --git a/docs/api/core/models/oci.core.models.LaunchAttachIScsiVolumeDetails.rst b/docs/api/core/models/oci.core.models.LaunchAttachIScsiVolumeDetails.rst new file mode 100644 index 0000000000..06858c6720 --- /dev/null +++ b/docs/api/core/models/oci.core.models.LaunchAttachIScsiVolumeDetails.rst @@ -0,0 +1,11 @@ +LaunchAttachIScsiVolumeDetails +============================== + +.. currentmodule:: oci.core.models + +.. autoclass:: LaunchAttachIScsiVolumeDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.LaunchAttachVolumeDetails.rst b/docs/api/core/models/oci.core.models.LaunchAttachVolumeDetails.rst new file mode 100644 index 0000000000..3e72c70b74 --- /dev/null +++ b/docs/api/core/models/oci.core.models.LaunchAttachVolumeDetails.rst @@ -0,0 +1,11 @@ +LaunchAttachVolumeDetails +========================= + +.. currentmodule:: oci.core.models + +.. autoclass:: LaunchAttachVolumeDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.LaunchCreateVolumeDetails.rst b/docs/api/core/models/oci.core.models.LaunchCreateVolumeDetails.rst new file mode 100644 index 0000000000..b0b55be007 --- /dev/null +++ b/docs/api/core/models/oci.core.models.LaunchCreateVolumeDetails.rst @@ -0,0 +1,11 @@ +LaunchCreateVolumeDetails +========================= + +.. currentmodule:: oci.core.models + +.. autoclass:: LaunchCreateVolumeDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.LaunchCreateVolumeFromAttributes.rst b/docs/api/core/models/oci.core.models.LaunchCreateVolumeFromAttributes.rst new file mode 100644 index 0000000000..01c4814e92 --- /dev/null +++ b/docs/api/core/models/oci.core.models.LaunchCreateVolumeFromAttributes.rst @@ -0,0 +1,11 @@ +LaunchCreateVolumeFromAttributes +================================ + +.. currentmodule:: oci.core.models + +.. autoclass:: LaunchCreateVolumeFromAttributes + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/data_catalog.rst b/docs/api/data_catalog.rst index b015be876f..b29d511302 100644 --- a/docs/api/data_catalog.rst +++ b/docs/api/data_catalog.rst @@ -19,6 +19,8 @@ Data Catalog :template: autosummary/model_class.rst oci.data_catalog.models.AddResourceLockDetails + oci.data_catalog.models.AsynchronousExportDataAssetDetails + oci.data_catalog.models.AsynchronousExportDataAssetResult oci.data_catalog.models.AsynchronousExportGlossaryDetails oci.data_catalog.models.AsynchronousExportGlossaryResult oci.data_catalog.models.AsynchronousExportRequestDetails diff --git a/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetDetails.rst b/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetDetails.rst new file mode 100644 index 0000000000..e82b7f47e7 --- /dev/null +++ b/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetDetails.rst @@ -0,0 +1,11 @@ +AsynchronousExportDataAssetDetails +================================== + +.. currentmodule:: oci.data_catalog.models + +.. autoclass:: AsynchronousExportDataAssetDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetResult.rst b/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetResult.rst new file mode 100644 index 0000000000..64ec9c271b --- /dev/null +++ b/docs/api/data_catalog/models/oci.data_catalog.models.AsynchronousExportDataAssetResult.rst @@ -0,0 +1,11 @@ +AsynchronousExportDataAssetResult +================================= + +.. currentmodule:: oci.data_catalog.models + +.. autoclass:: AsynchronousExportDataAssetResult + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database.rst b/docs/api/database.rst index f4593a70ec..226654424e 100644 --- a/docs/api/database.rst +++ b/docs/api/database.rst @@ -172,9 +172,9 @@ Database oci.database.models.DataGuardAssociation oci.database.models.DataGuardAssociationSummary oci.database.models.Database - oci.database.models.DatabaseConnectionCredentailsByName oci.database.models.DatabaseConnectionCredentials oci.database.models.DatabaseConnectionCredentialsByDetails + oci.database.models.DatabaseConnectionCredentialsByName oci.database.models.DatabaseConnectionString oci.database.models.DatabaseConnectionStringProfile oci.database.models.DatabaseConnectionStrings diff --git a/docs/api/database/models/oci.database.models.DatabaseConnectionCredentailsByName.rst b/docs/api/database/models/oci.database.models.DatabaseConnectionCredentialsByName.rst similarity index 68% rename from docs/api/database/models/oci.database.models.DatabaseConnectionCredentailsByName.rst rename to docs/api/database/models/oci.database.models.DatabaseConnectionCredentialsByName.rst index 253be3dac2..c18a39f6ba 100644 --- a/docs/api/database/models/oci.database.models.DatabaseConnectionCredentailsByName.rst +++ b/docs/api/database/models/oci.database.models.DatabaseConnectionCredentialsByName.rst @@ -1,9 +1,9 @@ -DatabaseConnectionCredentailsByName +DatabaseConnectionCredentialsByName =================================== .. currentmodule:: oci.database.models -.. autoclass:: DatabaseConnectionCredentailsByName +.. autoclass:: DatabaseConnectionCredentialsByName :show-inheritance: :special-members: __init__ :members: diff --git a/docs/api/database_management.rst b/docs/api/database_management.rst index 87efb758ee..6903d5e6ef 100644 --- a/docs/api/database_management.rst +++ b/docs/api/database_management.rst @@ -443,8 +443,10 @@ Database Management oci.database_management.models.UpdateDatabaseParametersResult oci.database_management.models.UpdateDbManagementPrivateEndpointDetails oci.database_management.models.UpdateExternalAsmDetails + oci.database_management.models.UpdateExternalAsmInstanceDetails oci.database_management.models.UpdateExternalClusterDetails oci.database_management.models.UpdateExternalClusterInstanceDetails + oci.database_management.models.UpdateExternalDbHomeDetails oci.database_management.models.UpdateExternalDbNodeDetails oci.database_management.models.UpdateExternalDbSystemConnectorDetails oci.database_management.models.UpdateExternalDbSystemDetails @@ -452,8 +454,11 @@ Database Management oci.database_management.models.UpdateExternalDbSystemMacsConnectorDetails oci.database_management.models.UpdateExternalExadataInfrastructureDetails oci.database_management.models.UpdateExternalExadataStorageConnectorDetails + oci.database_management.models.UpdateExternalExadataStorageGridDetails + oci.database_management.models.UpdateExternalExadataStorageServerDetails oci.database_management.models.UpdateExternalListenerDetails oci.database_management.models.UpdateJobDetails + oci.database_management.models.UpdateManagedDatabaseDetails oci.database_management.models.UpdateManagedDatabaseGroupDetails oci.database_management.models.UpdateNamedCredentialDetails oci.database_management.models.UpdateNamedPreferredCredentialDetails diff --git a/docs/api/database_management/models/oci.database_management.models.UpdateExternalAsmInstanceDetails.rst b/docs/api/database_management/models/oci.database_management.models.UpdateExternalAsmInstanceDetails.rst new file mode 100644 index 0000000000..65b5096e3a --- /dev/null +++ b/docs/api/database_management/models/oci.database_management.models.UpdateExternalAsmInstanceDetails.rst @@ -0,0 +1,11 @@ +UpdateExternalAsmInstanceDetails +================================ + +.. currentmodule:: oci.database_management.models + +.. autoclass:: UpdateExternalAsmInstanceDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database_management/models/oci.database_management.models.UpdateExternalDbHomeDetails.rst b/docs/api/database_management/models/oci.database_management.models.UpdateExternalDbHomeDetails.rst new file mode 100644 index 0000000000..8c057d70f6 --- /dev/null +++ b/docs/api/database_management/models/oci.database_management.models.UpdateExternalDbHomeDetails.rst @@ -0,0 +1,11 @@ +UpdateExternalDbHomeDetails +=========================== + +.. currentmodule:: oci.database_management.models + +.. autoclass:: UpdateExternalDbHomeDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageGridDetails.rst b/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageGridDetails.rst new file mode 100644 index 0000000000..7a11d72645 --- /dev/null +++ b/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageGridDetails.rst @@ -0,0 +1,11 @@ +UpdateExternalExadataStorageGridDetails +======================================= + +.. currentmodule:: oci.database_management.models + +.. autoclass:: UpdateExternalExadataStorageGridDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageServerDetails.rst b/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageServerDetails.rst new file mode 100644 index 0000000000..c27be27cf0 --- /dev/null +++ b/docs/api/database_management/models/oci.database_management.models.UpdateExternalExadataStorageServerDetails.rst @@ -0,0 +1,11 @@ +UpdateExternalExadataStorageServerDetails +========================================= + +.. currentmodule:: oci.database_management.models + +.. autoclass:: UpdateExternalExadataStorageServerDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database_management/models/oci.database_management.models.UpdateManagedDatabaseDetails.rst b/docs/api/database_management/models/oci.database_management.models.UpdateManagedDatabaseDetails.rst new file mode 100644 index 0000000000..af60af56b8 --- /dev/null +++ b/docs/api/database_management/models/oci.database_management.models.UpdateManagedDatabaseDetails.rst @@ -0,0 +1,11 @@ +UpdateManagedDatabaseDetails +============================ + +.. currentmodule:: oci.database_management.models + +.. autoclass:: UpdateManagedDatabaseDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/key_management.rst b/docs/api/key_management.rst index 1f30e45da1..c14add117f 100644 --- a/docs/api/key_management.rst +++ b/docs/api/key_management.rst @@ -26,6 +26,7 @@ Key Management :nosignatures: :template: autosummary/model_class.rst + oci.key_management.models.AutoKeyRotationDetails oci.key_management.models.BackupKeyDetails oci.key_management.models.BackupLocation oci.key_management.models.BackupLocationBucket diff --git a/docs/api/key_management/models/oci.key_management.models.AutoKeyRotationDetails.rst b/docs/api/key_management/models/oci.key_management.models.AutoKeyRotationDetails.rst new file mode 100644 index 0000000000..cdbfe2f95b --- /dev/null +++ b/docs/api/key_management/models/oci.key_management.models.AutoKeyRotationDetails.rst @@ -0,0 +1,11 @@ +AutoKeyRotationDetails +====================== + +.. currentmodule:: oci.key_management.models + +.. autoclass:: AutoKeyRotationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/landing.rst b/docs/api/landing.rst index 2c0b7111f1..d5ae035ac2 100644 --- a/docs/api/landing.rst +++ b/docs/api/landing.rst @@ -50,6 +50,7 @@ API Reference * :doc:`Computed Usage ` * :doc:`Computed Usage ` * :doc:`Config ` +* :doc:`Connector Plugins ` * :doc:`Container Engine ` * :doc:`Container Instance ` * :doc:`DNS ` diff --git a/docs/api/oda.rst b/docs/api/oda.rst index 009302e987..d2706d940b 100644 --- a/docs/api/oda.rst +++ b/docs/api/oda.rst @@ -29,6 +29,7 @@ Oda oci.oda.models.AuthenticationProviderCollection oci.oda.models.AuthenticationProviderSummary oci.oda.models.Bot + oci.oda.models.BulkCreateSkillEntitiesDetails oci.oda.models.ChangeOdaInstanceCompartmentDetails oci.oda.models.ChangeOdaPrivateEndpointCompartmentDetails oci.oda.models.Channel @@ -36,6 +37,7 @@ Oda oci.oda.models.ChannelSummary oci.oda.models.CloneDigitalAssistantDetails oci.oda.models.CloneSkillDetails + oci.oda.models.CompositeEntity oci.oda.models.ConfigureDigitalAssistantParametersDetails oci.oda.models.CortanaChannel oci.oda.models.CreateAndroidChannelDetails @@ -71,8 +73,11 @@ Oda oci.oda.models.CreateOsvcChannelResult oci.oda.models.CreateServiceCloudChannelDetails oci.oda.models.CreateServiceCloudChannelResult + oci.oda.models.CreateSkillCompositeEntityDetails oci.oda.models.CreateSkillDetails + oci.oda.models.CreateSkillEntityDetails oci.oda.models.CreateSkillParameterDetails + oci.oda.models.CreateSkillValueListEntityDetails oci.oda.models.CreateSkillVersionDetails oci.oda.models.CreateSlackChannelDetails oci.oda.models.CreateSlackChannelResult @@ -92,6 +97,14 @@ Oda oci.oda.models.DigitalAssistantParameterSummary oci.oda.models.DigitalAssistantParameterValue oci.oda.models.DigitalAssistantSummary + oci.oda.models.Entity + oci.oda.models.EntityAction + oci.oda.models.EntityActionArgument + oci.oda.models.EntityActionArgumentNaturalLanguageMapping + oci.oda.models.EntityActionNaturalLanguageMapping + oci.oda.models.EntityAttribute + oci.oda.models.EntityAttributeNaturalLanguageMapping + oci.oda.models.EntityNaturalLanguageMapping oci.oda.models.ErrorBody oci.oda.models.ExportBotDetails oci.oda.models.ExportDigitalAssistantDetails @@ -104,8 +117,10 @@ Oda oci.oda.models.ImportedPackage oci.oda.models.ImportedPackageSummary oci.oda.models.IosChannel + oci.oda.models.LanguageMapping oci.oda.models.MSTeamsChannel oci.oda.models.MetadataProperty + oci.oda.models.NameMapping oci.oda.models.OSSChannel oci.oda.models.OdaInstance oci.oda.models.OdaInstanceAttachment @@ -141,8 +156,13 @@ Oda oci.oda.models.SkillParameterSummary oci.oda.models.SkillSummary oci.oda.models.SlackChannel + oci.oda.models.StaticEntityValue + oci.oda.models.StaticEntityValueNaturalLanguageMapping oci.oda.models.StorageLocation oci.oda.models.TestChannel + oci.oda.models.TrainSkillDetails + oci.oda.models.TrainSkillParameter + oci.oda.models.TrainSkillQueryEntityParameter oci.oda.models.Translator oci.oda.models.TranslatorCollection oci.oda.models.TranslatorSummary @@ -172,6 +192,7 @@ Oda oci.oda.models.UpdateTwilioChannelDetails oci.oda.models.UpdateWebChannelDetails oci.oda.models.UpdateWebhookChannelDetails + oci.oda.models.ValueListEntity oci.oda.models.WebChannel oci.oda.models.WebhookChannel oci.oda.models.WorkRequest diff --git a/docs/api/oda/models/oci.oda.models.BulkCreateSkillEntitiesDetails.rst b/docs/api/oda/models/oci.oda.models.BulkCreateSkillEntitiesDetails.rst new file mode 100644 index 0000000000..e12e3368bf --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.BulkCreateSkillEntitiesDetails.rst @@ -0,0 +1,11 @@ +BulkCreateSkillEntitiesDetails +============================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: BulkCreateSkillEntitiesDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.CompositeEntity.rst b/docs/api/oda/models/oci.oda.models.CompositeEntity.rst new file mode 100644 index 0000000000..dcbe16d23a --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.CompositeEntity.rst @@ -0,0 +1,11 @@ +CompositeEntity +=============== + +.. currentmodule:: oci.oda.models + +.. autoclass:: CompositeEntity + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.CreateSkillCompositeEntityDetails.rst b/docs/api/oda/models/oci.oda.models.CreateSkillCompositeEntityDetails.rst new file mode 100644 index 0000000000..9d5850f25d --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.CreateSkillCompositeEntityDetails.rst @@ -0,0 +1,11 @@ +CreateSkillCompositeEntityDetails +================================= + +.. currentmodule:: oci.oda.models + +.. autoclass:: CreateSkillCompositeEntityDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.CreateSkillEntityDetails.rst b/docs/api/oda/models/oci.oda.models.CreateSkillEntityDetails.rst new file mode 100644 index 0000000000..4ab0b709ab --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.CreateSkillEntityDetails.rst @@ -0,0 +1,11 @@ +CreateSkillEntityDetails +======================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: CreateSkillEntityDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.CreateSkillValueListEntityDetails.rst b/docs/api/oda/models/oci.oda.models.CreateSkillValueListEntityDetails.rst new file mode 100644 index 0000000000..110d3cac62 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.CreateSkillValueListEntityDetails.rst @@ -0,0 +1,11 @@ +CreateSkillValueListEntityDetails +================================= + +.. currentmodule:: oci.oda.models + +.. autoclass:: CreateSkillValueListEntityDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.Entity.rst b/docs/api/oda/models/oci.oda.models.Entity.rst new file mode 100644 index 0000000000..2c9939d324 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.Entity.rst @@ -0,0 +1,11 @@ +Entity +====== + +.. currentmodule:: oci.oda.models + +.. autoclass:: Entity + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityAction.rst b/docs/api/oda/models/oci.oda.models.EntityAction.rst new file mode 100644 index 0000000000..0e8bdee680 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityAction.rst @@ -0,0 +1,11 @@ +EntityAction +============ + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityAction + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityActionArgument.rst b/docs/api/oda/models/oci.oda.models.EntityActionArgument.rst new file mode 100644 index 0000000000..a002d990b9 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityActionArgument.rst @@ -0,0 +1,11 @@ +EntityActionArgument +==================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityActionArgument + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityActionArgumentNaturalLanguageMapping.rst b/docs/api/oda/models/oci.oda.models.EntityActionArgumentNaturalLanguageMapping.rst new file mode 100644 index 0000000000..a28146c6c3 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityActionArgumentNaturalLanguageMapping.rst @@ -0,0 +1,11 @@ +EntityActionArgumentNaturalLanguageMapping +========================================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityActionArgumentNaturalLanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityActionNaturalLanguageMapping.rst b/docs/api/oda/models/oci.oda.models.EntityActionNaturalLanguageMapping.rst new file mode 100644 index 0000000000..4e9d38bdde --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityActionNaturalLanguageMapping.rst @@ -0,0 +1,11 @@ +EntityActionNaturalLanguageMapping +================================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityActionNaturalLanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityAttribute.rst b/docs/api/oda/models/oci.oda.models.EntityAttribute.rst new file mode 100644 index 0000000000..16950017ab --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityAttribute.rst @@ -0,0 +1,11 @@ +EntityAttribute +=============== + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityAttribute + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityAttributeNaturalLanguageMapping.rst b/docs/api/oda/models/oci.oda.models.EntityAttributeNaturalLanguageMapping.rst new file mode 100644 index 0000000000..f0120fd0d2 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityAttributeNaturalLanguageMapping.rst @@ -0,0 +1,11 @@ +EntityAttributeNaturalLanguageMapping +===================================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityAttributeNaturalLanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.EntityNaturalLanguageMapping.rst b/docs/api/oda/models/oci.oda.models.EntityNaturalLanguageMapping.rst new file mode 100644 index 0000000000..cc7d345e5e --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.EntityNaturalLanguageMapping.rst @@ -0,0 +1,11 @@ +EntityNaturalLanguageMapping +============================ + +.. currentmodule:: oci.oda.models + +.. autoclass:: EntityNaturalLanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.LanguageMapping.rst b/docs/api/oda/models/oci.oda.models.LanguageMapping.rst new file mode 100644 index 0000000000..f16601b98b --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.LanguageMapping.rst @@ -0,0 +1,11 @@ +LanguageMapping +=============== + +.. currentmodule:: oci.oda.models + +.. autoclass:: LanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.NameMapping.rst b/docs/api/oda/models/oci.oda.models.NameMapping.rst new file mode 100644 index 0000000000..3a946802fd --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.NameMapping.rst @@ -0,0 +1,11 @@ +NameMapping +=========== + +.. currentmodule:: oci.oda.models + +.. autoclass:: NameMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.StaticEntityValue.rst b/docs/api/oda/models/oci.oda.models.StaticEntityValue.rst new file mode 100644 index 0000000000..8dd6409946 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.StaticEntityValue.rst @@ -0,0 +1,11 @@ +StaticEntityValue +================= + +.. currentmodule:: oci.oda.models + +.. autoclass:: StaticEntityValue + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.StaticEntityValueNaturalLanguageMapping.rst b/docs/api/oda/models/oci.oda.models.StaticEntityValueNaturalLanguageMapping.rst new file mode 100644 index 0000000000..33b38f5a48 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.StaticEntityValueNaturalLanguageMapping.rst @@ -0,0 +1,11 @@ +StaticEntityValueNaturalLanguageMapping +======================================= + +.. currentmodule:: oci.oda.models + +.. autoclass:: StaticEntityValueNaturalLanguageMapping + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.TrainSkillDetails.rst b/docs/api/oda/models/oci.oda.models.TrainSkillDetails.rst new file mode 100644 index 0000000000..b7266abd5a --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.TrainSkillDetails.rst @@ -0,0 +1,11 @@ +TrainSkillDetails +================= + +.. currentmodule:: oci.oda.models + +.. autoclass:: TrainSkillDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.TrainSkillParameter.rst b/docs/api/oda/models/oci.oda.models.TrainSkillParameter.rst new file mode 100644 index 0000000000..51ee676104 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.TrainSkillParameter.rst @@ -0,0 +1,11 @@ +TrainSkillParameter +=================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: TrainSkillParameter + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.TrainSkillQueryEntityParameter.rst b/docs/api/oda/models/oci.oda.models.TrainSkillQueryEntityParameter.rst new file mode 100644 index 0000000000..4e778f2854 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.TrainSkillQueryEntityParameter.rst @@ -0,0 +1,11 @@ +TrainSkillQueryEntityParameter +============================== + +.. currentmodule:: oci.oda.models + +.. autoclass:: TrainSkillQueryEntityParameter + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/oda/models/oci.oda.models.ValueListEntity.rst b/docs/api/oda/models/oci.oda.models.ValueListEntity.rst new file mode 100644 index 0000000000..a91ce0e847 --- /dev/null +++ b/docs/api/oda/models/oci.oda.models.ValueListEntity.rst @@ -0,0 +1,11 @@ +ValueListEntity +=============== + +.. currentmodule:: oci.oda.models + +.. autoclass:: ValueListEntity + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/operator_access_control.rst b/docs/api/operator_access_control.rst index b73cc47625..c8002bf6fb 100644 --- a/docs/api/operator_access_control.rst +++ b/docs/api/operator_access_control.rst @@ -30,6 +30,9 @@ Operator Access Control oci.operator_access_control.models.AccessRequestHistorySummary oci.operator_access_control.models.AccessRequestSummary oci.operator_access_control.models.ApproveAccessRequestDetails + oci.operator_access_control.models.ApproverDetail + oci.operator_access_control.models.AssignmentValidationStatus + oci.operator_access_control.models.AuditLogReport oci.operator_access_control.models.ChangeOperatorControlAssignmentCompartmentDetails oci.operator_access_control.models.ChangeOperatorControlCompartmentDetails oci.operator_access_control.models.CreateOperatorControlAssignmentDetails @@ -50,5 +53,7 @@ Operator Access Control oci.operator_access_control.models.RejectAccessRequestDetails oci.operator_access_control.models.ReviewAccessRequestDetails oci.operator_access_control.models.RevokeAccessRequestDetails + oci.operator_access_control.models.StatusDetail oci.operator_access_control.models.UpdateOperatorControlAssignmentDetails oci.operator_access_control.models.UpdateOperatorControlDetails + oci.operator_access_control.models.ValidateOperatorAssignmentDetails diff --git a/docs/api/operator_access_control/models/oci.operator_access_control.models.ApproverDetail.rst b/docs/api/operator_access_control/models/oci.operator_access_control.models.ApproverDetail.rst new file mode 100644 index 0000000000..7c688b3c72 --- /dev/null +++ b/docs/api/operator_access_control/models/oci.operator_access_control.models.ApproverDetail.rst @@ -0,0 +1,11 @@ +ApproverDetail +============== + +.. currentmodule:: oci.operator_access_control.models + +.. autoclass:: ApproverDetail + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/operator_access_control/models/oci.operator_access_control.models.AssignmentValidationStatus.rst b/docs/api/operator_access_control/models/oci.operator_access_control.models.AssignmentValidationStatus.rst new file mode 100644 index 0000000000..ff3bc5890a --- /dev/null +++ b/docs/api/operator_access_control/models/oci.operator_access_control.models.AssignmentValidationStatus.rst @@ -0,0 +1,11 @@ +AssignmentValidationStatus +========================== + +.. currentmodule:: oci.operator_access_control.models + +.. autoclass:: AssignmentValidationStatus + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/operator_access_control/models/oci.operator_access_control.models.AuditLogReport.rst b/docs/api/operator_access_control/models/oci.operator_access_control.models.AuditLogReport.rst new file mode 100644 index 0000000000..048883a240 --- /dev/null +++ b/docs/api/operator_access_control/models/oci.operator_access_control.models.AuditLogReport.rst @@ -0,0 +1,11 @@ +AuditLogReport +============== + +.. currentmodule:: oci.operator_access_control.models + +.. autoclass:: AuditLogReport + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/operator_access_control/models/oci.operator_access_control.models.StatusDetail.rst b/docs/api/operator_access_control/models/oci.operator_access_control.models.StatusDetail.rst new file mode 100644 index 0000000000..78b7fbe02b --- /dev/null +++ b/docs/api/operator_access_control/models/oci.operator_access_control.models.StatusDetail.rst @@ -0,0 +1,11 @@ +StatusDetail +============ + +.. currentmodule:: oci.operator_access_control.models + +.. autoclass:: StatusDetail + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/operator_access_control/models/oci.operator_access_control.models.ValidateOperatorAssignmentDetails.rst b/docs/api/operator_access_control/models/oci.operator_access_control.models.ValidateOperatorAssignmentDetails.rst new file mode 100644 index 0000000000..98b348d93d --- /dev/null +++ b/docs/api/operator_access_control/models/oci.operator_access_control.models.ValidateOperatorAssignmentDetails.rst @@ -0,0 +1,11 @@ +ValidateOperatorAssignmentDetails +================================= + +.. currentmodule:: oci.operator_access_control.models + +.. autoclass:: ValidateOperatorAssignmentDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch.rst b/docs/api/sch.rst index af43b4464d..8ec4451efe 100644 --- a/docs/api/sch.rst +++ b/docs/api/sch.rst @@ -6,7 +6,9 @@ Sch :nosignatures: :template: autosummary/service_client.rst + oci.sch.ConnectorPluginsClient oci.sch.ServiceConnectorClient + oci.sch.ConnectorPluginsClientCompositeOperations oci.sch.ServiceConnectorClientCompositeOperations -------- @@ -19,6 +21,9 @@ Sch :template: autosummary/model_class.rst oci.sch.models.ChangeServiceConnectorCompartmentDetails + oci.sch.models.ConnectorPlugin + oci.sch.models.ConnectorPluginCollection + oci.sch.models.ConnectorPluginSummary oci.sch.models.CreateServiceConnectorDetails oci.sch.models.DimensionDetails oci.sch.models.DimensionValueDetails @@ -40,14 +45,19 @@ Sch oci.sch.models.MonitoringTargetDetails oci.sch.models.NotificationsTargetDetails oci.sch.models.ObjectStorageTargetDetails + oci.sch.models.PluginSourceDetails oci.sch.models.ServiceConnector oci.sch.models.ServiceConnectorCollection oci.sch.models.ServiceConnectorSummary + oci.sch.models.SourceConnectorPlugin + oci.sch.models.SourceConnectorPluginSummary oci.sch.models.SourceDetails oci.sch.models.StaticDimensionValue oci.sch.models.StreamingCursorDetails oci.sch.models.StreamingSourceDetails oci.sch.models.StreamingTargetDetails + oci.sch.models.TargetConnectorPlugin + oci.sch.models.TargetConnectorPluginSummary oci.sch.models.TargetDetails oci.sch.models.TaskDetails oci.sch.models.TrimHorizonStreamingCursor diff --git a/docs/api/sch/client/oci.sch.ConnectorPluginsClient.rst b/docs/api/sch/client/oci.sch.ConnectorPluginsClient.rst new file mode 100644 index 0000000000..9258d81409 --- /dev/null +++ b/docs/api/sch/client/oci.sch.ConnectorPluginsClient.rst @@ -0,0 +1,8 @@ +ConnectorPluginsClient +====================== + +.. currentmodule:: oci.sch + +.. autoclass:: ConnectorPluginsClient + :special-members: __init__ + :members: \ No newline at end of file diff --git a/docs/api/sch/client/oci.sch.ConnectorPluginsClientCompositeOperations.rst b/docs/api/sch/client/oci.sch.ConnectorPluginsClientCompositeOperations.rst new file mode 100644 index 0000000000..dfdb0d98fe --- /dev/null +++ b/docs/api/sch/client/oci.sch.ConnectorPluginsClientCompositeOperations.rst @@ -0,0 +1,8 @@ +ConnectorPluginsClientCompositeOperations +========================================= + +.. currentmodule:: oci.sch + +.. autoclass:: ConnectorPluginsClientCompositeOperations + :special-members: __init__ + :members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.ConnectorPlugin.rst b/docs/api/sch/models/oci.sch.models.ConnectorPlugin.rst new file mode 100644 index 0000000000..6806dd186e --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.ConnectorPlugin.rst @@ -0,0 +1,11 @@ +ConnectorPlugin +=============== + +.. currentmodule:: oci.sch.models + +.. autoclass:: ConnectorPlugin + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.ConnectorPluginCollection.rst b/docs/api/sch/models/oci.sch.models.ConnectorPluginCollection.rst new file mode 100644 index 0000000000..e416e514e2 --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.ConnectorPluginCollection.rst @@ -0,0 +1,11 @@ +ConnectorPluginCollection +========================= + +.. currentmodule:: oci.sch.models + +.. autoclass:: ConnectorPluginCollection + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.ConnectorPluginSummary.rst b/docs/api/sch/models/oci.sch.models.ConnectorPluginSummary.rst new file mode 100644 index 0000000000..f0c70974ef --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.ConnectorPluginSummary.rst @@ -0,0 +1,11 @@ +ConnectorPluginSummary +====================== + +.. currentmodule:: oci.sch.models + +.. autoclass:: ConnectorPluginSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.PluginSourceDetails.rst b/docs/api/sch/models/oci.sch.models.PluginSourceDetails.rst new file mode 100644 index 0000000000..b02a1d102f --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.PluginSourceDetails.rst @@ -0,0 +1,11 @@ +PluginSourceDetails +=================== + +.. currentmodule:: oci.sch.models + +.. autoclass:: PluginSourceDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.SourceConnectorPlugin.rst b/docs/api/sch/models/oci.sch.models.SourceConnectorPlugin.rst new file mode 100644 index 0000000000..1a90fde125 --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.SourceConnectorPlugin.rst @@ -0,0 +1,11 @@ +SourceConnectorPlugin +===================== + +.. currentmodule:: oci.sch.models + +.. autoclass:: SourceConnectorPlugin + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.SourceConnectorPluginSummary.rst b/docs/api/sch/models/oci.sch.models.SourceConnectorPluginSummary.rst new file mode 100644 index 0000000000..7e6a2e103c --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.SourceConnectorPluginSummary.rst @@ -0,0 +1,11 @@ +SourceConnectorPluginSummary +============================ + +.. currentmodule:: oci.sch.models + +.. autoclass:: SourceConnectorPluginSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.TargetConnectorPlugin.rst b/docs/api/sch/models/oci.sch.models.TargetConnectorPlugin.rst new file mode 100644 index 0000000000..2ac678533e --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.TargetConnectorPlugin.rst @@ -0,0 +1,11 @@ +TargetConnectorPlugin +===================== + +.. currentmodule:: oci.sch.models + +.. autoclass:: TargetConnectorPlugin + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/sch/models/oci.sch.models.TargetConnectorPluginSummary.rst b/docs/api/sch/models/oci.sch.models.TargetConnectorPluginSummary.rst new file mode 100644 index 0000000000..b9af3ac590 --- /dev/null +++ b/docs/api/sch/models/oci.sch.models.TargetConnectorPluginSummary.rst @@ -0,0 +1,11 @@ +TargetConnectorPluginSummary +============================ + +.. currentmodule:: oci.sch.models + +.. autoclass:: TargetConnectorPluginSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/vault.rst b/docs/api/vault.rst index a1c424f0a1..02fd33fb0c 100644 --- a/docs/api/vault.rst +++ b/docs/api/vault.rst @@ -20,19 +20,23 @@ Vault oci.vault.models.AdbTargetSystemDetails oci.vault.models.Base64SecretContentDetails + oci.vault.models.BytesGenerationContext oci.vault.models.ChangeSecretCompartmentDetails oci.vault.models.CreateSecretDetails oci.vault.models.FunctionTargetSystemDetails + oci.vault.models.PassphraseGenerationContext oci.vault.models.RotationConfig oci.vault.models.ScheduleSecretDeletionDetails oci.vault.models.ScheduleSecretVersionDeletionDetails oci.vault.models.Secret oci.vault.models.SecretContentDetails oci.vault.models.SecretExpiryRule + oci.vault.models.SecretGenerationContext oci.vault.models.SecretReuseRule oci.vault.models.SecretRule oci.vault.models.SecretSummary oci.vault.models.SecretVersion oci.vault.models.SecretVersionSummary + oci.vault.models.SshKeyGenerationContext oci.vault.models.TargetSystemDetails oci.vault.models.UpdateSecretDetails diff --git a/docs/api/vault/models/oci.vault.models.BytesGenerationContext.rst b/docs/api/vault/models/oci.vault.models.BytesGenerationContext.rst new file mode 100644 index 0000000000..db212c00bd --- /dev/null +++ b/docs/api/vault/models/oci.vault.models.BytesGenerationContext.rst @@ -0,0 +1,11 @@ +BytesGenerationContext +====================== + +.. currentmodule:: oci.vault.models + +.. autoclass:: BytesGenerationContext + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/vault/models/oci.vault.models.PassphraseGenerationContext.rst b/docs/api/vault/models/oci.vault.models.PassphraseGenerationContext.rst new file mode 100644 index 0000000000..c8608c2ffa --- /dev/null +++ b/docs/api/vault/models/oci.vault.models.PassphraseGenerationContext.rst @@ -0,0 +1,11 @@ +PassphraseGenerationContext +=========================== + +.. currentmodule:: oci.vault.models + +.. autoclass:: PassphraseGenerationContext + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/vault/models/oci.vault.models.SecretGenerationContext.rst b/docs/api/vault/models/oci.vault.models.SecretGenerationContext.rst new file mode 100644 index 0000000000..12b473341a --- /dev/null +++ b/docs/api/vault/models/oci.vault.models.SecretGenerationContext.rst @@ -0,0 +1,11 @@ +SecretGenerationContext +======================= + +.. currentmodule:: oci.vault.models + +.. autoclass:: SecretGenerationContext + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/vault/models/oci.vault.models.SshKeyGenerationContext.rst b/docs/api/vault/models/oci.vault.models.SshKeyGenerationContext.rst new file mode 100644 index 0000000000..0207c6f8e5 --- /dev/null +++ b/docs/api/vault/models/oci.vault.models.SshKeyGenerationContext.rst @@ -0,0 +1,11 @@ +SshKeyGenerationContext +======================= + +.. currentmodule:: oci.vault.models + +.. autoclass:: SshKeyGenerationContext + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/examples/showoci/CHANGELOG.rst b/examples/showoci/CHANGELOG.rst index 4e8d5ad619..e799ada1ce 100644 --- a/examples/showoci/CHANGELOG.rst +++ b/examples/showoci/CHANGELOG.rst @@ -5,9 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. ===================== -24.01.30 - 24.01.30 +24.03.02 - 24.03.02 +===================== +* Added CSV Resources with all resources +* Added Error array to Output CSV +* Factor client creation + +===================== +24.02.20 - 24.02.20 +===================== +* Added additional parameters to Boot and Block Volumes + +===================== +24.02.06 - 24.02.06 ===================== * Added Gen AI +* Fixed cores count for RAC Base database ===================== 23.12.20 - 23.12.20 diff --git a/examples/showoci/README.md b/examples/showoci/README.md index 09228e7976..2e14c11016 100644 --- a/examples/showoci/README.md +++ b/examples/showoci/README.md @@ -8,7 +8,7 @@ Output can be printer friendly, CSV files or JSON file with an option to load th [cost analysis](https://docs.oracle.com/en-us/iaas/Content/Billing/Concepts/costanalysisoverview.htm) and [usage reports](https://docs.oracle.com/en-us/iaas/Content/Billing/Concepts/usagereportsoverview.htm) features should be used instead.** -Developed by Adi Zohar, 2018-2023, Contributers: Olaf Heimburger +Developed by Adi Zohar, 2018-2024, Contributers: Olaf Heimburger ## Content diff --git a/examples/showoci/run_daily_report.sh b/examples/showoci/run_daily_report.sh old mode 100755 new mode 100644 diff --git a/examples/showoci/showoci.py b/examples/showoci/showoci.py index a76c19db95..d18eeaaea3 100644 --- a/examples/showoci/showoci.py +++ b/examples/showoci/showoci.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 ########################################################################## -# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # # showoci.py @@ -14,7 +14,7 @@ ########################################################################## # OCI Report Tool SHOWOCI: # -# require OCI read only user with OCI authentication: +# Requires OCI read only user with OCI authentication: # ALLOW GROUP ReadOnlyUsers to read all-resources IN TENANCY # # Recommend to set below for display interactive @@ -128,16 +128,16 @@ import os import time -version = "24.02.06" +version = "24.03.02" ########################################################################## # check OCI version ########################################################################## if sys.version_info.major < 3: - python_version = str(sys.version_info.major) + "." + str(sys.version_info.minor) + python_version = str(sys.version_info.major) + '.' + str(sys.version_info.minor) print("******************************************************") print("*** Showoci only supports Python 3 or Above ***") - print("*** Current Version = " + python_version.ljust(16) + " ***") + print(f"*** Current Version = {python_version.ljust(16)} ***") print("******************************************************") sys.exit() @@ -147,12 +147,12 @@ if version != ShowOCIData.version or version != ShowOCIService.version or version != ShowOCIOutput.version: print("******************************************************") print("*** Showoci files have different versions ***") - print("*** showoci.py - " + version + " ***") - print("*** showoci_data.py - " + ShowOCIData.version + " ***") - print("*** showoci_output.py - " + ShowOCIOutput.version + " ***") - print("*** showoci_service.py - " + ShowOCIService.version + " ***") + print(f"*** showoci.py - {version} ***") + print(f"*** showoci_data.py - {ShowOCIData.version} ***") + print(f"*** showoci_output.py - {ShowOCIOutput.version} ***") + print(f"*** showoci_service.py - {ShowOCIService.version} ***") print("******************************************************") - print("Abort !") + print("Aborting!") sys.exit() @@ -331,56 +331,56 @@ def return_error_message(service_error, service_warning, data_error, output_erro ########################################################################## def set_parser_arguments(argsList=[]): parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=80, width=130)) - parser.add_argument('-a', action='store_true', default=False, dest='all', help='Print All Resources') - parser.add_argument('-ani', action='store_true', default=False, dest='allnoiam', help='Print All Resources but identity') - parser.add_argument('-an', action='store_true', default=False, dest='announcement', help='Print Announcements') - parser.add_argument('-andays', default=30, dest='announcement_days', type=int, help='Announcement Last X Days (Default=30)') - parser.add_argument('-c', '-cn', action='store_true', default=False, dest='compute', help='Print Compute and Containers') - parser.add_argument('-d', action='store_true', default=False, dest='database', help='Print Database') - parser.add_argument('-edge', action='store_true', default=False, dest='edge', help='Print Edge, DNS Services and WAAS policies, DNS Zone is slow can be excluded using -exclude DNSZONE') - parser.add_argument('-f', '-o', action='store_true', default=False, dest='file', help='Print File and Object Storage') - parser.add_argument('-i', action='store_true', default=False, dest='identity', help='Print Identity and Identity Domains') - parser.add_argument('-ic', action='store_true', default=False, dest='identity_compartments', help='Print Identity Compartments only') - parser.add_argument('-isc', action='store_true', default=False, dest='skip_identity_user_credential', help='Skip Identity User Credential extract') - - parser.add_argument('-s', '-api', '-rm', '-fun', action='store_true', default=False, dest='streams_queues', help='Print API, Functions, Resource management, Gateways, Streams and Queues') + parser.add_argument('-a', action='store_true', default=False, dest='all', help='Print All Resources.') + parser.add_argument('-ani', action='store_true', default=False, dest='allnoiam', help='Print All Resources but identity.') + parser.add_argument('-an', action='store_true', default=False, dest='announcement', help='Print Announcements.') + parser.add_argument('-andays', default=30, dest='announcement_days', type=int, help='Announcement Last X Days (Default=30).') + parser.add_argument('-c', '-cn', action='store_true', default=False, dest='compute', help='Print Compute and Containers.') + parser.add_argument('-d', action='store_true', default=False, dest='database', help='Print Database.') + parser.add_argument('-edge', action='store_true', default=False, dest='edge', help='Print Edge, DNS Services and WAAS policies, DNS Zone is slow can be excluded using -exclude DNSZONE.') + parser.add_argument('-f', '-o', action='store_true', default=False, dest='file', help='Print File and Object Storage.') + parser.add_argument('-i', action='store_true', default=False, dest='identity', help='Print Identity and Identity Domains.') + parser.add_argument('-ic', action='store_true', default=False, dest='identity_compartments', help='Print Identity Compartments only.') + parser.add_argument('-isc', action='store_true', default=False, dest='skip_identity_user_credential', help='Skip Identity User Credential extract.') + + parser.add_argument('-s', '-api', '-rm', '-fun', action='store_true', default=False, dest='streams_queues', help='Print API, Functions, Resource management, Gateways, Streams and Queues.') parser.add_argument('-m', '-sec', '-lq', '-e', '-b', action='store_true', default=False, dest='monitoring', help='Print Monitor, Events, Agents, Security, Quotas, E-Mail, Limits...') - parser.add_argument('-paas', '-dataai', action='store_true', default=False, dest='paas_native', help='Print Native, Data and AI') - parser.add_argument('-n', '-l', action='store_true', default=False, dest='network', help='Print Network') - - parser.add_argument('-exclude', default="", dest='exclude', help='Exclude Services, Currently support NETWORK, QUOTAS, LIMITS, DNSZONE, VCIRCUITS') - parser.add_argument('-noparallel', action='store_true', default=False, dest='skip_threads', help='Do not run in parallel processing (Threads)') - parser.add_argument('-threads', default=8, dest='threads', type=int, help='Threads Processes when running with Threads (Default=8)') - parser.add_argument('-nobackups', action='store_true', default=False, dest='skip_backups', help='Do not process backups') - parser.add_argument('-skipdbhomes', action='store_true', default=False, dest='skip_dbhomes', help='Do not process Database Homes and Below') - parser.add_argument('-readtimeout', default=20, dest='readtimeout', type=int, help='Timeout for REST API Connection (Default=20)') - parser.add_argument('-conntimeout', default=150, dest='conntimeout', type=int, help='Timeout for REST API Read (Default=150)') - parser.add_argument('-so', action='store_true', default=False, dest='sumonly', help='Print Summary Only') - parser.add_argument('-mc', action='store_true', default=False, dest='mgdcompart', help='exclude ManagedCompartmentForPaaS') - parser.add_argument('-nr', action='store_true', default=False, dest='noroot', help='Not include root compartment') - parser.add_argument('-ip', action='store_true', default=False, dest='instance_principals', help='Use Instance Principals for Authentication') - parser.add_argument('-rp', action='store_true', default=False, dest='resource_principals', help='Use Resource Principals for Authentication') - parser.add_argument('-is', action='store_true', default=False, dest='security_token', help='Use Config and Security Token for Authentication') - parser.add_argument('-dt', action='store_true', default=False, dest='delegation_token', help='Use Delegation Token (Cloud shell)') - parser.add_argument('-t', default="", dest='profile', help='Config file section to use (tenancy profile)') - parser.add_argument('-p', default="", dest='proxy', help='Set Proxy (i.e. www-proxy-server.com:80) ') - parser.add_argument('-rg', default="", dest='region', help='Filter by Region, partial name or comma seperated') - parser.add_argument('-rgn', default="", dest='not_region', help='Filter by Region, do not include region partial name or comma seperated') - parser.add_argument('-cp', default="", dest='compart', help='Filter by Compartment Name or OCID') - parser.add_argument('-cpr', default="", dest='compart_recur', help='Filter by Comp Name Recursive') - parser.add_argument('-cpath', default="", dest='compartpath', help='Filter by Compartment path ,(i.e. -cpath "Adi / Sub"') - parser.add_argument('-tenantid', default="", dest='tenantid', help='Override confile file tenancy_id') - parser.add_argument('-cf', type=argparse.FileType('r'), dest='config', help="Config File (~/.oci/config)") - parser.add_argument('-csv', default="", dest='csv', help="Output to CSV files, Input as file header") - parser.add_argument('-csvcol', default="", dest='csvcol', help="Extract define tags as columns for Compute in CSV") - parser.add_argument('-csv_nodate', action='store_true', default=False, dest='csv_nodate', help='Do not add date field to the csv') - parser.add_argument('-csv_notagstocols', action='store_true', default=False, dest='csv_notagstocols', help='Do not Convert Tags to Columns in CSV Extract') - parser.add_argument('-jf', type=argparse.FileType('w'), dest='joutfile', help="Output to file (JSON format)") - parser.add_argument('-js', action='store_true', default=False, dest='joutscr', help="Output to screen (JSON format)") - parser.add_argument('-sjf', type=argparse.FileType('w'), dest='sjoutfile', help="Output to screen (nice format) and JSON File") - parser.add_argument('-cachef', type=argparse.FileType('w'), dest='servicefile', help="Output Cache to file (JSON format)") - parser.add_argument('-caches', action='store_true', default=False, dest='servicescr', help="Output Cache to screen (JSON format)") + parser.add_argument('-paas', '-dataai', action='store_true', default=False, dest='paas_native', help='Print Native, Data and AI.') + parser.add_argument('-n', '-l', action='store_true', default=False, dest='network', help='Print Network.') + + parser.add_argument('-exclude', default="", dest='exclude', help='Exclude Services, Currently support NETWORK, QUOTAS, LIMITS, DNSZONE, VCIRCUITS.') + parser.add_argument('-noparallel', action='store_true', default=False, dest='skip_threads', help='Do not run in parallel processing (Threads).') + parser.add_argument('-threads', default=8, dest='threads', type=int, help='Threads Processes when running with Threads (default=8).') + parser.add_argument('-nobackups', action='store_true', default=False, dest='skip_backups', help='Do not process backups.') + parser.add_argument('-skipdbhomes', action='store_true', default=False, dest='skip_dbhomes', help='Do not process Database Homes and below.') + parser.add_argument('-readtimeout', default=20, dest='readtimeout', type=int, help='Timeout for REST API Connection (default=20).') + parser.add_argument('-conntimeout', default=150, dest='conntimeout', type=int, help='Timeout for REST API Read (default=150).') + parser.add_argument('-so', action='store_true', default=False, dest='sumonly', help='Print Summary Only.') + parser.add_argument('-mc', action='store_true', default=False, dest='mgdcompart', help='exclude ManagedCompartmentForPaaS.') + parser.add_argument('-nr', action='store_true', default=False, dest='noroot', help='Not include root compartment.') + parser.add_argument('-ip', action='store_true', default=False, dest='instance_principals', help='Use Instance Principals for authentication.') + parser.add_argument('-rp', action='store_true', default=False, dest='resource_principals', help='Use Resource Principals for authentication.') + parser.add_argument('-is', action='store_true', default=False, dest='security_token', help='Use Config and Security Token for authentication.') + parser.add_argument('-dt', action='store_true', default=False, dest='delegation_token', help='Use Delegation Token (Cloud Shell).') + parser.add_argument('-t', default="", dest='profile', help='Config file section to use (tenancy profile).') + parser.add_argument('-p', default="", dest='proxy', help='Set Proxy (i.e. www-proxy-server.com:80).') + parser.add_argument('-rg', default="", dest='region', help='Filter by Region, partial name or comma seperated.') + parser.add_argument('-rgn', default="", dest='not_region', help='Filter by Region, do not include region partial name or comma seperated.') + parser.add_argument('-cp', default="", dest='compart', help='Filter by Compartment Name or OCID.') + parser.add_argument('-cpr', default="", dest='compart_recur', help='Filter by Compartment Name Recursive.') + parser.add_argument('-cpath', default="", dest='compartpath', help='Filter by Compartment path (i.e. -cpath "Adi / Sub").') + parser.add_argument('-tenantid', default="", dest='tenantid', help='Override confile file tenancy_id.') + parser.add_argument('-cf', type=argparse.FileType('r'), dest='config', help="Config File (~/.oci/config).") + parser.add_argument('-csv', default="", dest='csv', help="Output to CSV files, Input as file header.") + parser.add_argument('-csvcol', default="", dest='csvcol', help="Extract define tags as columns for Compute in CSV.") + parser.add_argument('-csv_nodate', action='store_true', default=False, dest='csv_nodate', help='Do not add date field to the CSV.') + parser.add_argument('-csv_notagstocols', action='store_true', default=False, dest='csv_notagstocols', help='Do not Convert Tags to Columns in CSV Extract.') + parser.add_argument('-jf', type=argparse.FileType('w'), dest='joutfile', help="Output to file (JSON format).") + parser.add_argument('-js', action='store_true', default=False, dest='joutscr', help="Output to screen (JSON format).") + parser.add_argument('-sjf', type=argparse.FileType('w'), dest='sjoutfile', help="Output to screen (nice format) and JSON File.") + parser.add_argument('-cachef', type=argparse.FileType('w'), dest='servicefile', help="Output Cache to file (JSON format).") + parser.add_argument('-caches', action='store_true', default=False, dest='servicescr', help="Output Cache to screen (JSON format).") parser.add_argument('--version', action='version', version='%(prog)s ' + version) if not argsList: @@ -406,7 +406,7 @@ def set_parser_arguments(argsList=[]): parser.print_help() print("******************************************************") - print("*** You must choose at least one parameter!! ***") + print("*** You must choose at least one parameter! ***") print("******************************************************") return None diff --git a/examples/showoci/showoci_data.py b/examples/showoci/showoci_data.py index 436dbc86c8..efe3270782 100644 --- a/examples/showoci/showoci_data.py +++ b/examples/showoci/showoci_data.py @@ -1,5 +1,5 @@ ########################################################################## -# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # # showoci_data.py @@ -20,7 +20,7 @@ class ShowOCIData(object): - version = "24.02.06" + version = "24.03.02" ############################################ # ShowOCIService - Service object to query @@ -70,7 +70,7 @@ def load_service_data(self): return self.service.load_service_data() ########################################################################## - # get_oci_main_data + # process_oci_data ########################################################################## def process_oci_data(self): @@ -239,7 +239,7 @@ def __get_oci_region_data(self, region_name): try: # Loop on Compartments and call services - compartments = self.service.get_compartment() + compartments = self.service.get_compartments() # Loop on all relevant compartments print("\nProcessing...") @@ -1525,6 +1525,11 @@ def __get_core_block_volume_boot(self, bva, compartment_name): 'auto_tuned_vpus_per_gb': bv['auto_tuned_vpus_per_gb'], 'time_created': bv['time_created'], 'display_name': bv['display_name'], + 'bv_volume_replicas': bv['bv_volume_replicas'], + 'autotune_policies': bv['autotune_policies'], + 'kms_key_id': bv['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(bv['kms_key_id']), + 'image_id': bv['image_id'], 'defined_tags': bv['defined_tags'], 'freeform_tags': bv['freeform_tags'] } @@ -1581,6 +1586,10 @@ def __get_core_block_volume(self, bva, compartment_name): 'is_auto_tune_enabled': bv['is_auto_tune_enabled'], 'auto_tuned_vpus_per_gb': bv['auto_tuned_vpus_per_gb'], 'iscsi_login_state': str(bva['iscsi_login_state']), + 'bv_volume_replicas': bv['bv_volume_replicas'], + 'autotune_policies': bv['autotune_policies'], + 'kms_key_id': bv['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(bv['kms_key_id']), 'defined_tags': bv['defined_tags'], 'freeform_tags': bv['freeform_tags'] } @@ -1616,6 +1625,7 @@ def __get_core_block_volume_boot_backup(self, region_name, compartment, volume_n value['source_name'] = backup['backup_name'] value['backup_type'] = backup['type'] value['kms_key_id'] = backup['kms_key_id'] + value['kms_key_name'] = self.__get_vault_key_name(backup['kms_key_id']) value['schedule_type'] = backup['source_type'] value['time_created'] = backup['time_created'][0:16] value['expiration_time'] = backup['expiration_time'][0:16] @@ -1673,6 +1683,9 @@ def __get_core_block_volume_not_attached(self, region_name, compartment): 'compartment_path': compartment['path'], 'volume_group_name': vol['volume_group_name'], 'vpus_per_gb': vol['vpus_per_gb'], + 'kms_key_id': vol['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(vol['kms_key_id']), + 'bv_volume_replicas': vol['bv_volume_replicas'], 'sum_info': 'Compute - Block Storage (GB)', 'sum_size_gb': vol['size_in_gbs'], 'defined_tags': vol['defined_tags'], @@ -1720,6 +1733,9 @@ def __get_core_block_boot_not_attached(self, region_name, compartment): 'display_name': vol['display_name'], 'availability_domain': vol['availability_domain'], 'size': vol['size_in_gbs'], + 'kms_key_id': vol['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(vol['kms_key_id']), + 'bv_volume_replicas': vol['bv_volume_replicas'], 'backup_policy': vol['backup_policy'], 'vpus_per_gb': vol['vpus_per_gb'], 'compartment_name': compartment['name'], @@ -1750,15 +1766,20 @@ def __get_core_block_volume_groups(self, region_name, compartment): volgroups = self.service.search_multi_items(self.service.C_BLOCK, self.service.C_BLOCK_VOLGRP, 'region_name', region_name, 'compartment_id', compartment['id']) for vplgrp in volgroups: - value = {'id': vplgrp['id'], - 'name': vplgrp['display_name'], - 'size_in_gbs': vplgrp['size_in_gbs'], - 'compartment_name': str(vplgrp['compartment_name']), - 'compartment_path': str(vplgrp['compartment_path']), - 'volumes': [], - 'time_created': vplgrp['time_created'], - 'defined_tags': vplgrp['defined_tags'], - 'freeform_tags': vplgrp['freeform_tags']} + value = { + 'id': vplgrp['id'], + 'name': vplgrp['display_name'], + 'size_in_gbs': vplgrp['size_in_gbs'], + 'compartment_name': str(vplgrp['compartment_name']), + 'compartment_path': str(vplgrp['compartment_path']), + 'volumes': [], + 'bv_volume_replicas': vplgrp['bv_volume_replicas'], + 'is_hydrated': vplgrp['is_hydrated'], + 'time_created': vplgrp['time_created'], + 'defined_tags': vplgrp['defined_tags'], + 'freeform_tags': vplgrp['freeform_tags'] + } + for vol_id in vplgrp['volume_ids']: vol = self.service.search_unique_item(self.service.C_BLOCK, self.service.C_BLOCK_VOL, 'id', vol_id) @@ -1769,6 +1790,7 @@ def __get_core_block_volume_groups(self, region_name, compartment): # if None continue if vol is None: continue + value['volumes'].append({ 'id': vol['id'], 'display_name': vol['display_name'], @@ -1870,7 +1892,8 @@ def __get_core_compute_instances(self, region_name, compartment): 'ipxe_script': instance['ipxe_script'], 'launch_mode': instance['launch_mode'], 'is_cross_numa_node': instance['is_cross_numa_node'], - 'logs': self.service.get_logging_log(instance['id'])} + 'logs': self.service.get_logging_log(instance['id']) + } # boot volumes attachments boot_vol_attachement = self.service.search_multi_items(self.service.C_COMPUTE, self.service.C_COMPUTE_BOOT_VOL_ATTACH, 'instance_id', instance['id']) @@ -2264,6 +2287,7 @@ def __get_database_db_databases(self, dbs): 'connection_strings_cdb': db['connection_strings_cdb'], 'source_database_point_in_time_recovery_timestamp': db['source_database_point_in_time_recovery_timestamp'], 'kms_key_id': db['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(db['kms_key_id']), 'vault_id': db['vault_id'], 'last_backup_timestamp': db['last_backup_timestamp'], 'id': db['id'] @@ -2334,6 +2358,7 @@ def __get_database_db_backups(self, backups): 'shape': backup['shape'], 'version': backup['version'], 'kms_key_id': backup['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(backup['kms_key_id']), 'kms_key_version_id': backup['kms_key_version_id'], 'vault_id': backup['vault_id'], 'type': backup['type'], @@ -2375,7 +2400,7 @@ def __get_database_db_pdbs(self, pdbs): return data ########################################################################## - # __load_database_dbsystems_dbnodes + # __get_database_db_homes ########################################################################## def __get_database_db_homes(self, db_homes): @@ -2400,7 +2425,7 @@ def __get_database_db_homes(self, db_homes): return data ########################################################################## - # __load_database_dbsystems_dbnodes + # __get_database_db_dataguard ########################################################################## def __get_database_db_dataguard(self, dataguards): @@ -2704,7 +2729,8 @@ def __get_database_db_exacc_adb_dedicated(self, region_name, compartment, infra_ 'compartment_path': vm['compartment_path'], 'compartment_id': vm['compartment_id'], 'region_name': vm['region_name'], - 'containers': []} + 'containers': [] + } # fetch the containers containers = self.service.search_multi_items(self.service.C_DATABASE, self.service.C_DATABASE_ADB_D_CONTAINERS, 'autonomous_vm_cluster_id', vm['id']) @@ -2801,6 +2827,7 @@ def __get_database_db_systems(self, region_name, compartment): 'storage_volume_performance_mode': dbs['storage_volume_performance_mode'], 'time_zone': dbs['time_zone'], 'kms_key_id': dbs['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(dbs['kms_key_id']), 'os_version': dbs['os_version'], 'disk_redundancy': dbs['disk_redundancy'], 'point_in_time_data_disk_clone_timestamp': dbs['point_in_time_data_disk_clone_timestamp'], @@ -2851,6 +2878,7 @@ def __get_database_db_all_backups(self, region_name, compartment): 'shape': backup['shape'], 'version': backup['version'], 'kms_key_id': backup['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(backup['kms_key_id']), 'kms_key_version_id': backup['kms_key_version_id'], 'vault_id': backup['vault_id'], 'type': backup['type'], @@ -2860,7 +2888,8 @@ def __get_database_db_all_backups(self, region_name, compartment): 'compartment_id': backup['compartment_id'], 'region_name': backup['region_name'], 'sum_info': 'Object Storage - DB Backup (GB)', - 'sum_size_gb': ssize}) + 'sum_size_gb': ssize + }) return data except Exception as e: @@ -2886,6 +2915,7 @@ def __get_database_adb_databases_backups(self, backups): 'type': backup['type'], 'id': backup['id'], 'kms_key_id': backup['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(backup['kms_key_id']), 'vault_id': backup['vault_id'], 'is_automatic': backup['is_automatic'] } @@ -2968,6 +2998,7 @@ def __get_database_adb_database_info(self, dbs): 'customer_contacts': dbs['customer_contacts'], 'supported_regions_to_clone_to': dbs['supported_regions_to_clone_to'], 'kms_key_id': dbs['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(dbs['kms_key_id']), 'vault_id': dbs['vault_id'], 'key_store_wallet_name': dbs['key_store_wallet_name'], 'key_store_id': dbs['key_store_id'], @@ -3357,12 +3388,12 @@ def __get_database_main(self, region_name, compartment): data = self.__get_database_db_exadata(region_name, compartment) if data: if len(data) > 0: - return_data['exadata_infrustructure'] = data + return_data['exadata_infrastructure'] = data data = self.__get_database_db_exacc(region_name, compartment) if data: if len(data) > 0: - return_data['exacc_infrustructure'] = data + return_data['exacc_infrastructure'] = data data = self.__get_database_adb_databases(region_name, compartment) if data: @@ -3546,6 +3577,7 @@ def __get_file_storage_main(self, region_name, compartment): 'compartment_path': fs['compartment_path'], 'compartment_id': fs['compartment_id'], 'kms_key_id': fs['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(fs['kms_key_id']), 'region_name': region_name, 'exports': self.__get_file_storage_exports(fs['id'])} data.append(dataval) @@ -3590,6 +3622,7 @@ def __get_object_storage_main(self, region_name, compartment): 'storage_tier': bucket['storage_tier'], 'object_events_enabled': bucket['object_events_enabled'], 'kms_key_id': bucket['kms_key_id'], + 'kms_key_name': self.__get_vault_key_name(bucket['kms_key_id']), 'object_lifecycle_policy_etag': bucket['object_lifecycle_policy_etag'], 'replication_enabled': bucket['replication_enabled'], 'is_read_only': bucket['is_read_only'], @@ -4354,6 +4387,22 @@ def __get_paas_native_main(self, region_name, compartment): self.__print_error(e) pass + ########################################################################## + # get key name + ########################################################################## + def __get_vault_key_name(self, key_id): + + data = "" + try: + if key_id: + key = self.service.search_unique_item(self.service.C_SECURITY, self.service.C_SECURITY_KEYS, 'id', key_id) + if key: + data = key['name'] + return data + + except Exception as e: + self.__print_error(e) + ########################################################################## # Security and Logging ########################################################################## @@ -4377,16 +4426,21 @@ def __get_security_main(self, region_name, compartment): if log: security_services['logging'] = log - # logging unified agenets + # logging unified agents logua = self.service.search_multi_items(self.service.C_SECURITY, self.service.C_SECURITY_LOGGING_UA, 'region_name', region_name, 'compartment_id', compartment['id']) if log: - security_services['logging_unified_agenets'] = logua + security_services['logging_unified_agents'] = logua # kms_vaults vaults = self.service.search_multi_items(self.service.C_SECURITY, self.service.C_SECURITY_VAULTS, 'region_name', region_name, 'compartment_id', compartment['id']) if vaults: security_services['kms_vaults'] = vaults + # kms_keys + keys = self.service.search_multi_items(self.service.C_SECURITY, self.service.C_SECURITY_KEYS, 'region_name', region_name, 'compartment_id', compartment['id']) + if keys: + security_services['kms_keys'] = keys + return security_services except Exception as e: diff --git a/examples/showoci/showoci_output.py b/examples/showoci/showoci_output.py index 392067242b..bbea639bf7 100644 --- a/examples/showoci/showoci_output.py +++ b/examples/showoci/showoci_output.py @@ -1,5 +1,5 @@ ########################################################################## -# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # # showoci_output.py @@ -18,10 +18,11 @@ ########################################################################## from __future__ import print_function import csv +import sys class ShowOCIOutput(object): - version = "24.02.06" + version = "24.03.02" ########################################################################## # spaces for align @@ -241,7 +242,7 @@ def __print_identity_domains(self, domains): for domain in domains: print(self.taba + domain['display_name'] + " - " + domain['description'] + " - Created: " + domain['time_created']) print(self.tabs + "URL : " + domain['url']) - print(self.tabs + "license : " + domain['license_type']) + print(self.tabs + "License : " + domain['license_type']) print(self.tabs + "Type : " + domain['type']) print("") @@ -395,7 +396,7 @@ def __print_identity_tag_namespace(self, tag_data): print("\nCompartment " + c['compartment_path'] + ":") for tag in tags: - retired = "" if tag['is_retired'] == "False" else " Retired " + retired = " Retired " if tag['is_retired'] == "True" else "" print(self.taba + tag['name'] + retired + " (" + tag['lifecycle_state'] + "), " + tag['description']) except Exception as e: @@ -626,7 +627,7 @@ def __print_core_network_vcn_security_groups(self, sec_groups, vcn_compartment): except Exception as e: self.__print_error("__print_core_network_vcn_security_groups", e) - ######################################################################## + ########################################################################## # Print Network vcn Route Tables ########################################################################## @@ -817,7 +818,7 @@ def __print_core_network_firewall(self, nfws): self.__print_error("__print_core_network_firewall", e) ########################################################################## - # print network firewall Policies + # print network firewall policies ########################################################################## def __print_core_network_firewall_policies(self, nfws): @@ -829,7 +830,7 @@ def __print_core_network_firewall_policies(self, nfws): self.print_header("Network Firewalls Policies", 2) for arr in nfws: - print(self.taba + arr['display_name'] + " - " + arr['lifecycle_state'] + ", Is Attached: " + arr['is_firewall_attached']) + print(self.taba + arr['display_name'] + " - " + arr['lifecycle_state']) except Exception as e: self.__print_error("__print_core_network_firewall_policies", e) @@ -892,7 +893,7 @@ def __print_core_network_ipsec(self, ipsecs): self.__print_error("__print_core_network_ipsec", e) ########################################################################## - # print virtual cirtuicts + # print virtual circuits ########################################################################## def __print_core_network_virtual_circuit(self, virtual_circuit): @@ -916,7 +917,7 @@ def __print_core_network_virtual_circuit(self, virtual_circuit): self.__print_error("__print_core_network_virtual_circuit", e) ########################################################################## - # print network Main + # print network main ########################################################################## def __print_core_network_main(self, data): @@ -942,7 +943,7 @@ def __print_core_network_main(self, data): self.__print_error("__print_core_network", e) ########################################################################## - # print load balancer backedset + # print load balancer backendset ########################################################################## def __print_load_balancer_backendset(self, backendset): @@ -1038,7 +1039,7 @@ def __print_load_balancer_details(self, load_balance_obj): self.__print_error("__print_load_balancer_details", e) ########################################################################## - # print network_load balancer config + # print network load balancer config ########################################################################## def __print_load_balancer_network_details(self, load_balance_obj): @@ -1069,7 +1070,7 @@ def __print_load_balancer_network_details(self, load_balance_obj): self.__print_error("__print_load_balancer_network_details", e) ########################################################################## - # Load Balancer + # Load Balancer main ########################################################################## def __print_load_balancer_main(self, load_balancers): @@ -1097,7 +1098,7 @@ def __print_load_balancer_main(self, load_balancers): self.__print_error("__print_load_balancer_main", e) ########################################################################## - # Network Load Balancer + # Network Load Balancer main ########################################################################## def __print_load_balancer_network_main(self, load_balancers): @@ -1848,14 +1849,14 @@ def __print_database_main(self, list_databases): if len(list_databases) == 0: return - if 'exadata_infrustructure' in list_databases: + if 'exadata_infrastructure' in list_databases: self.print_header("Exadata Infrastructure", 2) - self.__print_database_db_exadata_infra(list_databases['exadata_infrustructure']) + self.__print_database_db_exadata_infra(list_databases['exadata_infrastructure']) print("") - if 'exacc_infrustructure' in list_databases: + if 'exacc_infrastructure' in list_databases: self.print_header("ExaCC Infrastructure", 2) - self.__print_database_db_exacc_infra(list_databases['exacc_infrustructure']) + self.__print_database_db_exacc_infra(list_databases['exacc_infrastructure']) print("") if 'db_system' in list_databases: @@ -2518,10 +2519,10 @@ def __print_security_main(self, security): ", Created: " + log['time_created'][0:16]) print("") - # Logging unified agenets - if 'logging_unified_agenets' in security: + # Logging unified agents + if 'logging_unified_agents' in security: self.print_header("Logging Unified Agents Configuration", 2) - for val in security['logging_unified_agenets']: + for val in security['logging_unified_agents']: print(self.taba + val['display_name'] + ", (" + val['description'] + "), Is Enabled: " + val['is_enabled'] + ", Type: " + val['configuration_type'] + ", Created: " + val['time_created'][0:16]) print("") @@ -3262,8 +3263,8 @@ def __summary_security(self, security): self.__summary_core_size(security['cloud_guard']) if 'logging' in security: self.__summary_core_size(security['logging']) - if 'logging_unified_agenets' in security: - self.__summary_core_size(security['logging_unified_agenets']) + if 'logging_unified_agents' in security: + self.__summary_core_size(security['logging_unified_agents']) if 'bastions' in security: self.__summary_core_size(security['bastions']) if 'kms_vaults' in security: @@ -3508,11 +3509,11 @@ def __summary_database_main(self, list_databases): if len(list_databases) == 0: return - if 'exadata_infrustructure' in list_databases: - self.__summary_database_db_exadata(list_databases['exadata_infrustructure']) + if 'exadata_infrastructure' in list_databases: + self.__summary_database_db_exadata(list_databases['exadata_infrastructure']) - if 'exacc_infrustructure' in list_databases: - self.__summary_database_db_exacc(list_databases['exacc_infrustructure']) + if 'exacc_infrastructure' in list_databases: + self.__summary_database_db_exacc(list_databases['exacc_infrastructure']) if 'db_system' in list_databases: self.__summary_database_db_system(list_databases['db_system']) @@ -4091,10 +4092,12 @@ class ShowOCICSV(object): # class variables ############################################ error = 0 + error_array = [] csv_tags_to_cols = False csv_file_header = "" csv_announcements = [] csv_errors = [] + csv_resources = [] csv_identity_compartments = [] csv_identity_groups = [] csv_identity_users = [] @@ -4196,6 +4199,24 @@ def __init__(self, start_time): def get_errors(self): return self.error + ########################################################################## + # __add_to_error_array + ########################################################################## + def __add_to_error_array(self, classname, caller_function, compartment_name, err, warning=False): + + try: + error_info = { + 'class': classname, + 'function': caller_function, + 'compartment': compartment_name, + 'error': str(err), + 'is_warning': str(warning) + } + self.error_array.append(error_info) + + except Exception as e: + print("\nError in __add_to_error_array " + str(e)) + ########################################################################## # generate_csv ########################################################################## @@ -4212,10 +4233,10 @@ def generate_csv(self, data, csv_file_header, tenancy, add_date_field=True, csv_ if d['type'] == "identity": self.__csv_identity_main(d['data']) - if d['type'] == "errors": + elif d['type'] == "errors": self.__csv_error_data(d['data']) - if d['type'] == "announcement": + elif d['type'] == "announcement": self.__csv_announcements(d['data']) elif d['type'] == "region": @@ -4223,12 +4244,18 @@ def generate_csv(self, data, csv_file_header, tenancy, add_date_field=True, csv_ if 'limits' in d: self.__csv_limits_main(d['region'], d['limits']) - else: continue + # Run again for the error csv + for d in data: + if 'type' in d: + if d['type'] == "errors": + self.__csv_error_data(d['data']) + # generate CSV files from each file self.__print_header("Processing CSV Files", 0) + self.__export_to_csv_file("all_resources", self.csv_resources) self.__export_to_csv_file("announcements", self.csv_announcements) self.__export_to_csv_file("errors", self.csv_errors) self.__export_to_csv_file("identity_compartments", self.csv_identity_compartments) @@ -4413,12 +4440,20 @@ def __export_to_csv_file(self, file_subject, data): # print error ########################################################################## def __print_error(self, msg, e): - classname = type(self).__name__ - self.error += 1 - if isinstance(e, KeyError): - print("\nError in " + classname + ":" + msg + ": KeyError " + str(e.args)) - else: - print("\nError in " + classname + ":" + msg + ": " + str(e)) + try: + + classname = type(self).__name__ + caller_function = sys._getframe(2).f_code.co_name + ":" + sys._getframe(1).f_code.co_name + self.error += 1 + if isinstance(e, KeyError): + print("\nError in " + classname + ":" + caller_function + ":" + msg + ": KeyError " + str(e.args)) + else: + print("\nError in " + classname + ":" + caller_function + ":" + msg + ": " + str(e)) + + self.__add_to_error_array(classname, caller_function, "", e) + + except Exception as e: + print("\nError in __print_error " + str(e)) ########################################################################## # extract defined tags to string @@ -4483,6 +4518,32 @@ def __get_freeform_tags(self, freeform_tag): def __if_managed_paas_compartment(self, name): return name == "ManagedCompartmentForPaaS" + ########################################################################## + # Add to Service + ########################################################################## + def __csv_add_service(self, arr, service_type, col_name="name", col_id="id", col_info="info"): + + try: + if col_name not in arr: + if 'display_name' in arr: + col_name = 'display_name' + + self.csv_resources.append({ + 'resource_type': service_type, + 'region_name': arr['region_name'] if 'region_name' in arr else "", + 'availability_domain': arr['availability_domain'] if 'availability_domain' in arr else "", + 'compartment_name': arr['compartment_name'] if 'compartment_name' in arr else "", + 'compartment_path': arr['compartment_path'] if 'compartment_path' in arr else "", + 'resource_id': arr[col_id] if col_id in arr else "", + 'resource_name': arr[col_name] if col_name in arr else "", + 'resource_info': arr[col_info] if col_info in arr else "", + 'freeform_tags': arr['freeform_tags'] if 'freeform_tags' in arr else "", + 'defined_tags': arr['defined_tags'] if 'defined_tags' in arr else "" + }) + + except Exception as e: + self.__print_error("__csv_add_service", e) + ########################################################################## # CSV Identity Groups ########################################################################## @@ -4532,13 +4593,17 @@ def __csv_identity_users(self, users): # Check if credential exist if 'api_keys' in user: - data['api_keys'] = str(', '.join(x['id'] + " - " + x['lifecycle_state'] + " - " + x['time_created'] for x in user['api_keys'])) + if user['api_keys']: + data['api_keys'] = str(', '.join(x['id'] + " - " + x['lifecycle_state'] + " - " + x['time_created'] for x in user['api_keys'])) if 'auth_token' in user: - data['auth_token'] = str(', '.join(x['id'] + " - " + x['description'] + " - " + x['time_created'] for x in user['auth_token'])) + if data['auth_token']: + data['auth_token'] = str(', '.join(x['id'] + " - " + x['description'] + " - " + x['time_created'] for x in user['auth_token'])) if 'secret_key' in user: - data['secret_key'] = str(', '.join(x['id'] + " - " + x['display_name'] + " - " + x['time_created'] for x in user['secret_key'])) + if data['secret_key']: + data['secret_key'] = str(', '.join(x['id'] + " - " + x['display_name'] + " - " + x['time_created'] for x in user['secret_key'])) if 'smtp_cred' in user: - data['smtp_cred'] = str(', '.join(x['id'] + " - " + x['description'] + " - " + x['time_created'] for x in user['smtp_cred'])) + if data['smtp_cred']: + data['smtp_cred'] = str(', '.join(x['id'] + " - " + x['description'] + " - " + x['time_created'] for x in user['smtp_cred'])) self.csv_identity_users.append(data) @@ -4567,12 +4632,12 @@ def __csv_identity_domains(self, domains): 'freeform_tags': self.__get_freeform_tags(var['freeform_tags']), 'defined_tags': self.__get_defined_tags(var['defined_tags']), 'replica_regions': var['replica_regions'], - 'users': len(var['users']), - 'groups': len(var['groups']), - 'dynamic_groups': len(var['dynamic_groups']), - 'kmsi_setting': len(var['kmsi_setting']), - 'identity_providers': len(var['identity_providers']), - 'authentication_factor_settings': len(var['authentication_factor_settings']) + 'users': len(var['users']) if var['users'] else 0, + 'groups': len(var['groups']) if var['groups'] else 0, + 'dynamic_groups': len(var['dynamic_groups']) if var['dynamic_groups'] else 0, + 'kmsi_setting': len(var['kmsi_setting']) if var['kmsi_setting'] else 0, + 'identity_providers': len(var['identity_providers']) if var['identity_providers'] else 0, + 'authentication_factor_settings': len(var['authentication_factor_settings']) if var['authentication_factor_settings'] else 0 } self.csv_identity_domains.append(data) @@ -5237,13 +5302,35 @@ def __csv_error_data(self, data): 'class': err['class'], 'function': err['function'], 'compartment': err['compartment'], - 'region': err['region'], + 'region': '', 'is_warning': err['is_warning'], 'error': err['error'] } + self.csv_errors.append(value) + # run on local errors + for err in self.error_array: + value = { + 'class': err['class'], + 'function': err['function'], + 'compartment': err['compartment'], + 'region': "", + 'is_warning': err['is_warning'], + 'error': err['error'] + } self.csv_errors.append(value) + # if no error post one line to clean old errors + if not self.csv_errors: + self.csv_errors.append({ + 'class': "No Errors", + 'function': "", + 'compartment': "", + 'region': "", + 'is_warning': "", + 'error': "" + }) + except Exception as e: self.__print_error("__csv_error_data", e) @@ -5544,14 +5631,6 @@ def __csv_core_network_firewall_policies(self, region_name, network_firewalls_po 'compartment_id': arr['compartment_id'], 'name': arr['display_name'], 'lifecycle_state': arr['lifecycle_state'], - 'url_lists': arr['url_lists'], - 'mapped_secrets': arr['mapped_secrets'], - 'application_lists': arr['application_lists'], - 'ip_address_lists': arr['ip_address_lists'], - 'security_rules': arr['security_rules'], - 'decryption_rules': arr['decryption_rules'], - 'decryption_profiles': arr['decryption_profiles'], - 'is_firewall_attached': arr['is_firewall_attached'], 'time_created': arr['time_created'], 'time_updated': arr['time_updated'], 'id': arr['id'], @@ -5922,6 +6001,7 @@ def __csv_database_db_system(self, region_name, list_db_systems): self.csv_db_all.append(dbsd) self.csv_db_vm_bm.append(dbsd) + self.__csv_add_service(dbsd, "DB System") # Build the database CSV for db_home in dbs['db_homes']: @@ -5965,12 +6045,14 @@ def __csv_database_db_system(self, region_name, list_db_systems): 'kms_key_id': db['kms_key_id'], 'vault_id': db['vault_id'], 'database_id': db['id'], + 'id': db['id'], 'dbsystem_id': dbs['id'], 'db_home': db_home['home_name'], 'db_home_version': db_home['home_version'] } self.csv_database.append(data) + self.__csv_add_service(data, "DB System Database") # database Backups if 'backups' in db: @@ -6055,9 +6137,12 @@ def __csv_database_db_exadata(self, region_name, list_exa): 'maintenance_window': dbs['maintenance_window']['display'] if dbs['maintenance_window'] else "", 'last_maintenance_run': dbs['last_maintenance_run']['maintenance_display'] if dbs['last_maintenance_run'] else "", 'next_maintenance_run': dbs['next_maintenance_run']['maintenance_display'] if dbs['next_maintenance_run'] else "", - 'infra_id': dbs['id'] + 'infra_id': dbs['id'], + 'info': dbs['shape'], + 'id': dbs['id'] } self.csv_db_exa_infrastructure.append(infs) + self.__csv_add_service(infs, "DB ExaCS Infra") for vm in dbs['vm_clusters']: # Db Exa CSV @@ -6097,11 +6182,13 @@ def __csv_database_db_exadata(self, region_name, list_exa): 'last_maintenance_run': dbs['last_maintenance_run']['maintenance_display'] if dbs['last_maintenance_run'] else "", 'next_maintenance_run': dbs['next_maintenance_run']['maintenance_display'] if dbs['next_maintenance_run'] else "", 'id': vm['id'], + 'info': "ocpus:" + str(dbs['shape_ocpu']), 'infra_id': dbs['id'] } self.csv_db_all.append(dbsd) self.csv_db_exacs_vmclusters.append(dbsd) + self.__csv_add_service(dbsd, "DB ExaCS VMCluster") # Build the database CSV for db_home in vm['db_homes']: @@ -6117,6 +6204,7 @@ def __csv_database_db_exadata(self, region_name, list_exa): 'type': "ExaCS", 'name': dbs['display_name'], 'shape': dbs['shape'], + 'info': dbs['shape'], 'compute_model': 'OCPU', 'compute_count': vm['cpu_core_count'], 'cpu_core_count': vm['cpu_core_count'], @@ -6142,12 +6230,14 @@ def __csv_database_db_exadata(self, region_name, list_exa): 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), 'database_id': db['id'], + 'id': db['id'], 'dbsystem_id': vm['id'], 'db_home': db_home['home_name'], 'db_home_version': db_home['home_version'] } self.csv_database.append(data) + self.__csv_add_service(dbsd, "DB ExaCS Database") # database Backups if 'backups' in db: @@ -6172,6 +6262,7 @@ def __csv_database_db_exacc(self, region_name, list_exa): 'type': "ExaCC", 'name': dbs['display_name'], 'shape': dbs['shape'], + 'info': dbs['shape'], 'time_zone': dbs['time_zone'], 'cpus_enabled': dbs['cpus_enabled'], 'max_cpu_count': dbs['max_cpu_count'], @@ -6203,9 +6294,11 @@ def __csv_database_db_exacc(self, region_name, list_exa): 'maintenance_window': dbs['maintenance_window']['display'] if dbs['maintenance_window'] else "", 'last_maintenance_run': dbs['last_maintenance_run']['maintenance_display'] if dbs['last_maintenance_run'] else "", 'next_maintenance_run': dbs['next_maintenance_run']['maintenance_display'] if dbs['next_maintenance_run'] else "", - 'infra_id': dbs['id'] + 'infra_id': dbs['id'], + 'id': dbs['id'] } self.csv_db_exa_infrastructure.append(infs) + self.__csv_add_service(infs, "DB ExaCC Infra") # VM Clusters for vm in dbs['vm_clusters']: @@ -6246,12 +6339,16 @@ def __csv_database_db_exacc(self, region_name, list_exa): 'freeform_tags': self.__get_freeform_tags(vm['freeform_tags']), 'defined_tags': self.__get_defined_tags(vm['defined_tags']), 'id': vm['id'], - 'infra_id': dbs['id'], + 'info': "ocpus:" + str(vm['cpus_enabled']), + 'infra_id': dbs['id'] } self.csv_db_all.append(dbsd) self.csv_db_exacc_vmclusters.append(dbsd) + # Add to CSV Service + self.__csv_add_service(dbsd, "DB ExaCC VMCluster") + # Build the database CSV for db_home in vm['db_homes']: @@ -6266,6 +6363,7 @@ def __csv_database_db_exacc(self, region_name, list_exa): 'type': "ExaCC", 'name': dbs['display_name'], 'shape': dbs['shape'], + 'info': dbs['shape'], 'compute_model': 'OCPU', 'compute_count': vm['cpus_enabled'], 'cpu_core_count': vm['cpus_enabled'], @@ -6293,12 +6391,14 @@ def __csv_database_db_exacc(self, region_name, list_exa): 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), 'database_id': db['id'], + 'id': db['id'], 'dbsystem_id': vm['id'], 'db_home': db_home['home_name'], 'db_home_version': db_home['home_version'] } self.csv_database.append(data) + self.__csv_add_service(data, "DB ExaCC Database") # database Backups if 'backups' in db: @@ -6328,6 +6428,7 @@ def __csv_database_db_exacc_autonomous_dedicated(self, region_name, databases): 'compute_model': db['compute_model'], 'compute_count': db['compute_count'], 'cpu_core_count': db['cpu_core_count'], + 'info': str(db['cpu_core_count']), 'db_storage_gb': str(int(db['data_storage_size_in_tbs']) * 1024), 'shape_ocpus': vm['ocpu_count'], 'memory_gb': vm['memory_size_in_gbs'], @@ -6350,11 +6451,14 @@ def __csv_database_db_exacc_autonomous_dedicated(self, region_name, databases): 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), 'database_id': db['id'], + 'id': db['id'], 'dbsystem_id': vm['id'], 'db_home': "", 'db_home_version': "" } self.csv_database.append(data) + self.__csv_add_service(data, "DB ExaCC ADB") + except Exception as e: self.__print_error("__csv_database_db_exacc_autonomous_dedicated", e) @@ -6450,10 +6554,12 @@ def __csv_database_db_autonomous(self, region_name, databases): 'vault_id': dbs['vault_id'], 'freeform_tags': self.__get_freeform_tags(dbs['freeform_tags']), 'defined_tags': self.__get_defined_tags(dbs['defined_tags']), + 'info': "ocpus:" + str(dbs['cpu_core_count']), 'id': dbs['id'] } self.csv_db_autonomous.append(dadb) + self.__csv_add_service(dadb, "DB ADB-S") # database Backups if 'backups' in dbs: @@ -6523,11 +6629,15 @@ def __csv_database_db_autonomous_dedicated(self, region_name, databases): 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), 'database_id': db['id'], + 'id': db['id'], 'dbsystem_id': vm['id'], 'db_home': "", + 'info': "ocpus:" + str(db['cpu_core_count']), 'db_home_version': "" } self.csv_database.append(data) + self.__csv_add_service(data, "DB ADB-D") + except Exception as e: self.__print_error("__csv_database_db_autonomous_dedicated", e) @@ -6583,10 +6693,12 @@ def __csv_database_db_autonomous_databases(self, region_name, databases): 'key_store_id': db['key_store_id'], 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), + 'info': "ocpus" + str(db['cpu_core_count']), 'id': db['id'] } self.csv_db_autonomous.append(dadb) + self.__csv_add_service(dadb, "DB ADB-D") # database Backups if 'backups' in dbs: @@ -6642,10 +6754,12 @@ def __csv_database_goldengate(self, region_name, goldengates): 'deployment_type': db['deployment_type'], 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), + 'info': "ocpus:" + str(db['cpu_core_count']), 'id': db['id'] } self.csv_db_goldengate_deployments.append(gg) + self.__csv_add_service(gg, "Golden Gate", col_name="display_name") except Exception as e: self.__print_error("__csv_database_goldengate", e) @@ -6702,10 +6816,12 @@ def __csv_database_mysql(self, region_name, mysql): 'data_storage_size_in_gbs': db['data_storage_size_in_gbs'], 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), + 'info': db['shape_name'] + ":" + str(db['shape_ocpu']) + ":" + str(db['shape_memory_gb']), 'id': db['id'] } self.csv_db_mysql.append(var) + self.__csv_add_service(var, "MySQL", col_name="display_name") for bk in db['backups']: varb = { @@ -6807,10 +6923,12 @@ def __csv_database_postgresql(self, region_name, postgresql): 'source_type': db['source_type'], 'freeform_tags': self.__get_freeform_tags(db['freeform_tags']), 'defined_tags': self.__get_defined_tags(db['defined_tags']), + 'info': db['shape'], 'id': db['id'] } self.csv_db_postgresql.append(var) + self.__csv_add_service(var, "Golden Gate", col_name="PostgreSQL") for bk in db['backups']: varb = { @@ -6897,6 +7015,7 @@ def __csv_database_nosql(self, region_name, nosqls): } self.csv_db_nosql.append(arr) + self.__csv_add_service(arr, "NOSQL") except Exception as e: self.__print_error("__csv_database_goldengate", e) @@ -6911,15 +7030,15 @@ def __csv_database_main(self, region_name, list_databases): if len(list_databases) == 0: return - if 'exadata_infrustructure' in list_databases: - self.__csv_database_db_exadata(region_name, list_databases['exadata_infrustructure']) - self.__csv_database_db_autonomous_dedicated(region_name, list_databases['exadata_infrustructure']) - self.__csv_database_db_autonomous_databases(region_name, list_databases['exadata_infrustructure']) + if 'exadata_infrastructure' in list_databases: + self.__csv_database_db_exadata(region_name, list_databases['exadata_infrastructure']) + self.__csv_database_db_autonomous_dedicated(region_name, list_databases['exadata_infrastructure']) + self.__csv_database_db_autonomous_databases(region_name, list_databases['exadata_infrastructure']) - if 'exacc_infrustructure' in list_databases: - self.__csv_database_db_exacc(region_name, list_databases['exacc_infrustructure']) - self.__csv_database_db_exacc_autonomous_dedicated(region_name, list_databases['exacc_infrustructure']) - self.__csv_database_db_autonomous_databases(region_name, list_databases['exacc_infrustructure']) + if 'exacc_infrastructure' in list_databases: + self.__csv_database_db_exacc(region_name, list_databases['exacc_infrastructure']) + self.__csv_database_db_exacc_autonomous_dedicated(region_name, list_databases['exacc_infrastructure']) + self.__csv_database_db_autonomous_databases(region_name, list_databases['exacc_infrastructure']) if 'db_system' in list_databases: self.__csv_database_db_system(region_name, list_databases['db_system']) @@ -7064,7 +7183,9 @@ def __csv_core_compute_instances(self, region_name, instances): 'vnic_ids': "", 'freeform_tags': self.__get_freeform_tags(instance['freeform_tags']), 'defined_tags': self.__get_defined_tags(instance['defined_tags']), - 'instance_id': instance['id'] + 'instance_id': instance['id'], + 'info': instance['shape'] + ":" + str(instance['shape_ocpu']) + ":" + str(instance['shape_memory_gb']), + 'id': instance['id'] } # add columns for csvcol parameter @@ -7111,6 +7232,7 @@ def __csv_core_compute_instances(self, region_name, instances): data['block_volumes_total_gb'] = str(bv_total_size) self.csv_compute.append(data) + self.__csv_add_service(data, "Compute Instance", col_name="server_name") except Exception as e: self.__print_error("__csv_core_compute_instances", e) @@ -7145,17 +7267,22 @@ def __csv_core_compute_block_volumes(self, region_name, instances): 'is_pv_encryption_in_transit_enabled': bv['is_pv_encryption_in_transit_enabled'], 'encryption_in_transit_type': bv['encryption_in_transit_type'], 'is_hydrated': bv['is_hydrated'], + 'kms_key_id': bv['kms_key_id'], + 'kms_key_name': bv['kms_key_name'], 'is_read_only': "", 'is_shareable': "", 'is_multipath': "", 'iscsi_login_state': "", + 'bv_volume_replicas': ",".join(x['display_name'] + ":" + x['availability_domain'] for x in bv['bv_volume_replicas']), 'instance_id': instance['id'], 'id': bv['id'] + ((":" + instance['id']) if instance['id'] else ""), 'bv_id': bv['id'], + 'info': "size:" + str(bv['size']), 'freeform_tags': self.__get_freeform_tags(bv['freeform_tags']), 'defined_tags': self.__get_defined_tags(bv['defined_tags']) } self.csv_block_volumes.append(data) + self.__csv_add_service(data, "Compute Boot Volume", col_name="display_name") # Add block Volumes if 'block_volume' in instance: @@ -7176,17 +7303,22 @@ def __csv_core_compute_block_volumes(self, region_name, instances): 'is_pv_encryption_in_transit_enabled': bv['is_pv_encryption_in_transit_enabled'], 'encryption_in_transit_type': "", 'is_hydrated': bv['is_hydrated'], + 'kms_key_id': bv['kms_key_id'], + 'kms_key_name': bv['kms_key_name'], 'is_read_only': bv['is_read_only'], 'is_shareable': bv['is_shareable'], 'is_multipath': bv['is_multipath'], 'iscsi_login_state': bv['iscsi_login_state'], + 'bv_volume_replicas': ",".join(x['display_name'] + ":" + x['availability_domain'] for x in bv['bv_volume_replicas']), 'instance_id': instance['id'], 'id': bv['id'] + ((":" + instance['id']) if instance['id'] else ""), 'bv_id': bv['id'], + 'info': "size:" + str(bv['size']), 'freeform_tags': self.__get_freeform_tags(bv['freeform_tags']), 'defined_tags': self.__get_defined_tags(bv['defined_tags']) } self.csv_block_volumes.append(data) + self.__csv_add_service(data, "Compute Volume", col_name="display_name") except Exception as e: self.__print_error("__csv_core_compute_block_volumes", e) @@ -7243,6 +7375,8 @@ def __csv_core_compute_block_not_attached(self, region_name, blocks): 'compartment_name': bv['compartment_name'], 'compartment_path': bv['compartment_path'], 'id': bv['id'], + 'kms_key_id': bv['kms_key_id'], + 'kms_key_name': bv['kms_key_name'], 'display_name': bv['display_name'], 'size': bv['size'], 'backup_policy': bv['backup_policy'], @@ -7250,10 +7384,13 @@ def __csv_core_compute_block_not_attached(self, region_name, blocks): 'volume_group_name': bv['volume_group_name'], 'instance_name': '', 'instance_id': '', + 'bv_volume_replicas': ",".join(x['display_name'] + ":" + x['availability_domain'] for x in bv['bv_volume_replicas']), + 'info': "size:" + str(bv['size']), 'freeform_tags': self.__get_freeform_tags(bv['freeform_tags']), 'defined_tags': self.__get_defined_tags(bv['defined_tags']) } self.csv_block_volumes.append(data) + self.__csv_add_service(data, "Compute Volume Not Attached", col_name="display_name") except Exception as e: self.__print_error("__csv_core_compute_block_not_attached", e) @@ -7369,6 +7506,7 @@ def __csv_load_balancer_details(self, region_name, load_balance_obj): 'id': lb['id'] } self.csv_load_balancer.append(data) + self.__csv_add_service(data, "Load Balancer") # listeners for listener in lb['listeners']: @@ -7439,6 +7577,7 @@ def __csv_network_load_balancer_main(self, region_name, network_load_balancers): 'id': lb['id'] } self.csv_load_balancer.append(data) + self.__csv_add_service(data, "Network Load Balancer") # Listeners for listener in lb['listeners']: @@ -7534,14 +7673,16 @@ def __csv_apigw(self, region_name, apigw): 'logs': str(', '.join(x['name'] for x in dp['logs'])), 'dp_id': dp['id'], 'api_id': api['id'], + 'id': api['id'] } self.csv_apigw.append(data) + self.__csv_add_service(data, "API Gateway", col_name="gw_name") except Exception as e: self.__print_error("__csv_apigw", e) ########################################################################## - # csv load balancer backedset + # csv load balancer backendset ########################################################################## def __csv_load_balancer_backendset(self, region_name, load_balance_obj): @@ -7653,6 +7794,7 @@ def __csv_file_storage_main(self, region_name, file_storage): 'display_name': fs['display_name'], 'kms_key_id': fs['kms_key_id'], 'size_gb': fs['size_gb'], + 'info': "size:" + str(fs['size_gb']), 'id': fs['id'], 'time_created': fs['time_created'], 'exports': exports, @@ -7664,6 +7806,7 @@ def __csv_file_storage_main(self, region_name, file_storage): } self.csv_file_storage.append(data) + self.__csv_add_service(data, "File Storage", col_name="display_name") except Exception as e: self.__print_error("__csv_file_storage_main", e) @@ -7688,6 +7831,7 @@ def __csv_object_storage_main(self, region_name, object_storage): 'bucket_name': ar['name'], 'objects': ar['count'], 'size_gb': ar['sum_size_gb'], + 'info': "size:" + str(ar['sum_size_gb']), 'preauthenticated_requests': ar['preauthenticated_requests'], 'object_lifecycle': ar['object_lifecycle'], 'public_access_type': ar['public_access_type'], @@ -7699,6 +7843,7 @@ def __csv_object_storage_main(self, region_name, object_storage): 'auto_tiering': ar['auto_tiering'], 'kms_key_id': ar['kms_key_id'], 'bucket_id': ar['id'], + 'id': ar['id'], 'time_created': ar['time_created'], 'error_message': ar['error_message'], 'freeform_tags': self.__get_freeform_tags(ar['freeform_tags']), @@ -7707,6 +7852,7 @@ def __csv_object_storage_main(self, region_name, object_storage): } self.csv_object_storage_buckets.append(data) + self.__csv_add_service(data, "Object Storage", col_name="bucket_name") except Exception as e: self.__print_error("__csv_object_storage_main", e) @@ -7726,8 +7872,8 @@ def __csv_security_main(self, region_name, data): if 'logging' in data: self.__csv_security_logging(region_name, data['logging']) - if 'logging_unified_agenets' in data: - self.__csv_security_logging_unified_agents(region_name, data['logging_unified_agenets']) + if 'logging_unified_agents' in data: + self.__csv_security_logging_unified_agents(region_name, data['logging_unified_agents']) if 'cloud_guard' in data: self.__csv_security_cloud_guard(region_name, data['cloud_guard']) @@ -7769,6 +7915,7 @@ def __csv_security_bastions(self, region_name, bastions): } self.csv_security_bastions.append(data) + self.__csv_add_service(data, "Bastion") except Exception as e: self.__print_error("__csv_security_bastions", e) @@ -7862,6 +8009,7 @@ def __csv_security_kms_vaults(self, region_name, kms_vaults): } self.csv_security_kms_vault.append(data) + self.__csv_add_service(data, "KMS Vault") except Exception as e: self.__print_error("__csv_security_kms_vaults", e) @@ -7910,16 +8058,16 @@ def __csv_security_logging(self, region_name, log_groups): self.__print_error("__csv_security_logging", e) ########################################################################## - # Logging unified agenets + # Logging unified agents ########################################################################## - def __csv_security_logging_unified_agents(self, region_name, logging_unified_agenets): + def __csv_security_logging_unified_agents(self, region_name, logging_unified_agents): try: - if len(logging_unified_agenets) == 0: + if len(logging_unified_agents) == 0: return - if logging_unified_agenets: - for ar in logging_unified_agenets: + if logging_unified_agents: + for ar in logging_unified_agents: data = { 'region_name': region_name, 'compartment_name': ar['compartment_name'], @@ -7992,6 +8140,7 @@ def __csv_container(self, region_name, containers): } self.csv_container.append(data) + self.__csv_add_service(data, "OKE Container") # Containers nodepools if containers: @@ -8075,6 +8224,7 @@ def __csv_edge_waas_policies(self, region_name, waas_policies): } self.csv_edge_waas_policies.append(data) + self.__csv_add_service(data, "WaaS Policies") except Exception as e: self.__print_error("__csv_edge_waas_policies", e) @@ -8108,6 +8258,7 @@ def __csv_edge_waf(self, region_name, waf): } self.csv_edge_waf.append(data) + self.__csv_add_service(data, "WAF") except Exception as e: self.__print_error("__csv_edge_waf", e) @@ -8141,12 +8292,13 @@ def __csv_edge_dns_steering(self, region_name, steering_policies): } self.csv_edge_dns_steering_policies.append(data) + self.__csv_add_service(data, "DNS Steering Policies") except Exception as e: self.__print_error("__csv_edge_dns_steering", e) ########################################################################## - # Edge Healthchecl + # Edge Healthcheck ########################################################################## def __csv_edge_healthcheck(self, region_name, healthchecks): try: @@ -8179,6 +8331,7 @@ def __csv_edge_healthcheck(self, region_name, healthchecks): } self.csv_edge_healthcheck.append(data) + self.__csv_add_service(data, "Health Check HTTP", col_name="display_name") if 'ping' in healthchecks: for ar in healthchecks['ping']: @@ -8208,6 +8361,7 @@ def __csv_edge_healthcheck(self, region_name, healthchecks): } self.csv_edge_healthcheck.append(data) + self.__csv_add_service(data, "Health Check Ping") except Exception as e: self.__print_error("__csv_edge_healthcheck", e) @@ -8241,10 +8395,12 @@ def __csv_paas_oic(self, region_name, services): 'consumption_model': ar['consumption_model'], 'freeform_tags': self.__get_freeform_tags(ar['freeform_tags']), 'defined_tags': self.__get_defined_tags(ar['defined_tags']), + 'info': "msgpack:" + str(ar['message_packs']), 'id': ar['id'] } self.csv_paas_oic.append(data) + self.__csv_add_service(data, "OIC") except Exception as e: self.__print_error("__csv_paas_oic", e) @@ -8285,6 +8441,7 @@ def __csv_streams_queues(self, region_name, services): } self.csv_streams_queues.append(data) + self.__csv_add_service(data, "Stream") if 'queues' in services: if services['queues']: @@ -8312,6 +8469,7 @@ def __csv_streams_queues(self, region_name, services): } self.csv_streams_queues.append(data) + self.__csv_add_service(data, "Queue") except Exception as e: self.__print_error("__csv_streams_queues", e) @@ -8346,10 +8504,12 @@ def __csv_paas_oac(self, region_name, services): 'network_endpoint_details': ar['network_endpoint_details'], 'freeform_tags': self.__get_freeform_tags(ar['freeform_tags']), 'defined_tags': self.__get_defined_tags(ar['defined_tags']), + 'info': ar['capacity_type'] + ":" + str(ar['capacity_value']), 'id': ar['id'] } self.csv_paas_oac.append(data) + self.__csv_add_service(data, "OAC") except Exception as e: self.__print_error("__csv_paas_oac", e) @@ -8386,6 +8546,7 @@ def __csv_paas_oce(self, region_name, services): } self.csv_paas_oce.append(data) + self.__csv_add_service(data, "OCE") except Exception as e: self.__print_error("__csv_paas_oce", e) @@ -8423,6 +8584,7 @@ def __csv_paas_visualbuilder(self, region_name, services): } self.csv_paas_vb.append(data) + self.__csv_add_service(data, "Visual Builder") except Exception as e: self.__print_error("__csv_paas_visualbuilder", e) @@ -8483,12 +8645,13 @@ def __csv_paas_open_search(self, region_name, services): } self.csv_paas_open_search.append(data) + self.__csv_add_service(data, "Search", col_name="display_name") except Exception as e: self.__print_error("__csv_paas_open_search", e) ########################################################################## - # Paas VB + # Paas DevOps ########################################################################## def __csv_paas_devops(self, region_name, services): try: @@ -8516,6 +8679,7 @@ def __csv_paas_devops(self, region_name, services): } self.csv_paas_devops.append(data) + self.__csv_add_service(data, "DevOPS") except Exception as e: self.__print_error("__csv_paas_devops", e) @@ -8562,10 +8726,12 @@ def __csv_paas_ocvs(self, region_name, services): 'clusters': str(', '.join(x['display_name'] for x in ar['clusters'])), 'freeform_tags': self.__get_freeform_tags(ar['freeform_tags']), 'defined_tags': self.__get_defined_tags(ar['defined_tags']), + 'info': "ocpus:" + str(ar['sddc_ocpus']), 'id': ar['id'] } self.csv_paas_ocvs.append(data) + self.__csv_add_service(data, "OCVS") for cl in ar['clusters']: nt = cl['network_configuration'] @@ -8610,6 +8776,7 @@ def __csv_paas_ocvs(self, region_name, services): 'id': cl['id'] } self.csv_paas_ocvs_clusters.append(cdata) + self.__csv_add_service(data, "OCVS Cluster") except Exception as e: self.__print_error("__csv_paas_ocvs", e) @@ -8708,6 +8875,7 @@ def __csv_data_ai_oda(self, region_name, services): } self.csv_data_ai_oda.append(data) + self.__csv_add_service(data, "ODA") except Exception as e: self.__print_error("__csv_data_ai_oda", e) @@ -8771,6 +8939,7 @@ def __csv_data_ai_bds(self, region_name, services): } self.csv_data_ai_bds.append(data) + self.__csv_add_service(data, "BDS") except Exception as e: self.__print_error("__csv_data_ai_bds", e) @@ -8805,6 +8974,7 @@ def __csv_data_flow(self, region_name, services): } self.csv_data_flow.append(data) + self.__csv_add_service(data, "Data Flow") except Exception as e: self.__print_error("__csv_data_flow", e) @@ -8836,6 +9006,7 @@ def __csv_data_catalog(self, region_name, services): } self.csv_data_catalog.append(data) + self.__csv_add_service(data, "Data Catalog") except Exception as e: self.__print_error("__csv_data_catalog", e) @@ -8866,6 +9037,7 @@ def __csv_data_integration(self, region_name, services): } self.csv_data_integration.append(data) + self.__csv_add_service(data, "Data Integration") except Exception as e: self.__print_error("__csv_data_integration", e) @@ -8896,6 +9068,7 @@ def __csv_data_science(self, region_name, services): } self.csv_data_science.append(data) + self.__csv_add_service(data, "Data Science") except Exception as e: self.__print_error("__csv_data_science", e) @@ -9026,6 +9199,7 @@ def __csv_monitor_db_managements(self, region_name, db_managements): } self.csv_monitor_db_management.append(data) + self.__csv_add_service(data, "DB Management") except Exception as e: self.__print_error("__csv_monitor_db_managements", e) @@ -9060,6 +9234,7 @@ def __csv_monitor_alarms(self, region_name, alarms): } self.csv_monitor_alarms.append(data) + self.__csv_add_service(data, "Monitor Alarm", col_name='display_name') except Exception as e: self.__print_error("__csv_monitor_alarms", e) @@ -9101,6 +9276,7 @@ def __csv_notifications(self, region_name, notifications): } self.csv_notifications.append(data) + self.__csv_add_service(data, "Notification", col_name="topic_name") except Exception as e: self.__print_error("__csv_notifications", e) diff --git a/examples/showoci/showoci_service.py b/examples/showoci/showoci_service.py index 541211d883..de3c19be0b 100644 --- a/examples/showoci/showoci_service.py +++ b/examples/showoci/showoci_service.py @@ -1,5 +1,5 @@ ######################################################################### -# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # # showoci_service.py @@ -13,14 +13,14 @@ ########################################################################## # This file has ShowOCIService class, and ShowOCIFlags # -# ShowOCIService - class has all OCI APIs , once called load_service_data(), +# ShowOCIService - class has all OCI APIs, once called load_service_data(), # it will load all the data to the "data" property # # ShowOCIFlags - class has the flags for calling the service Classes # # ShowOCIDomains - class has the identity domain info # -# PaaS Services - OCE and OIC , ODA Tested +# PaaS Services - OCE and OIC, ODA Tested # OAC need to be tested ########################################################################## from __future__ import print_function @@ -39,7 +39,7 @@ # class ShowOCIService ########################################################################## class ShowOCIService(object): - version = "24.02.06" + version = "24.03.02" oci_compatible_version = "2.119.1" thread_lock = threading.Lock() @@ -141,7 +141,7 @@ class ShowOCIService(object): C_FILE_STORAGE_MOUNTS = 'mounts' C_FILE_STORAGE_EXPORTS = 'exports' - # database + # Database C_DATABASE = "database" C_DATABASE_HOMES = "dhomes" C_DATABASE_BACKUPS = "backups" @@ -167,33 +167,33 @@ class ShowOCIService(object): C_DATABASE_EXTERNAL_PDB = "external_pdb" C_DATABASE_EXTERNAL_NONPDB = "external_nonpdb" - # container + # Container C_CONTAINER = "container" C_CONTAINER_CLUSTERS = "clusters" C_CONTAINER_NODE_POOLS = "nodepools" - # streams and queues + # Streams and queues C_STREAMS = "streams_queues" C_STREAMS_STREAMS = "streams" C_STREAMS_QUEUES = "queues" - # budgets + # Budgets C_BUDGETS = "budgets" C_BUDGETS_BUDGETS = "budgets" - # monitoring + # Monitoring C_MONITORING = "monitoring" C_MONITORING_ALARMS = "alarms" C_MONITORING_EVENTS = "events" C_MONITORING_AGENTS = "agents" C_MONITORING_DB_MANAGEMENT = "db_management" - # notifications + # Notifications C_NOTIFICATIONS = "notifications" C_NOTIFICATIONS_TOPICS = "topics" C_NOTIFICATIONS_SUBSCRIPTIONS = "subscriptions" - # edge services and DNS + # Edge services and DNS C_EDGE = "edge" C_EDGE_HEALTHCHECK_PING = "healthcheck_ping" C_EDGE_HEALTHCHECK_HTTP = "healthcheck_http" @@ -206,7 +206,7 @@ class ShowOCIService(object): C_ANNOUNCEMENT = "announcement" C_ANNOUNCEMENT_ANNOUNCEMENT = "announcements" - # limits + # Limits C_LIMITS = "limits" C_LIMITS_SERVICES = "services" C_LIMITS_QUOTAS = "quotas" @@ -221,7 +221,7 @@ class ShowOCIService(object): C_PAAS_NATIVE_DEVOPS = "devops" C_PAAS_NATIVE_OPEN_SEARCH = "opensearch" - # function + # Functions C_FUNCTION = "functions" C_FUNCTION_APPLICATIONS = "applications" C_FUNCTION_FUNCTIONS = "app_functions" @@ -246,6 +246,7 @@ class ShowOCIService(object): C_SECURITY = "security" C_SECURITY_CLOUD_GUARD = "cloud_guard" C_SECURITY_VAULTS = "vaults" + C_SECURITY_KEYS = "keys" C_SECURITY_BASTION = "bastion" C_SECURITY_LOGGING = "logging" C_SECURITY_LOGGING_UA = "unified_agents" @@ -261,7 +262,7 @@ class ShowOCIService(object): warning = 0 reboot_migration_counter = 0 dbsystem_maintenance = [] - tenancy_home_region = "" + tenancy_home_region = '' ########################################################################## # Exclude Services @@ -560,10 +561,10 @@ def generate_signer_from_config(self, config_file, config_section): ) except oci.exceptions.ProfileNotFound as e: print("*********************************************************************") - print("* " + str(e)) + print(f'* {str(e)}') print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit ########################################################################## @@ -583,10 +584,10 @@ def generate_signer_from_config_and_security_token(self, config_file, config_sec except oci.exceptions.ProfileNotFound as e: print("*********************************************************************") - print("* " + str(e)) + print(f'* {str(e)}') print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit except Exception as e: @@ -594,7 +595,7 @@ def generate_signer_from_config_and_security_token(self, config_file, config_sec print("* " + str(e)) print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit ########################################################################## @@ -611,11 +612,14 @@ def generate_signer_from_instance_principals(self): print("* Error obtaining instance principals certificate. *") print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit # generate config info from signer - self.config = {'region': self.signer.region, 'tenancy': self.signer.tenancy_id} + self.config = { + 'region': self.signer.region, + 'tenancy': self.signer.tenancy_id + } ########################################################################## # Generate Signer from resource_principals @@ -631,11 +635,14 @@ def generate_signer_from_resource_principals(self): print("* Error obtaining resource principals certificate. *") print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit # generate config info from signer - self.config = {'region': self.signer.region, 'tenancy': self.signer.tenancy_id} + self.config = { + 'region': self.signer.region, + 'tenancy': self.signer.tenancy_id + } ########################################################################## # Generate Signer from delegation_token @@ -663,13 +670,13 @@ def generate_signer_from_delegation_token(self): self.signer = oci.auth.signers.InstancePrincipalsDelegationTokenSigner(delegation_token=delegation_token) except KeyError: - print("*********************************************************************") - print("* Key Error obtaining delegation_token_file") - print("* Config File = " + self.flags.config_file) - print("* Section File = " + self.flags.config_section) - print("* Aborting. *") - print("*********************************************************************") - print("") + print('**********************************************************************') + print('* Key Error obtaining delegation_token_file') + print(f'* Config File = {self.flags.config_file}') + print(f'* Section File = {self.flags.config_section}') + print('* Aborting. *') + print('*********************************************************************') + print('') raise SystemExit except Exception: @@ -678,12 +685,15 @@ def generate_signer_from_delegation_token(self): print("* with delegation token *") print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit # generate config info from signer tenancy_id = self.config["tenancy"] - self.config = {'region': self.signer.region, 'tenancy': tenancy_id} + self.config = { + 'region': self.signer.region, + 'tenancy': tenancy_id + } ########################################################################## # load_data @@ -696,7 +706,7 @@ def load_service_data(self): ########################################################################## def print_header(self, name, category): chars = int(self.print_header_options[category]) - print("") + print('') print('#' * chars) print("#" + str(name).center(chars - 2, " ") + "#") print('#' * chars) @@ -713,7 +723,7 @@ def get_tenancy(self): ################################################################################## def get_date(self, val): if not val: - return "" + return '' return str(val)[0:16].replace("T", " ") ########################################################################## @@ -748,7 +758,7 @@ def get_tenancy_id(self): ########################################################################## # return compartment data ########################################################################## - def get_compartment(self): + def get_compartments(self): return self.data[self.C_IDENTITY][self.C_IDENTITY_COMPARTMENTS] ########################################################################## @@ -756,7 +766,7 @@ def get_compartment(self): ########################################################################## def get_compartment_by_id(self, compartment_id): try: - compartments = self.data[self.C_IDENTITY][self.C_IDENTITY_COMPARTMENTS] + compartments = self.get_compartments() for c in compartments: if c['id'] == compartment_id: return c @@ -898,7 +908,7 @@ def get_oci_version(self): return oci.version.__version__ ########################################################################## - # check if service available (if not exist in the array then available + # check if service available (if not exist in the array then available) ########################################################################## def check_if_service_available(self, region_name, service_name): for array in self.service_not_available_array: @@ -907,7 +917,7 @@ def check_if_service_available(self, region_name, service_name): return True ########################################################################## - # check_lifecycle_state_not_terminated + # check_lifecycle_state_active ########################################################################## def check_lifecycle_state_active(self, lifecycle_state): return not (lifecycle_state == 'DELETED' or lifecycle_state == 'DELETING' or @@ -1012,16 +1022,16 @@ def check_oci_version_compatible(self): if int(i) > int(rl): return True if int(i) < int(rl): - print("") - print("*********************************************************************") - print("Error, OCI SDK minimum version " + self.oci_compatible_version + " required !") - print("OCI SDK Version installed = " + self.get_oci_version()) - print("Please use below command to upgrade OCI SDK:") - print(" python -m pip install --upgrade oci") - print("") - print("Aborting.") - print("*********************************************************************") - print("") + print('') + print('*********************************************************************') + print(f'ERROR: OCI SDK minimum version {self.oci_compatible_version} required!') + print(f'OCI SDK Version installed = {self.get_oci_version()}') + print('Please use below command to upgrade OCI SDK:') + print(' python -m pip install --upgrade oci') + print('') + print('Aborting.') + print('*********************************************************************') + print('') raise SystemExit except Exception as e: @@ -1088,6 +1098,25 @@ def search_multi_items(self, module, section, p1, v1, p2=None, v2=None, p3=None, except Exception as e: self.__print_error(e) + ########################################################################## + # Create client + ########################################################################## + def __create_client(self, client, service_endpoint=None): + + c = None + + # If client has service endpoint: + if service_endpoint: + c = client(self.config, signer=self.signer, service_endpoint=service_endpoint, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) + else: + c = client(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) + + # If Proxy + if self.flags.proxy: + c.base_client.session.proxies = {'https': self.flags.proxy} + + return c + ########################################################################## # initialize data key if not exist ########################################################################## @@ -1116,12 +1145,13 @@ def __load_print_section_time(self, section_start_time): ########################################################################## # print error ########################################################################## - def __load_print_error(self, err, compartment=[], increase_errors=True, to_print=True): + def __load_print_error(self, err, compartment=[], increase_errors=True, to_print=True, info=''): try: classname = type(self).__name__ caller_function = sys._getframe(1).f_code.co_name - compartment_info = "" - compartment_name = "" + caller_function += (':' + info if info else '') + compartment_info = '' + compartment_name = '' if compartment: if 'name' in compartment: @@ -1156,7 +1186,7 @@ def __add_to_error_array(self, classname, caller_function, compartment_name, err self.error_array.append(error_info) except Exception as e: - print("\nError in __add_to_error_array " + str(e)) + print(f'\nError in __add_to_error_array {str(e)}') ########################################################################## # print error @@ -1166,8 +1196,8 @@ def __print_error(self, e, compartment=[]): try: classname = type(self).__name__ caller_function = sys._getframe(1).f_code.co_name - compartment_info = "" - compartment_name = "" + compartment_info = '' + compartment_name = '' if compartment: if 'name' in compartment: @@ -1175,63 +1205,63 @@ def __print_error(self, e, compartment=[]): compartment_name = compartment['name'] if 'TooManyRequests' in str(e): - print(" - TooManyRequests Err in " + classname + ":" + caller_function + compartment_info) + print(f' - TooManyRequests Err in {classname}:{caller_function} {compartment_info}') elif isinstance(e, KeyError): - print("\nError in " + classname + ":" + caller_function + ": KeyError " + str(e.args) + compartment_info) + print(f'\nError in {classname}:{caller_function}: KeyError {str(e.args)} {compartment_info}') else: - print("\nError in " + classname + ":" + caller_function + ": " + str(e) + compartment_info) + print(f'\nError in {classname}:{caller_function}: {str(e)} {compartment_info}') self.error += 1 self.__add_to_error_array(classname, caller_function, compartment_name, e) except Exception as e: - print("\nError in __print_error " + str(e)) + print(f'\nError in __print_error {str(e)}') ########################################################################## # check service error to warn instead of error ########################################################################## - def __check_service_error(self, code, compartment=[], info=""): + def __check_service_error(self, ex, compartment=[], info=''): try: classname = type(self).__name__ caller_function = sys._getframe(2).f_code.co_name + ":" + sys._getframe(1).f_code.co_name - caller_function += (":" + info if info else "") - compartment_name = "" + caller_function += (':' + info if info else '') + compartment_name = '' if compartment: if 'name' in compartment: compartment_name = compartment['name'] - - value = ( - 'remote end closed' in str(code).lower() or - 'max retries exceeded' in str(code).lower() or - 'auth' in str(code).lower() or - 'aborted' in str(code).lower() or - 'notfound' in str(code).lower() or - 'closed connection' in str(code).lower() or - code == 'Forbidden' or - code == 'KmsKeyDisabled' or - code == 'TooManyRequests' or - code == 'NotAuthorizedOrNotFound' or - code == 'IncorrectState' or - code == 'LimitExceeded' - ) + code = '__MISSING__' + value = (ex.code in ['Forbidden', 'KmsKeyDisabled', 'TooManyRequests', 'NotAuthorizedOrNotFound', 'IncorrectState', 'LimitExceeded', 'InternalError']) + if value: + code = ex.code + else: + code = str(ex).lower() + value = ( + 'remote end closed' in code or + 'max retries exceeded' in code or + 'auth' in code or + 'aborted' in code or + 'notfound' in code or + 'closed connection' in code + ) if value: self.__add_to_error_array(classname, caller_function, compartment_name, code, warning=True) return value except Exception as e: - print("\nError in __check_service_error " + str(e)) + print(f'\nError in __check_service_error {str(e)}') ########################################################################## # check request error if service not exists for region ########################################################################## - def __check_request_error(self, e, compartment=[]): + def __check_request_error(self, e, compartment=[], info=""): try: classname = type(self).__name__ caller_function = sys._getframe(2).f_code.co_name + ":" + sys._getframe(1).f_code.co_name + caller_function += (":" + info if info else "") compartment_name = "" if compartment: @@ -1241,31 +1271,32 @@ def __check_request_error(self, e, compartment=[]): self.__add_to_error_array(classname, caller_function, compartment_name, e) # service not yet available + except_str = str(e) if ( - ('Errno 8' in str(e) and 'NewConnectionError' in str(e)) or - 'Max retries exceeded' in str(e) or - 'HTTPSConnectionPool' in str(e) or - 'not currently available' in str(e) or - 'closed connection' in str(e) + ('Errno 8' in except_str and 'NewConnectionError' in except_str) or + 'Max retries exceeded' in except_str or + 'HTTPSConnectionPool' in except_str or + 'not currently available' in except_str or + 'closed connection' in except_str ): print("Service Not Accessible or not yet exist") return True # if ReadTimeoutError timeout - if ('ReadTimeoutError' in str(e)): - print("ReadTimeoutError, Please use higher value with -readtimeout flag !\nError: " + str(e)) + if 'ReadTimeoutError' in except_str: + print("ReadTimeoutError, Please use higher value with -readtimeout flag !\nError: " + except_str) self.error += 1 return True # if Connection TimeoutError timeout - if ('TimeoutError' in str(e)): - print("Connection TimeoutError, Please use higher value with -conntimeout flag !\nError: " + str(e)) + if 'TimeoutError' in except_str: + print("Connection TimeoutError, Please use higher value with -conntimeout flag !\nError: " + except_str) self.error += 1 return True return False except Exception as e: - print("\nError in __check_request_error " + str(e)) + print(f'\nError in __check_request_error {str(e)}') ########################################################################## # check if managed paas compartment @@ -1288,7 +1319,7 @@ def __load_print_thread_cnt(self, header, cnt, start_time, errstr): # lock for printing with self.thread_lock: str1 = "--> " + header.ljust(32) + "<-- " - str2 = str_cnt + " - " + str_time + ((" - " + errstr) if errstr else "") + str2 = str_cnt + " - " + str_time + ((" - " + errstr) if errstr else '') print(str1 + str2) ########################################################################## @@ -1298,7 +1329,7 @@ def __load_print_auth_warning(self, special_char="a", increase_warning=True, to_ if increase_warning: self.warning += 1 if to_print: - print(special_char, end="") + print(special_char, end='') ########################################################################## # Main procedure to read data to the data @@ -1323,7 +1354,7 @@ def __load_data_main(self): if self.flags.filter_by_compartment_recursive: print("Filtered by Compartment Recursive = " + self.flags.filter_by_compartment_recursive) - print("") + print('') # load identity self.__load_section_identity_main() @@ -1464,9 +1495,7 @@ def __load_section_identity_main(self): section_start_time = time.time() # create identity object - identity = oci.identity.IdentityClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - if self.flags.proxy: - identity.base_client.session.proxies = {'https': self.flags.proxy} + identity = self.__create_client(oci.identity.IdentityClient) # get tenancy id from the config file tenancy_id = self.get_tenancy_id() @@ -1544,7 +1573,6 @@ def __load_section_identity_main(self): # Load Tenancy # Password policy contributed by Josh. ########################################################################## - def __load_identity_tenancy(self, identity, tenancy_id): errstr = "" header = "Tenancy" @@ -1569,8 +1597,8 @@ def __load_identity_tenancy(self, identity, tenancy_id): } except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) else: self.print_error(e) @@ -1580,12 +1608,11 @@ def __load_identity_tenancy(self, identity, tenancy_id): sub_regions = identity.list_region_subscriptions(tenancy.id).data data_subs = [str(es.region_name) for es in sub_regions] except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: self.print_error(e) - raise SystemExit # add the data data = { @@ -1612,7 +1639,7 @@ def __load_identity_tenancy(self, identity, tenancy_id): print("* " + str(e.message)) print("* Aborting. *") print("*********************************************************************") - print("") + print('') raise SystemExit except Exception as e: raise Exception("Error in __load_identity_tenancy: " + str(e.args)) @@ -1630,7 +1657,7 @@ def __load_identity_compartments(self, identity): try: # point to tenancy - tenancy = self.data[self.C_IDENTITY][self.C_IDENTITY_TENANCY] + tenancy = self.get_tenancy() # read all compartments to variable all_compartments = [] @@ -1643,7 +1670,7 @@ def __load_identity_compartments(self, identity): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -1757,11 +1784,11 @@ def __load_identity_single_compartments(self, identity): try: # read compartments to variable - compartment = "" + compartment = '' try: compartment = identity.get_compartment(self.flags.filter_by_compartment).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -1826,7 +1853,7 @@ def __load_identity_users_groups(self, identity, tenancy_id): if self.flags.skip_threads: if cnt % 10 == 0: - print("g", end="") + print("g", end='') cnt += 1 try: @@ -1867,7 +1894,7 @@ def __load_identity_users_groups(self, identity, tenancy_id): group_users = [] if self.flags.skip_threads: if cnt % 10 == 0: - print("u", end="") + print("u", end='') cnt += 1 # find the group users @@ -1964,11 +1991,13 @@ def __load_identity_user_credentials_apikey(self, identity, user): return datauserapikey except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if e.code == "NotAuthorizedOrNotFound": + return datauserapikey + if self.__check_service_error(e, info=str(user.name)): if self.flags.skip_threads: - self.__load_print_auth_warning('c') + self.__load_print_auth_warning('c', to_print=self.flags.skip_threads) else: - self.__load_print_error(e) + self.__load_print_error(e, info=str(user.name)) except Exception as e: self.__print_error(e) @@ -2007,11 +2036,14 @@ def __load_identity_user_credentials_token(self, identity, user): return datauserauthtoken except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if e.code == "NotAuthorizedOrNotFound": + return datauserauthtoken + + if self.__check_service_error(e, info=str(user.name)): if self.flags.skip_threads: - self.__load_print_auth_warning('c') + self.__load_print_auth_warning('c', to_print=self.flags.skip_threads) else: - self.__load_print_error(e) + self.__load_print_error(e, info=str(user.name)) except Exception as e: self.__print_error(e) @@ -2045,11 +2077,14 @@ def __load_identity_user_credentials_secret(self, identity, user): return datausersecretkey except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if e.code == "NotAuthorizedOrNotFound": + return datausersecretkey + + if self.__check_service_error(e, info=str(user.name)): if self.flags.skip_threads: - self.__load_print_auth_warning('c') + self.__load_print_auth_warning('c', to_print=self.flags.skip_threads) else: - self.__load_print_error(e) + self.__load_print_error(e, info=str(user.name)) except Exception as e: self.__print_error(e) @@ -2085,11 +2120,14 @@ def __load_identity_user_credentials_smtp(self, identity, user): return datausersmtpcred except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if e.code == "NotAuthorizedOrNotFound": + return datausersmtpcred + + if self.__check_service_error(e, info=str(user.name)): if self.flags.skip_threads: - self.__load_print_auth_warning('c') + self.__load_print_auth_warning('c', to_print=self.flags.skip_threads) else: - self.__load_print_error(e) + self.__load_print_error(e, info=str(user.name)) except Exception as e: self.__print_error(e) @@ -2105,7 +2143,7 @@ def __load_identity_policies(self, identity): start_time = time.time() try: - compartments = self.data[self.C_IDENTITY][self.C_IDENTITY_COMPARTMENTS] + compartments = self.get_compartments() for c in compartments: if self.__if_managed_paas_compartment(c['name']) and not self.flags.read_ManagedCompartmentForPaaS: @@ -2132,11 +2170,13 @@ def __load_identity_policies(self, identity): data.append(dataval) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e, c): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" - continue - raise + else: + self.__load_print_error(e, c) + errstr += "e" + continue # add to data self.data[self.C_IDENTITY][self.C_IDENTITY_POLICIES] = data @@ -2167,7 +2207,7 @@ def __load_identity_dynamic_groups(self, identity, tenancy_id): try: dynamic_groups = oci.pagination.list_call_get_all_results(identity.list_dynamic_groups, tenancy_id, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -2212,7 +2252,7 @@ def __load_identity_network_sources(self, identity, tenancy_id): try: network_sources = oci.pagination.list_call_get_all_results(identity.list_network_sources, tenancy_id, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -2269,7 +2309,7 @@ def __load_identity_cost_tracking_tags(self, identity, tenancy_id): try: tags = oci.pagination.list_call_get_all_results(identity.list_cost_tracking_tags, tenancy_id, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -2313,10 +2353,9 @@ def __load_identity_tag_namespace(self, identity): start_time = time.time() try: - compartments = self.data[self.C_IDENTITY][self.C_IDENTITY_COMPARTMENTS] + compartments = self.get_compartments() for c in compartments: - # print(".", end="") if self.__if_managed_paas_compartment(c['name']) and not self.flags.read_ManagedCompartmentForPaaS: continue @@ -2354,12 +2393,12 @@ def __load_identity_tag_namespace(self, identity): data.append(dataval) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e, c): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue else: - self.__load_print_error(e) + self.__load_print_error(e, c) errstr += "e" # add to data @@ -2382,11 +2421,7 @@ def __load_section_identity_availability_domain(self, region_name): try: print("Identity...") - - # create identity object - identity = oci.identity.IdentityClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - if self.flags.proxy: - identity.base_client.session.proxies = {'https': self.flags.proxy} + identity = self.__create_client(oci.identity.IdentityClient) errstr = "" header = "Availability Domains" @@ -2401,7 +2436,7 @@ def __load_section_identity_availability_domain(self, region_name): try: availability_domains = identity.list_availability_domains(self.get_tenancy_id()).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -2411,7 +2446,11 @@ def __load_section_identity_availability_domain(self, region_name): data = [] cnt = 0 for ad in availability_domains: - data.append({'region_name': region_name, 'id': str(ad.id), 'name': str(ad.name)}) + data.append({ + 'region_name': region_name, + 'id': str(ad.id), + 'name': str(ad.name) + }) cnt += 1 # add to data @@ -2421,7 +2460,7 @@ def __load_section_identity_availability_domain(self, region_name): cnt = len(data) self.__load_print_thread_cnt(header, cnt, start_time, errstr) - print("") + print('') except oci.exceptions.RequestException as e: if self.__check_request_error(e): @@ -2445,22 +2484,14 @@ def __load_section_core_network_main(self): section_start_time = time.time() - # Open connectivity to OCI - virtual_network = oci.core.VirtualNetworkClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - dns_client = oci.dns.DnsClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - nwf_client = oci.network_firewall.NetworkFirewallClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - load_balancer = oci.load_balancer.LoadBalancerClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - network_load_balancer = oci.network_load_balancer.NetworkLoadBalancerClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - virtual_network.base_client.session.proxies = {'https': self.flags.proxy} - dns_client.base_client.session.proxies = {'https': self.flags.proxy} - nwf_client.base_client.session.proxies = {'https': self.flags.proxy} - load_balancer.base_client.session.proxies = {'https': self.flags.proxy} - network_load_balancer.base_client.session.proxies = {'https': self.flags.proxy} + virtual_network = self.__create_client(oci.core.VirtualNetworkClient) + dns_client = self.__create_client(oci.dns.DnsClient) + nwf_client = self.__create_client(oci.network_firewall.NetworkFirewallClient) + load_balancer = self.__create_client(oci.load_balancer.LoadBalancerClient) + network_load_balancer = self.__create_client(oci.network_load_balancer.NetworkLoadBalancerClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key to the network if not exists self.__initialize_data_key(self.C_NETWORK, self.C_NETWORK_VCN) @@ -2538,7 +2569,7 @@ def __load_section_core_network_main(self): network[self.C_NETWORK_FIREWALL_POLICY] += self.__load_core_network_firewall_policy(nwf_client, compartments) network[self.C_NETWORK_FIREWALL] += self.__load_core_network_firewall(nwf_client, compartments) - routes = self.__load_core_network_routet(virtual_network, compartments) + routes = self.__load_core_network_route(virtual_network, compartments) network[self.C_NETWORK_ROUTE] += routes network[self.C_NETWORK_PRIVATEIP] += self.__load_core_network_privateip(virtual_network, routes) @@ -2599,7 +2630,7 @@ def __load_section_core_network_main(self): if self.is_vcn_exist_for_region and self.flags.read_network: # Run in parallel - future_network_routes = executor.submit(self.__load_core_network_routet, virtual_network, compartments) + future_network_routes = executor.submit(self.__load_core_network_route, virtual_network, compartments) future_network_vir = executor.submit(self.__load_core_network_vc, virtual_network, compartments) future_network_dns = executor.submit(self.__load_core_network_dns_resolvers, dns_client, compartments) future_network_igw = executor.submit(self.__load_core_network_igw, virtual_network, compartments) @@ -2660,7 +2691,7 @@ def __load_section_core_network_main(self): lb[self.C_LB_NETWORK_BACKEND_SETS] += next(as_completed([future_LB_NETWORK_BACKEND_SETS])).result() self.__load_print_section_time(section_start_time) - print("") + print('') except Exception as e: self.__print_error(e) @@ -2692,8 +2723,8 @@ def __load_core_network_vcn(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(compartment, to_print=self.flags.skip_threads) errstr += "a" continue else: @@ -2746,7 +2777,7 @@ def __load_core_network_vcn(self, virtual_network, compartments): else: self.__load_print_error(e) except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -2779,16 +2810,15 @@ def __load_core_network_vlan(self, virtual_network, compartments): except oci.exceptions.ServiceError as e: if 'not whitelisted' in str(e.message).lower(): - print(" tenant not enabled for this region, skipped.") + self.__load_print_thread_cnt(header, cnt, start_time, "Tenant not enabled for this region, skipped.") return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning('a', False, to_print=self.flags.skip_threads) errstr += "a" - continue else: self.__load_print_error(e, compartment) errstr += "e" - continue + continue except Exception as e: self.__load_print_error(e, compartment) @@ -2822,15 +2852,18 @@ def __load_core_network_vlan(self, virtual_network, compartments): return data + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: self.__load_print_error(e) - except Exception as e: - if 'NotAuthorizedOrNotFound' in str(e.message): return data - self.__print_error(e, compartment) + except Exception as e: + self.__print_error(e) return data ########################################################################## @@ -2862,7 +2895,7 @@ def __load_core_network_igw(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -2904,7 +2937,7 @@ def __load_core_network_igw(self, virtual_network, compartments): else: self.__load_print_error(e) except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -2935,7 +2968,7 @@ def __load_core_network_lpg(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -2990,11 +3023,11 @@ def __load_core_network_lpg(self, virtual_network, compartments): else: self.__load_print_error(e) except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # data network lpg + # __load_core_network_rpc ########################################################################## def __load_core_network_rpc(self, virtual_network, compartments): @@ -3008,7 +3041,7 @@ def __load_core_network_rpc(self, virtual_network, compartments): header = "Remote Peer Conns" self.__load_print_status_with_threads(header) - # iLoop on all compartments + # Loop on all compartments for compartment in compartments: rpcs = [] @@ -3020,7 +3053,7 @@ def __load_core_network_rpc(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3074,16 +3107,16 @@ def __load_core_network_rpc(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## # data network read route ########################################################################## - def __load_core_network_routet(self, virtual_network, compartments): + def __load_core_network_route(self, virtual_network, compartments): data = [] cnt = 0 @@ -3110,7 +3143,7 @@ def __load_core_network_routet(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3153,10 +3186,10 @@ def __load_core_network_routet(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -3164,7 +3197,7 @@ def __load_core_network_routet(self, virtual_network, compartments): ########################################################################## def __load_core_network_dhcpop_opt(self, dhcp_option): - retstr = "" + retstr = '' try: opt = dhcp_option @@ -3218,7 +3251,7 @@ def __load_core_network_dhcpop(self, virtual_network, compartments): retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3265,10 +3298,10 @@ def __load_core_network_dhcpop(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -3371,7 +3404,7 @@ def __load_core_network_seclst_rule(self, direction, security_rule): line += "(ALL)" else: icmp = security_rule.icmp_options - line += "" + line += '' if icmp.code is None: line += "(ALL)," value['icmp_code'] = "ALL" @@ -3453,7 +3486,7 @@ def __load_core_network_seclst(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3501,14 +3534,14 @@ def __load_core_network_seclst(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # Return NSG names strings from NSG OCIds + # Return NSG names strings from NSG OCIDs ########################################################################## def __load_core_network_get_nsg_names(self, nsg_ids): @@ -3541,7 +3574,7 @@ def __load_core_network_get_nsg_names(self, nsg_ids): ########################################################################## def __load_core_network_nsg_secrule(self, security_rule): - line = "" + line = '' protocol_name = self.__load_core_network_seclst_protocl_name(str(security_rule.protocol)) value = { 'id': str(security_rule.id), @@ -3633,7 +3666,7 @@ def __load_core_network_nsg_secrule(self, security_rule): line += "(ALL)" else: icmp = security_rule.icmp_options - line += "" + line += '' if icmp.code is None: line += "(ALL)," value['icmp_code'] = "ALL" @@ -3708,7 +3741,7 @@ def __load_core_network_nsg(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("n", False, to_print=self.flags.skip_threads) errstr += "n" continue @@ -3751,7 +3784,7 @@ def __load_core_network_nsg(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("p", False, to_print=self.flags.skip_threads) errstr += "n" else: @@ -3778,10 +3811,10 @@ def __load_core_network_nsg(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -3815,7 +3848,7 @@ def __load_core_network_subnet(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3867,10 +3900,10 @@ def __load_core_network_subnet(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -3926,7 +3959,7 @@ def __load_core_network_subnet_private_ip(self, virtual_network, subnets): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -3941,7 +3974,7 @@ def __load_core_network_subnet_private_ip(self, virtual_network, subnets): continue if self.flags.skip_threads: - print("s", end="") + print("s", end='') # loop on private ips for ip in private_ips: @@ -4013,7 +4046,7 @@ def __load_core_network_sgw(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4058,14 +4091,14 @@ def __load_core_network_sgw(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # data network read sgw + # data network read nat ########################################################################## def __load_core_network_nat(self, virtual_network, compartments): @@ -4095,7 +4128,7 @@ def __load_core_network_nat(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4140,10 +4173,10 @@ def __load_core_network_nat(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -4174,7 +4207,7 @@ def __load_core_network_dra(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4240,10 +4273,10 @@ def __load_core_network_dra(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -4273,7 +4306,7 @@ def __load_core_network_drg(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4315,8 +4348,8 @@ def __load_core_network_drg(self, virtual_network, compartments): if redundancy: val['redundancy'] = str(redundancy.status) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment, info="get_drg_redundancy_status"): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment, info="get_drg_redundancy_status"): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) # DRG Route Tables try: @@ -4344,11 +4377,18 @@ def __load_core_network_drg(self, virtual_network, compartments): network[self.C_NETWORK_DRG_RT].append(rta) except oci.exceptions.ServiceError as e: - if e.code == 'NotAuthorizedOrNotFound': + if e.code == "NotAuthorizedOrNotFound": pass + elif self.__check_service_error(e, compartment, info="list_drg_route_tables"): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" else: - if self.__check_service_error(e.code, compartment, info="list_drg_route_tables"): - pass + self.__load_print_error(e, compartment, info="list_drg_route_tables") + errstr += "e" + except Exception as e: + self.__load_print_error(e, compartment) + errstr += "e" + continue data.append(val) cnt += 1 @@ -4358,18 +4398,17 @@ def __load_core_network_drg(self, virtual_network, compartments): return data except oci.exceptions.RequestException as e: - - if self.__check_request_error(e, compartment): + if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # data network read cpes - 3/6/2023 + # data network read drg_route_rules - 3/6/2023 ########################################################################## def __load_core_network_drg_route_rules(self, virtual_network, drg_route_id): @@ -4449,7 +4488,7 @@ def __load_core_network_cpe(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4494,10 +4533,10 @@ def __load_core_network_cpe(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -4527,7 +4566,7 @@ def __load_core_network_firewall(self, network_firewall_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4588,14 +4627,14 @@ def __load_core_network_firewall(self, network_firewall_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # load network FW Policies + # load network FW policies ########################################################################## def __load_core_network_firewall_policy(self, network_firewall_client, compartments): @@ -4621,7 +4660,7 @@ def __load_core_network_firewall_policy(self, network_firewall_client, compartme ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4652,51 +4691,11 @@ def __load_core_network_firewall_policy(self, network_firewall_client, compartme 'compartment_id': str(compartment['id']), 'compartment_name': str(compartment['name']), 'compartment_path': str(compartment['path']), - 'url_lists': "", - 'mapped_secrets': "", - 'application_lists': "", - 'ip_address_lists': "", - 'security_rules': "", - 'decryption_rules': "", - 'decryption_profiles': "", - 'is_firewall_attached': "", 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, 'region_name': str(self.config['region']) } - # retrieve more details with get - try: - nfw = network_firewall_client.get_network_firewall_policy( - arr.id, - retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY - ).data - - # (dict(str, list[UrlPattern])) - val['url_lists'] = str(nfw.url_lists) if nfw.url_lists else "" - - # (dict(str, MappedSecret)) - val['mapped_secrets'] = str(nfw.mapped_secrets) if nfw.mapped_secrets else "" - - # (dict(str, list[Application])) - val['application_lists'] = str(nfw.application_lists) if nfw.application_lists else "" - - # (dict(str, list[str])) - val['ip_address_lists'] = str(nfw.ip_address_lists) if nfw.ip_address_lists else "" - - # (list[oci.network_firewall.models.SecurityRule]) - val['security_rules'] = str(nfw.security_rules) if nfw.security_rules else "" - - # (list[oci.network_firewall.models.DecryptionRule]) - val['decryption_rules'] = str(nfw.decryption_rules) if nfw.decryption_rules else "" - - # (dict(str, DecryptionProfile)) - val['decryption_profiles'] = str(nfw.decryption_profiles) if nfw.decryption_profiles else "" - val['is_firewall_attached'] = str(nfw.is_firewall_attached) if nfw.is_firewall_attached else "" - - except Exception: - print("w", end="") - data.append(val) cnt += 1 @@ -4705,14 +4704,13 @@ def __load_core_network_firewall_policy(self, network_firewall_client, compartme return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -4722,10 +4720,10 @@ def __load_core_network_single_privateip(self, virtual_network, ip_id, return_na try: if not ip_id: - return "" + return '' if 'privateip' not in ip_id: - return "" + return '' arr = virtual_network.get_private_ip( ip_id, @@ -4737,15 +4735,15 @@ def __load_core_network_single_privateip(self, virtual_network, ip_id, return_na return str(arr.ip_address) + " - " + str(arr.display_name) else: return str(arr.ip_address) - return "" + return '' except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): pass - return "" + return '' except Exception as e: self.__print_error(e) - return "" + return '' ########################################################################## # query vlan ip @@ -4754,10 +4752,10 @@ def __load_core_network_single_vlan(self, virtual_network, vlan_id): try: if not vlan_id: - return "" + return '' if 'vlan' not in vlan_id: - return "" + return '' arr = virtual_network.get_vlan( vlan_id, @@ -4766,15 +4764,19 @@ def __load_core_network_single_vlan(self, virtual_network, vlan_id): if arr: return "VLAN " + str(arr.vlan_tag) + " - " + str(arr.cidr_block).ljust(20) + " - " + str(arr.display_name) - return "" + return '' except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - pass + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + else: + self.__load_print_error(e) return "Error fetching VLAN info, Error: " + str(e.code) + except oci.exceptions.ConnectTimeout: + self.__load_print_auth_warning(to_print=self.flags.skip_threads) except Exception as e: - self.__print_error(e) - return "" + self.__load_print_error(e) + return '' ########################################################################## # __load_core_network_privateip @@ -4807,22 +4809,20 @@ def __load_core_network_privateip(self, virtual_network, routes): except oci.exceptions.ServiceError as e: if str(e.code) == 'NotAuthorizedOrNotFound': continue - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" - continue else: self.__load_print_error(e) errstr += "e" - continue - + continue except Exception as e: self.__load_print_error(e) errstr += "e" continue if self.flags.skip_threads: - print("-", end="") + print("-", end='') if arr is None: continue @@ -4841,11 +4841,9 @@ def __load_core_network_privateip(self, virtual_network, routes): cnt += 1 self.__load_print_thread_cnt(header, cnt, start_time, errstr) - return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: @@ -4884,7 +4882,7 @@ def __load_core_network_vc(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -4965,10 +4963,10 @@ def __load_core_network_vc(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -4998,7 +4996,7 @@ def __load_core_network_ips(self, virtual_network, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -5134,10 +5132,10 @@ def __load_core_network_ips(self, virtual_network, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -5173,7 +5171,7 @@ def __load_core_network_dns_resolvers(self, dns_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -5182,7 +5180,7 @@ def __load_core_network_dns_resolvers(self, dns_client, compartments): errstr += "e" continue except oci.exceptions.ConnectTimeout: - self.__load_print_auth_warning() + self.__load_print_auth_warning(compartment, to_print=self.flags.skip_threads) continue except Exception as e: @@ -5201,8 +5199,8 @@ def __load_core_network_dns_resolvers(self, dns_client, compartments): # get the resolver model arr = dns_client.get_resolver(arrsummary.id, scope="PRIVATE", retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) continue val = {'id': str(arr.id), @@ -5267,10 +5265,10 @@ def __load_core_network_dns_resolvers(self, dns_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -5282,26 +5280,16 @@ def __load_section_core_compute_main(self): section_start_time = time.time() print("Compute, Block Storage and Clusters (OKE)...") - # BlockstorageClient - block_storage = oci.core.BlockstorageClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - compute_manage = oci.core.ComputeManagementClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - compute_client = oci.core.ComputeClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - plugin_client = oci.compute_instance_agent.PluginClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - virtual_network = oci.core.VirtualNetworkClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - auto_scaling = oci.autoscaling.AutoScalingClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - container_client = oci.container_engine.ContainerEngineClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - block_storage.base_client.session.proxies = {'https': self.flags.proxy} - compute_manage.base_client.session.proxies = {'https': self.flags.proxy} - compute_client.base_client.session.proxies = {'https': self.flags.proxy} - plugin_client.base_client.session.proxies = {'https': self.flags.proxy} - virtual_network.base_client.session.proxies = {'https': self.flags.proxy} - auto_scaling.base_client.session.proxies = {'https': self.flags.proxy} - container_client.base_client.session.proxies = {'https': self.flags.proxy} + block_storage = self.__create_client(oci.core.BlockstorageClient) + compute_manage = self.__create_client(oci.core.ComputeManagementClient) + compute_client = self.__create_client(oci.core.ComputeClient) + plugin_client = self.__create_client(oci.compute_instance_agent.PluginClient) + virtual_network = self.__create_client(oci.core.VirtualNetworkClient) + auto_scaling = self.__create_client(oci.autoscaling.AutoScalingClient) + container_client = self.__create_client(oci.container_engine.ContainerEngineClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key to the network if not exists self.__initialize_data_key(self.C_COMPUTE, self.C_COMPUTE_INST) @@ -5407,7 +5395,7 @@ def __load_section_core_compute_main(self): cp[self.C_CONTAINER_NODE_POOLS] += next(as_completed([future_CONTAINER_NODE_POOLS])).result() self.__load_print_section_time(section_start_time) - print("") + print('') except Exception as e: self.__print_error(e) @@ -5441,7 +5429,7 @@ def __load_core_compute_instances(self, compute, compartments, plugin_client): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -5565,7 +5553,7 @@ def __load_core_compute_instances(self, compute, compartments, plugin_client): val['agent_plugin_status'].append({'name': plugin.name, 'status': plugin.status, 'time_last_updated_utc': str(plugin.time_last_updated_utc)}) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" @@ -5587,7 +5575,7 @@ def __load_core_compute_instances(self, compute, compartments, plugin_client): val['console_vnc_connection_string'] = icc.vnc_connection_string except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" @@ -5639,10 +5627,10 @@ def __load_core_compute_instances(self, compute, compartments, plugin_client): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -5674,7 +5662,7 @@ def __load_core_compute_images(self, compute, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -5716,14 +5704,13 @@ def __load_core_compute_images(self, compute, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -5756,14 +5743,13 @@ def __load_core_compute_capacity_reservation(self, compute_client, compartments) ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" - continue else: self.__load_print_error(e, compartment) errstr += "e" - continue + continue except Exception as e: self.__load_print_error(e, compartment) @@ -5812,7 +5798,16 @@ def __load_core_compute_capacity_reservation(self, compute_client, compartments) 'memory_in_gbs': res_config.instance_shape_config.memory_in_gbs }) values['config'] = config_data - except Exception: + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + else: + self.__load_print_error(e, compartment) + errstr += "e" + + except Exception as e: + self.__load_print_error(e, compartment) errstr += "w" # retrieve the instances @@ -5834,7 +5829,16 @@ def __load_core_compute_capacity_reservation(self, compute_client, compartments) 'ocpus': inst.shape_config.ocpus }) values['instances'] = instances_data - except Exception: + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + else: + self.__load_print_error(e, compartment) + errstr += "e" + + except Exception as e: + self.__load_print_error(e, compartment) errstr += "w" data.append(values) @@ -5844,14 +5848,13 @@ def __load_core_compute_capacity_reservation(self, compute_client, compartments) return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -5885,7 +5888,7 @@ def __load_core_compute_autoscaling(self, autoscaling, compute_manage, compartme ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -5932,7 +5935,7 @@ def __load_core_compute_autoscaling(self, autoscaling, compute_manage, compartme pool_name = compute_manage.get_instance_pool(auto.resource.id).data.display_name val['resource_name'] = str(pool_name) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("p", to_print=self.flags.skip_threads) errstr += "p" else: @@ -5989,7 +5992,7 @@ def __load_core_compute_autoscaling(self, autoscaling, compute_manage, compartme val['policies'].append(valpol) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("l", to_print=self.flags.skip_threads) errstr += "l" else: @@ -6013,10 +6016,10 @@ def __load_core_compute_autoscaling(self, autoscaling, compute_manage, compartme if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6052,7 +6055,7 @@ def __load_core_compute_inst_config(self, compute, compute_manage, block_storage # inst pool and inst config service often goes down, not marking warning # for inst pool and inst config except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue @@ -6091,7 +6094,7 @@ def __load_core_compute_inst_config(self, compute, compute_manage, block_storage except oci.exceptions.ServiceError as e: errstr += "Error for " + str(config.display_name) - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): continue continue @@ -6133,7 +6136,7 @@ def __load_core_compute_inst_config(self, compute, compute_manage, block_storage try: val['compute_source'] = "Image: " + str(compute.get_image(source_details.image_id).data.display_name) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): val['compute_source'] = "Image" # if InstanceConfigurationInstanceSourceViaBootVolumeDetails @@ -6144,7 +6147,7 @@ def __load_core_compute_inst_config(self, compute, compute_manage, block_storage if bootvol: val['compute_source'] = "Boot Volume: " + str(bootvol.display_name) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): val['compute_source'] = "Boot Volume" data.append(val) @@ -6157,10 +6160,10 @@ def __load_core_compute_inst_config(self, compute, compute_manage, block_storage if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6196,7 +6199,7 @@ def __load_core_compute_inst_pool(self, compute_manage, compartments): # inst pool and inst config service often goes down, not marking warning # for inst pool and inst config except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue @@ -6238,10 +6241,10 @@ def __load_core_compute_inst_pool(self, compute_manage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6279,7 +6282,7 @@ def __load_core_compute_boot_vol_attach(self, compute, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6318,10 +6321,10 @@ def __load_core_compute_boot_vol_attach(self, compute, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6350,7 +6353,7 @@ def __load_core_compute_vol_attach(self, compute, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6398,10 +6401,10 @@ def __load_core_compute_vol_attach(self, compute, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6478,14 +6481,14 @@ def __load_core_compute_vnic(self, virtual_network, vnic_id, compartment): return data - except oci.exceptions.RequestException as e: - if self.__check_request_error(e, compartment): + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): return data else: self.__load_print_error(e, compartment) return data - except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + except oci.exceptions.RequestException as e: + if self.__check_request_error(e, compartment): return data else: self.__load_print_error(e, compartment) @@ -6519,7 +6522,7 @@ def __load_core_compute_vnic_attach(self, compute, virtual_network, compartments retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6565,10 +6568,10 @@ def __load_core_compute_vnic_attach(self, compute, virtual_network, compartments if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6576,8 +6579,8 @@ def __load_core_compute_vnic_attach(self, compute, virtual_network, compartments ########################################################################## def __load_core_block_volume_backup_policy(self, block_storage, volume_id): + backupstr = '' try: - backupstr = "" backup_policy_assignments = block_storage.get_volume_backup_policy_asset_assignment(volume_id, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data if backup_policy_assignments: @@ -6590,20 +6593,21 @@ def __load_core_block_volume_backup_policy(self, block_storage, volume_id): backupstr += self.get_value(backup_policy_assignment.policy_id) + " " return backupstr - except oci.exceptions.RequestException as e: - if self.__check_request_error(e): - return "" + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e) or e.code == 'InvalidParameter' or e.code == 'TooManyRequests': + return backupstr else: self.__load_print_error(e) - return "" - except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code) or e.code == 'InvalidParameter' or e.code == 'TooManyRequests': - return "" + return backupstr + except oci.exceptions.RequestException as e: + if self.__check_request_error(e): + return backupstr else: self.__load_print_error(e) - return "" + return backupstr except Exception as e: self.__print_error(e) + return backupstr ########################################################################## # data compute read boot volume @@ -6642,7 +6646,7 @@ def __load_core_block_boot(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6660,25 +6664,37 @@ def __load_core_block_boot(self, block_storage, compartments): # arr = oci.core.models.BootVolume. for arr in boot_volumes: - val = {'id': str(arr.id), 'display_name': str(arr.display_name), - 'size_in_gbs': self.get_value(arr.size_in_gbs), - 'time_created': self.get_value(arr.time_created), - 'kms_key_id': self.get_value(arr.kms_key_id), - 'vpus_per_gb': self.get_value(arr.vpus_per_gb), - 'is_hydrated': self.get_value(arr.is_hydrated), - 'volume_group_id': self.get_value(arr.volume_group_id), - 'volume_group_name': "", - 'availability_domain': self.get_value(arr.availability_domain), - 'compartment_name': str(compartment['name']), - 'compartment_id': str(compartment['id']), - 'compartment_path': str(compartment['path']), - 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, - 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, - 'is_auto_tune_enabled': self.get_value(arr.is_auto_tune_enabled), - 'auto_tuned_vpus_per_gb': self.get_value(arr.auto_tuned_vpus_per_gb), - 'region_name': str(self.config['region']), - 'backup_policy': self.__load_core_block_volume_backup_policy(block_storage, str(arr.id)), - 'lifecycle_state': str(arr.lifecycle_state)} + val = { + 'id': str(arr.id), + 'display_name': str(arr.display_name), + 'size_in_gbs': self.get_value(arr.size_in_gbs), + 'time_created': self.get_value(arr.time_created), + 'kms_key_id': self.get_value(arr.kms_key_id), + 'vpus_per_gb': self.get_value(arr.vpus_per_gb), + 'is_hydrated': self.get_value(arr.is_hydrated), + 'volume_group_id': self.get_value(arr.volume_group_id), + 'volume_group_name': "", + 'availability_domain': self.get_value(arr.availability_domain), + 'compartment_name': str(compartment['name']), + 'compartment_id': str(compartment['id']), + 'compartment_path': str(compartment['path']), + 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, + 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, + 'is_auto_tune_enabled': self.get_value(arr.is_auto_tune_enabled), + 'auto_tuned_vpus_per_gb': self.get_value(arr.auto_tuned_vpus_per_gb), + 'bv_volume_replicas': [{ + 'display_name': self.get_value(x.display_name), + 'bv_replica_id': self.get_value(x.boot_volume_replica_id), + 'availability_domain': self.get_value(x.availability_domain) + } for x in arr.boot_volume_replicas] if arr.boot_volume_replicas else [], + 'autotune_policies': [{ + 'autotune_type': self.get_value(x.autotune_type) + } for x in arr.autotune_policies] if arr.autotune_policies else [], + 'region_name': str(self.config['region']), + 'backup_policy': self.__load_core_block_volume_backup_policy(block_storage, str(arr.id)), + 'image_id': self.get_value(arr.image_id), + 'lifecycle_state': str(arr.lifecycle_state) + } # find vol group name for volgrp in volgroups: @@ -6697,10 +6713,10 @@ def __load_core_block_boot(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6734,7 +6750,7 @@ def __load_core_block_volume(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6755,25 +6771,36 @@ def __load_core_block_volume(self, block_storage, compartments): # arr = oci.core.models.Volume. for arr in arrs: - val = {'id': str(arr.id), 'display_name': str(arr.display_name), - 'size_in_gbs': str(arr.size_in_gbs), - 'time_created': str(arr.time_created), - 'kms_key_id': str(arr.kms_key_id), - 'volume_group_id': str(arr.volume_group_id), - 'volume_group_name': "", - 'availability_domain': str(arr.availability_domain), - 'compartment_name': str(compartment['name']), - 'compartment_path': str(compartment['path']), - 'compartment_id': str(compartment['id']), - 'vpus_per_gb': self.get_value(arr.vpus_per_gb), - 'is_hydrated': self.get_value(arr.is_hydrated), - 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, - 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, - 'region_name': str(self.config['region']), - 'is_auto_tune_enabled': self.get_value(arr.is_auto_tune_enabled), - 'auto_tuned_vpus_per_gb': self.get_value(arr.auto_tuned_vpus_per_gb), - 'backup_policy': self.get_value(self.__load_core_block_volume_backup_policy(block_storage, str(arr.id))), - 'lifecycle_state': str(arr.lifecycle_state)} + val = { + 'id': self.get_value(arr.id), + 'display_name': self.get_value(arr.display_name), + 'size_in_gbs': self.get_value(arr.size_in_gbs), + 'time_created': self.get_value(arr.time_created), + 'kms_key_id': self.get_value(arr.kms_key_id), + 'volume_group_id': self.get_value(arr.volume_group_id), + 'volume_group_name': "", + 'availability_domain': self.get_value(arr.availability_domain), + 'compartment_name': str(compartment['name']), + 'compartment_path': str(compartment['path']), + 'compartment_id': str(compartment['id']), + 'vpus_per_gb': self.get_value(arr.vpus_per_gb), + 'is_hydrated': self.get_value(arr.is_hydrated), + 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, + 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, + 'region_name': str(self.config['region']), + 'is_auto_tune_enabled': self.get_value(arr.is_auto_tune_enabled), + 'auto_tuned_vpus_per_gb': self.get_value(arr.auto_tuned_vpus_per_gb), + 'backup_policy': self.get_value(self.__load_core_block_volume_backup_policy(block_storage, str(arr.id))), + 'bv_volume_replicas': [{ + 'display_name': self.get_value(x.display_name), + 'bv_replica_id': self.get_value(x.block_volume_replica_id), + 'availability_domain': self.get_value(x.availability_domain) + } for x in arr.block_volume_replicas] if arr.block_volume_replicas else [], + 'autotune_policies': [{ + 'autotune_type': self.get_value(x.autotune_type) + } for x in arr.autotune_policies] if arr.autotune_policies else [], + 'lifecycle_state': self.get_value(arr.lifecycle_state) + } # find vol group name for volgrp in volgroups: @@ -6791,10 +6818,10 @@ def __load_core_block_volume(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6830,7 +6857,7 @@ def __load_core_block_volume_group(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): if self.flags.skip_threads: print(".", end="") # don't count it as error, it is showing error on old tenancies @@ -6853,19 +6880,25 @@ def __load_core_block_volume_group(self, block_storage, compartments): for arr in arrs: val = { 'id': str(arr.id), - 'display_name': str(arr.display_name), - 'size_in_gbs': str(arr.size_in_gbs), - 'time_created': str(arr.time_created), + 'display_name': self.get_value(arr.display_name), + 'size_in_gbs': self.get_value(arr.size_in_gbs), + 'time_created': self.get_value(arr.time_created), 'volume_ids': [str(a) for a in arr.volume_ids], 'compartment_name': str(compartment['name']), 'compartment_path': str(compartment['path']), 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, - 'lifecycle_state': arr.lifecycle_state, + 'lifecycle_state': self.get_value(arr.lifecycle_state), + 'is_hydrated': self.get_value(arr.is_hydrated), 'compartment_id': str(compartment['id']), - 'region_name': str(self.config['region'])} + 'bv_volume_replicas': [{ + 'display_name': self.get_value(x.display_name), + 'bv_replica_id': self.get_value(x.volume_group_replica_id), + 'availability_domain': self.get_value(x.availability_domain) + } for x in arr.volume_group_replicas] if arr.volume_group_replicas else [], + 'region_name': str(self.config['region']) + } - # check boot volume backup policy data.append(val) cnt += 1 @@ -6877,10 +6910,10 @@ def __load_core_block_volume_group(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -6912,7 +6945,7 @@ def __load_core_block_boot_backup(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -6973,10 +7006,10 @@ def __load_core_block_boot_backup(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -7008,7 +7041,7 @@ def __load_core_block_volume_backup(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -7064,10 +7097,10 @@ def __load_core_block_volume_backup(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -7098,7 +7131,7 @@ def __load_core_block_volume_group_backup(self, block_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -7157,10 +7190,10 @@ def __load_core_block_volume_group_backup(self, block_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -7175,7 +7208,7 @@ def __load_load_balancers(self, load_balancer, compartments): try: errstr = "" - header = "Load Balnacers" + header = "Load Balancers" self.__load_print_status_with_threads(header) # loop on all compartments @@ -7192,7 +7225,7 @@ def __load_load_balancers(self, load_balancer, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -7214,11 +7247,11 @@ def __load_load_balancers(self, load_balancer, compartments): for arr in load_balancers: # get LB health - status = "" + status = '' try: status = load_balancer.get_load_balancer_health(arr.id).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): pass else: self.__load_print_error(e, compartment) @@ -7354,10 +7387,10 @@ def __load_load_balancers(self, load_balancer, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -7389,7 +7422,7 @@ def __load_load_balancers_network(self, network_load_balancer, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -7411,11 +7444,11 @@ def __load_load_balancers_network(self, network_load_balancer, compartments): for arr in network_load_balancers: # get LB health - status = "" + status = '' try: status = network_load_balancer.get_network_load_balancer_health(arr.id).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): pass else: self.__load_print_error(e, compartment) @@ -7480,10 +7513,10 @@ def __load_load_balancers_network(self, network_load_balancer, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -7574,7 +7607,7 @@ def __load_load_balancer_backendset(self, load_balancer): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -7586,7 +7619,7 @@ def __load_load_balancer_backendset(self, load_balancer): # print next load balancer if self.flags.skip_threads: - print("L", end="") + print("L", end='') # loop on backendsets # bs = oci.load_balancer.models.BackendSet @@ -7595,11 +7628,11 @@ def __load_load_balancer_backendset(self, load_balancer): ############################ # get status ############################ - status = "" + status = '' try: status = load_balancer.get_backend_set_health(load_balancer_id, bs.name).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): pass else: self.__load_print_auth_warning("s", False, to_print=self.flags.skip_threads) @@ -7637,10 +7670,10 @@ def __load_load_balancer_backendset(self, load_balancer): try: bh_status = load_balancer.get_backend_health(load_balancer_id, bs.name, backend.name).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): pass else: - self.__load_print_auth_warning("h", False) + self.__load_print_auth_warning("h", False, to_print=self.flags.skip_threads) bh_status = "-" time.sleep(1) @@ -7733,7 +7766,7 @@ def __load_load_balancer_backendset(self, load_balancer): return data ########################################################################## - # __load_network_load_balancer_backendset + # __load_load_balancer_backendset_network ########################################################################## def __load_load_balancer_backendset_network(self, network_load_balancer): @@ -7764,19 +7797,18 @@ def __load_load_balancer_backendset_network(self, network_load_balancer): backend_sets = network_load_balancer.list_backend_sets(load_balancer_id, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" - continue else: self.__load_print_auth_warning("b", False, to_print=self.flags.skip_threads) errstr += "b" time.sleep(1) - continue + continue # print next load balancer if self.flags.skip_threads: - print("L", end="") + print("L", end='') # loop on backendsets if backend_sets: @@ -7789,10 +7821,10 @@ def __load_load_balancer_backendset_network(self, network_load_balancer): try: status = network_load_balancer.get_backend_set_health(load_balancer_id, bs.name).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): pass else: - self.__load_print_auth_warning("s", False) + self.__load_print_auth_warning("s", False, to_print=self.flags.skip_threads) status = "-" time.sleep(1) @@ -7818,7 +7850,7 @@ def __load_load_balancer_backendset_network(self, network_load_balancer): try: bh_status = network_load_balancer.get_backend_health(load_balancer_id, bs.name, backend.name).data.status except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): pass else: self.__load_print_auth_warning("h", False, to_print=self.flags.skip_threads) @@ -7875,7 +7907,7 @@ def __load_load_balancer_backendset_network(self, network_load_balancer): return data ########################################################################## - # __load_object_storage_file_storage_main + # __load_section_object_storage_file_storage_main ########################################################################## # # OCI Classes used: @@ -7888,17 +7920,12 @@ def __load_section_object_storage_file_storage_main(self): try: print("Object and File Storage...") - file_storage = oci.file_storage.FileStorageClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - object_storage = oci.object_storage.ObjectStorageClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - virtual_network = oci.core.VirtualNetworkClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - file_storage.base_client.session.proxies = {'https': self.flags.proxy} - virtual_network.base_client.session.proxies = {'https': self.flags.proxy} - object_storage.base_client.session.proxies = {'https': self.flags.proxy} + file_storage = self.__create_client(oci.file_storage.FileStorageClient) + object_storage = self.__create_client(oci.object_storage.ObjectStorageClient) + virtual_network = self.__create_client(oci.core.VirtualNetworkClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key if not exists self.__initialize_data_key(self.C_FILE_STORAGE, self.C_FILE_STORAGE_FILESYSTEMS) @@ -7934,13 +7961,13 @@ def __load_section_object_storage_file_storage_main(self): fs[self.C_FILE_STORAGE_MOUNTS] += next(as_completed([future_FILE_STORAGE_MOUNTS])).result() os[self.C_OS_BUCKETS] += next(as_completed([future_OS_BUCKETS])).result() - print("") + print('') except Exception as e: self.__print_error(e) ########################################################################## - # data load load balancers + # data load object storage buckets ########################################################################## def __load_object_storage_buckets(self, object_storage, compartments): @@ -7968,8 +7995,8 @@ def __load_object_storage_buckets(self, object_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) continue else: self.__load_print_error(e, compartment) @@ -8051,7 +8078,7 @@ def __load_object_storage_buckets(self, object_storage, compartments): except oci.exceptions.ServiceError as e: errstr += "Issue with " + arr.name + " " val['error_message'] = str(e) - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) except Exception as e: @@ -8075,7 +8102,7 @@ def __load_object_storage_buckets(self, object_storage, compartments): except oci.exceptions.ServiceError as e: if e.code == "LifecyclePolicyNotFound": pass - elif self.__check_service_error(e.code, compartment): + elif self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) else: pass @@ -8133,7 +8160,7 @@ def __load_file_storage_filesystems(self, file_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -8178,7 +8205,7 @@ def __load_file_storage_filesystems(self, file_storage, compartments): sval = {'id': str(snap.id), 'name': str(snap.name), 'time_created': str(snap.time_created)} val['snapshots'].append(sval) except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): pass continue @@ -8234,7 +8261,7 @@ def __load_file_storage_mount_targets(self, file_storage, virtual_network, compa ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -8316,7 +8343,7 @@ def __load_file_storage_exports(self, file_storage, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -8369,7 +8396,7 @@ def __load_file_storage_exports(self, file_storage, compartments): val['export_set'] = valexp except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): pass continue @@ -8384,14 +8411,14 @@ def __load_file_storage_exports(self, file_storage, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # __load_database_main + # __load_section_database_main ########################################################################## def __load_section_database_main(self): @@ -8399,26 +8426,17 @@ def __load_section_database_main(self): section_start_time = time.time() print("Database...") - # DatabaseClient - database_client = oci.database.DatabaseClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - virtual_network = oci.core.VirtualNetworkClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - nosql_client = oci.nosql.NosqlClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - mysql_client = oci.mysql.DbSystemClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - mysql_backup_client = oci.mysql.DbBackupsClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - postgresql_client = oci.psql.PostgresqlClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - gg_client = oci.golden_gate.GoldenGateClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - database_client.base_client.session.proxies = {'https': self.flags.proxy} - virtual_network.base_client.session.proxies = {'https': self.flags.proxy} - nosql_client.base_client.session.proxies = {'https': self.flags.proxy} - mysql_client.base_client.session.proxies = {'https': self.flags.proxy} - mysql_backup_client.base_client.session.proxies = {'https': self.flags.proxy} - postgresql_client.base_client.session.proxies = {'https': self.flags.proxy} - gg_client.base_client.session.proxies = {'https': self.flags.proxy} + database_client = self.__create_client(oci.database.DatabaseClient) + virtual_network = self.__create_client(oci.core.VirtualNetworkClient) + nosql_client = self.__create_client(oci.nosql.NosqlClient) + mysql_client = self.__create_client(oci.mysql.DbSystemClient) + mysql_backup_client = self.__create_client(oci.mysql.DbBackupsClient) + postgresql_client = self.__create_client(oci.psql.PostgresqlClient) + gg_client = self.__create_client(oci.golden_gate.GoldenGateClient) + # datasafe_client = self.__create_client(oci.data_safe.DataSafeClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key if not exists self.__initialize_data_key(self.C_DATABASE, self.C_DATABASE_HOMES) @@ -8532,15 +8550,15 @@ def __load_section_database_main(self): # Complete Database self.__load_print_section_time(section_start_time) - print("") + print('') except Exception as e: self.__print_error(e) ########################################################################## - # __load_database_maintatance + # __load_database_maintenance ########################################################################## - def __load_database_maintatance(self, database_client, maintenance_run_id, db_system_name): + def __load_database_maintenance(self, database_client, maintenance_run_id, db_system_name): try: if not maintenance_run_id: return {} @@ -8570,19 +8588,20 @@ def __load_database_maintatance(self, database_client, maintenance_run_id, db_sy self.dbsystem_maintenance.append(val['maintenance_alert']) return val - except oci.exceptions.ServiceError: - print("m", end="") - return "" - except oci.exceptions.RequestException: - print("m", end="") - return "" + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + else: + self.__load_print_error(e) + except oci.exceptions.RequestException as e: + self.__load_print_auth_warning(e, to_print=self.flags.skip_threads) except Exception as e: - self.__print_error(e) + self.__load_print_error(e) ########################################################################## - # __load_database_maintatance_estimate_date + # __load_database_maintenance_estimate_date ########################################################################## - def __load_database_maintatance_estimate_date(self, input_months, input_week, input_day): + def __load_database_maintenance_estimate_date(self, input_months, input_week, input_day): try: # define output dates output_dates = [] @@ -8631,9 +8650,9 @@ def __load_database_maintatance_estimate_date(self, input_months, input_week, in self.__print_error(e) ########################################################################## - # __load_database_maintatance_windows + # __load_database_maintenance_windows ########################################################################## - def __load_database_maintatance_windows(self, maintenance_window): + def __load_database_maintenance_windows(self, maintenance_window): try: if not maintenance_window: return {} @@ -8641,12 +8660,12 @@ def __load_database_maintatance_windows(self, maintenance_window): mw = maintenance_window # estimate dates - estimate_dates_str = "" + estimate_dates_str = '' if str(mw.preference) != "NO_PREFERENCE" and mw.months and mw.weeks_of_month and mw.days_of_week: array_months = [x.name for x in mw.months] week_of_month = [x for x in mw.weeks_of_month][0] day_of_week = [x.name for x in mw.days_of_week][0] - estimate_dates = self.__load_database_maintatance_estimate_date(array_months, week_of_month, day_of_week) + estimate_dates = self.__load_database_maintenance_estimate_date(array_months, week_of_month, day_of_week) if estimate_dates: estimate_dates_str = ", ".join([x for x in estimate_dates]) @@ -8701,7 +8720,7 @@ def __load_database_exacc_infrastructure(self, database_client, virtual_network, ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", to_print=self.flags.skip_threads) errstr += "a" continue @@ -8751,9 +8770,9 @@ def __load_database_exacc_infrastructure(self, database_client, virtual_network, 'lifecycle_details': self.get_value(dbs.lifecycle_details), 'csi_number': self.get_value(dbs.csi_number), 'maintenance_slo_status': self.get_value(dbs.maintenance_slo_status), - 'maintenance_window': self.__load_database_maintatance_windows(dbs.maintenance_window), - 'last_maintenance_run': self.__load_database_maintatance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), 'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags, 'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags, 'contacts': "" if dbs.contacts is None else str(', '.join(x.name for x in dbs.contacts)), @@ -8816,7 +8835,7 @@ def __load_database_exacc_vm_clusters(self, database_client, virtual_network, co ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -8888,10 +8907,10 @@ def __load_database_exacc_vm_clusters(self, database_client, virtual_network, co if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -8929,7 +8948,7 @@ def __load_database_exacc_adb_vmclusters(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -8978,9 +8997,9 @@ def __load_database_exacc_adb_vmclusters(self, database_client, compartments): 'scan_listener_port_tls': str(dbs.scan_listener_port_tls), 'scan_listener_port_non_tls': str(dbs.scan_listener_port_non_tls), 'is_mtls_enabled': str(dbs.is_mtls_enabled), - 'maintenance_window': self.__load_database_maintatance_windows(dbs.maintenance_window), - 'last_maintenance_run': self.__load_database_maintatance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), 'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags, 'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags, 'compartment_name': str(compartment['name']), @@ -9016,10 +9035,10 @@ def __load_database_exacc_adb_vmclusters(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9071,20 +9090,20 @@ def __load_database_exacc_dbservers(self, database_client, compartment, dbs_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: self.__load_print_error(e, compartment) return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): + if self.__check_request_error(e, compartment): return data else: self.__load_print_error(e, compartment) return data except Exception as e: - self.__print_error(e) + self.__print_error(e, compartment) return data ########################################################################## @@ -9123,7 +9142,7 @@ def __load_database_exadata_infrastructure(self, database_client, virtual_networ ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -9161,9 +9180,9 @@ def __load_database_exadata_infrastructure(self, database_client, virtual_networ 'compartment_path': str(compartment['path']), 'compartment_id': str(compartment['id']), 'time_created': str(dbs.time_created), - 'last_maintenance_run': self.__load_database_maintatance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'maintenance_window': self.__load_database_maintatance_windows(dbs.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window), 'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags, 'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags, 'region_name': str(self.config['region']), @@ -9203,10 +9222,10 @@ def __load_database_exadata_infrastructure(self, database_client, virtual_networ if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9242,7 +9261,7 @@ def __load_database_exadata_vm_clusters(self, database_client, virtual_network, ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -9354,8 +9373,8 @@ def __load_database_exadata_vm_clusters(self, database_client, virtual_network, return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: self.__load_print_error(e) @@ -9364,10 +9383,10 @@ def __load_database_exadata_vm_clusters(self, database_client, virtual_network, if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9407,7 +9426,7 @@ def __load_database_homes(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -9457,20 +9476,20 @@ def __load_database_homes(self, database_client, compartments): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9511,7 +9530,7 @@ def __load_database_standalone_backups(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -9560,20 +9579,20 @@ def __load_database_standalone_backups(self, database_client, compartments): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9596,7 +9615,7 @@ def __load_database_exadata_vm_patches(self, database_client, vm_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): return data else: self.__load_print_error(e) @@ -9647,7 +9666,7 @@ def __load_database_dbsystems(self, database_client, virtual_network, compartmen ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -9699,9 +9718,9 @@ def __load_database_dbsystems(self, database_client, virtual_network, compartmen 'storage_management': "", 'sparse_diskgroup': self.get_value(dbs.sparse_diskgroup), 'reco_storage_size_in_gb': self.get_value(dbs.reco_storage_size_in_gb), - 'last_maintenance_run': self.__load_database_maintatance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'maintenance_window': self.__load_database_maintatance_windows(dbs.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window), 'region_name': str(self.config['region']), 'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags, 'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags, @@ -9767,14 +9786,14 @@ def __load_database_dbsystems(self, database_client, virtual_network, compartmen if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # __load_database_exadata_infrastructure + # __load_database_dbsystems_dbnodes ########################################################################## def __load_database_dbsystems_dbnodes(self, database_client, virtual_network, compartment, dbs_id, exa=False): @@ -9822,20 +9841,20 @@ def __load_database_dbsystems_dbnodes(self, database_client, virtual_network, co return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -9896,26 +9915,25 @@ def __load_database_dbsystems_db_backups(self, database_client, db_id, compartme return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## # __load_database_dbsystems_dbhomes_databases ########################################################################## - def __load_database_dbsystems_dbhomes_databases(self, database_client, db_home_id, compartment): data = [] @@ -9976,20 +9994,20 @@ def __load_database_dbsystems_dbhomes_databases(self, database_client, db_home_i return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning("d") + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning("d", to_print=self.flags.skip_threads) return data else: self.__load_print_error(e, compartment) return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): + if self.__check_request_error(e, compartment): return data else: self.__load_print_error(e, compartment) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10056,24 +10074,24 @@ def __load_database_dbsystems_home_patches(self, database_client, dbhome_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e, info=dbhome_id): return data else: # Added in order to avoid internal error which happen often here if 'InternalError' in str(e.code): - print('p', end="") + print('p', end='') return data if 'Aborted' in str(e.code): - print('p', end="") + print('p', end='') return data else: - print('e', end="") + print('e', end='') return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): + if self.__check_request_error(e, info=dbhome_id): return data else: - self.__load_print_error(e) + self.__load_print_error(e, info=dbhome_id) return data except Exception as e: self.__print_error(e) @@ -10108,12 +10126,12 @@ def __load_database_dbsystems_home_patches_history(self, database_client, dbhome return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): return data else: # Added in order to avoid internal error which happen often here if 'InternalError' in str(e.code): - print('p', end="") + print('p', end='') return data else: self.__load_print_error(e) @@ -10148,7 +10166,7 @@ def __load_database_dbsystems_patches(self, database_client, dbs_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): return data else: self.__load_print_error(e) @@ -10164,7 +10182,7 @@ def __load_database_dbsystems_patches(self, database_client, dbs_id): return data ########################################################################## - # get db system patches + # get db system db dg ########################################################################## def __load_database_dbsystems_db_dg(self, database_client, db_id): @@ -10211,8 +10229,8 @@ def __load_database_dbsystems_db_dg(self, database_client, db_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: self.__load_print_error(e) @@ -10262,7 +10280,7 @@ def __load_database_adb_d_vmclusters(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10316,9 +10334,9 @@ def __load_database_adb_d_vmclusters(self, database_client, compartments): 'autonomous_data_storage_size_in_tbs': str(dbs.autonomous_data_storage_size_in_tbs), 'db_node_storage_size_in_gbs': str(dbs.db_node_storage_size_in_gbs), 'memory_per_oracle_compute_unit_in_gbs': str(dbs.memory_per_oracle_compute_unit_in_gbs), - 'maintenance_window': self.__load_database_maintatance_windows(dbs.maintenance_window), - 'last_maintenance_run': self.__load_database_maintatance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'maintenance_window': self.__load_database_maintenance_windows(dbs.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, dbs.last_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, dbs.next_maintenance_run_id, str(dbs.display_name) + " - " + str(dbs.shape)), 'defined_tags': [] if dbs.defined_tags is None else dbs.defined_tags, 'freeform_tags': [] if dbs.freeform_tags is None else dbs.freeform_tags, 'compartment_name': str(compartment['name']), @@ -10359,10 +10377,10 @@ def __load_database_adb_d_vmclusters(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10398,7 +10416,7 @@ def __load_database_adb_d_containers(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10433,9 +10451,9 @@ def __load_database_adb_d_containers(self, database_client, compartments): 'time_created': str(arr.time_created), 'patch_model': str(arr.patch_model), 'patch_id': str(arr.patch_id), - 'maintenance_window': self.__load_database_maintatance_windows(arr.maintenance_window), - 'last_maintenance_run': self.__load_database_maintatance(database_client, arr.last_maintenance_run_id, str(arr.display_name)), - 'next_maintenance_run': self.__load_database_maintatance(database_client, arr.next_maintenance_run_id, str(arr.display_name)), + 'maintenance_window': self.__load_database_maintenance_windows(arr.maintenance_window), + 'last_maintenance_run': self.__load_database_maintenance(database_client, arr.last_maintenance_run_id, str(arr.display_name)), + 'next_maintenance_run': self.__load_database_maintenance(database_client, arr.next_maintenance_run_id, str(arr.display_name)), 'standby_maintenance_buffer_in_days': str(arr.standby_maintenance_buffer_in_days), 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, @@ -10462,10 +10480,10 @@ def __load_database_adb_d_containers(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10503,7 +10521,7 @@ def __load_database_adb_database(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10672,10 +10690,10 @@ def __load_database_adb_database(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10713,7 +10731,7 @@ def __load_database_external_cdb(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10780,10 +10798,10 @@ def __load_database_external_cdb(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10821,7 +10839,7 @@ def __load_database_external_pdb(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10890,10 +10908,10 @@ def __load_database_external_pdb(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -10930,7 +10948,7 @@ def __load_database_external_nonpdb(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -10997,10 +11015,10 @@ def __load_database_external_nonpdb(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11038,7 +11056,7 @@ def __load_database_nosql(self, nosql_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11092,10 +11110,10 @@ def __load_database_nosql(self, nosql_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11134,7 +11152,7 @@ def __load_database_mysql(self, mysql_client, compartments): # mysql throw service error often, ignoring incase it does except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11234,8 +11252,17 @@ def __load_database_mysql(self, mysql_client, compartments): value['time_earliest_recovery_point'] = str(mysql.point_in_time_recovery_details.time_earliest_recovery_point)[0:16] if mysql.point_in_time_recovery_details else "" value['time_latest_recovery_point'] = str(mysql.point_in_time_recovery_details.time_latest_recovery_point)[0:16] if mysql.point_in_time_recovery_details else "" - except Exception: - print("w", end="") + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + else: + self.__load_print_error(e, compartment) + errstr += "w" + + except Exception as e: + self.__load_print_error(e, compartment) + errstr += "w" # add the data cnt += 1 @@ -11248,10 +11275,10 @@ def __load_database_mysql(self, mysql_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11292,7 +11319,7 @@ def __load_database_mysql_backups(self, mysql_backup_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11339,20 +11366,20 @@ def __load_database_mysql_backups(self, mysql_backup_client, compartments): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11391,7 +11418,7 @@ def __load_database_postgresql(self, postgresql_client, compartments): # mysql throw service error often, ignoring incase it does except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11491,8 +11518,17 @@ def __load_database_postgresql(self, postgresql_client, compartments): if pgv.source: value['source_type'] = self.get_value(pgv.source.source_type) - except Exception: - print("w", end="") + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + else: + self.__load_print_error(e, compartment) + errstr += "w" + + except Exception as e: + self.__load_print_error(e, compartment) + errstr += "w" # add the data cnt += 1 @@ -11505,10 +11541,10 @@ def __load_database_postgresql(self, postgresql_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11549,7 +11585,7 @@ def __load_database_postgresql_backups(self, postgresql_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11593,20 +11629,20 @@ def __load_database_postgresql_backups(self, postgresql_client, compartments): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11644,7 +11680,7 @@ def __load_database_software_images(self, database_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11691,10 +11727,10 @@ def __load_database_software_images(self, database_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11729,7 +11765,7 @@ def __load_database_gg_deployments(self, gg_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11787,10 +11823,10 @@ def __load_database_gg_deployments(self, gg_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11825,7 +11861,7 @@ def __load_database_gg_db_registration(self, gg_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -11877,10 +11913,10 @@ def __load_database_gg_db_registration(self, gg_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -11917,8 +11953,8 @@ def __load_database_autonomouns_backups(self, database_client, db_id): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: self.__load_print_error(e) @@ -11960,7 +11996,7 @@ def __load_container_node_pools(self, container_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12021,10 +12057,10 @@ def __load_container_node_pools(self, container_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12054,7 +12090,7 @@ def __load_container_clusters(self, container_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12159,10 +12195,10 @@ def __load_container_clusters(self, container_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12182,23 +12218,15 @@ def __load_section_streams_queues_api_fun_orm_main(self): print("Streams, Queues, API GW, Functions, Resource Management...") # initial connection - stream_client = oci.streaming.StreamAdminClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - queue_client = oci.queue.QueueAdminClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - api_gw_client = oci.apigateway.GatewayClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - api_deployment_client = oci.apigateway.DeploymentClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - function_client = oci.functions.FunctionsManagementClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - orm = oci.resource_manager.ResourceManagerClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - stream_client.base_client.session.proxies = {'https': self.flags.proxy} - queue_client.base_client.session.proxies = {'https': self.flags.proxy} - api_gw_client.base_client.session.proxies = {'https': self.flags.proxy} - api_deployment_client.base_client.session.proxies = {'https': self.flags.proxy} - function_client.base_client.session.proxies = {'https': self.flags.proxy} - orm.base_client.session.proxies = {'https': self.flags.proxy} + stream_client = self.__create_client(oci.streaming.StreamAdminClient) + queue_client = self.__create_client(oci.queue.QueueAdminClient) + api_gw_client = self.__create_client(oci.apigateway.GatewayClient) + api_deployment_client = self.__create_client(oci.apigateway.DeploymentClient) + function_client = self.__create_client(oci.functions.FunctionsManagementClient) + orm = self.__create_client(oci.resource_manager.ResourceManagerClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key if not exists self.__initialize_data_key(self.C_STREAMS, self.C_STREAMS_STREAMS) @@ -12254,7 +12282,7 @@ def __load_section_streams_queues_api_fun_orm_main(self): fn[self.C_FUNCTION_FUNCTIONS] += next(as_completed([future_FUNCTION_FUNCTIONS])).result() self.__load_print_section_time(section_start_time) - print("") + print('') except Exception as e: self.__print_error(e) @@ -12286,7 +12314,7 @@ def __load_streams_streams(self, stream_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12326,10 +12354,10 @@ def __load_streams_streams(self, stream_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12359,7 +12387,7 @@ def __load_streams_queues(self, queue_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12411,10 +12439,10 @@ def __load_streams_queues(self, queue_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12449,7 +12477,7 @@ def __load_api_gateways(self, api_client, compartments): if self.__check_request_error(e): return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12503,10 +12531,10 @@ def __load_api_gateways(self, api_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12540,7 +12568,7 @@ def __load_api_deployments(self, api_deployment_client, compartments): if self.__check_request_error(e): return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12589,10 +12617,10 @@ def __load_api_deployments(self, api_deployment_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12627,7 +12655,7 @@ def __load_functions_applications(self, function_client, compartments): if self.__check_request_error(e): return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12666,10 +12694,10 @@ def __load_functions_applications(self, function_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -12700,7 +12728,7 @@ def __load_functions_functions(self, function_client, applications): if self.__check_request_error(e): return data - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12715,7 +12743,7 @@ def __load_functions_functions(self, function_client, applications): continue if self.flags.skip_threads: - print("f", end="") + print("f", end='') # fns = oci.functions.models.ApplicationSummary for fun in funs: @@ -12790,7 +12818,7 @@ def __load_resource_management_stacks(self, orm, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12830,8 +12858,8 @@ def __load_resource_management_stacks(self, orm, compartments): retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): - self.__load_print_auth_warning() + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) else: pass @@ -12861,14 +12889,14 @@ def __load_resource_management_stacks(self, orm, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # data load load __load_email_senders + # __load_email_senders ########################################################################## def __load_email_senders(self, email, compartments): @@ -12895,7 +12923,7 @@ def __load_email_senders(self, email, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -12937,14 +12965,14 @@ def __load_email_senders(self, email, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # data load load __load_email_suppressions + # __load_email_suppressions ########################################################################## def __load_email_suppressions(self, email, compartments): @@ -12973,7 +13001,7 @@ def __load_email_suppressions(self, email, compartments): if self.__check_request_error(e): return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13013,10 +13041,10 @@ def __load_email_suppressions(self, email, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13043,7 +13071,7 @@ def __load_budgets_budgets(self, budget_client, tenancy_id): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -13090,7 +13118,7 @@ def __load_budgets_budgets(self, budget_client, tenancy_id): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: self.__print_error(e) @@ -13105,48 +13133,34 @@ def __load_section_monitor_notification_security_quotas_main(self): section_start_time = time.time() print("Monitoring, Notifications, Events, Bastion, Logging, KMS, Limits, Quotas, E-Mail, Budget...") - monitor_client = oci.monitoring.MonitoringClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - ons_cp_client = oci.ons.NotificationControlPlaneClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - ons_dp_client = oci.ons.NotificationDataPlaneClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - event_client = oci.events.EventsClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - management_agent_client = oci.management_agent.ManagementAgentClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - db_management_client = oci.database_management.DbManagementClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - bs_client = oci.bastion.BastionClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - cg_client = oci.cloud_guard.CloudGuardClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - log_client = oci.logging.LoggingManagementClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - kms_client = oci.key_management.KmsVaultClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - limits_client = oci.limits.LimitsClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - quotas_client = oci.limits.QuotasClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - email_client = oci.email.EmailClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - budget_client = oci.budget.BudgetClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - monitor_client.base_client.session.proxies = {'https': self.flags.proxy} - ons_cp_client.base_client.session.proxies = {'https': self.flags.proxy} - ons_dp_client.base_client.session.proxies = {'https': self.flags.proxy} - event_client.base_client.session.proxies = {'https': self.flags.proxy} - event_client.base_client.session.proxies = {'https': self.flags.proxy} - db_management_client.base_client.session.proxies = {'https': self.flags.proxy} - cg_client.base_client.session.proxies = {'https': self.flags.proxy} - log_client.base_client.session.proxies = {'https': self.flags.proxy} - bs_client.base_client.session.proxies = {'https': self.flags.proxy} - kms_client.base_client.session.proxies = {'https': self.flags.proxy} - limits_client.base_client.session.proxies = {'https': self.flags.proxy} - quotas_client.base_client.session.proxies = {'https': self.flags.proxy} - email_client.base_client.session.proxies = {'https': self.flags.proxy} - budget_client.base_client.session.proxies = {'https': self.flags.proxy} + monitor_client = self.__create_client(oci.monitoring.MonitoringClient) + ons_cp_client = self.__create_client(oci.ons.NotificationControlPlaneClient) + ons_dp_client = self.__create_client(oci.ons.NotificationDataPlaneClient) + event_client = self.__create_client(oci.events.EventsClient) + management_agent_client = self.__create_client(oci.management_agent.ManagementAgentClient) + db_management_client = self.__create_client(oci.database_management.DbManagementClient) + bs_client = self.__create_client(oci.bastion.BastionClient) + cg_client = self.__create_client(oci.cloud_guard.CloudGuardClient) + log_client = self.__create_client(oci.logging.LoggingManagementClient) + kms_client = self.__create_client(oci.key_management.KmsVaultClient) + limits_client = self.__create_client(oci.limits.LimitsClient) + quotas_client = self.__create_client(oci.limits.QuotasClient) + email_client = self.__create_client(oci.email.EmailClient) + budget_client = self.__create_client(oci.budget.BudgetClient) + search_client = self.__create_client(oci.resource_search.ResourceSearchClient) # reference to tenancy tenancy = self.get_tenancy() # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key if not exists self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_BASTION) self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_CLOUD_GUARD) self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_LOGGING_UA) self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_LOGGING) + self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_KEYS) self.__initialize_data_key(self.C_SECURITY, self.C_SECURITY_VAULTS) self.__initialize_data_key(self.C_MONITORING, self.C_MONITORING_ALARMS) self.__initialize_data_key(self.C_MONITORING, self.C_MONITORING_EVENTS) @@ -13183,6 +13197,7 @@ def __load_section_monitor_notification_security_quotas_main(self): sec[self.C_SECURITY_LOGGING_UA] += self.__load_security_log_unified_agents(bs_client, compartments) sec[self.C_SECURITY_LOGGING] += self.__load_security_log_groups(log_client, compartments) sec[self.C_SECURITY_VAULTS] += self.__load_security_kms_vaults(kms_client, compartments) + sec[self.C_SECURITY_KEYS] += self.__load_security_kms_keys(search_client) sec[self.C_SECURITY_CLOUD_GUARD] += self.__load_security_cloud_guard(cg_client, compartments) email[self.C_EMAIL_SENDERS] += self.__load_email_senders(email_client, compartments) @@ -13207,6 +13222,7 @@ def __load_section_monitor_notification_security_quotas_main(self): future_SECURITY_LOGGING = executor.submit(self.__load_security_log_groups, log_client, compartments) future_SECURITY_LOGGING_UA = executor.submit(self.__load_security_log_unified_agents, log_client, compartments) future_SECURITY_VAULTS = executor.submit(self.__load_security_kms_vaults, kms_client, compartments) + future_SECURITY_KEYS = executor.submit(self.__load_security_kms_keys, search_client) future_SECURITY_CLOUD_GUARD = executor.submit(self.__load_security_cloud_guard, cg_client, compartments) future_EMAIL_SENDERS = executor.submit(self.__load_email_senders, email_client, compartments) future_EMAIL_SUPPRESSIONS = executor.submit(self.__load_email_suppressions, email_client, compartments) @@ -13224,6 +13240,7 @@ def __load_section_monitor_notification_security_quotas_main(self): sec[self.C_SECURITY_LOGGING] += next(as_completed([future_SECURITY_LOGGING])).result() sec[self.C_SECURITY_LOGGING_UA] += next(as_completed([future_SECURITY_LOGGING_UA])).result() sec[self.C_SECURITY_VAULTS] += next(as_completed([future_SECURITY_VAULTS])).result() + sec[self.C_SECURITY_KEYS] += next(as_completed([future_SECURITY_KEYS])).result() sec[self.C_SECURITY_CLOUD_GUARD] += next(as_completed([future_SECURITY_CLOUD_GUARD])).result() email[self.C_EMAIL_SENDERS] += next(as_completed([future_EMAIL_SENDERS])).result() email[self.C_EMAIL_SUPPRESSIONS] += next(as_completed([future_EMAIL_SUPPRESSIONS])).result() @@ -13232,7 +13249,7 @@ def __load_section_monitor_notification_security_quotas_main(self): limits[self.C_LIMITS_QUOTAS] += next(as_completed([future_LIMITS_QUOTAS])).result() self.__load_print_section_time(section_start_time) - print("") + print('') except Exception as e: self.__print_error(e) @@ -13269,7 +13286,7 @@ def __load_monitoring_events(self, event_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13325,8 +13342,13 @@ def __load_monitoring_events(self, event_client, compartments): action['dest_id'] = str(act.function_id) val['actions'].append(action) - except oci.exceptions.ServiceError: - print("w", end="") + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + else: + self.__load_print_error(e, compartment) + errstr += "e" # add the data cnt += 1 @@ -13337,10 +13359,10 @@ def __load_monitoring_events(self, event_client, compartments): except oci.exceptions.RequestException as e: if not self.__check_request_error(e): - self.__print_error(e, compartment) + self.__print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13375,7 +13397,7 @@ def __load_monitoring_agents(self, management_agent_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13425,14 +13447,13 @@ def __load_monitoring_agents(self, management_agent_client, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13466,7 +13487,7 @@ def __load_monitoring_database_management(self, db_management_client, compartmen ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13511,14 +13532,13 @@ def __load_monitoring_database_management(self, db_management_client, compartmen return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13553,7 +13573,7 @@ def __load_monitoring_alarms(self, monitor_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13595,14 +13615,13 @@ def __load_monitoring_alarms(self, monitor_client, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13637,7 +13656,7 @@ def __load_notifications_topics(self, ons_cp_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13677,14 +13696,13 @@ def __load_notifications_topics(self, ons_cp_client, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13717,7 +13735,7 @@ def __load_notifications_subscriptions(self, ons_dp_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue @@ -13760,14 +13778,13 @@ def __load_notifications_subscriptions(self, ons_dp_client, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13786,19 +13803,13 @@ def __load_section_edge_services_main(self): try: print("Edge Services...") - healthcheck_client = oci.healthchecks.HealthChecksClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - dns = oci.dns.DnsClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - waas = oci.waas.WaasClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - waf = oci.waf.WafClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - healthcheck_client.base_client.session.proxies = {'https': self.flags.proxy} - dns.base_client.session.proxies = {'https': self.flags.proxy} - waas.base_client.session.proxies = {'https': self.flags.proxy} - waf.base_client.session.proxies = {'https': self.flags.proxy} + healthcheck_client = self.__create_client(oci.healthchecks.HealthChecksClient) + dns = self.__create_client(oci.dns.DnsClient) + waas = self.__create_client(oci.waas.WaasClient) + waf = self.__create_client(oci.waf.WafClient) # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() # add the key if not exists self.__initialize_data_key(self.C_EDGE, self.C_EDGE_HEALTHCHECK_PING) @@ -13847,7 +13858,7 @@ def __load_section_edge_services_main(self): edge[self.C_EDGE_WAAS_POLICIES] += next(as_completed([future_EDGE_WAAS_POLICIES])).result() edge[self.C_EDGE_WAF] += next(as_completed([future_EDGE_WAF])).result() - print("") + print('') except Exception as e: self.__print_error(e) @@ -13883,7 +13894,7 @@ def __load_edge_healthchecks_ping(self, healthcheck_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13909,7 +13920,7 @@ def __load_edge_healthchecks_ping(self, healthcheck_client, compartments): try: health = healthcheck_client.get_ping_monitor(healthcheck.id).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -13952,10 +13963,10 @@ def __load_edge_healthchecks_ping(self, healthcheck_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -13989,7 +14000,7 @@ def __load_edge_healthchecks_http(self, healthcheck_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14015,7 +14026,7 @@ def __load_edge_healthchecks_http(self, healthcheck_client, compartments): try: health = healthcheck_client.get_http_monitor(healthcheck.id).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14024,7 +14035,7 @@ def __load_edge_healthchecks_http(self, healthcheck_client, compartments): errstr += "e" continue except oci.exceptions.ConnectTimeout: - self.__load_print_auth_warning() + self.__load_print_auth_warning(to_print=self.flags.skip_threads) continue except Exception as e: @@ -14060,14 +14071,13 @@ def __load_edge_healthchecks_http(self, healthcheck_client, compartments): return data except oci.exceptions.RequestException as e: - if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14102,7 +14112,7 @@ def __load_edge_dns_zone(self, dns_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14151,10 +14161,10 @@ def __load_edge_dns_zone(self, dns_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14189,7 +14199,7 @@ def __load_edge_dns_steering(self, dns_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14238,10 +14248,10 @@ def __load_edge_dns_steering(self, dns_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14275,7 +14285,7 @@ def __load_edge_waas_policies(self, waas, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14326,10 +14336,10 @@ def __load_edge_waas_policies(self, waas, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14363,14 +14373,13 @@ def __load_edge_waf(self, waf, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" - continue else: self.__load_print_error(e, compartment) errstr += "e" - continue + continue except oci.exceptions.ConnectTimeout: self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" @@ -14415,10 +14424,10 @@ def __load_edge_waf(self, waf, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14471,7 +14480,7 @@ def __load_section_native_data_ai_main(self): genai_client.base_client.session.proxies = {'https': self.flags.proxy} # reference to compartments - compartments = self.get_compartment() + compartments = self.get_compartments() self.__initialize_data_key(self.C_PAAS_NATIVE, self.C_PAAS_NATIVE_OAC) self.__initialize_data_key(self.C_PAAS_NATIVE, self.C_PAAS_NATIVE_OIC) @@ -14588,7 +14597,7 @@ def __load_data_ai_catalog(self, dc_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14643,10 +14652,10 @@ def __load_data_ai_catalog(self, dc_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14680,7 +14689,7 @@ def __load_data_ai_science(self, ds_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14733,10 +14742,10 @@ def __load_data_ai_science(self, ds_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14770,7 +14779,7 @@ def __load_data_ai_flow(self, df_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14827,10 +14836,10 @@ def __load_data_ai_flow(self, df_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14863,7 +14872,7 @@ def __load_data_ai_oda(self, oda_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -14922,10 +14931,10 @@ def __load_data_ai_oda(self, oda_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -14958,7 +14967,7 @@ def __load_data_ai_bds(self, bds_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue @@ -15137,11 +15146,11 @@ def __load_data_ai_bds(self, bds_client, compartments): except oci.exceptions.RequestException as e: if not self.__check_request_error(e): - self.__print_error(e, compartment) + self.__print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15174,7 +15183,7 @@ def __load_data_ai_data_integration(self, di_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue @@ -15227,10 +15236,10 @@ def __load_data_ai_data_integration(self, di_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15263,17 +15272,17 @@ def __load_data_ai_data_genai(self, ai_client, compartments): ).data except oci.exceptions.ServiceError as e: - # inly implemented in chicago, to avoid error skip warning - if e.code == "NotAuthorizedOrNotFound": + # Only implemented in Chicago, to avoid error skip warning + if e.code in ['NotAuthorizedOrNotFound', 'InternalError']: errstr += "a" continue - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" continue else: - self.__load_print_error(e, compartment) + self.__load_print_error(e, compartment, to_print=self.flags.skip_threads) errstr += "e" continue except oci.exceptions.ConnectTimeout: @@ -15281,7 +15290,7 @@ def __load_data_ai_data_genai(self, ai_client, compartments): errstr += "a" continue except Exception as e: - self.__load_print_error(e, compartment) + self.__load_print_error(e, compartment, to_print=self.flags.skip_threads) errstr += "e" continue @@ -15326,10 +15335,10 @@ def __load_data_ai_data_genai(self, ai_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15363,7 +15372,7 @@ def __load_paas_oic(self, oic_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -15429,10 +15438,10 @@ def __load_paas_oic(self, oic_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15466,7 +15475,7 @@ def __load_paas_ocvs(self, ocvs_client, cluster_client, esxi_client, virtual_net ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -15686,14 +15695,14 @@ def __load_paas_ocvs(self, ocvs_client, cluster_client, esxi_client, virtual_net if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## - # __load_paas_oac + # __load_paas_ocvs_network_configuration ########################################################################## def __load_paas_ocvs_network_configuration(self, network_configuration, virtual_network): try: @@ -15778,7 +15787,7 @@ def __load_paas_oac(self, oac_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -15853,10 +15862,10 @@ def __load_paas_oac(self, oac_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15890,7 +15899,7 @@ def __load_paas_oce(self, oce_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -15950,10 +15959,10 @@ def __load_paas_oce(self, oce_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -15987,7 +15996,7 @@ def __load_paas_visualbuilder(self, vb_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -16044,10 +16053,10 @@ def __load_paas_visualbuilder(self, vb_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16081,7 +16090,7 @@ def __load_paas_open_search(self, open_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -16202,10 +16211,10 @@ def __load_paas_open_search(self, open_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16239,7 +16248,7 @@ def __load_paas_devops(self, devops_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -16295,10 +16304,10 @@ def __load_paas_devops(self, devops_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16325,7 +16334,7 @@ def __load_limits(self, limits_client, tenancy_id, compartments): retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning("a", False) else: self.__load_print_error(e) @@ -16349,7 +16358,7 @@ def __load_limits(self, limits_client, tenancy_id, compartments): retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY ).data except oci.exceptions.Exception as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning("a", False, to_print=self.flags.skip_threads) errstr += "a" else: @@ -16463,7 +16472,7 @@ def __load_quotas(self, quotas_client, compartments): errstr = "Can run on home region only, skipping." self.__load_print_thread_cnt(header, cnt, start_time, errstr) return data - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -16517,10 +16526,10 @@ def __load_quotas(self, quotas_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16554,7 +16563,7 @@ def __load_security_cloud_guard(self, cg_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -16654,6 +16663,22 @@ def __load_security_cloud_guard(self, cg_client, compartments): 'time_updated': str(arr.time_updated), 'effective_responder_rules': [y.responder_rule_id for y in arr.effective_responder_rules] if arr.effective_responder_rules else [], } for arr in itemfull.target_responder_recipes] if itemfull.target_responder_recipes else [] + + except oci.exceptions.ServiceError as e: + if self.__check_service_error(e, compartment): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) + errstr += "a" + continue + else: + self.__load_print_error(e, compartment) + errstr += "e" + continue + except oci.exceptions.RequestException as e: + if self.__check_request_error(e, compartment): + continue + else: + self.__load_print_error(e, compartment) + continue except Exception as e: self.__print_error(e, compartment) @@ -16671,7 +16696,7 @@ def __load_security_cloud_guard(self, cg_client, compartments): self.__load_print_error(e, compartment) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16688,10 +16713,7 @@ def __load_security_scores_main(self): print("Cloud Guard Scores...") # clients - cg_client = oci.cloud_guard.CloudGuardClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - - if self.flags.proxy: - cg_client.base_client.session.proxies = {'https': self.flags.proxy} + cg_client = self.__create_client(oci.cloud_guard.CloudGuardClient) # reference to compartments root_compartment = self.get_tenancy_id() @@ -16712,6 +16734,60 @@ def __load_security_scores_main(self): except Exception as e: self.__print_error(e) + ########################################################################## + # __load_security_kms_keys + ########################################################################## + def __load_security_kms_keys(self, search_client): + + data = [] + cnt = 0 + start_time = time.time() + + try: + errstr = "" + header = "KMS Keys" + self.__load_print_status_with_threads(header) + + key_search_detail = oci.resource_search.models.StructuredSearchDetails( + query="query key resources", + type='Structured', + matching_context_type=oci.resource_search.models.SearchDetails.MATCHING_CONTEXT_TYPE_NONE + ) + keys = search_client.search_resources(key_search_detail, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY).data + + # item = oci.key_management.models.VaultSummary + for item in keys.items: + if self.check_lifecycle_state_active(item.lifecycle_state): + + compartment = self.get_compartment_by_id(item.compartment_id) + if compartment: + + val = { + 'id': self.get_value(item.identifier), + 'compartment_id': self.get_value(item.compartment_id), + 'name': self.get_value(item.display_name), + 'time_created': self.get_value(item.time_created), + 'freeform_tags': [] if item.freeform_tags is None else item.freeform_tags, + 'compartment_name': str(compartment['name']), + 'compartment_path': str(compartment['path']), + 'region_name': str(self.config['region']) + } + cnt += 1 + data.append(val) + + self.__load_print_thread_cnt(header, cnt, start_time, errstr) + return data + + except oci.exceptions.RequestException as e: + if self.__check_request_error(e): + return data + else: + self.__load_print_error(e) + return data + except Exception as e: + self.__print_error(e) + return data + ########################################################################## # __load_security_kms_vaults ########################################################################## @@ -16743,7 +16819,7 @@ def __load_security_kms_vaults(self, kms_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -16799,7 +16875,6 @@ def __load_security_kms_vaults(self, kms_client, compartments): val['key_version_count'] = str(usage.key_version_count) val['software_key_count'] = str(usage.software_key_count) val['software_key_version_count'] = str(usage.software_key_version_count) - except Exception: pass @@ -16831,10 +16906,10 @@ def __load_security_kms_vaults(self, kms_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -16861,8 +16936,8 @@ def __load_security_cloud_guard_risk_scores(self, cg_client, root_compartment): if e.code == 404: print(" Not Enabled") return data - if self.__check_service_error(e.code): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.flags.skip_threads) return data else: self.__load_print_error(e) @@ -16895,7 +16970,7 @@ def __load_security_cloud_guard_risk_scores(self, cg_client, root_compartment): return data ########################################################################## - # __load_security_cloud_guard_risk_scores + # __load_security_cloud_guard_security_scores ########################################################################## def __load_security_cloud_guard_security_scores(self, cg_client, root_compartment): @@ -16918,7 +16993,7 @@ def __load_security_cloud_guard_security_scores(self, cg_client, root_compartmen if e.code == 404: print(" Not Enabled") return data - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" return data @@ -16982,7 +17057,7 @@ def __load_security_log_groups(self, log_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -17035,7 +17110,7 @@ def __load_security_log_groups(self, log_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -17115,10 +17190,10 @@ def __load_security_log_groups(self, log_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -17132,7 +17207,7 @@ def __load_security_log_unified_agents(self, log_client, compartments): try: errstr = "" - header = "Logging Unified Agenets" + header = "Logging Unified Agents" self.__load_print_status_with_threads(header) # loop on all compartments @@ -17152,7 +17227,7 @@ def __load_security_log_unified_agents(self, log_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -17245,10 +17320,10 @@ def __load_security_log_unified_agents(self, log_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -17280,7 +17355,7 @@ def __load_security_bastions(self, bs_client, compartments): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code, compartment): + if self.__check_service_error(e, compartment): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" continue @@ -17336,10 +17411,10 @@ def __load_security_bastions(self, bs_client, compartments): if self.__check_request_error(e): return data else: - self.__load_print_error(e, compartment) + self.__load_print_error(e) return data except Exception as e: - self.__print_error(e, compartment) + self.__print_error(e) return data ########################################################################## @@ -17350,9 +17425,7 @@ def __load_announcement_main(self): print("Announcements...") # AnnouncementClient - announcement_client = oci.announcements_service.AnnouncementClient(self.config, signer=self.signer, timeout=(self.flags.connection_timeout, self.flags.read_timeout)) - if self.flags.proxy: - announcement_client.base_client.session.proxies = {'https': self.flags.proxy} + announcement_client = self.__create_client(oci.announcements_service.AnnouncementClient) # reference to tenancy tenancy = self.get_tenancy() @@ -17397,7 +17470,7 @@ def __load_announcements(self, announcement_client, tenancy_id): ).data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): + if self.__check_service_error(e): self.__load_print_auth_warning(to_print=self.flags.skip_threads) errstr += "a" else: @@ -17843,6 +17916,7 @@ def __add_to_error_array(self, classname, caller_function, compartment_name, err 'class': classname, 'function': caller_function, 'compartment': compartment_name, + 'region': '', 'error': str(err), 'is_warning': str(warning) } @@ -17877,33 +17951,38 @@ def __print_error(self, e): ########################################################################## # check service error to warn instead of error ########################################################################## - def __check_service_error(self, code): + def __check_service_error(self, ex, compartment=[], info=''): try: classname = type(self).__name__ - caller_function = sys._getframe(1).f_code.co_name + caller_function = sys._getframe(2).f_code.co_name + ":" + sys._getframe(1).f_code.co_name + caller_function += (':' + info if info else '') + compartment_name = '' - value = ( - 'remote end closed' in str(code).lower() or - 'max retries exceeded' in str(code).lower() or - 'auth' in str(code).lower() or - 'aborted' in str(code).lower() or - 'notfound' in str(code).lower() or - 'closed connection' in str(code).lower() or - 'accessdenied' in str(code).lower() or - code == 'Forbidden' or - code == 'KmsKeyDisabled' or - code == 'TooManyRequests' or - code == 'NotAuthorizedOrNotFound' or - code == 'IncorrectState' or - code == 'LimitExceeded' - ) + if compartment: + if 'name' in compartment: + compartment_name = compartment['name'] + code = '__MISSING__' + value = (ex.code in ['Forbidden', 'KmsKeyDisabled', 'TooManyRequests', 'NotAuthorizedOrNotFound', 'IncorrectState', 'LimitExceeded', 'InternalError']) + if value: + code = ex.code + else: + code = str(ex).lower() + value = ( + 'remote end closed' in code or + 'max retries exceeded' in code or + 'auth' in code or + 'aborted' in code or + 'notfound' in code or + 'accessdenied' in code or + 'closed connection' in code + ) if value: - self.__add_to_error_array(classname, caller_function, "", code, warning=True) + self.__add_to_error_array(classname, caller_function, compartment_name, code, warning=True) return value except Exception as e: - print("\nError in __check_service_error " + str(e)) + print(f'\nError in __check_service_error {str(e)}') ########################################################################## # print error @@ -17926,10 +18005,11 @@ def __load_print_error(self, err, increase_errors=True, to_print=True): ########################################################################## # print auth warning ########################################################################## - def __load_print_auth_warning(self, special_char="a", increase_warning=True): + def __load_print_auth_warning(self, special_char='a', increase_warning=True, to_print=True): if increase_warning: self.warning += 1 - print(special_char, end="") + if to_print: + print(special_char, end='') ########################################################################## # check request error if service not exists for region @@ -17942,25 +18022,26 @@ def __check_request_error(self, e): self.__add_to_error_array(classname, caller_function, "", e) # service not yet available + except_str = str(e) if ( - ('Errno 8' in str(e) and 'NewConnectionError' in str(e)) or - 'Max retries exceeded' in str(e) or - 'HTTPSConnectionPool' in str(e) or - 'not currently available' in str(e) or - 'closed connection' in str(e) + ('Errno 8' in except_str and 'NewConnectionError' in except_str) or + 'Max retries exceeded' in except_str or + 'HTTPSConnectionPool' in except_str or + 'not currently available' in except_str or + 'closed connection' in except_str ): - print("Service Not Accessible or not yet exist") + print("Service Not Accessible or not yet exist.") return True # if ReadTimeoutError timeout - if ('ReadTimeoutError' in str(e)): - print("ReadTimeoutError, Please use higher value with -readtimeout flag !\nError: " + str(e)) + if 'ReadTimeoutError' in except_str: + print("ReadTimeoutError, Please use higher value with -readtimeout flag!\nError: " + except_str) self.error += 1 return True # if Connection TimeoutError timeout - if ('TimeoutError' in str(e)): - print("Connection TimeoutError, Please use higher value with -conntimeout flag !\nError: " + str(e)) + if 'TimeoutError' in except_str: + print("Connection TimeoutError, Please use higher value with -conntimeout flag!\nError: " + except_str) self.error += 1 return True return False @@ -18023,9 +18104,9 @@ def __list_call_get_all_results_generator_domains(self, list_func_ref, *list_fun else: keep_paginating = False -################################################################################## -# load_identity_domain_users -################################################################################## + ################################################################################## + # load_identity_domain_users + ################################################################################## def __load_identity_domain_users(self, identity_domain_client, domain_name): data = [] @@ -18127,10 +18208,8 @@ def __load_identity_domain_users(self, identity_domain_client, domain_name): return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() - elif self.__check_service_error(str(e)): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data @@ -18143,9 +18222,9 @@ def __load_identity_domain_users(self, identity_domain_client, domain_name): except Exception as e: self.__print_error(e) -################################################################################## -# load_identity_domain_users_ext_password -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_self_change + ################################################################################## def load_identity_domain_users_ext_self_change(self, var): data = "" try: @@ -18160,9 +18239,9 @@ def load_identity_domain_users_ext_self_change(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_password -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_password + ################################################################################## def load_identity_domain_users_ext_password(self, var): try: @@ -18196,9 +18275,9 @@ def load_identity_domain_users_ext_password(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_db_user_credential -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_db_user_credential + ################################################################################## def load_identity_domain_users_ext_db_user_credential(self, var): try: @@ -18218,9 +18297,9 @@ def load_identity_domain_users_ext_db_user_credential(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_adaptive -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_adaptive + ################################################################################## def load_identity_domain_users_ext_adaptive(self, var): try: @@ -18242,9 +18321,9 @@ def load_identity_domain_users_ext_adaptive(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_posix -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_posix + ################################################################################## def load_identity_domain_users_ext_posix(self, var): try: @@ -18271,9 +18350,9 @@ def load_identity_domain_users_ext_posix(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_db_user -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_db_user + ################################################################################## def load_identity_domain_users_ext_db_user(self, var): try: @@ -18298,9 +18377,9 @@ def load_identity_domain_users_ext_db_user(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_user_state -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_user_state + ################################################################################## def load_identity_domain_users_ext_user_state(self, var): try: @@ -18346,9 +18425,9 @@ def load_identity_domain_users_ext_user_state(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_mfa -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_mfa + ################################################################################## def load_identity_domain_users_ext_mfa(self, var): try: @@ -18380,9 +18459,9 @@ def load_identity_domain_users_ext_mfa(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_capabilities -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_capabilities + ################################################################################## def load_identity_domain_users_ext_capabilities(self, var): try: @@ -18413,9 +18492,9 @@ def load_identity_domain_users_ext_capabilities(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_users_ext_user -################################################################################## + ################################################################################## + # load_identity_domain_users_ext_user + ################################################################################## def load_identity_domain_users_ext_user(self, var): data = {} try: @@ -18456,9 +18535,9 @@ def load_identity_domain_users_ext_user(self, var): self.__print_error(e) return data -################################################################################## -# load_identity_domain_groups -################################################################################## + ################################################################################## + # load_identity_domain_groups + ################################################################################## def __load_identity_domain_groups(self, identity_domain_client, domain_name): data = [] @@ -18551,9 +18630,9 @@ def __load_identity_domain_groups(self, identity_domain_client, domain_name): except Exception as e: self.__print_error(e) -################################################################################## -# __load_identity_domain_dynamic_resource_groups -################################################################################## + ################################################################################## + # __load_identity_domain_dynamic_resource_groups + ################################################################################## def __load_identity_domain_dynamic_resource_groups(self, identity_domain_client, domain_name): data = [] @@ -18615,10 +18694,8 @@ def __load_identity_domain_dynamic_resource_groups(self, identity_domain_client, return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() - elif self.__check_service_error(str(e)): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data @@ -18631,9 +18708,9 @@ def __load_identity_domain_dynamic_resource_groups(self, identity_domain_client, except Exception as e: self.__print_error(e) -################################################################################## -# __load_identity_domain_identity_providers -################################################################################## + ################################################################################## + # __load_identity_domain_identity_providers + ################################################################################## def __load_identity_domain_identity_providers(self, identity_domain_client, domain_name): data = [] @@ -18759,10 +18836,8 @@ def __load_identity_domain_identity_providers(self, identity_domain_client, doma return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() - elif self.__check_service_error(str(e)): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data @@ -18775,9 +18850,9 @@ def __load_identity_domain_identity_providers(self, identity_domain_client, doma except Exception as e: self.__print_error(e) -################################################################################## -# __load_identity_domain_kmsi_setting -################################################################################## + ################################################################################## + # __load_identity_domain_kmsi_setting + ################################################################################## def __load_identity_domain_kmsi_setting(self, identity_domain_client, domain_name): data = [] @@ -18826,10 +18901,8 @@ def __load_identity_domain_kmsi_setting(self, identity_domain_client, domain_nam return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() - elif self.__check_service_error(str(e)): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data @@ -18842,9 +18915,9 @@ def __load_identity_domain_kmsi_setting(self, identity_domain_client, domain_nam except Exception as e: self.__print_error(e) -################################################################################## -# __load_identity_domain_authentication_factor_settings -################################################################################## + ################################################################################## + # __load_identity_domain_authentication_factor_settings + ################################################################################## def __load_identity_domain_authentication_factor_settings(self, identity_domain_client, domain_name): data = [] @@ -18966,10 +19039,8 @@ def __load_identity_domain_authentication_factor_settings(self, identity_domain_ return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() - elif self.__check_service_error(str(e)): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data @@ -18982,9 +19053,9 @@ def __load_identity_domain_authentication_factor_settings(self, identity_domain_ except Exception as e: self.__print_error(e) -################################################################################## -# __load_identity_domain_password_policies -################################################################################## + ################################################################################## + # __load_identity_domain_password_policies + ################################################################################## def __load_identity_domain_password_policies(self, identity_domain_client, domain_name): data = [] @@ -19069,14 +19140,14 @@ def __load_identity_domain_password_policies(self, identity_domain_client, domai return data except oci.exceptions.ServiceError as e: - if self.__check_service_error(e.code): - self.__load_print_auth_warning() + if self.__check_service_error(e): + self.__load_print_auth_warning(to_print=self.skip_threads) else: self.__load_print_error(e) return data except oci.exceptions.RequestException as e: if self.__check_request_error(e): - return + return data else: self.__load_print_error(e) return data @@ -19181,18 +19252,18 @@ def load_identity_domains_main(self): self.data.append(domain_data) - print("") + print('') return self.data - except oci.exceptions.RequestException as e: - if self.__check_request_error(e): + except oci.exceptions.ServiceError as e: + if "is not enabled" in str(e): + print("--> Identity Domains is not enabled.") return [] else: self.__print_error(e) return [] - except oci.exceptions.ServiceError as e: - if "is not enabled" in str(e): - print("--> Identity Domains is not enabled.") + except oci.exceptions.RequestException as e: + if self.__check_request_error(e): return [] else: self.__print_error(e) diff --git a/examples/showoci/showoci_upgrade.sh b/examples/showoci/showoci_upgrade.sh old mode 100755 new mode 100644 diff --git a/requirements.txt b/requirements.txt index 0481ca7649..54b52ce691 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ autodocsumm==0.1.11 certifi coverage==4.5.2 -cryptography>=3.2.1,<42.0.0 +cryptography>=3.2.1,<43.0.0 flake8>=3.6.0,<6 mock==2.0.0 -pyOpenSSL>=17.5.0,<24.0.0 +pyOpenSSL>=17.5.0,<25.0.0 pytest==4.1.0 pytest-cov==2.6.1 attrs==19.1.0 diff --git a/setup.py b/setup.py index bff5d7cf05..a4e3cbf2e8 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ def open_relative(*path): requires = [ "certifi", "configparser==4.0.2 ; python_version < '3'", - "cryptography>=3.2.1,<42.0.0", - "pyOpenSSL>=17.5.0,<24.0.0", + "cryptography>=3.2.1,<43.0.0", + "pyOpenSSL>=17.5.0,<25.0.0", "python-dateutil>=2.5.3,<3.0.0", "pytz>=2016.10", "circuitbreaker>=1.3.1,< 2.0.0" diff --git a/src/oci/container_instances/container_instance_client.py b/src/oci/container_instances/container_instance_client.py index 1cba7829f8..e3d0ac1cd5 100644 --- a/src/oci/container_instances/container_instance_client.py +++ b/src/oci/container_instances/container_instance_client.py @@ -1760,6 +1760,10 @@ def retrieve_logs(self, container_id, **kwargs): :param str opc_request_id: (optional) Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a particular request, please provide the request ID. + :param bool is_previous: (optional) + Returns the logs for the previous run of the container in a pod if the pod exists. + If the container fails for some reason, this parameter is useful to determine the root cause of the failure. + :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. @@ -1789,7 +1793,8 @@ def retrieve_logs(self, container_id, **kwargs): expected_kwargs = [ "allow_control_chars", "retry_strategy", - "opc_request_id" + "opc_request_id", + "is_previous" ] extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: @@ -1806,6 +1811,11 @@ def retrieve_logs(self, container_id, **kwargs): if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') + query_params = { + "isPrevious": kwargs.get("is_previous", 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, text/plain", "content-type": "application/json", @@ -1829,6 +1839,7 @@ def retrieve_logs(self, container_id, **kwargs): resource_path=resource_path, method=method, path_params=path_params, + query_params=query_params, header_params=header_params, response_type="stream", allow_control_chars=kwargs.get('allow_control_chars'), @@ -1840,6 +1851,7 @@ def retrieve_logs(self, container_id, **kwargs): resource_path=resource_path, method=method, path_params=path_params, + query_params=query_params, header_params=header_params, response_type="stream", allow_control_chars=kwargs.get('allow_control_chars'), diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index 4a20b12abb..e2f0aba38b 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -10719,6 +10719,9 @@ def terminate_instance(self, instance_id, **kwargs): To preserve the boot volume associated with the instance, specify `true` for `PreserveBootVolumeQueryParam`. To delete the boot volume when the instance is deleted, specify `false` or do not specify a value for `PreserveBootVolumeQueryParam`. + To preserve data volumes created with the instance, specify `true` or do not specify a value for `PreserveDataVolumesQueryParam`. + To delete the data volumes when the instance itself is deleted, specify `false` for `PreserveDataVolumesQueryParam`. + This is an asynchronous operation. The instance's `lifecycleState` changes to TERMINATING temporarily until the instance is completely deleted. After the instance is deleted, the record remains visible in the list of instances with the state TERMINATED for at least 12 hours, but no further action is needed. @@ -10738,6 +10741,11 @@ def terminate_instance(self, instance_id, **kwargs): Specifies whether to delete or preserve the boot volume when terminating an instance. When set to `true`, the boot volume is preserved. The default value is `false`. + :param bool preserve_data_volumes_created_at_launch: (optional) + Specifies whether to delete or preserve the data volumes created during launch when + terminating an instance. When set to `true`, the data volumes are preserved. The + default value is `true`. + :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. @@ -10768,7 +10776,8 @@ def terminate_instance(self, instance_id, **kwargs): "allow_control_chars", "retry_strategy", "if_match", - "preserve_boot_volume" + "preserve_boot_volume", + "preserve_data_volumes_created_at_launch" ] extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: @@ -10786,7 +10795,8 @@ def terminate_instance(self, instance_id, **kwargs): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { - "preserveBootVolume": kwargs.get("preserve_boot_volume", missing) + "preserveBootVolume": kwargs.get("preserve_boot_volume", missing), + "preserveDataVolumesCreatedAtLaunch": kwargs.get("preserve_data_volumes_created_at_launch", missing) } query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} diff --git a/src/oci/core/models/__init__.py b/src/oci/core/models/__init__.py index 61d9b03f52..044bdb4879 100644 --- a/src/oci/core/models/__init__.py +++ b/src/oci/core/models/__init__.py @@ -379,6 +379,10 @@ from .ipsec_tunnel_drg_attachment_network_details import IpsecTunnelDrgAttachmentNetworkDetails from .ipv6 import Ipv6 from .ipv6_address_ipv6_subnet_cidr_pair_details import Ipv6AddressIpv6SubnetCidrPairDetails +from .launch_attach_i_scsi_volume_details import LaunchAttachIScsiVolumeDetails +from .launch_attach_volume_details import LaunchAttachVolumeDetails +from .launch_create_volume_details import LaunchCreateVolumeDetails +from .launch_create_volume_from_attributes import LaunchCreateVolumeFromAttributes from .launch_instance_agent_config_details import LaunchInstanceAgentConfigDetails from .launch_instance_availability_config_details import LaunchInstanceAvailabilityConfigDetails from .launch_instance_details import LaunchInstanceDetails @@ -958,6 +962,10 @@ "IpsecTunnelDrgAttachmentNetworkDetails": IpsecTunnelDrgAttachmentNetworkDetails, "Ipv6": Ipv6, "Ipv6AddressIpv6SubnetCidrPairDetails": Ipv6AddressIpv6SubnetCidrPairDetails, + "LaunchAttachIScsiVolumeDetails": LaunchAttachIScsiVolumeDetails, + "LaunchAttachVolumeDetails": LaunchAttachVolumeDetails, + "LaunchCreateVolumeDetails": LaunchCreateVolumeDetails, + "LaunchCreateVolumeFromAttributes": LaunchCreateVolumeFromAttributes, "LaunchInstanceAgentConfigDetails": LaunchInstanceAgentConfigDetails, "LaunchInstanceAvailabilityConfigDetails": LaunchInstanceAvailabilityConfigDetails, "LaunchInstanceDetails": LaunchInstanceDetails, diff --git a/src/oci/core/models/attach_volume_details.py b/src/oci/core/models/attach_volume_details.py index 0c6786acaf..16f9b85d90 100644 --- a/src/oci/core/models/attach_volume_details.py +++ b/src/oci/core/models/attach_volume_details.py @@ -160,7 +160,8 @@ def display_name(self, display_name): def instance_id(self): """ **[Required]** Gets the instance_id of this AttachVolumeDetails. - The OCID of the instance. + The OCID of the instance. For AttachVolume operation, this is a required field for the request, + see :func:`attach_volume`. :return: The instance_id of this AttachVolumeDetails. @@ -172,7 +173,8 @@ def instance_id(self): def instance_id(self, instance_id): """ Sets the instance_id of this AttachVolumeDetails. - The OCID of the instance. + The OCID of the instance. For AttachVolume operation, this is a required field for the request, + see :func:`attach_volume`. :param instance_id: The instance_id of this AttachVolumeDetails. @@ -262,7 +264,7 @@ def type(self, type): def volume_id(self): """ **[Required]** Gets the volume_id of this AttachVolumeDetails. - The OCID of the volume. + The OCID of the volume. If CreateVolumeDetails is specified, this field must be omitted from the request. :return: The volume_id of this AttachVolumeDetails. @@ -274,7 +276,7 @@ def volume_id(self): def volume_id(self, volume_id): """ Sets the volume_id of this AttachVolumeDetails. - The OCID of the volume. + The OCID of the volume. If CreateVolumeDetails is specified, this field must be omitted from the request. :param volume_id: The volume_id of this AttachVolumeDetails. diff --git a/src/oci/core/models/launch_attach_i_scsi_volume_details.py b/src/oci/core/models/launch_attach_i_scsi_volume_details.py new file mode 100644 index 0000000000..f95a2da4cf --- /dev/null +++ b/src/oci/core/models/launch_attach_i_scsi_volume_details.py @@ -0,0 +1,203 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20160918 + +from .launch_attach_volume_details import LaunchAttachVolumeDetails +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 LaunchAttachIScsiVolumeDetails(LaunchAttachVolumeDetails): + """ + Details specific to ISCSI type volume attachments. + """ + + #: A constant which can be used with the encryption_in_transit_type property of a LaunchAttachIScsiVolumeDetails. + #: This constant has a value of "NONE" + ENCRYPTION_IN_TRANSIT_TYPE_NONE = "NONE" + + #: A constant which can be used with the encryption_in_transit_type property of a LaunchAttachIScsiVolumeDetails. + #: This constant has a value of "BM_ENCRYPTION_IN_TRANSIT" + ENCRYPTION_IN_TRANSIT_TYPE_BM_ENCRYPTION_IN_TRANSIT = "BM_ENCRYPTION_IN_TRANSIT" + + def __init__(self, **kwargs): + """ + Initializes a new LaunchAttachIScsiVolumeDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.core.models.LaunchAttachIScsiVolumeDetails.type` attribute + of this class is ``iscsi`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param device: + The value to assign to the device property of this LaunchAttachIScsiVolumeDetails. + :type device: str + + :param display_name: + The value to assign to the display_name property of this LaunchAttachIScsiVolumeDetails. + :type display_name: str + + :param is_read_only: + The value to assign to the is_read_only property of this LaunchAttachIScsiVolumeDetails. + :type is_read_only: bool + + :param is_shareable: + The value to assign to the is_shareable property of this LaunchAttachIScsiVolumeDetails. + :type is_shareable: bool + + :param type: + The value to assign to the type property of this LaunchAttachIScsiVolumeDetails. + :type type: str + + :param volume_id: + The value to assign to the volume_id property of this LaunchAttachIScsiVolumeDetails. + :type volume_id: str + + :param launch_create_volume_details: + The value to assign to the launch_create_volume_details property of this LaunchAttachIScsiVolumeDetails. + :type launch_create_volume_details: oci.core.models.LaunchCreateVolumeDetails + + :param use_chap: + The value to assign to the use_chap property of this LaunchAttachIScsiVolumeDetails. + :type use_chap: bool + + :param encryption_in_transit_type: + The value to assign to the encryption_in_transit_type property of this LaunchAttachIScsiVolumeDetails. + Allowed values for this property are: "NONE", "BM_ENCRYPTION_IN_TRANSIT" + :type encryption_in_transit_type: str + + :param is_agent_auto_iscsi_login_enabled: + The value to assign to the is_agent_auto_iscsi_login_enabled property of this LaunchAttachIScsiVolumeDetails. + :type is_agent_auto_iscsi_login_enabled: bool + + """ + self.swagger_types = { + 'device': 'str', + 'display_name': 'str', + 'is_read_only': 'bool', + 'is_shareable': 'bool', + 'type': 'str', + 'volume_id': 'str', + 'launch_create_volume_details': 'LaunchCreateVolumeDetails', + 'use_chap': 'bool', + 'encryption_in_transit_type': 'str', + 'is_agent_auto_iscsi_login_enabled': 'bool' + } + + self.attribute_map = { + 'device': 'device', + 'display_name': 'displayName', + 'is_read_only': 'isReadOnly', + 'is_shareable': 'isShareable', + 'type': 'type', + 'volume_id': 'volumeId', + 'launch_create_volume_details': 'launchCreateVolumeDetails', + 'use_chap': 'useChap', + 'encryption_in_transit_type': 'encryptionInTransitType', + 'is_agent_auto_iscsi_login_enabled': 'isAgentAutoIscsiLoginEnabled' + } + + self._device = None + self._display_name = None + self._is_read_only = None + self._is_shareable = None + self._type = None + self._volume_id = None + self._launch_create_volume_details = None + self._use_chap = None + self._encryption_in_transit_type = None + self._is_agent_auto_iscsi_login_enabled = None + self._type = 'iscsi' + + @property + def use_chap(self): + """ + Gets the use_chap of this LaunchAttachIScsiVolumeDetails. + Whether to use CHAP authentication for the volume attachment. Defaults to false. + + + :return: The use_chap of this LaunchAttachIScsiVolumeDetails. + :rtype: bool + """ + return self._use_chap + + @use_chap.setter + def use_chap(self, use_chap): + """ + Sets the use_chap of this LaunchAttachIScsiVolumeDetails. + Whether to use CHAP authentication for the volume attachment. Defaults to false. + + + :param use_chap: The use_chap of this LaunchAttachIScsiVolumeDetails. + :type: bool + """ + self._use_chap = use_chap + + @property + def encryption_in_transit_type(self): + """ + Gets the encryption_in_transit_type of this LaunchAttachIScsiVolumeDetails. + Refer the top-level definition of encryptionInTransitType. + The default value is NONE. + + Allowed values for this property are: "NONE", "BM_ENCRYPTION_IN_TRANSIT" + + + :return: The encryption_in_transit_type of this LaunchAttachIScsiVolumeDetails. + :rtype: str + """ + return self._encryption_in_transit_type + + @encryption_in_transit_type.setter + def encryption_in_transit_type(self, encryption_in_transit_type): + """ + Sets the encryption_in_transit_type of this LaunchAttachIScsiVolumeDetails. + Refer the top-level definition of encryptionInTransitType. + The default value is NONE. + + + :param encryption_in_transit_type: The encryption_in_transit_type of this LaunchAttachIScsiVolumeDetails. + :type: str + """ + allowed_values = ["NONE", "BM_ENCRYPTION_IN_TRANSIT"] + if not value_allowed_none_or_none_sentinel(encryption_in_transit_type, allowed_values): + raise ValueError( + f"Invalid value for `encryption_in_transit_type`, must be None or one of {allowed_values}" + ) + self._encryption_in_transit_type = encryption_in_transit_type + + @property + def is_agent_auto_iscsi_login_enabled(self): + """ + Gets the is_agent_auto_iscsi_login_enabled of this LaunchAttachIScsiVolumeDetails. + Whether to enable Oracle Cloud Agent to perform the iSCSI login and logout commands after the volume attach or detach operations for non multipath-enabled iSCSI attachments. + + + :return: The is_agent_auto_iscsi_login_enabled of this LaunchAttachIScsiVolumeDetails. + :rtype: bool + """ + return self._is_agent_auto_iscsi_login_enabled + + @is_agent_auto_iscsi_login_enabled.setter + def is_agent_auto_iscsi_login_enabled(self, is_agent_auto_iscsi_login_enabled): + """ + Sets the is_agent_auto_iscsi_login_enabled of this LaunchAttachIScsiVolumeDetails. + Whether to enable Oracle Cloud Agent to perform the iSCSI login and logout commands after the volume attach or detach operations for non multipath-enabled iSCSI attachments. + + + :param is_agent_auto_iscsi_login_enabled: The is_agent_auto_iscsi_login_enabled of this LaunchAttachIScsiVolumeDetails. + :type: bool + """ + self._is_agent_auto_iscsi_login_enabled = is_agent_auto_iscsi_login_enabled + + 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/core/models/launch_attach_volume_details.py b/src/oci/core/models/launch_attach_volume_details.py new file mode 100644 index 0000000000..639a7c85cb --- /dev/null +++ b/src/oci/core/models/launch_attach_volume_details.py @@ -0,0 +1,279 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20160918 + + +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 LaunchAttachVolumeDetails(object): + """ + The details of the volume to attach. + """ + + def __init__(self, **kwargs): + """ + Initializes a new LaunchAttachVolumeDetails object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.core.models.LaunchAttachIScsiVolumeDetails` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param device: + The value to assign to the device property of this LaunchAttachVolumeDetails. + :type device: str + + :param display_name: + The value to assign to the display_name property of this LaunchAttachVolumeDetails. + :type display_name: str + + :param is_read_only: + The value to assign to the is_read_only property of this LaunchAttachVolumeDetails. + :type is_read_only: bool + + :param is_shareable: + The value to assign to the is_shareable property of this LaunchAttachVolumeDetails. + :type is_shareable: bool + + :param type: + The value to assign to the type property of this LaunchAttachVolumeDetails. + :type type: str + + :param volume_id: + The value to assign to the volume_id property of this LaunchAttachVolumeDetails. + :type volume_id: str + + :param launch_create_volume_details: + The value to assign to the launch_create_volume_details property of this LaunchAttachVolumeDetails. + :type launch_create_volume_details: oci.core.models.LaunchCreateVolumeDetails + + """ + self.swagger_types = { + 'device': 'str', + 'display_name': 'str', + 'is_read_only': 'bool', + 'is_shareable': 'bool', + 'type': 'str', + 'volume_id': 'str', + 'launch_create_volume_details': 'LaunchCreateVolumeDetails' + } + + self.attribute_map = { + 'device': 'device', + 'display_name': 'displayName', + 'is_read_only': 'isReadOnly', + 'is_shareable': 'isShareable', + 'type': 'type', + 'volume_id': 'volumeId', + 'launch_create_volume_details': 'launchCreateVolumeDetails' + } + + self._device = None + self._display_name = None + self._is_read_only = None + self._is_shareable = None + self._type = None + self._volume_id = None + self._launch_create_volume_details = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['type'] + + if type == 'iscsi': + return 'LaunchAttachIScsiVolumeDetails' + else: + return 'LaunchAttachVolumeDetails' + + @property + def device(self): + """ + Gets the device of this LaunchAttachVolumeDetails. + The device name. To retrieve a list of devices for a given instance, see :func:`list_instance_devices`. + + + :return: The device of this LaunchAttachVolumeDetails. + :rtype: str + """ + return self._device + + @device.setter + def device(self, device): + """ + Sets the device of this LaunchAttachVolumeDetails. + The device name. To retrieve a list of devices for a given instance, see :func:`list_instance_devices`. + + + :param device: The device of this LaunchAttachVolumeDetails. + :type: str + """ + self._device = device + + @property + def display_name(self): + """ + Gets the display_name of this LaunchAttachVolumeDetails. + A user-friendly name. Does not have to be unique, and it's changeable. + Avoid entering confidential information. + + + :return: The display_name of this LaunchAttachVolumeDetails. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this LaunchAttachVolumeDetails. + A user-friendly name. Does not have to be unique, and it's changeable. + Avoid entering confidential information. + + + :param display_name: The display_name of this LaunchAttachVolumeDetails. + :type: str + """ + self._display_name = display_name + + @property + def is_read_only(self): + """ + Gets the is_read_only of this LaunchAttachVolumeDetails. + Whether the attachment was created in read-only mode. + + + :return: The is_read_only of this LaunchAttachVolumeDetails. + :rtype: bool + """ + return self._is_read_only + + @is_read_only.setter + def is_read_only(self, is_read_only): + """ + Sets the is_read_only of this LaunchAttachVolumeDetails. + Whether the attachment was created in read-only mode. + + + :param is_read_only: The is_read_only of this LaunchAttachVolumeDetails. + :type: bool + """ + self._is_read_only = is_read_only + + @property + def is_shareable(self): + """ + Gets the is_shareable of this LaunchAttachVolumeDetails. + Whether the attachment should be created in shareable mode. If an attachment + is created in shareable mode, then other instances can attach the same volume, provided + that they also create their attachments in shareable mode. Only certain volume types can + be attached in shareable mode. Defaults to false if not specified. + + + :return: The is_shareable of this LaunchAttachVolumeDetails. + :rtype: bool + """ + return self._is_shareable + + @is_shareable.setter + def is_shareable(self, is_shareable): + """ + Sets the is_shareable of this LaunchAttachVolumeDetails. + Whether the attachment should be created in shareable mode. If an attachment + is created in shareable mode, then other instances can attach the same volume, provided + that they also create their attachments in shareable mode. Only certain volume types can + be attached in shareable mode. Defaults to false if not specified. + + + :param is_shareable: The is_shareable of this LaunchAttachVolumeDetails. + :type: bool + """ + self._is_shareable = is_shareable + + @property + def type(self): + """ + **[Required]** Gets the type of this LaunchAttachVolumeDetails. + The type of volume. Currently, the only supported value is \"iscsi\". + + + :return: The type of this LaunchAttachVolumeDetails. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this LaunchAttachVolumeDetails. + The type of volume. Currently, the only supported value is \"iscsi\". + + + :param type: The type of this LaunchAttachVolumeDetails. + :type: str + """ + self._type = type + + @property + def volume_id(self): + """ + Gets the volume_id of this LaunchAttachVolumeDetails. + The OCID of the volume. If CreateVolumeDetails is specified, this field must be omitted from the request. + + + :return: The volume_id of this LaunchAttachVolumeDetails. + :rtype: str + """ + return self._volume_id + + @volume_id.setter + def volume_id(self, volume_id): + """ + Sets the volume_id of this LaunchAttachVolumeDetails. + The OCID of the volume. If CreateVolumeDetails is specified, this field must be omitted from the request. + + + :param volume_id: The volume_id of this LaunchAttachVolumeDetails. + :type: str + """ + self._volume_id = volume_id + + @property + def launch_create_volume_details(self): + """ + Gets the launch_create_volume_details of this LaunchAttachVolumeDetails. + + :return: The launch_create_volume_details of this LaunchAttachVolumeDetails. + :rtype: oci.core.models.LaunchCreateVolumeDetails + """ + return self._launch_create_volume_details + + @launch_create_volume_details.setter + def launch_create_volume_details(self, launch_create_volume_details): + """ + Sets the launch_create_volume_details of this LaunchAttachVolumeDetails. + + :param launch_create_volume_details: The launch_create_volume_details of this LaunchAttachVolumeDetails. + :type: oci.core.models.LaunchCreateVolumeDetails + """ + self._launch_create_volume_details = launch_create_volume_details + + 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/core/models/launch_create_volume_details.py b/src/oci/core/models/launch_create_volume_details.py new file mode 100644 index 0000000000..80bdef3e79 --- /dev/null +++ b/src/oci/core/models/launch_create_volume_details.py @@ -0,0 +1,101 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20160918 + + +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 LaunchCreateVolumeDetails(object): + """ + Define a volume that will be created and attached or attached to an instance on creation. + """ + + #: A constant which can be used with the volume_creation_type property of a LaunchCreateVolumeDetails. + #: This constant has a value of "ATTRIBUTES" + VOLUME_CREATION_TYPE_ATTRIBUTES = "ATTRIBUTES" + + def __init__(self, **kwargs): + """ + Initializes a new LaunchCreateVolumeDetails object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.core.models.LaunchCreateVolumeFromAttributes` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param volume_creation_type: + The value to assign to the volume_creation_type property of this LaunchCreateVolumeDetails. + Allowed values for this property are: "ATTRIBUTES" + :type volume_creation_type: str + + """ + self.swagger_types = { + 'volume_creation_type': 'str' + } + + self.attribute_map = { + 'volume_creation_type': 'volumeCreationType' + } + + self._volume_creation_type = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['volumeCreationType'] + + if type == 'ATTRIBUTES': + return 'LaunchCreateVolumeFromAttributes' + else: + return 'LaunchCreateVolumeDetails' + + @property + def volume_creation_type(self): + """ + **[Required]** Gets the volume_creation_type of this LaunchCreateVolumeDetails. + Specifies the method for volume creation. + + Allowed values for this property are: "ATTRIBUTES" + + + :return: The volume_creation_type of this LaunchCreateVolumeDetails. + :rtype: str + """ + return self._volume_creation_type + + @volume_creation_type.setter + def volume_creation_type(self, volume_creation_type): + """ + Sets the volume_creation_type of this LaunchCreateVolumeDetails. + Specifies the method for volume creation. + + + :param volume_creation_type: The volume_creation_type of this LaunchCreateVolumeDetails. + :type: str + """ + allowed_values = ["ATTRIBUTES"] + if not value_allowed_none_or_none_sentinel(volume_creation_type, allowed_values): + raise ValueError( + f"Invalid value for `volume_creation_type`, must be None or one of {allowed_values}" + ) + self._volume_creation_type = volume_creation_type + + 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/core/models/launch_create_volume_from_attributes.py b/src/oci/core/models/launch_create_volume_from_attributes.py new file mode 100644 index 0000000000..741dc3b792 --- /dev/null +++ b/src/oci/core/models/launch_create_volume_from_attributes.py @@ -0,0 +1,240 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20160918 + +from .launch_create_volume_details import LaunchCreateVolumeDetails +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 LaunchCreateVolumeFromAttributes(LaunchCreateVolumeDetails): + """ + The details of the volume to create for CreateVolume operation. + """ + + def __init__(self, **kwargs): + """ + Initializes a new LaunchCreateVolumeFromAttributes object with values from keyword arguments. The default value of the :py:attr:`~oci.core.models.LaunchCreateVolumeFromAttributes.volume_creation_type` attribute + of this class is ``ATTRIBUTES`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param volume_creation_type: + The value to assign to the volume_creation_type property of this LaunchCreateVolumeFromAttributes. + Allowed values for this property are: "ATTRIBUTES" + :type volume_creation_type: str + + :param compartment_id: + The value to assign to the compartment_id property of this LaunchCreateVolumeFromAttributes. + :type compartment_id: str + + :param display_name: + The value to assign to the display_name property of this LaunchCreateVolumeFromAttributes. + :type display_name: str + + :param kms_key_id: + The value to assign to the kms_key_id property of this LaunchCreateVolumeFromAttributes. + :type kms_key_id: str + + :param vpus_per_gb: + The value to assign to the vpus_per_gb property of this LaunchCreateVolumeFromAttributes. + :type vpus_per_gb: int + + :param size_in_gbs: + The value to assign to the size_in_gbs property of this LaunchCreateVolumeFromAttributes. + :type size_in_gbs: int + + """ + self.swagger_types = { + 'volume_creation_type': 'str', + 'compartment_id': 'str', + 'display_name': 'str', + 'kms_key_id': 'str', + 'vpus_per_gb': 'int', + 'size_in_gbs': 'int' + } + + self.attribute_map = { + 'volume_creation_type': 'volumeCreationType', + 'compartment_id': 'compartmentId', + 'display_name': 'displayName', + 'kms_key_id': 'kmsKeyId', + 'vpus_per_gb': 'vpusPerGB', + 'size_in_gbs': 'sizeInGBs' + } + + self._volume_creation_type = None + self._compartment_id = None + self._display_name = None + self._kms_key_id = None + self._vpus_per_gb = None + self._size_in_gbs = None + self._volume_creation_type = 'ATTRIBUTES' + + @property + def compartment_id(self): + """ + Gets the compartment_id of this LaunchCreateVolumeFromAttributes. + The OCID of the compartment that contains the volume. If not provided, + it will be inherited from the instance. + + + :return: The compartment_id of this LaunchCreateVolumeFromAttributes. + :rtype: str + """ + return self._compartment_id + + @compartment_id.setter + def compartment_id(self, compartment_id): + """ + Sets the compartment_id of this LaunchCreateVolumeFromAttributes. + The OCID of the compartment that contains the volume. If not provided, + it will be inherited from the instance. + + + :param compartment_id: The compartment_id of this LaunchCreateVolumeFromAttributes. + :type: str + """ + self._compartment_id = compartment_id + + @property + def display_name(self): + """ + Gets the display_name of this LaunchCreateVolumeFromAttributes. + A user-friendly name. Does not have to be unique, and it's changeable. + Avoid entering confidential information. + + + :return: The display_name of this LaunchCreateVolumeFromAttributes. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this LaunchCreateVolumeFromAttributes. + A user-friendly name. Does not have to be unique, and it's changeable. + Avoid entering confidential information. + + + :param display_name: The display_name of this LaunchCreateVolumeFromAttributes. + :type: str + """ + self._display_name = display_name + + @property + def kms_key_id(self): + """ + Gets the kms_key_id of this LaunchCreateVolumeFromAttributes. + The OCID of the Vault service key to assign as the master encryption key + for the volume. + + + :return: The kms_key_id of this LaunchCreateVolumeFromAttributes. + :rtype: str + """ + return self._kms_key_id + + @kms_key_id.setter + def kms_key_id(self, kms_key_id): + """ + Sets the kms_key_id of this LaunchCreateVolumeFromAttributes. + The OCID of the Vault service key to assign as the master encryption key + for the volume. + + + :param kms_key_id: The kms_key_id of this LaunchCreateVolumeFromAttributes. + :type: str + """ + self._kms_key_id = kms_key_id + + @property + def vpus_per_gb(self): + """ + Gets the vpus_per_gb of this LaunchCreateVolumeFromAttributes. + The number of volume performance units (VPUs) that will be applied to this volume per GB, + representing the Block Volume service's elastic performance options. + See `Block Volume Performance Levels`__ for more information. + + Allowed values: + + * `0`: Represents Lower Cost option. + + * `10`: Represents Balanced option. + + * `20`: Represents Higher Performance option. + + * `30`-`120`: Represents the Ultra High Performance option. + + __ https://docs.cloud.oracle.com/iaas/Content/Block/Concepts/blockvolumeperformance.htm#perf_levels + + + :return: The vpus_per_gb of this LaunchCreateVolumeFromAttributes. + :rtype: int + """ + return self._vpus_per_gb + + @vpus_per_gb.setter + def vpus_per_gb(self, vpus_per_gb): + """ + Sets the vpus_per_gb of this LaunchCreateVolumeFromAttributes. + The number of volume performance units (VPUs) that will be applied to this volume per GB, + representing the Block Volume service's elastic performance options. + See `Block Volume Performance Levels`__ for more information. + + Allowed values: + + * `0`: Represents Lower Cost option. + + * `10`: Represents Balanced option. + + * `20`: Represents Higher Performance option. + + * `30`-`120`: Represents the Ultra High Performance option. + + __ https://docs.cloud.oracle.com/iaas/Content/Block/Concepts/blockvolumeperformance.htm#perf_levels + + + :param vpus_per_gb: The vpus_per_gb of this LaunchCreateVolumeFromAttributes. + :type: int + """ + self._vpus_per_gb = vpus_per_gb + + @property + def size_in_gbs(self): + """ + **[Required]** Gets the size_in_gbs of this LaunchCreateVolumeFromAttributes. + The size of the volume in GBs. + + + :return: The size_in_gbs of this LaunchCreateVolumeFromAttributes. + :rtype: int + """ + return self._size_in_gbs + + @size_in_gbs.setter + def size_in_gbs(self, size_in_gbs): + """ + Sets the size_in_gbs of this LaunchCreateVolumeFromAttributes. + The size of the volume in GBs. + + + :param size_in_gbs: The size_in_gbs of this LaunchCreateVolumeFromAttributes. + :type: int + """ + self._size_in_gbs = size_in_gbs + + 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/core/models/launch_instance_details.py b/src/oci/core/models/launch_instance_details.py index 3e3ef47ed5..9ccc9bbcc1 100644 --- a/src/oci/core/models/launch_instance_details.py +++ b/src/oci/core/models/launch_instance_details.py @@ -117,6 +117,10 @@ def __init__(self, **kwargs): The value to assign to the subnet_id property of this LaunchInstanceDetails. :type subnet_id: str + :param launch_volume_attachments: + The value to assign to the launch_volume_attachments property of this LaunchInstanceDetails. + :type launch_volume_attachments: list[oci.core.models.LaunchAttachVolumeDetails] + :param is_pv_encryption_in_transit_enabled: The value to assign to the is_pv_encryption_in_transit_enabled property of this LaunchInstanceDetails. :type is_pv_encryption_in_transit_enabled: bool @@ -155,6 +159,7 @@ def __init__(self, **kwargs): 'shape_config': 'LaunchInstanceShapeConfigDetails', 'source_details': 'InstanceSourceDetails', 'subnet_id': 'str', + 'launch_volume_attachments': 'list[LaunchAttachVolumeDetails]', 'is_pv_encryption_in_transit_enabled': 'bool', 'platform_config': 'LaunchInstancePlatformConfig', 'instance_configuration_id': 'str' @@ -185,6 +190,7 @@ def __init__(self, **kwargs): 'shape_config': 'shapeConfig', 'source_details': 'sourceDetails', 'subnet_id': 'subnetId', + 'launch_volume_attachments': 'launchVolumeAttachments', 'is_pv_encryption_in_transit_enabled': 'isPvEncryptionInTransitEnabled', 'platform_config': 'platformConfig', 'instance_configuration_id': 'instanceConfigurationId' @@ -214,6 +220,7 @@ def __init__(self, **kwargs): self._shape_config = None self._source_details = None self._subnet_id = None + self._launch_volume_attachments = None self._is_pv_encryption_in_transit_enabled = None self._platform_config = None self._instance_configuration_id = None @@ -1022,6 +1029,30 @@ def subnet_id(self, subnet_id): """ self._subnet_id = subnet_id + @property + def launch_volume_attachments(self): + """ + Gets the launch_volume_attachments of this LaunchInstanceDetails. + Volume attachments to create as part of the launch instance operation. + + + :return: The launch_volume_attachments of this LaunchInstanceDetails. + :rtype: list[oci.core.models.LaunchAttachVolumeDetails] + """ + return self._launch_volume_attachments + + @launch_volume_attachments.setter + def launch_volume_attachments(self, launch_volume_attachments): + """ + Sets the launch_volume_attachments of this LaunchInstanceDetails. + Volume attachments to create as part of the launch instance operation. + + + :param launch_volume_attachments: The launch_volume_attachments of this LaunchInstanceDetails. + :type: list[oci.core.models.LaunchAttachVolumeDetails] + """ + self._launch_volume_attachments = launch_volume_attachments + @property def is_pv_encryption_in_transit_enabled(self): """ diff --git a/src/oci/data_catalog/data_catalog_client.py b/src/oci/data_catalog/data_catalog_client.py index 19fd0d240a..28e338809a 100644 --- a/src/oci/data_catalog/data_catalog_client.py +++ b/src/oci/data_catalog/data_catalog_client.py @@ -692,6 +692,140 @@ def associate_custom_property(self, catalog_id, type_key, associate_custom_prope api_reference_link=api_reference_link, required_arguments=required_arguments) + def asynchronous_export_data_asset(self, catalog_id, data_asset_key, asynchronous_export_data_asset_details, export_type, **kwargs): + """ + Export technical objects from a Data Asset in Excel format. Returns details about the job which actually performs the export. + + + :param str catalog_id: (required) + Unique catalog identifier. + + :param str data_asset_key: (required) + Unique data asset key. + + :param oci.data_catalog.models.AsynchronousExportDataAssetDetails asynchronous_export_data_asset_details: (required) + Details needed by the Data Asset export request. + + :param oci.data_catalog.models.list[str] export_type: (required) + Type of export. + + Allowed values are: "CUSTOM_PROPERTY_VALUES", "ALL" + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. For example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + might 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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.data_catalog.models.AsynchronousExportDataAssetResult` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use asynchronous_export_data_asset API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['catalogId', 'dataAssetKey', 'exportType'] + resource_path = "/catalogs/{catalogId}/dataAssets/{dataAssetKey}/actions/asynchronousExport" + method = "POST" + operation_name = "asynchronous_export_data_asset" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/data-catalog/20190325/DataAsset/AsynchronousExportDataAsset" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"asynchronous_export_data_asset got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "catalogId": catalog_id, + "dataAssetKey": data_asset_key + } + + 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(f'Parameter {k} cannot be None, whitespace or empty string') + + export_type_allowed_values = ["CUSTOM_PROPERTY_VALUES", "ALL"] + for export_type_item in export_type: + if export_type_item not in export_type_allowed_values: + raise ValueError( + f"Invalid value for `export_type`, must be one of { export_type_allowed_values }" + ) + + query_params = { + "exportType": self.base_client.generate_collection_format_param(export_type, 'multi') + } + 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), + "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.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + body=asynchronous_export_data_asset_details, + response_type="AsynchronousExportDataAssetResult", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + body=asynchronous_export_data_asset_details, + response_type="AsynchronousExportDataAssetResult", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def asynchronous_export_glossary(self, catalog_id, glossary_key, asynchronous_export_glossary_details, **kwargs): """ Exports the contents of a glossary in Excel format. Returns details about the job which actually performs the export. @@ -13173,7 +13307,7 @@ def list_job_definitions(self, catalog_id, **kwargs): :param str job_type: (optional) Job type. - Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :param bool is_incremental: (optional) Whether job definition is an incremental harvest (true) or a full harvest (false). @@ -13310,7 +13444,7 @@ def list_job_definitions(self, catalog_id, **kwargs): ) if 'job_type' in kwargs: - job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if kwargs['job_type'] not in job_type_allowed_values: raise ValueError( f"Invalid value for `job_type`, must be one of { job_type_allowed_values }" @@ -13439,7 +13573,7 @@ def list_job_executions(self, catalog_id, job_key, **kwargs): :param str job_type: (optional) Job type. - Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :param str sub_type: (optional) Sub-type of this job execution. @@ -13577,7 +13711,7 @@ def list_job_executions(self, catalog_id, job_key, **kwargs): ) if 'job_type' in kwargs: - job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if kwargs['job_type'] not in job_type_allowed_values: raise ValueError( f"Invalid value for `job_type`, must be one of { job_type_allowed_values }" @@ -14155,7 +14289,7 @@ def list_jobs(self, catalog_id, **kwargs): :param str job_type: (optional) Job type. - Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :param str job_definition_key: (optional) Unique job definition key. @@ -14299,7 +14433,7 @@ def list_jobs(self, catalog_id, **kwargs): ) if 'job_type' in kwargs: - job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + job_type_allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if kwargs['job_type'] not in job_type_allowed_values: raise ValueError( f"Invalid value for `job_type`, must be one of { job_type_allowed_values }" diff --git a/src/oci/data_catalog/models/__init__.py b/src/oci/data_catalog/models/__init__.py index 8ac966386a..0e3b5bfe73 100644 --- a/src/oci/data_catalog/models/__init__.py +++ b/src/oci/data_catalog/models/__init__.py @@ -7,6 +7,8 @@ from __future__ import absolute_import from .add_resource_lock_details import AddResourceLockDetails +from .asynchronous_export_data_asset_details import AsynchronousExportDataAssetDetails +from .asynchronous_export_data_asset_result import AsynchronousExportDataAssetResult from .asynchronous_export_glossary_details import AsynchronousExportGlossaryDetails from .asynchronous_export_glossary_result import AsynchronousExportGlossaryResult from .asynchronous_export_request_details import AsynchronousExportRequestDetails @@ -187,6 +189,8 @@ # Maps type names to classes for data_catalog services. data_catalog_type_mapping = { "AddResourceLockDetails": AddResourceLockDetails, + "AsynchronousExportDataAssetDetails": AsynchronousExportDataAssetDetails, + "AsynchronousExportDataAssetResult": AsynchronousExportDataAssetResult, "AsynchronousExportGlossaryDetails": AsynchronousExportGlossaryDetails, "AsynchronousExportGlossaryResult": AsynchronousExportGlossaryResult, "AsynchronousExportRequestDetails": AsynchronousExportRequestDetails, diff --git a/src/oci/data_catalog/models/asynchronous_export_data_asset_details.py b/src/oci/data_catalog/models/asynchronous_export_data_asset_details.py new file mode 100644 index 0000000000..4313d17a79 --- /dev/null +++ b/src/oci/data_catalog/models/asynchronous_export_data_asset_details.py @@ -0,0 +1,99 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190325 + + +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 AsynchronousExportDataAssetDetails(object): + """ + Details needed by the Data Asset export request. + """ + + def __init__(self, **kwargs): + """ + Initializes a new AsynchronousExportDataAssetDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param export_scope: + The value to assign to the export_scope property of this AsynchronousExportDataAssetDetails. + :type export_scope: list[oci.data_catalog.models.DataAssetExportScope] + + :param object_storage_target: + The value to assign to the object_storage_target property of this AsynchronousExportDataAssetDetails. + :type object_storage_target: oci.data_catalog.models.ObjectStorageObjectReference + + """ + self.swagger_types = { + 'export_scope': 'list[DataAssetExportScope]', + 'object_storage_target': 'ObjectStorageObjectReference' + } + + self.attribute_map = { + 'export_scope': 'exportScope', + 'object_storage_target': 'objectStorageTarget' + } + + self._export_scope = None + self._object_storage_target = None + + @property + def export_scope(self): + """ + Gets the export_scope of this AsynchronousExportDataAssetDetails. + Array of objects and their child types to be selected for export. + + + :return: The export_scope of this AsynchronousExportDataAssetDetails. + :rtype: list[oci.data_catalog.models.DataAssetExportScope] + """ + return self._export_scope + + @export_scope.setter + def export_scope(self, export_scope): + """ + Sets the export_scope of this AsynchronousExportDataAssetDetails. + Array of objects and their child types to be selected for export. + + + :param export_scope: The export_scope of this AsynchronousExportDataAssetDetails. + :type: list[oci.data_catalog.models.DataAssetExportScope] + """ + self._export_scope = export_scope + + @property + def object_storage_target(self): + """ + Gets the object_storage_target of this AsynchronousExportDataAssetDetails. + + :return: The object_storage_target of this AsynchronousExportDataAssetDetails. + :rtype: oci.data_catalog.models.ObjectStorageObjectReference + """ + return self._object_storage_target + + @object_storage_target.setter + def object_storage_target(self, object_storage_target): + """ + Sets the object_storage_target of this AsynchronousExportDataAssetDetails. + + :param object_storage_target: The object_storage_target of this AsynchronousExportDataAssetDetails. + :type: oci.data_catalog.models.ObjectStorageObjectReference + """ + self._object_storage_target = object_storage_target + + 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/data_catalog/models/asynchronous_export_data_asset_result.py b/src/oci/data_catalog/models/asynchronous_export_data_asset_result.py new file mode 100644 index 0000000000..95c49cf8ef --- /dev/null +++ b/src/oci/data_catalog/models/asynchronous_export_data_asset_result.py @@ -0,0 +1,196 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190325 + + +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 AsynchronousExportDataAssetResult(object): + """ + Details about the job which performs an export. + """ + + def __init__(self, **kwargs): + """ + Initializes a new AsynchronousExportDataAssetResult object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param job_definition_name: + The value to assign to the job_definition_name property of this AsynchronousExportDataAssetResult. + :type job_definition_name: str + + :param job_definition_key: + The value to assign to the job_definition_key property of this AsynchronousExportDataAssetResult. + :type job_definition_key: str + + :param job_key: + The value to assign to the job_key property of this AsynchronousExportDataAssetResult. + :type job_key: str + + :param job_execution_key: + The value to assign to the job_execution_key property of this AsynchronousExportDataAssetResult. + :type job_execution_key: str + + :param source_key: + The value to assign to the source_key property of this AsynchronousExportDataAssetResult. + :type source_key: str + + """ + self.swagger_types = { + 'job_definition_name': 'str', + 'job_definition_key': 'str', + 'job_key': 'str', + 'job_execution_key': 'str', + 'source_key': 'str' + } + + self.attribute_map = { + 'job_definition_name': 'jobDefinitionName', + 'job_definition_key': 'jobDefinitionKey', + 'job_key': 'jobKey', + 'job_execution_key': 'jobExecutionKey', + 'source_key': 'sourceKey' + } + + self._job_definition_name = None + self._job_definition_key = None + self._job_key = None + self._job_execution_key = None + self._source_key = None + + @property + def job_definition_name(self): + """ + Gets the job_definition_name of this AsynchronousExportDataAssetResult. + Display name of the export job. + + + :return: The job_definition_name of this AsynchronousExportDataAssetResult. + :rtype: str + """ + return self._job_definition_name + + @job_definition_name.setter + def job_definition_name(self, job_definition_name): + """ + Sets the job_definition_name of this AsynchronousExportDataAssetResult. + Display name of the export job. + + + :param job_definition_name: The job_definition_name of this AsynchronousExportDataAssetResult. + :type: str + """ + self._job_definition_name = job_definition_name + + @property + def job_definition_key(self): + """ + Gets the job_definition_key of this AsynchronousExportDataAssetResult. + Unique key of the export job definition. + + + :return: The job_definition_key of this AsynchronousExportDataAssetResult. + :rtype: str + """ + return self._job_definition_key + + @job_definition_key.setter + def job_definition_key(self, job_definition_key): + """ + Sets the job_definition_key of this AsynchronousExportDataAssetResult. + Unique key of the export job definition. + + + :param job_definition_key: The job_definition_key of this AsynchronousExportDataAssetResult. + :type: str + """ + self._job_definition_key = job_definition_key + + @property + def job_key(self): + """ + Gets the job_key of this AsynchronousExportDataAssetResult. + Unique key of the export job. + + + :return: The job_key of this AsynchronousExportDataAssetResult. + :rtype: str + """ + return self._job_key + + @job_key.setter + def job_key(self, job_key): + """ + Sets the job_key of this AsynchronousExportDataAssetResult. + Unique key of the export job. + + + :param job_key: The job_key of this AsynchronousExportDataAssetResult. + :type: str + """ + self._job_key = job_key + + @property + def job_execution_key(self): + """ + Gets the job_execution_key of this AsynchronousExportDataAssetResult. + Unique key of the job execution. + + + :return: The job_execution_key of this AsynchronousExportDataAssetResult. + :rtype: str + """ + return self._job_execution_key + + @job_execution_key.setter + def job_execution_key(self, job_execution_key): + """ + Sets the job_execution_key of this AsynchronousExportDataAssetResult. + Unique key of the job execution. + + + :param job_execution_key: The job_execution_key of this AsynchronousExportDataAssetResult. + :type: str + """ + self._job_execution_key = job_execution_key + + @property + def source_key(self): + """ + Gets the source_key of this AsynchronousExportDataAssetResult. + Unique key of the object being exported. + + + :return: The source_key of this AsynchronousExportDataAssetResult. + :rtype: str + """ + return self._source_key + + @source_key.setter + def source_key(self, source_key): + """ + Sets the source_key of this AsynchronousExportDataAssetResult. + Unique key of the object being exported. + + + :param source_key: The source_key of this AsynchronousExportDataAssetResult. + :type: str + """ + self._source_key = source_key + + 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/data_catalog/models/create_job_definition_details.py b/src/oci/data_catalog/models/create_job_definition_details.py index 9fc2b24d55..75f8abb1a6 100644 --- a/src/oci/data_catalog/models/create_job_definition_details.py +++ b/src/oci/data_catalog/models/create_job_definition_details.py @@ -93,6 +93,10 @@ class CreateJobDefinitionDetails(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a CreateJobDefinitionDetails. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + def __init__(self, **kwargs): """ Initializes a new CreateJobDefinitionDetails object with values from keyword arguments. @@ -108,7 +112,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this CreateJobDefinitionDetails. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :type job_type: str :param is_incremental: @@ -233,7 +237,7 @@ def job_type(self): **[Required]** Gets the job_type of this CreateJobDefinitionDetails. Type of the job definition. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :return: The job_type of this CreateJobDefinitionDetails. @@ -251,7 +255,7 @@ def job_type(self, job_type): :param job_type: The job_type of this CreateJobDefinitionDetails. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): raise ValueError( f"Invalid value for `job_type`, must be None or one of {allowed_values}" diff --git a/src/oci/data_catalog/models/create_job_execution_details.py b/src/oci/data_catalog/models/create_job_execution_details.py index 93d6d5577f..c67a5efdad 100644 --- a/src/oci/data_catalog/models/create_job_execution_details.py +++ b/src/oci/data_catalog/models/create_job_execution_details.py @@ -91,6 +91,10 @@ class CreateJobExecutionDetails(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a CreateJobExecutionDetails. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the lifecycle_state property of a CreateJobExecutionDetails. #: This constant has a value of "CREATED" LIFECYCLE_STATE_CREATED = "CREATED" @@ -130,7 +134,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this CreateJobExecutionDetails. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :type job_type: str :param parent_key: @@ -262,7 +266,7 @@ def job_type(self): Gets the job_type of this CreateJobExecutionDetails. Type of the job execution. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY" + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET" :return: The job_type of this CreateJobExecutionDetails. @@ -280,7 +284,7 @@ def job_type(self, job_type): :param job_type: The job_type of this CreateJobExecutionDetails. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): raise ValueError( f"Invalid value for `job_type`, must be None or one of {allowed_values}" diff --git a/src/oci/data_catalog/models/job.py b/src/oci/data_catalog/models/job.py index 8cb6c807ac..e5d92b185a 100644 --- a/src/oci/data_catalog/models/job.py +++ b/src/oci/data_catalog/models/job.py @@ -103,6 +103,10 @@ class Job(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a Job. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the schedule_type property of a Job. #: This constant has a value of "SCHEDULED" SCHEDULE_TYPE_SCHEDULED = "SCHEDULED" @@ -148,7 +152,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this Job. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -497,7 +501,7 @@ def job_type(self): Gets the job_type of this Job. Type of the job. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -516,7 +520,7 @@ def job_type(self, job_type): :param job_type: The job_type of this Job. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/data_catalog/models/job_definition.py b/src/oci/data_catalog/models/job_definition.py index 6f85b4f770..243fffd1a7 100644 --- a/src/oci/data_catalog/models/job_definition.py +++ b/src/oci/data_catalog/models/job_definition.py @@ -93,6 +93,10 @@ class JobDefinition(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a JobDefinition. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the lifecycle_state property of a JobDefinition. #: This constant has a value of "CREATING" LIFECYCLE_STATE_CREATING = "CREATING" @@ -180,7 +184,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this JobDefinition. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -423,7 +427,7 @@ def job_type(self): Gets the job_type of this JobDefinition. Type of the job definition. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -442,7 +446,7 @@ def job_type(self, job_type): :param job_type: The job_type of this JobDefinition. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/data_catalog/models/job_definition_summary.py b/src/oci/data_catalog/models/job_definition_summary.py index 5a1b5c4cf6..a041544895 100644 --- a/src/oci/data_catalog/models/job_definition_summary.py +++ b/src/oci/data_catalog/models/job_definition_summary.py @@ -93,6 +93,10 @@ class JobDefinitionSummary(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a JobDefinitionSummary. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the lifecycle_state property of a JobDefinitionSummary. #: This constant has a value of "CREATING" LIFECYCLE_STATE_CREATING = "CREATING" @@ -188,7 +192,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this JobDefinitionSummary. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -422,7 +426,7 @@ def job_type(self): Gets the job_type of this JobDefinitionSummary. Type of the job definition. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -441,7 +445,7 @@ def job_type(self, job_type): :param job_type: The job_type of this JobDefinitionSummary. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/data_catalog/models/job_execution.py b/src/oci/data_catalog/models/job_execution.py index 73c6151fc2..090615c7ae 100644 --- a/src/oci/data_catalog/models/job_execution.py +++ b/src/oci/data_catalog/models/job_execution.py @@ -91,6 +91,10 @@ class JobExecution(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a JobExecution. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the lifecycle_state property of a JobExecution. #: This constant has a value of "CREATED" LIFECYCLE_STATE_CREATED = "CREATED" @@ -134,7 +138,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this JobExecution. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -330,7 +334,7 @@ def job_type(self): Gets the job_type of this JobExecution. Type of the job execution. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -349,7 +353,7 @@ def job_type(self, job_type): :param job_type: The job_type of this JobExecution. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/data_catalog/models/job_execution_summary.py b/src/oci/data_catalog/models/job_execution_summary.py index 7317f4d7c6..2a8b4affe0 100644 --- a/src/oci/data_catalog/models/job_execution_summary.py +++ b/src/oci/data_catalog/models/job_execution_summary.py @@ -91,6 +91,10 @@ class JobExecutionSummary(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a JobExecutionSummary. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + #: A constant which can be used with the lifecycle_state property of a JobExecutionSummary. #: This constant has a value of "CREATED" LIFECYCLE_STATE_CREATED = "CREATED" @@ -134,7 +138,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this JobExecutionSummary. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -260,7 +264,7 @@ def job_type(self): Gets the job_type of this JobExecutionSummary. Type of the job execution. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -279,7 +283,7 @@ def job_type(self, job_type): :param job_type: The job_type of this JobExecutionSummary. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/data_catalog/models/job_summary.py b/src/oci/data_catalog/models/job_summary.py index 6cae36e049..dd49005612 100644 --- a/src/oci/data_catalog/models/job_summary.py +++ b/src/oci/data_catalog/models/job_summary.py @@ -103,6 +103,10 @@ class JobSummary(object): #: This constant has a value of "ASYNC_EXPORT_GLOSSARY" JOB_TYPE_ASYNC_EXPORT_GLOSSARY = "ASYNC_EXPORT_GLOSSARY" + #: A constant which can be used with the job_type property of a JobSummary. + #: This constant has a value of "ASYNC_EXPORT_DATA_ASSET" + JOB_TYPE_ASYNC_EXPORT_DATA_ASSET = "ASYNC_EXPORT_DATA_ASSET" + def __init__(self, **kwargs): """ Initializes a new JobSummary object with values from keyword arguments. @@ -136,7 +140,7 @@ def __init__(self, **kwargs): :param job_type: The value to assign to the job_type property of this JobSummary. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type job_type: str @@ -439,7 +443,7 @@ def job_type(self): Gets the job_type of this JobSummary. Type of the job. - Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -458,7 +462,7 @@ def job_type(self, job_type): :param job_type: The job_type of this JobSummary. :type: str """ - allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY"] + allowed_values = ["HARVEST", "PROFILING", "SAMPLING", "PREVIEW", "IMPORT", "EXPORT", "IMPORT_GLOSSARY", "EXPORT_GLOSSARY", "INTERNAL", "PURGE", "IMMEDIATE", "SCHEDULED", "IMMEDIATE_EXECUTION", "SCHEDULED_EXECUTION", "SCHEDULED_EXECUTION_INSTANCE", "ASYNC_DELETE", "IMPORT_DATA_ASSET", "CREATE_SCAN_PROXY", "ASYNC_EXPORT_GLOSSARY", "ASYNC_EXPORT_DATA_ASSET"] if not value_allowed_none_or_none_sentinel(job_type, allowed_values): job_type = 'UNKNOWN_ENUM_VALUE' self._job_type = job_type diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index d5de1eecea..266be81ce4 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -6414,9 +6414,9 @@ def create_key_store(self, create_key_store_details, **kwargs): def create_maintenance_run(self, create_maintenance_run_details, **kwargs): """ Creates a maintenance run with one of the following: - The latest available release update patch (RUP) for the Autonomous Container Database. - The latest available RUP and DST time zone (TZ) file updates for the Autonomous Container Database. - Creates a maintenance run to update the DST TZ file for the Autonomous Container Database. + 1. The latest available release update patch (RUP) for the Autonomous Container Database. + 2. The latest available RUP and DST time-zone (TZ) file updates for the Autonomous Container Database. + 3. The DST TZ file updates for the Autonomous Container Database. :param oci.database.models.CreateMaintenanceRunDetails create_maintenance_run_details: (required) @@ -12844,9 +12844,12 @@ def enable_pluggable_database_management(self, pluggable_database_id, enable_plu def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): """ - Initiates a failover the specified Autonomous Database to a standby. To perform a failover to a standby located in a remote region, specify the `OCID`__ of the remote standby using the `peerDbId` parameter. - - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + Initiates a failover of the specified Autonomous Database to the associated peer database. Applicable only to databases with Disaster Recovery enabled. + This API should be called in the remote region where the peer database resides. + Below parameter is optional: + - `peerDbId` + Use this parameter to specify the database OCID of the Disaster Recovery peer, which is located in a different (remote) region from the current peer database. + If this parameter is not provided, the failover will happen in the same region. :param str autonomous_database_id: (required) @@ -12870,9 +12873,7 @@ def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): Unique identifier for the request. :param str peer_db_id: (optional) - The database `OCID`__ of the Autonomous Data Guard standby database located in a different (remote) region from the source primary Autonomous Database. - - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + The database OCID(/Content/General/Concepts/identifiers.htm) of the Disaster Recovery peer (source Primary) database, which is located in a different (remote) region from the current peer database. :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. @@ -22612,6 +22613,9 @@ def list_cloud_exadata_infrastructures(self, compartment_id, **kwargs): :param str display_name: (optional) A filter to return only resources that match the entire display name given. The match is not case sensitive. + :param str cluster_placement_group_id: (optional) + A filter to return only resources that match the given cluster placement group ID exactly. + :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. @@ -22647,7 +22651,8 @@ def list_cloud_exadata_infrastructures(self, compartment_id, **kwargs): "sort_by", "sort_order", "lifecycle_state", - "display_name" + "display_name", + "cluster_placement_group_id" ] extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: @@ -22682,7 +22687,8 @@ def list_cloud_exadata_infrastructures(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing), - "displayName": kwargs.get("display_name", missing) + "displayName": kwargs.get("display_name", missing), + "clusterPlacementGroupId": kwargs.get("cluster_placement_group_id", missing) } query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} @@ -32841,9 +32847,12 @@ def switchover_autonomous_container_database_dataguard_association(self, autonom def switchover_autonomous_database(self, autonomous_database_id, **kwargs): """ - Initiates a switchover of the specified Autonomous Database to the associated standby database. Applicable only to databases with Autonomous Data Guard enabled. To perform a switchover to a standby located in a remote region, specify the `OCID`__ of the remote standby using the `peerDbId` parameter. - - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + Initiates a switchover of the specified Autonomous Database to the associated peer database. Applicable only to databases with Disaster Recovery enabled. + This API should be called in the remote region where the peer database resides. + Below parameter is optional: + - `peerDbId` + Use this parameter to specify the database OCID of the Disaster Recovery peer, which is located in a different (remote) region from the current peer database. + If this parameter is not provided, the switchover will happen in the same region. :param str autonomous_database_id: (required) @@ -32867,9 +32876,7 @@ def switchover_autonomous_database(self, autonomous_database_id, **kwargs): Unique identifier for the request. :param str peer_db_id: (optional) - The database `OCID`__ of the Autonomous Data Guard standby database located in a different (remote) region from the source primary Autonomous Database. - - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + The database OCID(/Content/General/Concepts/identifiers.htm) of the Disaster Recovery peer (source Primary) database, which is located in a different (remote) region from the current peer database. :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. diff --git a/src/oci/database/models/__init__.py b/src/oci/database/models/__init__.py index b9497cf955..4c4762d1a6 100644 --- a/src/oci/database/models/__init__.py +++ b/src/oci/database/models/__init__.py @@ -160,9 +160,9 @@ from .data_guard_association import DataGuardAssociation from .data_guard_association_summary import DataGuardAssociationSummary from .database import Database -from .database_connection_credentails_by_name import DatabaseConnectionCredentailsByName from .database_connection_credentials import DatabaseConnectionCredentials from .database_connection_credentials_by_details import DatabaseConnectionCredentialsByDetails +from .database_connection_credentials_by_name import DatabaseConnectionCredentialsByName from .database_connection_string import DatabaseConnectionString from .database_connection_string_profile import DatabaseConnectionStringProfile from .database_connection_strings import DatabaseConnectionStrings @@ -529,9 +529,9 @@ "DataGuardAssociation": DataGuardAssociation, "DataGuardAssociationSummary": DataGuardAssociationSummary, "Database": Database, - "DatabaseConnectionCredentailsByName": DatabaseConnectionCredentailsByName, "DatabaseConnectionCredentials": DatabaseConnectionCredentials, "DatabaseConnectionCredentialsByDetails": DatabaseConnectionCredentialsByDetails, + "DatabaseConnectionCredentialsByName": DatabaseConnectionCredentialsByName, "DatabaseConnectionString": DatabaseConnectionString, "DatabaseConnectionStringProfile": DatabaseConnectionStringProfile, "DatabaseConnectionStrings": DatabaseConnectionStrings, diff --git a/src/oci/database/models/autonomous_container_database.py b/src/oci/database/models/autonomous_container_database.py index 40cd00b4c0..c440d5b133 100644 --- a/src/oci/database/models/autonomous_container_database.py +++ b/src/oci/database/models/autonomous_container_database.py @@ -761,7 +761,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousContainerDatabase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -776,7 +776,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousContainerDatabase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -791,7 +791,7 @@ def vault_id(self, vault_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousContainerDatabase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousContainerDatabase. @@ -803,7 +803,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousContainerDatabase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousContainerDatabase. @@ -1155,7 +1155,7 @@ def is_dst_file_update_enabled(self, is_dst_file_update_enabled): def dst_file_version(self): """ Gets the dst_file_version of this AutonomousContainerDatabase. - DST Time Zone File version of the Autonomous Container Database. + DST Time-zone File version of the Autonomous Container Database. :return: The dst_file_version of this AutonomousContainerDatabase. @@ -1167,7 +1167,7 @@ def dst_file_version(self): def dst_file_version(self, dst_file_version): """ Sets the dst_file_version of this AutonomousContainerDatabase. - DST Time Zone File version of the Autonomous Container Database. + DST Time-zone File version of the Autonomous Container Database. :param dst_file_version: The dst_file_version of this AutonomousContainerDatabase. @@ -1341,7 +1341,7 @@ def backup_config(self, backup_config): def key_store_id(self): """ Gets the key_store_id of this AutonomousContainerDatabase. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1355,7 +1355,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousContainerDatabase. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1393,7 +1393,7 @@ def key_store_wallet_name(self, key_store_wallet_name): def memory_per_oracle_compute_unit_in_gbs(self): """ Gets the memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabase. - The amount of memory (in GBs) enabled per OCPU or ECPU in the Autonomous VM Cluster. + The amount of memory (in GBs) enabled per ECPU or OCPU in the Autonomous VM Cluster. :return: The memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabase. @@ -1405,7 +1405,7 @@ def memory_per_oracle_compute_unit_in_gbs(self): def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_in_gbs): """ Sets the memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabase. - The amount of memory (in GBs) enabled per OCPU or ECPU in the Autonomous VM Cluster. + The amount of memory (in GBs) enabled per ECPU or OCPU in the Autonomous VM Cluster. :param memory_per_oracle_compute_unit_in_gbs: The memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabase. @@ -1417,8 +1417,7 @@ def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_i def available_cpus(self): """ Gets the available_cpus of this AutonomousContainerDatabase. - Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database. :return: The available_cpus of this AutonomousContainerDatabase. @@ -1430,8 +1429,7 @@ def available_cpus(self): def available_cpus(self, available_cpus): """ Sets the available_cpus of this AutonomousContainerDatabase. - Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database. :param available_cpus: The available_cpus of this AutonomousContainerDatabase. @@ -1443,8 +1441,7 @@ def available_cpus(self, available_cpus): def total_cpus(self): """ Gets the total_cpus of this AutonomousContainerDatabase. - The number of CPUs allocated to the Autonomous VM cluster.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + The number of CPUs allocated to the Autonomous VM cluster. :return: The total_cpus of this AutonomousContainerDatabase. @@ -1456,8 +1453,7 @@ def total_cpus(self): def total_cpus(self, total_cpus): """ Sets the total_cpus of this AutonomousContainerDatabase. - The number of CPUs allocated to the Autonomous VM cluster.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + The number of CPUs allocated to the Autonomous VM cluster. :param total_cpus: The total_cpus of this AutonomousContainerDatabase. @@ -1469,9 +1465,7 @@ def total_cpus(self, total_cpus): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this AutonomousContainerDatabase. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this AutonomousContainerDatabase. @@ -1483,9 +1477,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this AutonomousContainerDatabase. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this AutonomousContainerDatabase. @@ -1497,8 +1489,7 @@ def reclaimable_cpus(self, reclaimable_cpus): def provisionable_cpus(self): """ Gets the provisionable_cpus of this AutonomousContainerDatabase. - An array of CPU values that can be used to successfully provision a single Autonomous Database.\\ - For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + An array of CPU values that can be used to successfully provision a single Autonomous Database. :return: The provisionable_cpus of this AutonomousContainerDatabase. @@ -1510,8 +1501,7 @@ def provisionable_cpus(self): def provisionable_cpus(self, provisionable_cpus): """ Sets the provisionable_cpus of this AutonomousContainerDatabase. - An array of CPU values that can be used to successfully provision a single Autonomous Database.\\ - For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + An array of CPU values that can be used to successfully provision a single Autonomous Database. :param provisionable_cpus: The provisionable_cpus of this AutonomousContainerDatabase. @@ -1523,7 +1513,9 @@ def provisionable_cpus(self, provisionable_cpus): def compute_model(self): """ Gets the compute_model of this AutonomousContainerDatabase. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1538,7 +1530,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousContainerDatabase. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this AutonomousContainerDatabase. diff --git a/src/oci/database/models/autonomous_container_database_dataguard_association.py b/src/oci/database/models/autonomous_container_database_dataguard_association.py index e1516446b7..6932ffaf49 100644 --- a/src/oci/database/models/autonomous_container_database_dataguard_association.py +++ b/src/oci/database/models/autonomous_container_database_dataguard_association.py @@ -96,8 +96,8 @@ class AutonomousContainerDatabaseDataguardAssociation(object): PEER_LIFECYCLE_STATE_AVAILABLE = "AVAILABLE" #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. - #: This constant has a value of "ROLE_CHANGE_IN_PROGRESS" - PEER_LIFECYCLE_STATE_ROLE_CHANGE_IN_PROGRESS = "ROLE_CHANGE_IN_PROGRESS" + #: This constant has a value of "UPDATING" + PEER_LIFECYCLE_STATE_UPDATING = "UPDATING" #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. #: This constant has a value of "TERMINATING" @@ -112,12 +112,36 @@ class AutonomousContainerDatabaseDataguardAssociation(object): PEER_LIFECYCLE_STATE_FAILED = "FAILED" #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. - #: This constant has a value of "UNAVAILABLE" - PEER_LIFECYCLE_STATE_UNAVAILABLE = "UNAVAILABLE" + #: This constant has a value of "BACKUP_IN_PROGRESS" + PEER_LIFECYCLE_STATE_BACKUP_IN_PROGRESS = "BACKUP_IN_PROGRESS" #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. - #: This constant has a value of "UPDATING" - PEER_LIFECYCLE_STATE_UPDATING = "UPDATING" + #: This constant has a value of "RESTORING" + PEER_LIFECYCLE_STATE_RESTORING = "RESTORING" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "RESTORE_FAILED" + PEER_LIFECYCLE_STATE_RESTORE_FAILED = "RESTORE_FAILED" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "RESTARTING" + PEER_LIFECYCLE_STATE_RESTARTING = "RESTARTING" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "MAINTENANCE_IN_PROGRESS" + PEER_LIFECYCLE_STATE_MAINTENANCE_IN_PROGRESS = "MAINTENANCE_IN_PROGRESS" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "ROLE_CHANGE_IN_PROGRESS" + PEER_LIFECYCLE_STATE_ROLE_CHANGE_IN_PROGRESS = "ROLE_CHANGE_IN_PROGRESS" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "ENABLING_AUTONOMOUS_DATA_GUARD" + PEER_LIFECYCLE_STATE_ENABLING_AUTONOMOUS_DATA_GUARD = "ENABLING_AUTONOMOUS_DATA_GUARD" + + #: A constant which can be used with the peer_lifecycle_state property of a AutonomousContainerDatabaseDataguardAssociation. + #: This constant has a value of "UNAVAILABLE" + PEER_LIFECYCLE_STATE_UNAVAILABLE = "UNAVAILABLE" #: A constant which can be used with the protection_mode property of a AutonomousContainerDatabaseDataguardAssociation. #: This constant has a value of "MAXIMUM_AVAILABILITY" @@ -172,7 +196,7 @@ def __init__(self, **kwargs): :param peer_lifecycle_state: The value to assign to the peer_lifecycle_state property of this AutonomousContainerDatabaseDataguardAssociation. - Allowed values for this property are: "PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "BACKUP_IN_PROGRESS", "RESTORING", "RESTORE_FAILED", "RESTARTING", "MAINTENANCE_IN_PROGRESS", "ROLE_CHANGE_IN_PROGRESS", "ENABLING_AUTONOMOUS_DATA_GUARD", "UNAVAILABLE", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type peer_lifecycle_state: str @@ -304,7 +328,7 @@ def id(self, id): def autonomous_container_database_id(self): """ **[Required]** Gets the autonomous_container_database_id of this AutonomousContainerDatabaseDataguardAssociation. - The `OCID`__ of the Autonomous Container Database that has a relationship with the peer Autonomous Container Database. + The `OCID`__ of the Autonomous Container Database that has a relationship with the peer Autonomous Container Database. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -318,7 +342,7 @@ def autonomous_container_database_id(self): def autonomous_container_database_id(self, autonomous_container_database_id): """ Sets the autonomous_container_database_id of this AutonomousContainerDatabaseDataguardAssociation. - The `OCID`__ of the Autonomous Container Database that has a relationship with the peer Autonomous Container Database. + The `OCID`__ of the Autonomous Container Database that has a relationship with the peer Autonomous Container Database. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -498,9 +522,9 @@ def peer_role(self, peer_role): def peer_lifecycle_state(self): """ Gets the peer_lifecycle_state of this AutonomousContainerDatabaseDataguardAssociation. - The current state of Autonomous Data Guard. + The current state of the Autonomous Container Database. - Allowed values for this property are: "PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "BACKUP_IN_PROGRESS", "RESTORING", "RESTORE_FAILED", "RESTARTING", "MAINTENANCE_IN_PROGRESS", "ROLE_CHANGE_IN_PROGRESS", "ENABLING_AUTONOMOUS_DATA_GUARD", "UNAVAILABLE", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -513,13 +537,13 @@ def peer_lifecycle_state(self): def peer_lifecycle_state(self, peer_lifecycle_state): """ Sets the peer_lifecycle_state of this AutonomousContainerDatabaseDataguardAssociation. - The current state of Autonomous Data Guard. + The current state of the Autonomous Container Database. :param peer_lifecycle_state: The peer_lifecycle_state of this AutonomousContainerDatabaseDataguardAssociation. :type: str """ - allowed_values = ["PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING"] + allowed_values = ["PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "BACKUP_IN_PROGRESS", "RESTORING", "RESTORE_FAILED", "RESTARTING", "MAINTENANCE_IN_PROGRESS", "ROLE_CHANGE_IN_PROGRESS", "ENABLING_AUTONOMOUS_DATA_GUARD", "UNAVAILABLE"] if not value_allowed_none_or_none_sentinel(peer_lifecycle_state, allowed_values): peer_lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._peer_lifecycle_state = peer_lifecycle_state diff --git a/src/oci/database/models/autonomous_container_database_resource_usage.py b/src/oci/database/models/autonomous_container_database_resource_usage.py index 713abfda7a..722c306c4e 100644 --- a/src/oci/database/models/autonomous_container_database_resource_usage.py +++ b/src/oci/database/models/autonomous_container_database_resource_usage.py @@ -168,7 +168,7 @@ def display_name(self, display_name): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this AutonomousContainerDatabaseResourceUsage. - CPUs / cores reclaimable or released to cluster on Autonomous Container Database restart. + Number of CPUs that are reclaimable or released to the AVMC on Autonomous Container Database restart. :return: The reclaimable_cpus of this AutonomousContainerDatabaseResourceUsage. @@ -180,7 +180,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this AutonomousContainerDatabaseResourceUsage. - CPUs / cores reclaimable or released to cluster on Autonomous Container Database restart. + Number of CPUs that are reclaimable or released to the AVMC on Autonomous Container Database restart. :param reclaimable_cpus: The reclaimable_cpus of this AutonomousContainerDatabaseResourceUsage. @@ -192,7 +192,7 @@ def reclaimable_cpus(self, reclaimable_cpus): def available_cpus(self): """ Gets the available_cpus of this AutonomousContainerDatabaseResourceUsage. - CPUs / cores available for ADB provisioning or scaling in the Autonomous Container Database. + CPUs available for provisioning or scaling an Autonomous Database in the Autonomous Container Database. :return: The available_cpus of this AutonomousContainerDatabaseResourceUsage. @@ -204,7 +204,7 @@ def available_cpus(self): def available_cpus(self, available_cpus): """ Sets the available_cpus of this AutonomousContainerDatabaseResourceUsage. - CPUs / cores available for ADB provisioning or scaling in the Autonomous Container Database. + CPUs available for provisioning or scaling an Autonomous Database in the Autonomous Container Database. :param available_cpus: The available_cpus of this AutonomousContainerDatabaseResourceUsage. @@ -316,7 +316,7 @@ def used_cpus(self, used_cpus): def provisionable_cpus(self): """ Gets the provisionable_cpus of this AutonomousContainerDatabaseResourceUsage. - Valid list of provisionable CPUs / cores for ADB creation. + Valid list of provisionable CPUs for Autonomous Database. :return: The provisionable_cpus of this AutonomousContainerDatabaseResourceUsage. @@ -328,7 +328,7 @@ def provisionable_cpus(self): def provisionable_cpus(self, provisionable_cpus): """ Sets the provisionable_cpus of this AutonomousContainerDatabaseResourceUsage. - Valid list of provisionable CPUs / cores for ADB creation. + Valid list of provisionable CPUs for Autonomous Database. :param provisionable_cpus: The provisionable_cpus of this AutonomousContainerDatabaseResourceUsage. diff --git a/src/oci/database/models/autonomous_container_database_summary.py b/src/oci/database/models/autonomous_container_database_summary.py index f250648f4f..1dda594d7c 100644 --- a/src/oci/database/models/autonomous_container_database_summary.py +++ b/src/oci/database/models/autonomous_container_database_summary.py @@ -761,7 +761,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousContainerDatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -776,7 +776,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousContainerDatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -791,7 +791,7 @@ def vault_id(self, vault_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousContainerDatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousContainerDatabaseSummary. @@ -803,7 +803,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousContainerDatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousContainerDatabaseSummary. @@ -1155,7 +1155,7 @@ def is_dst_file_update_enabled(self, is_dst_file_update_enabled): def dst_file_version(self): """ Gets the dst_file_version of this AutonomousContainerDatabaseSummary. - DST Time Zone File version of the Autonomous Container Database. + DST Time-zone File version of the Autonomous Container Database. :return: The dst_file_version of this AutonomousContainerDatabaseSummary. @@ -1167,7 +1167,7 @@ def dst_file_version(self): def dst_file_version(self, dst_file_version): """ Sets the dst_file_version of this AutonomousContainerDatabaseSummary. - DST Time Zone File version of the Autonomous Container Database. + DST Time-zone File version of the Autonomous Container Database. :param dst_file_version: The dst_file_version of this AutonomousContainerDatabaseSummary. @@ -1341,7 +1341,7 @@ def backup_config(self, backup_config): def key_store_id(self): """ Gets the key_store_id of this AutonomousContainerDatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1355,7 +1355,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousContainerDatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1393,7 +1393,7 @@ def key_store_wallet_name(self, key_store_wallet_name): def memory_per_oracle_compute_unit_in_gbs(self): """ Gets the memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabaseSummary. - The amount of memory (in GBs) enabled per OCPU or ECPU in the Autonomous VM Cluster. + The amount of memory (in GBs) enabled per ECPU or OCPU in the Autonomous VM Cluster. :return: The memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabaseSummary. @@ -1405,7 +1405,7 @@ def memory_per_oracle_compute_unit_in_gbs(self): def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_in_gbs): """ Sets the memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabaseSummary. - The amount of memory (in GBs) enabled per OCPU or ECPU in the Autonomous VM Cluster. + The amount of memory (in GBs) enabled per ECPU or OCPU in the Autonomous VM Cluster. :param memory_per_oracle_compute_unit_in_gbs: The memory_per_oracle_compute_unit_in_gbs of this AutonomousContainerDatabaseSummary. @@ -1417,8 +1417,7 @@ def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_i def available_cpus(self): """ Gets the available_cpus of this AutonomousContainerDatabaseSummary. - Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database. :return: The available_cpus of this AutonomousContainerDatabaseSummary. @@ -1430,8 +1429,7 @@ def available_cpus(self): def available_cpus(self, available_cpus): """ Sets the available_cpus of this AutonomousContainerDatabaseSummary. - Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database. :param available_cpus: The available_cpus of this AutonomousContainerDatabaseSummary. @@ -1443,8 +1441,7 @@ def available_cpus(self, available_cpus): def total_cpus(self): """ Gets the total_cpus of this AutonomousContainerDatabaseSummary. - The number of CPUs allocated to the Autonomous VM cluster.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + The number of CPUs allocated to the Autonomous VM cluster. :return: The total_cpus of this AutonomousContainerDatabaseSummary. @@ -1456,8 +1453,7 @@ def total_cpus(self): def total_cpus(self, total_cpus): """ Sets the total_cpus of this AutonomousContainerDatabaseSummary. - The number of CPUs allocated to the Autonomous VM cluster.
- For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + The number of CPUs allocated to the Autonomous VM cluster. :param total_cpus: The total_cpus of this AutonomousContainerDatabaseSummary. @@ -1469,9 +1465,7 @@ def total_cpus(self, total_cpus): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this AutonomousContainerDatabaseSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this AutonomousContainerDatabaseSummary. @@ -1483,9 +1477,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this AutonomousContainerDatabaseSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this AutonomousContainerDatabaseSummary. @@ -1497,8 +1489,7 @@ def reclaimable_cpus(self, reclaimable_cpus): def provisionable_cpus(self): """ Gets the provisionable_cpus of this AutonomousContainerDatabaseSummary. - An array of CPU values that can be used to successfully provision a single Autonomous Database.\\ - For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + An array of CPU values that can be used to successfully provision a single Autonomous Database. :return: The provisionable_cpus of this AutonomousContainerDatabaseSummary. @@ -1510,8 +1501,7 @@ def provisionable_cpus(self): def provisionable_cpus(self, provisionable_cpus): """ Sets the provisionable_cpus of this AutonomousContainerDatabaseSummary. - An array of CPU values that can be used to successfully provision a single Autonomous Database.\\ - For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + An array of CPU values that can be used to successfully provision a single Autonomous Database. :param provisionable_cpus: The provisionable_cpus of this AutonomousContainerDatabaseSummary. @@ -1523,7 +1513,9 @@ def provisionable_cpus(self, provisionable_cpus): def compute_model(self): """ Gets the compute_model of this AutonomousContainerDatabaseSummary. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1538,7 +1530,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousContainerDatabaseSummary. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this AutonomousContainerDatabaseSummary. diff --git a/src/oci/database/models/autonomous_database.py b/src/oci/database/models/autonomous_database.py index 651b793c33..7e3f326c52 100644 --- a/src/oci/database/models/autonomous_database.py +++ b/src/oci/database/models/autonomous_database.py @@ -734,10 +734,6 @@ def __init__(self, **kwargs): The value to assign to the actual_used_data_storage_size_in_tbs property of this AutonomousDatabase. :type actual_used_data_storage_size_in_tbs: float - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this AutonomousDatabase. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this AutonomousDatabase. Allowed values for this property are: "STANDARD_EDITION", "ENTERPRISE_EDITION", 'UNKNOWN_ENUM_VALUE'. @@ -870,7 +866,6 @@ def __init__(self, **kwargs): 'is_auto_scaling_for_storage_enabled': 'bool', 'allocated_storage_size_in_tbs': 'float', 'actual_used_data_storage_size_in_tbs': 'float', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'local_disaster_recovery_type': 'str', @@ -982,7 +977,6 @@ def __init__(self, **kwargs): 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', 'allocated_storage_size_in_tbs': 'allocatedStorageSizeInTBs', 'actual_used_data_storage_size_in_tbs': 'actualUsedDataStorageSizeInTBs', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'local_disaster_recovery_type': 'localDisasterRecoveryType', @@ -1093,7 +1087,6 @@ def __init__(self, **kwargs): self._is_auto_scaling_for_storage_enabled = None self._allocated_storage_size_in_tbs = None self._actual_used_data_storage_size_in_tbs = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._local_disaster_recovery_type = None @@ -1239,7 +1232,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousDatabase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1254,7 +1247,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousDatabase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1293,7 +1286,7 @@ def kms_key_lifecycle_details(self, kms_key_lifecycle_details): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousDatabase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousDatabase. @@ -1305,7 +1298,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousDatabase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousDatabase. @@ -1395,7 +1388,7 @@ def ncharacter_set(self, ncharacter_set): def in_memory_percentage(self): """ Gets the in_memory_percentage of this AutonomousDatabase. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :return: The in_memory_percentage of this AutonomousDatabase. @@ -1407,7 +1400,7 @@ def in_memory_percentage(self): def in_memory_percentage(self, in_memory_percentage): """ Sets the in_memory_percentage of this AutonomousDatabase. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :param in_memory_percentage: The in_memory_percentage of this AutonomousDatabase. @@ -1637,7 +1630,7 @@ def key_history_entry(self, key_history_entry): def cpu_core_count(self): """ Gets the cpu_core_count of this AutonomousDatabase. - The number of OCPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Database on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -1653,7 +1646,7 @@ def cpu_core_count(self): def cpu_core_count(self, cpu_core_count): """ Sets the cpu_core_count of this AutonomousDatabase. - The number of OCPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Database on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -1693,7 +1686,7 @@ def local_adg_auto_failover_max_data_loss_limit(self, local_adg_auto_failover_ma def compute_model(self): """ Gets the compute_model of this AutonomousDatabase. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1708,7 +1701,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousDatabase. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this AutonomousDatabase. @@ -1723,8 +1716,8 @@ def compute_model(self, compute_model): def compute_count(self): """ Gets the compute_count of this AutonomousDatabase. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. - For an Autonomous Database Serverless instance, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :return: The compute_count of this AutonomousDatabase. @@ -1736,8 +1729,8 @@ def compute_count(self): def compute_count(self, compute_count): """ Sets the compute_count of this AutonomousDatabase. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. - For an Autonomous Database Serverless instance, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :param compute_count: The compute_count of this AutonomousDatabase. @@ -1801,7 +1794,8 @@ def ocpu_count(self): The following points apply: - For Autonomous Databases on Dedicated Exadata Infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both shared and dedicated Exadata infrastructure. + - To provision cores, enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both serverless and dedicated Exadata infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata Infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -1823,7 +1817,8 @@ def ocpu_count(self, ocpu_count): The following points apply: - For Autonomous Databases on Dedicated Exadata Infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both shared and dedicated Exadata infrastructure. + - To provision cores, enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both serverless and dedicated Exadata infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata Infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -1889,7 +1884,7 @@ def data_storage_size_in_tbs(self, data_storage_size_in_tbs): def memory_per_oracle_compute_unit_in_gbs(self): """ Gets the memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabase. - The amount of memory (in GBs) enabled per OCPU or ECPU. + The amount of memory (in GBs) enabled per ECPU or OCPU. :return: The memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabase. @@ -1901,7 +1896,7 @@ def memory_per_oracle_compute_unit_in_gbs(self): def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_in_gbs): """ Sets the memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabase. - The amount of memory (in GBs) enabled per OCPU or ECPU. + The amount of memory (in GBs) enabled per ECPU or OCPU. :param memory_per_oracle_compute_unit_in_gbs: The memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabase. @@ -2019,7 +2014,7 @@ def is_dedicated(self, is_dedicated): def autonomous_container_database_id(self): """ Gets the autonomous_container_database_id of this AutonomousDatabase. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -2033,7 +2028,7 @@ def autonomous_container_database_id(self): def autonomous_container_database_id(self, autonomous_container_database_id): """ Sets the autonomous_container_database_id of this AutonomousDatabase. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -2166,9 +2161,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -2189,9 +2184,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -2401,7 +2396,10 @@ def private_endpoint(self, private_endpoint): def private_endpoint_label(self): """ Gets the private_endpoint_label of this AutonomousDatabase. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -2415,7 +2413,10 @@ def private_endpoint_label(self): def private_endpoint_label(self, private_endpoint_label): """ Sets the private_endpoint_label of this AutonomousDatabase. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -2551,7 +2552,7 @@ def is_access_control_enabled(self): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :return: The is_access_control_enabled of this AutonomousDatabase. @@ -2569,7 +2570,7 @@ def is_access_control_enabled(self, is_access_control_enabled): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :param is_access_control_enabled: The is_access_control_enabled of this AutonomousDatabase. @@ -2583,9 +2584,10 @@ def whitelisted_ips(self): Gets the whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2608,9 +2610,10 @@ def whitelisted_ips(self, whitelisted_ips): Sets the whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2661,9 +2664,10 @@ def standby_whitelisted_ips(self): Gets the standby_whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2686,9 +2690,10 @@ def standby_whitelisted_ips(self, standby_whitelisted_ips): Sets the standby_whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2733,7 +2738,7 @@ def apex_details(self, apex_details): def is_auto_scaling_enabled(self): """ Gets the is_auto_scaling_enabled of this AutonomousDatabase. - Indicates if auto scaling is enabled for the Autonomous Database CPU core count. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :return: The is_auto_scaling_enabled of this AutonomousDatabase. @@ -2745,7 +2750,7 @@ def is_auto_scaling_enabled(self): def is_auto_scaling_enabled(self, is_auto_scaling_enabled): """ Sets the is_auto_scaling_enabled of this AutonomousDatabase. - Indicates if auto scaling is enabled for the Autonomous Database CPU core count. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :param is_auto_scaling_enabled: The is_auto_scaling_enabled of this AutonomousDatabase. @@ -3393,7 +3398,7 @@ def available_upgrade_versions(self, available_upgrade_versions): def key_store_id(self): """ Gets the key_store_id of this AutonomousDatabase. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -3407,7 +3412,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousDatabase. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -3601,7 +3606,7 @@ def is_mtls_connection_required(self): Gets the is_mtls_connection_required of this AutonomousDatabase. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -3623,7 +3628,7 @@ def is_mtls_connection_required(self, is_mtls_connection_required): Sets the is_mtls_connection_required of this AutonomousDatabase. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -3795,7 +3800,7 @@ def autonomous_maintenance_schedule_type(self, autonomous_maintenance_schedule_t def scheduled_operations(self): """ Gets the scheduled_operations of this AutonomousDatabase. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -3809,7 +3814,7 @@ def scheduled_operations(self): def scheduled_operations(self, scheduled_operations): """ Sets the scheduled_operations of this AutonomousDatabase. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -3895,30 +3900,6 @@ def actual_used_data_storage_size_in_tbs(self, actual_used_data_storage_size_in_ """ self._actual_used_data_storage_size_in_tbs = actual_used_data_storage_size_in_tbs - @property - def max_cpu_core_count(self): - """ - Gets the max_cpu_core_count of this AutonomousDatabase. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :return: The max_cpu_core_count of this AutonomousDatabase. - :rtype: int - """ - return self._max_cpu_core_count - - @max_cpu_core_count.setter - def max_cpu_core_count(self, max_cpu_core_count): - """ - Sets the max_cpu_core_count of this AutonomousDatabase. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :param max_cpu_core_count: The max_cpu_core_count of this AutonomousDatabase. - :type: int - """ - self._max_cpu_core_count = max_cpu_core_count - @property def database_edition(self): """ diff --git a/src/oci/database/models/autonomous_database_backup.py b/src/oci/database/models/autonomous_database_backup.py index a0b32a93fe..0d1bc26226 100644 --- a/src/oci/database/models/autonomous_database_backup.py +++ b/src/oci/database/models/autonomous_database_backup.py @@ -538,7 +538,7 @@ def is_restorable(self, is_restorable): def key_store_id(self): """ Gets the key_store_id of this AutonomousDatabaseBackup. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -552,7 +552,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousDatabaseBackup. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -614,7 +614,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousDatabaseBackup. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -629,7 +629,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousDatabaseBackup. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -644,7 +644,7 @@ def vault_id(self, vault_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousDatabaseBackup. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousDatabaseBackup. @@ -656,7 +656,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousDatabaseBackup. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousDatabaseBackup. diff --git a/src/oci/database/models/autonomous_database_backup_summary.py b/src/oci/database/models/autonomous_database_backup_summary.py index a78227e2df..6c7050ed06 100644 --- a/src/oci/database/models/autonomous_database_backup_summary.py +++ b/src/oci/database/models/autonomous_database_backup_summary.py @@ -543,7 +543,7 @@ def is_restorable(self, is_restorable): def key_store_id(self): """ Gets the key_store_id of this AutonomousDatabaseBackupSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -557,7 +557,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousDatabaseBackupSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -619,7 +619,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousDatabaseBackupSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -634,7 +634,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousDatabaseBackupSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -649,7 +649,7 @@ def vault_id(self, vault_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousDatabaseBackupSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousDatabaseBackupSummary. @@ -661,7 +661,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousDatabaseBackupSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousDatabaseBackupSummary. diff --git a/src/oci/database/models/autonomous_database_dataguard_association.py b/src/oci/database/models/autonomous_database_dataguard_association.py index bd414d7d66..ba34dcbdfa 100644 --- a/src/oci/database/models/autonomous_database_dataguard_association.py +++ b/src/oci/database/models/autonomous_database_dataguard_association.py @@ -98,8 +98,16 @@ class AutonomousDatabaseDataguardAssociation(object): PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_AVAILABLE = "AVAILABLE" #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. - #: This constant has a value of "ROLE_CHANGE_IN_PROGRESS" - PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_ROLE_CHANGE_IN_PROGRESS = "ROLE_CHANGE_IN_PROGRESS" + #: This constant has a value of "STOPPING" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_STOPPING = "STOPPING" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "STOPPED" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_STOPPED = "STOPPED" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "STARTING" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_STARTING = "STARTING" #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. #: This constant has a value of "TERMINATING" @@ -109,18 +117,62 @@ class AutonomousDatabaseDataguardAssociation(object): #: This constant has a value of "TERMINATED" PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_TERMINATED = "TERMINATED" - #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. - #: This constant has a value of "FAILED" - PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_FAILED = "FAILED" - #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. #: This constant has a value of "UNAVAILABLE" PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_UNAVAILABLE = "UNAVAILABLE" + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "RESTORE_IN_PROGRESS" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_RESTORE_IN_PROGRESS = "RESTORE_IN_PROGRESS" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "RESTORE_FAILED" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_RESTORE_FAILED = "RESTORE_FAILED" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "BACKUP_IN_PROGRESS" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_BACKUP_IN_PROGRESS = "BACKUP_IN_PROGRESS" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "SCALE_IN_PROGRESS" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_SCALE_IN_PROGRESS = "SCALE_IN_PROGRESS" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "AVAILABLE_NEEDS_ATTENTION" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_AVAILABLE_NEEDS_ATTENTION = "AVAILABLE_NEEDS_ATTENTION" + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. #: This constant has a value of "UPDATING" PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_UPDATING = "UPDATING" + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "MAINTENANCE_IN_PROGRESS" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_MAINTENANCE_IN_PROGRESS = "MAINTENANCE_IN_PROGRESS" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "RESTARTING" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_RESTARTING = "RESTARTING" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "RECREATING" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_RECREATING = "RECREATING" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "ROLE_CHANGE_IN_PROGRESS" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_ROLE_CHANGE_IN_PROGRESS = "ROLE_CHANGE_IN_PROGRESS" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "UPGRADING" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_UPGRADING = "UPGRADING" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "INACCESSIBLE" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_INACCESSIBLE = "INACCESSIBLE" + + #: A constant which can be used with the peer_autonomous_database_life_cycle_state property of a AutonomousDatabaseDataguardAssociation. + #: This constant has a value of "STANDBY" + PEER_AUTONOMOUS_DATABASE_LIFE_CYCLE_STATE_STANDBY = "STANDBY" + #: A constant which can be used with the protection_mode property of a AutonomousDatabaseDataguardAssociation. #: This constant has a value of "MAXIMUM_AVAILABILITY" PROTECTION_MODE_MAXIMUM_AVAILABILITY = "MAXIMUM_AVAILABILITY" @@ -170,7 +222,7 @@ def __init__(self, **kwargs): :param peer_autonomous_database_life_cycle_state: The value to assign to the peer_autonomous_database_life_cycle_state property of this AutonomousDatabaseDataguardAssociation. - Allowed values for this property are: "PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PROVISIONING", "AVAILABLE", "STOPPING", "STOPPED", "STARTING", "TERMINATING", "TERMINATED", "UNAVAILABLE", "RESTORE_IN_PROGRESS", "RESTORE_FAILED", "BACKUP_IN_PROGRESS", "SCALE_IN_PROGRESS", "AVAILABLE_NEEDS_ATTENTION", "UPDATING", "MAINTENANCE_IN_PROGRESS", "RESTARTING", "RECREATING", "ROLE_CHANGE_IN_PROGRESS", "UPGRADING", "INACCESSIBLE", "STANDBY", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type peer_autonomous_database_life_cycle_state: str @@ -462,9 +514,9 @@ def peer_autonomous_database_id(self, peer_autonomous_database_id): def peer_autonomous_database_life_cycle_state(self): """ Gets the peer_autonomous_database_life_cycle_state of this AutonomousDatabaseDataguardAssociation. - The current state of Autonomous Data Guard. + The current state of the Autonomous Database. - Allowed values for this property are: "PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PROVISIONING", "AVAILABLE", "STOPPING", "STOPPED", "STARTING", "TERMINATING", "TERMINATED", "UNAVAILABLE", "RESTORE_IN_PROGRESS", "RESTORE_FAILED", "BACKUP_IN_PROGRESS", "SCALE_IN_PROGRESS", "AVAILABLE_NEEDS_ATTENTION", "UPDATING", "MAINTENANCE_IN_PROGRESS", "RESTARTING", "RECREATING", "ROLE_CHANGE_IN_PROGRESS", "UPGRADING", "INACCESSIBLE", "STANDBY", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -477,13 +529,13 @@ def peer_autonomous_database_life_cycle_state(self): def peer_autonomous_database_life_cycle_state(self, peer_autonomous_database_life_cycle_state): """ Sets the peer_autonomous_database_life_cycle_state of this AutonomousDatabaseDataguardAssociation. - The current state of Autonomous Data Guard. + The current state of the Autonomous Database. :param peer_autonomous_database_life_cycle_state: The peer_autonomous_database_life_cycle_state of this AutonomousDatabaseDataguardAssociation. :type: str """ - allowed_values = ["PROVISIONING", "AVAILABLE", "ROLE_CHANGE_IN_PROGRESS", "TERMINATING", "TERMINATED", "FAILED", "UNAVAILABLE", "UPDATING"] + allowed_values = ["PROVISIONING", "AVAILABLE", "STOPPING", "STOPPED", "STARTING", "TERMINATING", "TERMINATED", "UNAVAILABLE", "RESTORE_IN_PROGRESS", "RESTORE_FAILED", "BACKUP_IN_PROGRESS", "SCALE_IN_PROGRESS", "AVAILABLE_NEEDS_ATTENTION", "UPDATING", "MAINTENANCE_IN_PROGRESS", "RESTARTING", "RECREATING", "ROLE_CHANGE_IN_PROGRESS", "UPGRADING", "INACCESSIBLE", "STANDBY"] if not value_allowed_none_or_none_sentinel(peer_autonomous_database_life_cycle_state, allowed_values): peer_autonomous_database_life_cycle_state = 'UNKNOWN_ENUM_VALUE' self._peer_autonomous_database_life_cycle_state = peer_autonomous_database_life_cycle_state diff --git a/src/oci/database/models/autonomous_database_key_history_entry.py b/src/oci/database/models/autonomous_database_key_history_entry.py index 8b814c2687..911288c672 100644 --- a/src/oci/database/models/autonomous_database_key_history_entry.py +++ b/src/oci/database/models/autonomous_database_key_history_entry.py @@ -90,7 +90,7 @@ def id(self, id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousDatabaseKeyHistoryEntry. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousDatabaseKeyHistoryEntry. @@ -102,7 +102,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousDatabaseKeyHistoryEntry. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousDatabaseKeyHistoryEntry. @@ -114,7 +114,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this AutonomousDatabaseKeyHistoryEntry. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -129,7 +129,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousDatabaseKeyHistoryEntry. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts diff --git a/src/oci/database/models/autonomous_database_summary.py b/src/oci/database/models/autonomous_database_summary.py index 0cf8830819..94b7e996f5 100644 --- a/src/oci/database/models/autonomous_database_summary.py +++ b/src/oci/database/models/autonomous_database_summary.py @@ -736,10 +736,6 @@ def __init__(self, **kwargs): The value to assign to the actual_used_data_storage_size_in_tbs property of this AutonomousDatabaseSummary. :type actual_used_data_storage_size_in_tbs: float - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this AutonomousDatabaseSummary. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this AutonomousDatabaseSummary. Allowed values for this property are: "STANDARD_EDITION", "ENTERPRISE_EDITION", 'UNKNOWN_ENUM_VALUE'. @@ -872,7 +868,6 @@ def __init__(self, **kwargs): 'is_auto_scaling_for_storage_enabled': 'bool', 'allocated_storage_size_in_tbs': 'float', 'actual_used_data_storage_size_in_tbs': 'float', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'local_disaster_recovery_type': 'str', @@ -984,7 +979,6 @@ def __init__(self, **kwargs): 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', 'allocated_storage_size_in_tbs': 'allocatedStorageSizeInTBs', 'actual_used_data_storage_size_in_tbs': 'actualUsedDataStorageSizeInTBs', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'local_disaster_recovery_type': 'localDisasterRecoveryType', @@ -1095,7 +1089,6 @@ def __init__(self, **kwargs): self._is_auto_scaling_for_storage_enabled = None self._allocated_storage_size_in_tbs = None self._actual_used_data_storage_size_in_tbs = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._local_disaster_recovery_type = None @@ -1241,7 +1234,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this AutonomousDatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1256,7 +1249,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this AutonomousDatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1295,7 +1288,7 @@ def kms_key_lifecycle_details(self, kms_key_lifecycle_details): def kms_key_version_id(self): """ Gets the kms_key_version_id of this AutonomousDatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this AutonomousDatabaseSummary. @@ -1307,7 +1300,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this AutonomousDatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this AutonomousDatabaseSummary. @@ -1397,7 +1390,7 @@ def ncharacter_set(self, ncharacter_set): def in_memory_percentage(self): """ Gets the in_memory_percentage of this AutonomousDatabaseSummary. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :return: The in_memory_percentage of this AutonomousDatabaseSummary. @@ -1409,7 +1402,7 @@ def in_memory_percentage(self): def in_memory_percentage(self, in_memory_percentage): """ Sets the in_memory_percentage of this AutonomousDatabaseSummary. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :param in_memory_percentage: The in_memory_percentage of this AutonomousDatabaseSummary. @@ -1639,7 +1632,7 @@ def key_history_entry(self, key_history_entry): def cpu_core_count(self): """ Gets the cpu_core_count of this AutonomousDatabaseSummary. - The number of OCPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Database on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -1655,7 +1648,7 @@ def cpu_core_count(self): def cpu_core_count(self, cpu_core_count): """ Sets the cpu_core_count of this AutonomousDatabaseSummary. - The number of OCPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. When the ECPU is selected, the value for cpuCoreCount is 0. For Autonomous Database on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -1695,7 +1688,7 @@ def local_adg_auto_failover_max_data_loss_limit(self, local_adg_auto_failover_ma def compute_model(self): """ Gets the compute_model of this AutonomousDatabaseSummary. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1710,7 +1703,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousDatabaseSummary. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this AutonomousDatabaseSummary. @@ -1725,8 +1718,8 @@ def compute_model(self, compute_model): def compute_count(self): """ Gets the compute_count of this AutonomousDatabaseSummary. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. - For an Autonomous Database Serverless instance, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :return: The compute_count of this AutonomousDatabaseSummary. @@ -1738,8 +1731,8 @@ def compute_count(self): def compute_count(self, compute_count): """ Sets the compute_count of this AutonomousDatabaseSummary. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. - For an Autonomous Database Serverless instance, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :param compute_count: The compute_count of this AutonomousDatabaseSummary. @@ -1803,7 +1796,8 @@ def ocpu_count(self): The following points apply: - For Autonomous Databases on Dedicated Exadata Infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both shared and dedicated Exadata infrastructure. + - To provision cores, enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both serverless and dedicated Exadata infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata Infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -1825,7 +1819,8 @@ def ocpu_count(self, ocpu_count): The following points apply: - For Autonomous Databases on Dedicated Exadata Infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both shared and dedicated Exadata infrastructure. + - To provision cores, enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to Autonomous Databases on both serverless and dedicated Exadata infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata Infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -1891,7 +1886,7 @@ def data_storage_size_in_tbs(self, data_storage_size_in_tbs): def memory_per_oracle_compute_unit_in_gbs(self): """ Gets the memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabaseSummary. - The amount of memory (in GBs) enabled per OCPU or ECPU. + The amount of memory (in GBs) enabled per ECPU or OCPU. :return: The memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabaseSummary. @@ -1903,7 +1898,7 @@ def memory_per_oracle_compute_unit_in_gbs(self): def memory_per_oracle_compute_unit_in_gbs(self, memory_per_oracle_compute_unit_in_gbs): """ Sets the memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabaseSummary. - The amount of memory (in GBs) enabled per OCPU or ECPU. + The amount of memory (in GBs) enabled per ECPU or OCPU. :param memory_per_oracle_compute_unit_in_gbs: The memory_per_oracle_compute_unit_in_gbs of this AutonomousDatabaseSummary. @@ -2021,7 +2016,7 @@ def is_dedicated(self, is_dedicated): def autonomous_container_database_id(self): """ Gets the autonomous_container_database_id of this AutonomousDatabaseSummary. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -2035,7 +2030,7 @@ def autonomous_container_database_id(self): def autonomous_container_database_id(self, autonomous_container_database_id): """ Sets the autonomous_container_database_id of this AutonomousDatabaseSummary. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -2168,9 +2163,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -2191,9 +2186,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -2403,7 +2398,10 @@ def private_endpoint(self, private_endpoint): def private_endpoint_label(self): """ Gets the private_endpoint_label of this AutonomousDatabaseSummary. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -2417,7 +2415,10 @@ def private_endpoint_label(self): def private_endpoint_label(self, private_endpoint_label): """ Sets the private_endpoint_label of this AutonomousDatabaseSummary. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -2553,7 +2554,7 @@ def is_access_control_enabled(self): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :return: The is_access_control_enabled of this AutonomousDatabaseSummary. @@ -2571,7 +2572,7 @@ def is_access_control_enabled(self, is_access_control_enabled): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :param is_access_control_enabled: The is_access_control_enabled of this AutonomousDatabaseSummary. @@ -2585,9 +2586,10 @@ def whitelisted_ips(self): Gets the whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2610,9 +2612,10 @@ def whitelisted_ips(self, whitelisted_ips): Sets the whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2663,9 +2666,10 @@ def standby_whitelisted_ips(self): Gets the standby_whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2688,9 +2692,10 @@ def standby_whitelisted_ips(self, standby_whitelisted_ips): Sets the standby_whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -2735,7 +2740,7 @@ def apex_details(self, apex_details): def is_auto_scaling_enabled(self): """ Gets the is_auto_scaling_enabled of this AutonomousDatabaseSummary. - Indicates if auto scaling is enabled for the Autonomous Database CPU core count. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :return: The is_auto_scaling_enabled of this AutonomousDatabaseSummary. @@ -2747,7 +2752,7 @@ def is_auto_scaling_enabled(self): def is_auto_scaling_enabled(self, is_auto_scaling_enabled): """ Sets the is_auto_scaling_enabled of this AutonomousDatabaseSummary. - Indicates if auto scaling is enabled for the Autonomous Database CPU core count. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :param is_auto_scaling_enabled: The is_auto_scaling_enabled of this AutonomousDatabaseSummary. @@ -3395,7 +3400,7 @@ def available_upgrade_versions(self, available_upgrade_versions): def key_store_id(self): """ Gets the key_store_id of this AutonomousDatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -3409,7 +3414,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this AutonomousDatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -3603,7 +3608,7 @@ def is_mtls_connection_required(self): Gets the is_mtls_connection_required of this AutonomousDatabaseSummary. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -3625,7 +3630,7 @@ def is_mtls_connection_required(self, is_mtls_connection_required): Sets the is_mtls_connection_required of this AutonomousDatabaseSummary. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -3797,7 +3802,7 @@ def autonomous_maintenance_schedule_type(self, autonomous_maintenance_schedule_t def scheduled_operations(self): """ Gets the scheduled_operations of this AutonomousDatabaseSummary. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -3811,7 +3816,7 @@ def scheduled_operations(self): def scheduled_operations(self, scheduled_operations): """ Sets the scheduled_operations of this AutonomousDatabaseSummary. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -3897,30 +3902,6 @@ def actual_used_data_storage_size_in_tbs(self, actual_used_data_storage_size_in_ """ self._actual_used_data_storage_size_in_tbs = actual_used_data_storage_size_in_tbs - @property - def max_cpu_core_count(self): - """ - Gets the max_cpu_core_count of this AutonomousDatabaseSummary. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :return: The max_cpu_core_count of this AutonomousDatabaseSummary. - :rtype: int - """ - return self._max_cpu_core_count - - @max_cpu_core_count.setter - def max_cpu_core_count(self, max_cpu_core_count): - """ - Sets the max_cpu_core_count of this AutonomousDatabaseSummary. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :param max_cpu_core_count: The max_cpu_core_count of this AutonomousDatabaseSummary. - :type: int - """ - self._max_cpu_core_count = max_cpu_core_count - @property def database_edition(self): """ diff --git a/src/oci/database/models/autonomous_db_preview_version_summary.py b/src/oci/database/models/autonomous_db_preview_version_summary.py index a678e1be78..245fbac99f 100644 --- a/src/oci/database/models/autonomous_db_preview_version_summary.py +++ b/src/oci/database/models/autonomous_db_preview_version_summary.py @@ -14,7 +14,7 @@ class AutonomousDbPreviewVersionSummary(object): """ The Autonomous Database preview version. Note that preview version software is only available for `Autonomous Database Serverless instances`__. - __ https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/ """ #: A constant which can be used with the db_workload property of a AutonomousDbPreviewVersionSummary. diff --git a/src/oci/database/models/autonomous_vm_cluster.py b/src/oci/database/models/autonomous_vm_cluster.py index 965e88f2ed..6593980045 100644 --- a/src/oci/database/models/autonomous_vm_cluster.py +++ b/src/oci/database/models/autonomous_vm_cluster.py @@ -722,7 +722,9 @@ def cpus_enabled(self, cpus_enabled): def compute_model(self): """ Gets the compute_model of this AutonomousVmCluster. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -737,7 +739,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousVmCluster. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this AutonomousVmCluster. @@ -1092,7 +1096,7 @@ def reserved_cpus(self, reserved_cpus): def provisionable_autonomous_container_databases(self): """ Gets the provisionable_autonomous_container_databases of this AutonomousVmCluster. - The number of provisionable Autonomous Container Databases in an Autonomous VM Cluster. + **Deprecated.** Use field totalContainerDatabases. :return: The provisionable_autonomous_container_databases of this AutonomousVmCluster. @@ -1104,7 +1108,7 @@ def provisionable_autonomous_container_databases(self): def provisionable_autonomous_container_databases(self, provisionable_autonomous_container_databases): """ Sets the provisionable_autonomous_container_databases of this AutonomousVmCluster. - The number of provisionable Autonomous Container Databases in an Autonomous VM Cluster. + **Deprecated.** Use field totalContainerDatabases. :param provisionable_autonomous_container_databases: The provisionable_autonomous_container_databases of this AutonomousVmCluster. @@ -1430,9 +1434,7 @@ def db_servers(self, db_servers): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this AutonomousVmCluster. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this AutonomousVmCluster. @@ -1444,9 +1446,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this AutonomousVmCluster. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this AutonomousVmCluster. @@ -1626,7 +1626,7 @@ def time_ords_certificate_expires(self, time_ords_certificate_expires): def exadata_storage_in_tbs_lowest_scaled_value(self): """ Gets the exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmCluster. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage(in TBs) can be scaled down. :return: The exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmCluster. @@ -1638,7 +1638,7 @@ def exadata_storage_in_tbs_lowest_scaled_value(self): def exadata_storage_in_tbs_lowest_scaled_value(self, exadata_storage_in_tbs_lowest_scaled_value): """ Sets the exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmCluster. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage(in TBs) can be scaled down. :param exadata_storage_in_tbs_lowest_scaled_value: The exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmCluster. @@ -1674,7 +1674,7 @@ def cpus_lowest_scaled_value(self, cpus_lowest_scaled_value): def max_acds_lowest_scaled_value(self): """ Gets the max_acds_lowest_scaled_value of this AutonomousVmCluster. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :return: The max_acds_lowest_scaled_value of this AutonomousVmCluster. @@ -1686,7 +1686,7 @@ def max_acds_lowest_scaled_value(self): def max_acds_lowest_scaled_value(self, max_acds_lowest_scaled_value): """ Sets the max_acds_lowest_scaled_value of this AutonomousVmCluster. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :param max_acds_lowest_scaled_value: The max_acds_lowest_scaled_value of this AutonomousVmCluster. diff --git a/src/oci/database/models/autonomous_vm_cluster_summary.py b/src/oci/database/models/autonomous_vm_cluster_summary.py index e4237375b0..e351a5598d 100644 --- a/src/oci/database/models/autonomous_vm_cluster_summary.py +++ b/src/oci/database/models/autonomous_vm_cluster_summary.py @@ -722,7 +722,9 @@ def cpus_enabled(self, cpus_enabled): def compute_model(self): """ Gets the compute_model of this AutonomousVmClusterSummary. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -737,7 +739,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this AutonomousVmClusterSummary. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this AutonomousVmClusterSummary. @@ -1092,7 +1096,7 @@ def reserved_cpus(self, reserved_cpus): def provisionable_autonomous_container_databases(self): """ Gets the provisionable_autonomous_container_databases of this AutonomousVmClusterSummary. - The number of provisionable Autonomous Container Databases in an Autonomous VM Cluster. + **Deprecated.** Use field totalContainerDatabases. :return: The provisionable_autonomous_container_databases of this AutonomousVmClusterSummary. @@ -1104,7 +1108,7 @@ def provisionable_autonomous_container_databases(self): def provisionable_autonomous_container_databases(self, provisionable_autonomous_container_databases): """ Sets the provisionable_autonomous_container_databases of this AutonomousVmClusterSummary. - The number of provisionable Autonomous Container Databases in an Autonomous VM Cluster. + **Deprecated.** Use field totalContainerDatabases. :param provisionable_autonomous_container_databases: The provisionable_autonomous_container_databases of this AutonomousVmClusterSummary. @@ -1430,9 +1434,7 @@ def db_servers(self, db_servers): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this AutonomousVmClusterSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this AutonomousVmClusterSummary. @@ -1444,9 +1446,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this AutonomousVmClusterSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this AutonomousVmClusterSummary. @@ -1626,7 +1626,7 @@ def time_ords_certificate_expires(self, time_ords_certificate_expires): def exadata_storage_in_tbs_lowest_scaled_value(self): """ Gets the exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmClusterSummary. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage(in TBs) can be scaled down. :return: The exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmClusterSummary. @@ -1638,7 +1638,7 @@ def exadata_storage_in_tbs_lowest_scaled_value(self): def exadata_storage_in_tbs_lowest_scaled_value(self, exadata_storage_in_tbs_lowest_scaled_value): """ Sets the exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmClusterSummary. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage(in TBs) can be scaled down. :param exadata_storage_in_tbs_lowest_scaled_value: The exadata_storage_in_tbs_lowest_scaled_value of this AutonomousVmClusterSummary. @@ -1674,7 +1674,7 @@ def cpus_lowest_scaled_value(self, cpus_lowest_scaled_value): def max_acds_lowest_scaled_value(self): """ Gets the max_acds_lowest_scaled_value of this AutonomousVmClusterSummary. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :return: The max_acds_lowest_scaled_value of this AutonomousVmClusterSummary. @@ -1686,7 +1686,7 @@ def max_acds_lowest_scaled_value(self): def max_acds_lowest_scaled_value(self, max_acds_lowest_scaled_value): """ Sets the max_acds_lowest_scaled_value of this AutonomousVmClusterSummary. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :param max_acds_lowest_scaled_value: The max_acds_lowest_scaled_value of this AutonomousVmClusterSummary. diff --git a/src/oci/database/models/backup.py b/src/oci/database/models/backup.py index 117f1ea111..e3d245090b 100644 --- a/src/oci/database/models/backup.py +++ b/src/oci/database/models/backup.py @@ -621,7 +621,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this Backup. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this Backup. @@ -633,7 +633,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this Backup. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this Backup. @@ -645,7 +645,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this Backup. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -660,7 +660,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this Backup. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -675,7 +675,7 @@ def vault_id(self, vault_id): def key_store_id(self): """ Gets the key_store_id of this Backup. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -689,7 +689,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this Backup. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm diff --git a/src/oci/database/models/backup_summary.py b/src/oci/database/models/backup_summary.py index ce9b891f56..c0b8e6a36c 100644 --- a/src/oci/database/models/backup_summary.py +++ b/src/oci/database/models/backup_summary.py @@ -626,7 +626,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this BackupSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this BackupSummary. @@ -638,7 +638,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this BackupSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this BackupSummary. @@ -650,7 +650,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this BackupSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -665,7 +665,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this BackupSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -680,7 +680,7 @@ def vault_id(self, vault_id): def key_store_id(self): """ Gets the key_store_id of this BackupSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -694,7 +694,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this BackupSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm diff --git a/src/oci/database/models/cloud_autonomous_vm_cluster.py b/src/oci/database/models/cloud_autonomous_vm_cluster.py index 0e8cb51c58..02a605934b 100644 --- a/src/oci/database/models/cloud_autonomous_vm_cluster.py +++ b/src/oci/database/models/cloud_autonomous_vm_cluster.py @@ -1059,7 +1059,9 @@ def ocpu_count(self, ocpu_count): def compute_model(self): """ Gets the compute_model of this CloudAutonomousVmCluster. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1074,7 +1076,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this CloudAutonomousVmCluster. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this CloudAutonomousVmCluster. @@ -1164,9 +1168,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1187,9 +1191,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1467,9 +1471,7 @@ def available_cpus(self, available_cpus): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this CloudAutonomousVmCluster. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this CloudAutonomousVmCluster. @@ -1481,9 +1483,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this CloudAutonomousVmCluster. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this CloudAutonomousVmCluster. @@ -1883,7 +1883,7 @@ def non_provisionable_autonomous_container_databases(self, non_provisionable_aut def exadata_storage_in_tbs_lowest_scaled_value(self): """ Gets the exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmCluster. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage (in TBs) can be scaled down. :return: The exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmCluster. @@ -1895,7 +1895,7 @@ def exadata_storage_in_tbs_lowest_scaled_value(self): def exadata_storage_in_tbs_lowest_scaled_value(self, exadata_storage_in_tbs_lowest_scaled_value): """ Sets the exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmCluster. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage (in TBs) can be scaled down. :param exadata_storage_in_tbs_lowest_scaled_value: The exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmCluster. @@ -1931,7 +1931,7 @@ def ocpus_lowest_scaled_value(self, ocpus_lowest_scaled_value): def max_acds_lowest_scaled_value(self): """ Gets the max_acds_lowest_scaled_value of this CloudAutonomousVmCluster. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :return: The max_acds_lowest_scaled_value of this CloudAutonomousVmCluster. @@ -1943,7 +1943,7 @@ def max_acds_lowest_scaled_value(self): def max_acds_lowest_scaled_value(self, max_acds_lowest_scaled_value): """ Sets the max_acds_lowest_scaled_value of this CloudAutonomousVmCluster. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :param max_acds_lowest_scaled_value: The max_acds_lowest_scaled_value of this CloudAutonomousVmCluster. diff --git a/src/oci/database/models/cloud_autonomous_vm_cluster_summary.py b/src/oci/database/models/cloud_autonomous_vm_cluster_summary.py index befee9da3b..a4cb34a02c 100644 --- a/src/oci/database/models/cloud_autonomous_vm_cluster_summary.py +++ b/src/oci/database/models/cloud_autonomous_vm_cluster_summary.py @@ -1059,7 +1059,9 @@ def ocpu_count(self, ocpu_count): def compute_model(self): """ Gets the compute_model of this CloudAutonomousVmClusterSummary. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak Allowed values for this property are: "ECPU", "OCPU", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -1074,7 +1076,9 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this CloudAutonomousVmClusterSummary. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. See `Compute Models in Autonomous Database on Dedicated Exadata #Infrastructure`__ for more details. + + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak :param compute_model: The compute_model of this CloudAutonomousVmClusterSummary. @@ -1164,9 +1168,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1187,9 +1191,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1467,9 +1471,7 @@ def available_cpus(self, available_cpus): def reclaimable_cpus(self): """ Gets the reclaimable_cpus of this CloudAutonomousVmClusterSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :return: The reclaimable_cpus of this CloudAutonomousVmClusterSummary. @@ -1481,9 +1483,7 @@ def reclaimable_cpus(self): def reclaimable_cpus(self, reclaimable_cpus): """ Sets the reclaimable_cpus of this CloudAutonomousVmClusterSummary. - For Autonomous Databases on Dedicated Exadata Infrastructure: - - These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. - - The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. + CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database. :param reclaimable_cpus: The reclaimable_cpus of this CloudAutonomousVmClusterSummary. @@ -1883,7 +1883,7 @@ def non_provisionable_autonomous_container_databases(self, non_provisionable_aut def exadata_storage_in_tbs_lowest_scaled_value(self): """ Gets the exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmClusterSummary. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage (in TBs) can be scaled down. :return: The exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmClusterSummary. @@ -1895,7 +1895,7 @@ def exadata_storage_in_tbs_lowest_scaled_value(self): def exadata_storage_in_tbs_lowest_scaled_value(self, exadata_storage_in_tbs_lowest_scaled_value): """ Sets the exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmClusterSummary. - The lowest value to which exadataStorage in TBs can be scaled down. + The lowest value to which exadataStorage (in TBs) can be scaled down. :param exadata_storage_in_tbs_lowest_scaled_value: The exadata_storage_in_tbs_lowest_scaled_value of this CloudAutonomousVmClusterSummary. @@ -1931,7 +1931,7 @@ def ocpus_lowest_scaled_value(self, ocpus_lowest_scaled_value): def max_acds_lowest_scaled_value(self): """ Gets the max_acds_lowest_scaled_value of this CloudAutonomousVmClusterSummary. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :return: The max_acds_lowest_scaled_value of this CloudAutonomousVmClusterSummary. @@ -1943,7 +1943,7 @@ def max_acds_lowest_scaled_value(self): def max_acds_lowest_scaled_value(self, max_acds_lowest_scaled_value): """ Sets the max_acds_lowest_scaled_value of this CloudAutonomousVmClusterSummary. - The lowest value to which ACDs can be scaled down. + The lowest value to which maximum number of ACDs can be scaled down. :param max_acds_lowest_scaled_value: The max_acds_lowest_scaled_value of this CloudAutonomousVmClusterSummary. diff --git a/src/oci/database/models/cloud_exadata_infrastructure.py b/src/oci/database/models/cloud_exadata_infrastructure.py index 7d536a61a8..bc0f31117b 100644 --- a/src/oci/database/models/cloud_exadata_infrastructure.py +++ b/src/oci/database/models/cloud_exadata_infrastructure.py @@ -56,6 +56,10 @@ def __init__(self, **kwargs): The value to assign to the compartment_id property of this CloudExadataInfrastructure. :type compartment_id: str + :param cluster_placement_group_id: + The value to assign to the cluster_placement_group_id property of this CloudExadataInfrastructure. + :type cluster_placement_group_id: str + :param lifecycle_state: The value to assign to the lifecycle_state property of this CloudExadataInfrastructure. Allowed values for this property are: "PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "MAINTENANCE_IN_PROGRESS", 'UNKNOWN_ENUM_VALUE'. @@ -158,6 +162,10 @@ def __init__(self, **kwargs): The value to assign to the defined_tags property of this CloudExadataInfrastructure. :type defined_tags: dict(str, dict(str, object)) + :param system_tags: + The value to assign to the system_tags property of this CloudExadataInfrastructure. + :type system_tags: dict(str, dict(str, object)) + :param customer_contacts: The value to assign to the customer_contacts property of this CloudExadataInfrastructure. :type customer_contacts: list[oci.database.models.CustomerContact] @@ -182,6 +190,7 @@ def __init__(self, **kwargs): self.swagger_types = { 'id': 'str', 'compartment_id': 'str', + 'cluster_placement_group_id': 'str', 'lifecycle_state': 'str', 'display_name': 'str', 'shape': 'str', @@ -207,6 +216,7 @@ def __init__(self, **kwargs): 'next_maintenance_run_id': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', + 'system_tags': 'dict(str, dict(str, object))', 'customer_contacts': 'list[CustomerContact]', 'storage_server_version': 'str', 'db_server_version': 'str', @@ -217,6 +227,7 @@ def __init__(self, **kwargs): self.attribute_map = { 'id': 'id', 'compartment_id': 'compartmentId', + 'cluster_placement_group_id': 'clusterPlacementGroupId', 'lifecycle_state': 'lifecycleState', 'display_name': 'displayName', 'shape': 'shape', @@ -242,6 +253,7 @@ def __init__(self, **kwargs): 'next_maintenance_run_id': 'nextMaintenanceRunId', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', + 'system_tags': 'systemTags', 'customer_contacts': 'customerContacts', 'storage_server_version': 'storageServerVersion', 'db_server_version': 'dbServerVersion', @@ -251,6 +263,7 @@ def __init__(self, **kwargs): self._id = None self._compartment_id = None + self._cluster_placement_group_id = None self._lifecycle_state = None self._display_name = None self._shape = None @@ -276,6 +289,7 @@ def __init__(self, **kwargs): self._next_maintenance_run_id = None self._freeform_tags = None self._defined_tags = None + self._system_tags = None self._customer_contacts = None self._storage_server_version = None self._db_server_version = None @@ -338,6 +352,34 @@ def compartment_id(self, compartment_id): """ self._compartment_id = compartment_id + @property + def cluster_placement_group_id(self): + """ + Gets the cluster_placement_group_id of this CloudExadataInfrastructure. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The cluster_placement_group_id of this CloudExadataInfrastructure. + :rtype: str + """ + return self._cluster_placement_group_id + + @cluster_placement_group_id.setter + def cluster_placement_group_id(self, cluster_placement_group_id): + """ + Sets the cluster_placement_group_id of this CloudExadataInfrastructure. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param cluster_placement_group_id: The cluster_placement_group_id of this CloudExadataInfrastructure. + :type: str + """ + self._cluster_placement_group_id = cluster_placement_group_id + @property def lifecycle_state(self): """ @@ -964,6 +1006,36 @@ def defined_tags(self, defined_tags): """ self._defined_tags = defined_tags + @property + def system_tags(self): + """ + Gets the system_tags of this CloudExadataInfrastructure. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The system_tags of this CloudExadataInfrastructure. + :rtype: dict(str, dict(str, object)) + """ + return self._system_tags + + @system_tags.setter + def system_tags(self, system_tags): + """ + Sets the system_tags of this CloudExadataInfrastructure. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param system_tags: The system_tags of this CloudExadataInfrastructure. + :type: dict(str, dict(str, object)) + """ + self._system_tags = system_tags + @property def customer_contacts(self): """ diff --git a/src/oci/database/models/cloud_exadata_infrastructure_summary.py b/src/oci/database/models/cloud_exadata_infrastructure_summary.py index 433ea69d8c..a6f2e76c57 100644 --- a/src/oci/database/models/cloud_exadata_infrastructure_summary.py +++ b/src/oci/database/models/cloud_exadata_infrastructure_summary.py @@ -56,6 +56,10 @@ def __init__(self, **kwargs): The value to assign to the compartment_id property of this CloudExadataInfrastructureSummary. :type compartment_id: str + :param cluster_placement_group_id: + The value to assign to the cluster_placement_group_id property of this CloudExadataInfrastructureSummary. + :type cluster_placement_group_id: str + :param lifecycle_state: The value to assign to the lifecycle_state property of this CloudExadataInfrastructureSummary. Allowed values for this property are: "PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "MAINTENANCE_IN_PROGRESS", 'UNKNOWN_ENUM_VALUE'. @@ -158,6 +162,10 @@ def __init__(self, **kwargs): The value to assign to the defined_tags property of this CloudExadataInfrastructureSummary. :type defined_tags: dict(str, dict(str, object)) + :param system_tags: + The value to assign to the system_tags property of this CloudExadataInfrastructureSummary. + :type system_tags: dict(str, dict(str, object)) + :param customer_contacts: The value to assign to the customer_contacts property of this CloudExadataInfrastructureSummary. :type customer_contacts: list[oci.database.models.CustomerContact] @@ -182,6 +190,7 @@ def __init__(self, **kwargs): self.swagger_types = { 'id': 'str', 'compartment_id': 'str', + 'cluster_placement_group_id': 'str', 'lifecycle_state': 'str', 'display_name': 'str', 'shape': 'str', @@ -207,6 +216,7 @@ def __init__(self, **kwargs): 'next_maintenance_run_id': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', + 'system_tags': 'dict(str, dict(str, object))', 'customer_contacts': 'list[CustomerContact]', 'storage_server_version': 'str', 'db_server_version': 'str', @@ -217,6 +227,7 @@ def __init__(self, **kwargs): self.attribute_map = { 'id': 'id', 'compartment_id': 'compartmentId', + 'cluster_placement_group_id': 'clusterPlacementGroupId', 'lifecycle_state': 'lifecycleState', 'display_name': 'displayName', 'shape': 'shape', @@ -242,6 +253,7 @@ def __init__(self, **kwargs): 'next_maintenance_run_id': 'nextMaintenanceRunId', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', + 'system_tags': 'systemTags', 'customer_contacts': 'customerContacts', 'storage_server_version': 'storageServerVersion', 'db_server_version': 'dbServerVersion', @@ -251,6 +263,7 @@ def __init__(self, **kwargs): self._id = None self._compartment_id = None + self._cluster_placement_group_id = None self._lifecycle_state = None self._display_name = None self._shape = None @@ -276,6 +289,7 @@ def __init__(self, **kwargs): self._next_maintenance_run_id = None self._freeform_tags = None self._defined_tags = None + self._system_tags = None self._customer_contacts = None self._storage_server_version = None self._db_server_version = None @@ -338,6 +352,34 @@ def compartment_id(self, compartment_id): """ self._compartment_id = compartment_id + @property + def cluster_placement_group_id(self): + """ + Gets the cluster_placement_group_id of this CloudExadataInfrastructureSummary. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The cluster_placement_group_id of this CloudExadataInfrastructureSummary. + :rtype: str + """ + return self._cluster_placement_group_id + + @cluster_placement_group_id.setter + def cluster_placement_group_id(self, cluster_placement_group_id): + """ + Sets the cluster_placement_group_id of this CloudExadataInfrastructureSummary. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param cluster_placement_group_id: The cluster_placement_group_id of this CloudExadataInfrastructureSummary. + :type: str + """ + self._cluster_placement_group_id = cluster_placement_group_id + @property def lifecycle_state(self): """ @@ -964,6 +1006,36 @@ def defined_tags(self, defined_tags): """ self._defined_tags = defined_tags + @property + def system_tags(self): + """ + Gets the system_tags of this CloudExadataInfrastructureSummary. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The system_tags of this CloudExadataInfrastructureSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._system_tags + + @system_tags.setter + def system_tags(self, system_tags): + """ + Sets the system_tags of this CloudExadataInfrastructureSummary. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param system_tags: The system_tags of this CloudExadataInfrastructureSummary. + :type: dict(str, dict(str, object)) + """ + self._system_tags = system_tags + @property def customer_contacts(self): """ diff --git a/src/oci/database/models/cloud_vm_cluster.py b/src/oci/database/models/cloud_vm_cluster.py index 4235f0d360..6b3102fdf4 100644 --- a/src/oci/database/models/cloud_vm_cluster.py +++ b/src/oci/database/models/cloud_vm_cluster.py @@ -234,6 +234,10 @@ def __init__(self, **kwargs): The value to assign to the defined_tags property of this CloudVmCluster. :type defined_tags: dict(str, dict(str, object)) + :param system_tags: + The value to assign to the system_tags property of this CloudVmCluster. + :type system_tags: dict(str, dict(str, object)) + :param scan_dns_name: The value to assign to the scan_dns_name property of this CloudVmCluster. :type scan_dns_name: str @@ -297,6 +301,7 @@ def __init__(self, **kwargs): 'scan_dns_record_id': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', + 'system_tags': 'dict(str, dict(str, object))', 'scan_dns_name': 'str', 'zone_id': 'str', 'scan_listener_port_tcp': 'int', @@ -346,6 +351,7 @@ def __init__(self, **kwargs): 'scan_dns_record_id': 'scanDnsRecordId', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', + 'system_tags': 'systemTags', 'scan_dns_name': 'scanDnsName', 'zone_id': 'zoneId', 'scan_listener_port_tcp': 'scanListenerPortTcp', @@ -394,6 +400,7 @@ def __init__(self, **kwargs): self._scan_dns_record_id = None self._freeform_tags = None self._defined_tags = None + self._system_tags = None self._scan_dns_name = None self._zone_id = None self._scan_listener_port_tcp = None @@ -1514,6 +1521,36 @@ def defined_tags(self, defined_tags): """ self._defined_tags = defined_tags + @property + def system_tags(self): + """ + Gets the system_tags of this CloudVmCluster. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The system_tags of this CloudVmCluster. + :rtype: dict(str, dict(str, object)) + """ + return self._system_tags + + @system_tags.setter + def system_tags(self, system_tags): + """ + Sets the system_tags of this CloudVmCluster. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param system_tags: The system_tags of this CloudVmCluster. + :type: dict(str, dict(str, object)) + """ + self._system_tags = system_tags + @property def scan_dns_name(self): """ diff --git a/src/oci/database/models/cloud_vm_cluster_summary.py b/src/oci/database/models/cloud_vm_cluster_summary.py index 4da8d258ae..032254f959 100644 --- a/src/oci/database/models/cloud_vm_cluster_summary.py +++ b/src/oci/database/models/cloud_vm_cluster_summary.py @@ -230,6 +230,10 @@ def __init__(self, **kwargs): The value to assign to the defined_tags property of this CloudVmClusterSummary. :type defined_tags: dict(str, dict(str, object)) + :param system_tags: + The value to assign to the system_tags property of this CloudVmClusterSummary. + :type system_tags: dict(str, dict(str, object)) + :param scan_dns_name: The value to assign to the scan_dns_name property of this CloudVmClusterSummary. :type scan_dns_name: str @@ -292,6 +296,7 @@ def __init__(self, **kwargs): 'scan_dns_record_id': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', + 'system_tags': 'dict(str, dict(str, object))', 'scan_dns_name': 'str', 'zone_id': 'str', 'scan_listener_port_tcp': 'int', @@ -340,6 +345,7 @@ def __init__(self, **kwargs): 'scan_dns_record_id': 'scanDnsRecordId', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', + 'system_tags': 'systemTags', 'scan_dns_name': 'scanDnsName', 'zone_id': 'zoneId', 'scan_listener_port_tcp': 'scanListenerPortTcp', @@ -387,6 +393,7 @@ def __init__(self, **kwargs): self._scan_dns_record_id = None self._freeform_tags = None self._defined_tags = None + self._system_tags = None self._scan_dns_name = None self._zone_id = None self._scan_listener_port_tcp = None @@ -1487,6 +1494,36 @@ def defined_tags(self, defined_tags): """ self._defined_tags = defined_tags + @property + def system_tags(self): + """ + Gets the system_tags of this CloudVmClusterSummary. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The system_tags of this CloudVmClusterSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._system_tags + + @system_tags.setter + def system_tags(self, system_tags): + """ + Sets the system_tags of this CloudVmClusterSummary. + System tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param system_tags: The system_tags of this CloudVmClusterSummary. + :type: dict(str, dict(str, object)) + """ + self._system_tags = system_tags + @property def scan_dns_name(self): """ diff --git a/src/oci/database/models/compute_performance_summary.py b/src/oci/database/models/compute_performance_summary.py index 517b26a30d..0362899c11 100644 --- a/src/oci/database/models/compute_performance_summary.py +++ b/src/oci/database/models/compute_performance_summary.py @@ -67,7 +67,7 @@ def __init__(self, **kwargs): def cpu_core_count(self): """ **[Required]** Gets the cpu_core_count of this ComputePerformanceSummary. - The number of OCPU cores available. + The number of CPU cores available. :return: The cpu_core_count of this ComputePerformanceSummary. @@ -79,7 +79,7 @@ def cpu_core_count(self): def cpu_core_count(self, cpu_core_count): """ Sets the cpu_core_count of this ComputePerformanceSummary. - The number of OCPU cores available. + The number of CPU cores available. :param cpu_core_count: The cpu_core_count of this ComputePerformanceSummary. diff --git a/src/oci/database/models/configure_autonomous_database_vault_key_details.py b/src/oci/database/models/configure_autonomous_database_vault_key_details.py index 98b226e9a0..61076cb91b 100644 --- a/src/oci/database/models/configure_autonomous_database_vault_key_details.py +++ b/src/oci/database/models/configure_autonomous_database_vault_key_details.py @@ -79,7 +79,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this ConfigureAutonomousDatabaseVaultKeyDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -94,7 +94,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this ConfigureAutonomousDatabaseVaultKeyDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts diff --git a/src/oci/database/models/create_autonomous_container_database_dataguard_association_details.py b/src/oci/database/models/create_autonomous_container_database_dataguard_association_details.py index 9b5f18d338..efd8162cdc 100644 --- a/src/oci/database/models/create_autonomous_container_database_dataguard_association_details.py +++ b/src/oci/database/models/create_autonomous_container_database_dataguard_association_details.py @@ -40,6 +40,14 @@ def __init__(self, **kwargs): The value to assign to the peer_cloud_autonomous_vm_cluster_id property of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. :type peer_cloud_autonomous_vm_cluster_id: str + :param peer_autonomous_vm_cluster_id: + The value to assign to the peer_autonomous_vm_cluster_id property of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :type peer_autonomous_vm_cluster_id: str + + :param peer_db_unique_name: + The value to assign to the peer_db_unique_name property of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :type peer_db_unique_name: str + :param peer_autonomous_container_database_backup_config: The value to assign to the peer_autonomous_container_database_backup_config property of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. :type peer_autonomous_container_database_backup_config: oci.database.models.PeerAutonomousContainerDatabaseBackupConfig @@ -66,6 +74,8 @@ def __init__(self, **kwargs): 'peer_autonomous_container_database_display_name': 'str', 'peer_autonomous_container_database_compartment_id': 'str', 'peer_cloud_autonomous_vm_cluster_id': 'str', + 'peer_autonomous_vm_cluster_id': 'str', + 'peer_db_unique_name': 'str', 'peer_autonomous_container_database_backup_config': 'PeerAutonomousContainerDatabaseBackupConfig', 'is_automatic_failover_enabled': 'bool', 'protection_mode': 'str', @@ -77,6 +87,8 @@ def __init__(self, **kwargs): 'peer_autonomous_container_database_display_name': 'peerAutonomousContainerDatabaseDisplayName', 'peer_autonomous_container_database_compartment_id': 'peerAutonomousContainerDatabaseCompartmentId', 'peer_cloud_autonomous_vm_cluster_id': 'peerCloudAutonomousVmClusterId', + 'peer_autonomous_vm_cluster_id': 'peerAutonomousVmClusterId', + 'peer_db_unique_name': 'peerDbUniqueName', 'peer_autonomous_container_database_backup_config': 'peerAutonomousContainerDatabaseBackupConfig', 'is_automatic_failover_enabled': 'isAutomaticFailoverEnabled', 'protection_mode': 'protectionMode', @@ -87,6 +99,8 @@ def __init__(self, **kwargs): self._peer_autonomous_container_database_display_name = None self._peer_autonomous_container_database_compartment_id = None self._peer_cloud_autonomous_vm_cluster_id = None + self._peer_autonomous_vm_cluster_id = None + self._peer_db_unique_name = None self._peer_autonomous_container_database_backup_config = None self._is_automatic_failover_enabled = None self._protection_mode = None @@ -150,7 +164,7 @@ def peer_autonomous_container_database_compartment_id(self, peer_autonomous_cont @property def peer_cloud_autonomous_vm_cluster_id(self): """ - **[Required]** Gets the peer_cloud_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + Gets the peer_cloud_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. The `OCID`__ of the peer cloud Autonomous Exadata VM Cluster. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -175,6 +189,58 @@ def peer_cloud_autonomous_vm_cluster_id(self, peer_cloud_autonomous_vm_cluster_i """ self._peer_cloud_autonomous_vm_cluster_id = peer_cloud_autonomous_vm_cluster_id + @property + def peer_autonomous_vm_cluster_id(self): + """ + Gets the peer_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + The `OCID`__ of the peer Autonomous Exadata VM Cluster. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The peer_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :rtype: str + """ + return self._peer_autonomous_vm_cluster_id + + @peer_autonomous_vm_cluster_id.setter + def peer_autonomous_vm_cluster_id(self, peer_autonomous_vm_cluster_id): + """ + Sets the peer_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + The `OCID`__ of the peer Autonomous Exadata VM Cluster. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param peer_autonomous_vm_cluster_id: The peer_autonomous_vm_cluster_id of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :type: str + """ + self._peer_autonomous_vm_cluster_id = peer_autonomous_vm_cluster_id + + @property + def peer_db_unique_name(self): + """ + Gets the peer_db_unique_name of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + Specifies the `DB_UNIQUE_NAME` of the peer database to be created. + + + :return: The peer_db_unique_name of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :rtype: str + """ + return self._peer_db_unique_name + + @peer_db_unique_name.setter + def peer_db_unique_name(self, peer_db_unique_name): + """ + Sets the peer_db_unique_name of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + Specifies the `DB_UNIQUE_NAME` of the peer database to be created. + + + :param peer_db_unique_name: The peer_db_unique_name of this CreateAutonomousContainerDatabaseDataguardAssociationDetails. + :type: str + """ + self._peer_db_unique_name = peer_db_unique_name + @property def peer_autonomous_container_database_backup_config(self): """ diff --git a/src/oci/database/models/create_autonomous_container_database_details.py b/src/oci/database/models/create_autonomous_container_database_details.py index 47d3eb73d1..f1e2ede88e 100644 --- a/src/oci/database/models/create_autonomous_container_database_details.py +++ b/src/oci/database/models/create_autonomous_container_database_details.py @@ -1021,7 +1021,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this CreateAutonomousContainerDatabaseDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this CreateAutonomousContainerDatabaseDetails. @@ -1033,7 +1033,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this CreateAutonomousContainerDatabaseDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this CreateAutonomousContainerDatabaseDetails. @@ -1045,7 +1045,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this CreateAutonomousContainerDatabaseDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1060,7 +1060,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this CreateAutonomousContainerDatabaseDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1075,7 +1075,7 @@ def vault_id(self, vault_id): def key_store_id(self): """ Gets the key_store_id of this CreateAutonomousContainerDatabaseDetails. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1089,7 +1089,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this CreateAutonomousContainerDatabaseDetails. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm diff --git a/src/oci/database/models/create_autonomous_database_base.py b/src/oci/database/models/create_autonomous_database_base.py index 96ccb8f35c..f081735767 100644 --- a/src/oci/database/models/create_autonomous_database_base.py +++ b/src/oci/database/models/create_autonomous_database_base.py @@ -15,7 +15,7 @@ class CreateAutonomousDatabaseBase(object): Details to create an Oracle Autonomous Database. **Notes:** - - To specify OCPU core count, you must use either `ocpuCount` or `cpuCoreCount`. You cannot use both parameters at the same time. + - To specify OCPU core count, you must use either `ocpuCount` or `cpuCoreCount`. You cannot use both parameters at the same time. For Autonomous Database Serverless instances, `ocpuCount` is not used. - To specify a storage allocation, you must use either `dataStorageSizeInGBs` or `dataStorageSizeInTBs`. - See the individual parameter discriptions for more information on the OCPU and storage value parameters. @@ -286,10 +286,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateAutonomousDatabaseBase. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateAutonomousDatabaseBase. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateAutonomousDatabaseBase. :type database_edition: str @@ -352,7 +348,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -404,7 +399,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -455,7 +449,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None @@ -592,7 +585,7 @@ def ncharacter_set(self, ncharacter_set): def db_name(self): """ Gets the db_name of this CreateAutonomousDatabaseBase. - The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. It is required in all cases except when creating a cross-region Autonomous Data Guard standby instance or a cross-region disaster recovery standby instance. + The database name. The name must begin with an alphabetic character and can contain a maximum of 30 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. It is required in all cases except when creating a cross-region Autonomous Data Guard standby instance or a cross-region disaster recovery standby instance. :return: The db_name of this CreateAutonomousDatabaseBase. @@ -604,7 +597,7 @@ def db_name(self): def db_name(self, db_name): """ Sets the db_name of this CreateAutonomousDatabaseBase. - The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. It is required in all cases except when creating a cross-region Autonomous Data Guard standby instance or a cross-region disaster recovery standby instance. + The database name. The name must begin with an alphabetic character and can contain a maximum of 30 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. It is required in all cases except when creating a cross-region Autonomous Data Guard standby instance or a cross-region disaster recovery standby instance. :param db_name: The db_name of this CreateAutonomousDatabaseBase. @@ -616,7 +609,7 @@ def db_name(self, db_name): def cpu_core_count(self): """ Gets the cpu_core_count of this CreateAutonomousDatabaseBase. - The number of OCPU cores to be made available to the database. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -632,7 +625,7 @@ def cpu_core_count(self): def cpu_core_count(self, cpu_core_count): """ Sets the cpu_core_count of this CreateAutonomousDatabaseBase. - The number of OCPU cores to be made available to the database. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. + The number of CPU cores to be made available to the database. For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. **Note:** This parameter cannot be used with the `ocpuCount` parameter. @@ -672,7 +665,7 @@ def backup_retention_period_in_days(self, backup_retention_period_in_days): def compute_model(self): """ Gets the compute_model of this CreateAutonomousDatabaseBase. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU" @@ -686,7 +679,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this CreateAutonomousDatabaseBase. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this CreateAutonomousDatabaseBase. @@ -703,7 +696,8 @@ def compute_model(self, compute_model): def compute_count(self): """ Gets the compute_count of this CreateAutonomousDatabaseBase. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :return: The compute_count of this CreateAutonomousDatabaseBase. @@ -715,7 +709,8 @@ def compute_count(self): def compute_count(self, compute_count): """ Sets the compute_count of this CreateAutonomousDatabaseBase. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure, the 'ECPU' compute model requires values in multiples of two. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. :param compute_count: The compute_count of this CreateAutonomousDatabaseBase. @@ -732,6 +727,7 @@ def ocpu_count(self): The following points apply: - For Autonomous Databases on Dedicated Exadata infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -754,6 +750,7 @@ def ocpu_count(self, ocpu_count): The following points apply: - For Autonomous Databases on Dedicated Exadata infrastructure, to provision less than 1 core, enter a fractional value in an increment of 0.1. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. (Note that fractional OCPU values are not supported for Autonomous Database Serverless instances.) - To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available for the infrastructure shape. For example, you can provision 2 cores or 3 cores, but not 2.5 cores. This applies to an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + - For Autonomous Database Serverless instances, this parameter is not used. For Autonomous Databases on Dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -938,7 +935,7 @@ def kms_key_id(self, kms_key_id): def vault_id(self): """ Gets the vault_id of this CreateAutonomousDatabaseBase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -953,7 +950,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this CreateAutonomousDatabaseBase. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1023,9 +1020,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1045,9 +1042,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1067,7 +1064,7 @@ def license_model(self, license_model): def is_preview_version_with_service_terms_accepted(self): """ Gets the is_preview_version_with_service_terms_accepted of this CreateAutonomousDatabaseBase. - If set to `TRUE`, indicates that an Autonomous Database preview version is being provisioned, and that the preview version's terms of service have been accepted. Note that preview version software is only available for Autonomous Database Serverless instances (https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html). + If set to `TRUE`, indicates that an Autonomous Database preview version is being provisioned, and that the preview version's terms of service have been accepted. Note that preview version software is only available for Autonomous Database Serverless instances (https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/). :return: The is_preview_version_with_service_terms_accepted of this CreateAutonomousDatabaseBase. @@ -1079,7 +1076,7 @@ def is_preview_version_with_service_terms_accepted(self): def is_preview_version_with_service_terms_accepted(self, is_preview_version_with_service_terms_accepted): """ Sets the is_preview_version_with_service_terms_accepted of this CreateAutonomousDatabaseBase. - If set to `TRUE`, indicates that an Autonomous Database preview version is being provisioned, and that the preview version's terms of service have been accepted. Note that preview version software is only available for Autonomous Database Serverless instances (https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html). + If set to `TRUE`, indicates that an Autonomous Database preview version is being provisioned, and that the preview version's terms of service have been accepted. Note that preview version software is only available for Autonomous Database Serverless instances (https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/). :param is_preview_version_with_service_terms_accepted: The is_preview_version_with_service_terms_accepted of this CreateAutonomousDatabaseBase. @@ -1091,7 +1088,7 @@ def is_preview_version_with_service_terms_accepted(self, is_preview_version_with def is_auto_scaling_enabled(self): """ Gets the is_auto_scaling_enabled of this CreateAutonomousDatabaseBase. - Indicates if auto scaling is enabled for the Autonomous Database OCPU core count. The default value is `FALSE`. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :return: The is_auto_scaling_enabled of this CreateAutonomousDatabaseBase. @@ -1103,7 +1100,7 @@ def is_auto_scaling_enabled(self): def is_auto_scaling_enabled(self, is_auto_scaling_enabled): """ Sets the is_auto_scaling_enabled of this CreateAutonomousDatabaseBase. - Indicates if auto scaling is enabled for the Autonomous Database OCPU core count. The default value is `FALSE`. + Indicates if auto scaling is enabled for the Autonomous Database CPU core count. The default value is `TRUE`. :param is_auto_scaling_enabled: The is_auto_scaling_enabled of this CreateAutonomousDatabaseBase. @@ -1143,7 +1140,7 @@ def is_dedicated(self, is_dedicated): def autonomous_container_database_id(self): """ Gets the autonomous_container_database_id of this CreateAutonomousDatabaseBase. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1157,7 +1154,7 @@ def autonomous_container_database_id(self): def autonomous_container_database_id(self, autonomous_container_database_id): """ Sets the autonomous_container_database_id of this CreateAutonomousDatabaseBase. - The Autonomous Container Database `OCID`__. + The Autonomous Container Database `OCID`__. Used only by Autonomous Database on Dedicated Exadata Infrastructure. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1171,7 +1168,7 @@ def autonomous_container_database_id(self, autonomous_container_database_id): def in_memory_percentage(self): """ Gets the in_memory_percentage of this CreateAutonomousDatabaseBase. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :return: The in_memory_percentage of this CreateAutonomousDatabaseBase. @@ -1183,7 +1180,7 @@ def in_memory_percentage(self): def in_memory_percentage(self, in_memory_percentage): """ Sets the in_memory_percentage of this CreateAutonomousDatabaseBase. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :param in_memory_percentage: The in_memory_percentage of this CreateAutonomousDatabaseBase. @@ -1201,7 +1198,7 @@ def is_access_control_enabled(self): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :return: The is_access_control_enabled of this CreateAutonomousDatabaseBase. @@ -1219,7 +1216,7 @@ def is_access_control_enabled(self, is_access_control_enabled): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :param is_access_control_enabled: The is_access_control_enabled of this CreateAutonomousDatabaseBase. @@ -1233,9 +1230,10 @@ def whitelisted_ips(self): Gets the whitelisted_ips of this CreateAutonomousDatabaseBase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1258,9 +1256,10 @@ def whitelisted_ips(self, whitelisted_ips): Sets the whitelisted_ips of this CreateAutonomousDatabaseBase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1311,9 +1310,10 @@ def standby_whitelisted_ips(self): Gets the standby_whitelisted_ips of this CreateAutonomousDatabaseBase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1336,9 +1336,10 @@ def standby_whitelisted_ips(self, standby_whitelisted_ips): Sets the standby_whitelisted_ips of this CreateAutonomousDatabaseBase. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1487,7 +1488,10 @@ def nsg_ids(self, nsg_ids): def private_endpoint_label(self): """ Gets the private_endpoint_label of this CreateAutonomousDatabaseBase. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -1501,7 +1505,10 @@ def private_endpoint_label(self): def private_endpoint_label(self, private_endpoint_label): """ Sets the private_endpoint_label of this CreateAutonomousDatabaseBase. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -1631,7 +1638,7 @@ def source(self): For `Autonomous Database Serverless instances`__, the following cloning options are available: Use `BACKUP_FROM_ID` for creating a new Autonomous Database from a specified backup. Use `BACKUP_FROM_TIMESTAMP` for creating a point-in-time Autonomous Database clone using backups. For more information, see `Cloning and Moving an Autonomous Database`__. - __ https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/ __ https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/clone-autonomous-database.html#GUID-D771796F-5081-4CFB-A7FF-0F893EABD7BC Allowed values for this property are: "NONE", "DATABASE", "BACKUP_FROM_ID", "BACKUP_FROM_TIMESTAMP", "CLONE_TO_REFRESHABLE", "CROSS_REGION_DATAGUARD", "CROSS_REGION_DISASTER_RECOVERY" @@ -1650,7 +1657,7 @@ def source(self, source): For `Autonomous Database Serverless instances`__, the following cloning options are available: Use `BACKUP_FROM_ID` for creating a new Autonomous Database from a specified backup. Use `BACKUP_FROM_TIMESTAMP` for creating a point-in-time Autonomous Database clone using backups. For more information, see `Cloning and Moving an Autonomous Database`__. - __ https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/ __ https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/clone-autonomous-database.html#GUID-D771796F-5081-4CFB-A7FF-0F893EABD7BC @@ -1694,7 +1701,7 @@ def is_mtls_connection_required(self): Gets the is_mtls_connection_required of this CreateAutonomousDatabaseBase. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -1716,7 +1723,7 @@ def is_mtls_connection_required(self, is_mtls_connection_required): Sets the is_mtls_connection_required of this CreateAutonomousDatabaseBase. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -1817,7 +1824,7 @@ def autonomous_maintenance_schedule_type(self, autonomous_maintenance_schedule_t def scheduled_operations(self): """ Gets the scheduled_operations of this CreateAutonomousDatabaseBase. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -1831,7 +1838,7 @@ def scheduled_operations(self): def scheduled_operations(self, scheduled_operations): """ Sets the scheduled_operations of this CreateAutonomousDatabaseBase. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -1865,30 +1872,6 @@ def is_auto_scaling_for_storage_enabled(self, is_auto_scaling_for_storage_enable """ self._is_auto_scaling_for_storage_enabled = is_auto_scaling_for_storage_enabled - @property - def max_cpu_core_count(self): - """ - Gets the max_cpu_core_count of this CreateAutonomousDatabaseBase. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :return: The max_cpu_core_count of this CreateAutonomousDatabaseBase. - :rtype: int - """ - return self._max_cpu_core_count - - @max_cpu_core_count.setter - def max_cpu_core_count(self, max_cpu_core_count): - """ - Sets the max_cpu_core_count of this CreateAutonomousDatabaseBase. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :param max_cpu_core_count: The max_cpu_core_count of this CreateAutonomousDatabaseBase. - :type: int - """ - self._max_cpu_core_count = max_cpu_core_count - @property def database_edition(self): """ diff --git a/src/oci/database/models/create_autonomous_database_clone_details.py b/src/oci/database/models/create_autonomous_database_clone_details.py index 9c42f39f31..dfd498766b 100644 --- a/src/oci/database/models/create_autonomous_database_clone_details.py +++ b/src/oci/database/models/create_autonomous_database_clone_details.py @@ -210,10 +210,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateAutonomousDatabaseCloneDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateAutonomousDatabaseCloneDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateAutonomousDatabaseCloneDetails. :type database_edition: str @@ -285,7 +281,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -339,7 +334,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -392,7 +386,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_autonomous_database_details.py b/src/oci/database/models/create_autonomous_database_details.py index 724dc892ee..5900fdc850 100644 --- a/src/oci/database/models/create_autonomous_database_details.py +++ b/src/oci/database/models/create_autonomous_database_details.py @@ -202,10 +202,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateAutonomousDatabaseDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateAutonomousDatabaseDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateAutonomousDatabaseDetails. :type database_edition: str @@ -268,7 +264,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -320,7 +315,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -371,7 +365,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_autonomous_database_from_backup_details.py b/src/oci/database/models/create_autonomous_database_from_backup_details.py index 0a0a4ebb34..e921d9748c 100644 --- a/src/oci/database/models/create_autonomous_database_from_backup_details.py +++ b/src/oci/database/models/create_autonomous_database_from_backup_details.py @@ -210,10 +210,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateAutonomousDatabaseFromBackupDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateAutonomousDatabaseFromBackupDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateAutonomousDatabaseFromBackupDetails. :type database_edition: str @@ -285,7 +281,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -339,7 +334,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -392,7 +386,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_autonomous_database_from_backup_timestamp_details.py b/src/oci/database/models/create_autonomous_database_from_backup_timestamp_details.py index 633e990257..6aa6ee7d14 100644 --- a/src/oci/database/models/create_autonomous_database_from_backup_timestamp_details.py +++ b/src/oci/database/models/create_autonomous_database_from_backup_timestamp_details.py @@ -210,10 +210,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateAutonomousDatabaseFromBackupTimestampDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateAutonomousDatabaseFromBackupTimestampDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateAutonomousDatabaseFromBackupTimestampDetails. :type database_edition: str @@ -293,7 +289,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -349,7 +344,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -404,7 +398,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_autonomous_vm_cluster_details.py b/src/oci/database/models/create_autonomous_vm_cluster_details.py index fe0f91a242..0be57330f4 100644 --- a/src/oci/database/models/create_autonomous_vm_cluster_details.py +++ b/src/oci/database/models/create_autonomous_vm_cluster_details.py @@ -422,7 +422,7 @@ def cpu_core_count_per_node(self, cpu_core_count_per_node): def compute_model(self): """ Gets the compute_model of this CreateAutonomousVmClusterDetails. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU" @@ -436,7 +436,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this CreateAutonomousVmClusterDetails. - The compute model of the Autonomous VM Cluster. + The compute model of the Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this CreateAutonomousVmClusterDetails. diff --git a/src/oci/database/models/create_cloud_autonomous_vm_cluster_details.py b/src/oci/database/models/create_cloud_autonomous_vm_cluster_details.py index f43774147c..01a6ab83bf 100644 --- a/src/oci/database/models/create_cloud_autonomous_vm_cluster_details.py +++ b/src/oci/database/models/create_cloud_autonomous_vm_cluster_details.py @@ -446,7 +446,7 @@ def cluster_time_zone(self, cluster_time_zone): def compute_model(self): """ Gets the compute_model of this CreateCloudAutonomousVmClusterDetails. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU" @@ -460,7 +460,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this CreateCloudAutonomousVmClusterDetails. - The compute model of the Cloud Autonomous VM Cluster. + The compute model of the Cloud Autonomous VM Cluster. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this CreateCloudAutonomousVmClusterDetails. @@ -596,9 +596,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -618,9 +618,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html diff --git a/src/oci/database/models/create_cloud_exadata_infrastructure_details.py b/src/oci/database/models/create_cloud_exadata_infrastructure_details.py index bb9b925e79..cba7155b17 100644 --- a/src/oci/database/models/create_cloud_exadata_infrastructure_details.py +++ b/src/oci/database/models/create_cloud_exadata_infrastructure_details.py @@ -56,6 +56,10 @@ def __init__(self, **kwargs): The value to assign to the defined_tags property of this CreateCloudExadataInfrastructureDetails. :type defined_tags: dict(str, dict(str, object)) + :param cluster_placement_group_id: + The value to assign to the cluster_placement_group_id property of this CreateCloudExadataInfrastructureDetails. + :type cluster_placement_group_id: str + :param customer_contacts: The value to assign to the customer_contacts property of this CreateCloudExadataInfrastructureDetails. :type customer_contacts: list[oci.database.models.CustomerContact] @@ -71,6 +75,7 @@ def __init__(self, **kwargs): 'maintenance_window': 'MaintenanceWindow', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', + 'cluster_placement_group_id': 'str', 'customer_contacts': 'list[CustomerContact]' } @@ -84,6 +89,7 @@ def __init__(self, **kwargs): 'maintenance_window': 'maintenanceWindow', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', + 'cluster_placement_group_id': 'clusterPlacementGroupId', 'customer_contacts': 'customerContacts' } @@ -96,6 +102,7 @@ def __init__(self, **kwargs): self._maintenance_window = None self._freeform_tags = None self._defined_tags = None + self._cluster_placement_group_id = None self._customer_contacts = None @property @@ -330,6 +337,34 @@ def defined_tags(self, defined_tags): """ self._defined_tags = defined_tags + @property + def cluster_placement_group_id(self): + """ + Gets the cluster_placement_group_id of this CreateCloudExadataInfrastructureDetails. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The cluster_placement_group_id of this CreateCloudExadataInfrastructureDetails. + :rtype: str + """ + return self._cluster_placement_group_id + + @cluster_placement_group_id.setter + def cluster_placement_group_id(self, cluster_placement_group_id): + """ + Sets the cluster_placement_group_id of this CreateCloudExadataInfrastructureDetails. + The `OCID`__ of the cluster placement group of the Exadata Infrastructure. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param cluster_placement_group_id: The cluster_placement_group_id of this CreateCloudExadataInfrastructureDetails. + :type: str + """ + self._cluster_placement_group_id = cluster_placement_group_id + @property def customer_contacts(self): """ diff --git a/src/oci/database/models/create_cross_region_autonomous_database_data_guard_details.py b/src/oci/database/models/create_cross_region_autonomous_database_data_guard_details.py index 54d7453ba4..bd058169c4 100644 --- a/src/oci/database/models/create_cross_region_autonomous_database_data_guard_details.py +++ b/src/oci/database/models/create_cross_region_autonomous_database_data_guard_details.py @@ -246,10 +246,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateCrossRegionAutonomousDatabaseDataGuardDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateCrossRegionAutonomousDatabaseDataGuardDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateCrossRegionAutonomousDatabaseDataGuardDetails. :type database_edition: str @@ -316,7 +312,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -369,7 +364,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -421,7 +415,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_cross_region_disaster_recovery_details.py b/src/oci/database/models/create_cross_region_disaster_recovery_details.py index 2957c1aacb..219534b688 100644 --- a/src/oci/database/models/create_cross_region_disaster_recovery_details.py +++ b/src/oci/database/models/create_cross_region_disaster_recovery_details.py @@ -242,10 +242,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateCrossRegionDisasterRecoveryDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateCrossRegionDisasterRecoveryDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateCrossRegionDisasterRecoveryDetails. :type database_edition: str @@ -320,7 +316,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -375,7 +370,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -429,7 +423,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/create_data_guard_association_with_new_db_system_details.py b/src/oci/database/models/create_data_guard_association_with_new_db_system_details.py index 11c9c040f2..e823a31b76 100644 --- a/src/oci/database/models/create_data_guard_association_with_new_db_system_details.py +++ b/src/oci/database/models/create_data_guard_association_with_new_db_system_details.py @@ -323,7 +323,7 @@ def shape(self, shape): def cpu_core_count(self): """ Gets the cpu_core_count of this CreateDataGuardAssociationWithNewDbSystemDetails. - The number of OCPU cores available for AMD-based virtual machine DB systems. + The number of CPU cores available for AMD-based virtual machine DB systems. :return: The cpu_core_count of this CreateDataGuardAssociationWithNewDbSystemDetails. @@ -335,7 +335,7 @@ def cpu_core_count(self): def cpu_core_count(self, cpu_core_count): """ Sets the cpu_core_count of this CreateDataGuardAssociationWithNewDbSystemDetails. - The number of OCPU cores available for AMD-based virtual machine DB systems. + The number of CPU cores available for AMD-based virtual machine DB systems. :param cpu_core_count: The cpu_core_count of this CreateDataGuardAssociationWithNewDbSystemDetails. @@ -640,7 +640,7 @@ def private_ip(self, private_ip): def license_model(self): """ Gets the license_model of this CreateDataGuardAssociationWithNewDbSystemDetails. - The Oracle license model that applies to all the databases on the dataguard standby DB system. The default is LICENSE_INCLUDED. + The Oracle license model that applies to all the databases on the dataguard standby DB system. The default is LICENSE_INCLUDED. Bring your own license (BYOL) allows you to select the DB edition using the optional parameter, for Autonomous Database Serverless. Allowed values for this property are: "LICENSE_INCLUDED", "BRING_YOUR_OWN_LICENSE" @@ -654,7 +654,7 @@ def license_model(self): def license_model(self, license_model): """ Sets the license_model of this CreateDataGuardAssociationWithNewDbSystemDetails. - The Oracle license model that applies to all the databases on the dataguard standby DB system. The default is LICENSE_INCLUDED. + The Oracle license model that applies to all the databases on the dataguard standby DB system. The default is LICENSE_INCLUDED. Bring your own license (BYOL) allows you to select the DB edition using the optional parameter, for Autonomous Database Serverless. :param license_model: The license_model of this CreateDataGuardAssociationWithNewDbSystemDetails. diff --git a/src/oci/database/models/create_database_base.py b/src/oci/database/models/create_database_base.py index 26c8a373b1..9a734f69bc 100644 --- a/src/oci/database/models/create_database_base.py +++ b/src/oci/database/models/create_database_base.py @@ -216,7 +216,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this CreateDatabaseBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this CreateDatabaseBase. @@ -228,7 +228,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this CreateDatabaseBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this CreateDatabaseBase. diff --git a/src/oci/database/models/create_database_details.py b/src/oci/database/models/create_database_details.py index bd56a9ef9c..c50932b126 100644 --- a/src/oci/database/models/create_database_details.py +++ b/src/oci/database/models/create_database_details.py @@ -502,7 +502,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this CreateDatabaseDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this CreateDatabaseDetails. @@ -514,7 +514,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this CreateDatabaseDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this CreateDatabaseDetails. @@ -526,7 +526,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this CreateDatabaseDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -541,7 +541,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this CreateDatabaseDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts diff --git a/src/oci/database/models/create_db_home_base.py b/src/oci/database/models/create_db_home_base.py index 8e5d1815fc..229c3537f3 100644 --- a/src/oci/database/models/create_db_home_base.py +++ b/src/oci/database/models/create_db_home_base.py @@ -192,7 +192,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this CreateDbHomeBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this CreateDbHomeBase. @@ -204,7 +204,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this CreateDbHomeBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this CreateDbHomeBase. diff --git a/src/oci/database/models/create_refreshable_autonomous_database_clone_details.py b/src/oci/database/models/create_refreshable_autonomous_database_clone_details.py index d1243e8242..ac7739e6b0 100644 --- a/src/oci/database/models/create_refreshable_autonomous_database_clone_details.py +++ b/src/oci/database/models/create_refreshable_autonomous_database_clone_details.py @@ -210,10 +210,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this CreateRefreshableAutonomousDatabaseCloneDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this CreateRefreshableAutonomousDatabaseCloneDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this CreateRefreshableAutonomousDatabaseCloneDetails. :type database_edition: str @@ -285,7 +281,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'str', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -339,7 +334,6 @@ def __init__(self, **kwargs): 'autonomous_maintenance_schedule_type': 'autonomousMaintenanceScheduleType', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -392,7 +386,6 @@ def __init__(self, **kwargs): self._autonomous_maintenance_schedule_type = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None diff --git a/src/oci/database/models/database.py b/src/oci/database/models/database.py index c87fcfb30a..2cdadfd585 100644 --- a/src/oci/database/models/database.py +++ b/src/oci/database/models/database.py @@ -863,7 +863,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this Database. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this Database. @@ -875,7 +875,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this Database. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this Database. @@ -887,7 +887,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this Database. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -902,7 +902,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this Database. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1041,7 +1041,7 @@ def sid_prefix(self, sid_prefix): def key_store_id(self): """ Gets the key_store_id of this Database. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1055,7 +1055,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this Database. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm diff --git a/src/oci/database/models/database_connection_credentials.py b/src/oci/database/models/database_connection_credentials.py index ca2603c0c3..a65dbd1c39 100644 --- a/src/oci/database/models/database_connection_credentials.py +++ b/src/oci/database/models/database_connection_credentials.py @@ -32,8 +32,8 @@ def __init__(self, **kwargs): Initializes a new DatabaseConnectionCredentials object with values from keyword arguments. This class has the following subclasses and if you are using this class as input to a service operations then you should favor using a subclass over the base class: - * :class:`~oci.database.models.DatabaseConnectionCredentailsByName` * :class:`~oci.database.models.DatabaseSslConnectionCredentials` + * :class:`~oci.database.models.DatabaseConnectionCredentialsByName` * :class:`~oci.database.models.DatabaseConnectionCredentialsByDetails` The following keyword arguments are supported (corresponding to the getters/setters of this class): @@ -63,12 +63,12 @@ def get_subtype(object_dictionary): """ type = object_dictionary['credentialType'] - if type == 'NAME_REFERENCE': - return 'DatabaseConnectionCredentailsByName' - if type == 'SSL_DETAILS': return 'DatabaseSslConnectionCredentials' + if type == 'NAME_REFERENCE': + return 'DatabaseConnectionCredentialsByName' + if type == 'DETAILS': return 'DatabaseConnectionCredentialsByDetails' else: diff --git a/src/oci/database/models/database_connection_credentails_by_name.py b/src/oci/database/models/database_connection_credentials_by_name.py similarity index 91% rename from src/oci/database/models/database_connection_credentails_by_name.py rename to src/oci/database/models/database_connection_credentials_by_name.py index d9c2905d52..3d36f59072 100644 --- a/src/oci/database/models/database_connection_credentails_by_name.py +++ b/src/oci/database/models/database_connection_credentials_by_name.py @@ -10,24 +10,24 @@ @init_model_state_from_kwargs -class DatabaseConnectionCredentailsByName(DatabaseConnectionCredentials): +class DatabaseConnectionCredentialsByName(DatabaseConnectionCredentials): """ Existing named credential used to connect to the database. """ def __init__(self, **kwargs): """ - Initializes a new DatabaseConnectionCredentailsByName object with values from keyword arguments. The default value of the :py:attr:`~oci.database.models.DatabaseConnectionCredentailsByName.credential_type` attribute + Initializes a new DatabaseConnectionCredentialsByName object with values from keyword arguments. The default value of the :py:attr:`~oci.database.models.DatabaseConnectionCredentialsByName.credential_type` attribute of this class is ``NAME_REFERENCE`` and it should not be changed. The following keyword arguments are supported (corresponding to the getters/setters of this class): :param credential_type: - The value to assign to the credential_type property of this DatabaseConnectionCredentailsByName. + The value to assign to the credential_type property of this DatabaseConnectionCredentialsByName. Allowed values for this property are: "NAME_REFERENCE", "DETAILS", "SSL_DETAILS" :type credential_type: str :param credential_name: - The value to assign to the credential_name property of this DatabaseConnectionCredentailsByName. + The value to assign to the credential_name property of this DatabaseConnectionCredentialsByName. :type credential_name: str """ @@ -48,7 +48,7 @@ def __init__(self, **kwargs): @property def credential_name(self): """ - **[Required]** Gets the credential_name of this DatabaseConnectionCredentailsByName. + **[Required]** Gets the credential_name of this DatabaseConnectionCredentialsByName. The name of the credential information that used to connect to the database. The name should be in \"x.y\" format, where the length of \"x\" has a maximum of 64 characters, and length of \"y\" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for @@ -60,7 +60,7 @@ def credential_name(self): For example: inventorydb.abc112233445566778899 - :return: The credential_name of this DatabaseConnectionCredentailsByName. + :return: The credential_name of this DatabaseConnectionCredentialsByName. :rtype: str """ return self._credential_name @@ -68,7 +68,7 @@ def credential_name(self): @credential_name.setter def credential_name(self, credential_name): """ - Sets the credential_name of this DatabaseConnectionCredentailsByName. + Sets the credential_name of this DatabaseConnectionCredentialsByName. The name of the credential information that used to connect to the database. The name should be in \"x.y\" format, where the length of \"x\" has a maximum of 64 characters, and length of \"y\" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for @@ -80,7 +80,7 @@ def credential_name(self, credential_name): For example: inventorydb.abc112233445566778899 - :param credential_name: The credential_name of this DatabaseConnectionCredentailsByName. + :param credential_name: The credential_name of this DatabaseConnectionCredentialsByName. :type: str """ self._credential_name = credential_name diff --git a/src/oci/database/models/database_summary.py b/src/oci/database/models/database_summary.py index ec85bbb462..4ac3ba67ed 100644 --- a/src/oci/database/models/database_summary.py +++ b/src/oci/database/models/database_summary.py @@ -870,7 +870,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this DatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this DatabaseSummary. @@ -882,7 +882,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this DatabaseSummary. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this DatabaseSummary. @@ -894,7 +894,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this DatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -909,7 +909,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this DatabaseSummary. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -1048,7 +1048,7 @@ def sid_prefix(self, sid_prefix): def key_store_id(self): """ Gets the key_store_id of this DatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -1062,7 +1062,7 @@ def key_store_id(self): def key_store_id(self, key_store_id): """ Sets the key_store_id of this DatabaseSummary. - The `OCID`__ of the key store. + The `OCID`__ of the key store of Oracle Vault. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm diff --git a/src/oci/database/models/key_store_type_from_oracle_key_vault_details.py b/src/oci/database/models/key_store_type_from_oracle_key_vault_details.py index 9535b65955..f17c71254f 100644 --- a/src/oci/database/models/key_store_type_from_oracle_key_vault_details.py +++ b/src/oci/database/models/key_store_type_from_oracle_key_vault_details.py @@ -118,7 +118,7 @@ def admin_username(self, admin_username): def vault_id(self): """ **[Required]** Gets the vault_id of this KeyStoreTypeFromOracleKeyVaultDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -133,7 +133,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this KeyStoreTypeFromOracleKeyVaultDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts diff --git a/src/oci/database/models/launch_db_system_base.py b/src/oci/database/models/launch_db_system_base.py index 262dd6c88b..cd1be1514f 100644 --- a/src/oci/database/models/launch_db_system_base.py +++ b/src/oci/database/models/launch_db_system_base.py @@ -940,7 +940,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this LaunchDbSystemBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this LaunchDbSystemBase. @@ -952,7 +952,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this LaunchDbSystemBase. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this LaunchDbSystemBase. diff --git a/src/oci/database/models/migrate_vault_key_details.py b/src/oci/database/models/migrate_vault_key_details.py index ae4e958b53..dab53ba7b1 100644 --- a/src/oci/database/models/migrate_vault_key_details.py +++ b/src/oci/database/models/migrate_vault_key_details.py @@ -93,7 +93,7 @@ def kms_key_id(self, kms_key_id): def kms_key_version_id(self): """ Gets the kms_key_version_id of this MigrateVaultKeyDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :return: The kms_key_version_id of this MigrateVaultKeyDetails. @@ -105,7 +105,7 @@ def kms_key_version_id(self): def kms_key_version_id(self, kms_key_version_id): """ Sets the kms_key_version_id of this MigrateVaultKeyDetails. - The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. + The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances. :param kms_key_version_id: The kms_key_version_id of this MigrateVaultKeyDetails. @@ -117,7 +117,7 @@ def kms_key_version_id(self, kms_key_version_id): def vault_id(self): """ Gets the vault_id of this MigrateVaultKeyDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts @@ -132,7 +132,7 @@ def vault_id(self): def vault_id(self, vault_id): """ Sets the vault_id of this MigrateVaultKeyDetails. - The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. + The `OCID`__ of the Oracle Cloud Infrastructure `vault`__. This parameter and `secretId` are required for Customer Managed Keys. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts diff --git a/src/oci/database/models/update_autonomous_database_details.py b/src/oci/database/models/update_autonomous_database_details.py index 21f6c18597..24c310a9cd 100644 --- a/src/oci/database/models/update_autonomous_database_details.py +++ b/src/oci/database/models/update_autonomous_database_details.py @@ -15,7 +15,7 @@ class UpdateAutonomousDatabaseDetails(object): Details to update an Oracle Autonomous Database. **Notes** - - To specify OCPU core count, you must use either `ocpuCount` or `cpuCoreCount`. You cannot use both parameters at the same time. + - To specify OCPU core count, you must use either `ocpuCount` or `cpuCoreCount`. You cannot use both parameters at the same time. For Autonomous Database Serverless instances, `ocpuCount` is not used. - To specify a storage allocation, you must use either `dataStorageSizeInGBs` or `dataStorageSizeInTBs`. - See the individual parameter discriptions for more information on the OCPU and storage value parameters. **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. @@ -252,10 +252,6 @@ def __init__(self, **kwargs): The value to assign to the is_auto_scaling_for_storage_enabled property of this UpdateAutonomousDatabaseDetails. :type is_auto_scaling_for_storage_enabled: bool - :param max_cpu_core_count: - The value to assign to the max_cpu_core_count property of this UpdateAutonomousDatabaseDetails. - :type max_cpu_core_count: int - :param database_edition: The value to assign to the database_edition property of this UpdateAutonomousDatabaseDetails. :type database_edition: str @@ -315,7 +311,6 @@ def __init__(self, **kwargs): 'resource_pool_summary': 'ResourcePoolSummary', 'scheduled_operations': 'list[ScheduledOperationDetails]', 'is_auto_scaling_for_storage_enabled': 'bool', - 'max_cpu_core_count': 'int', 'database_edition': 'str', 'db_tools_details': 'list[DatabaseTool]', 'secret_id': 'str', @@ -364,7 +359,6 @@ def __init__(self, **kwargs): 'resource_pool_summary': 'resourcePoolSummary', 'scheduled_operations': 'scheduledOperations', 'is_auto_scaling_for_storage_enabled': 'isAutoScalingForStorageEnabled', - 'max_cpu_core_count': 'maxCpuCoreCount', 'database_edition': 'databaseEdition', 'db_tools_details': 'dbToolsDetails', 'secret_id': 'secretId', @@ -412,7 +406,6 @@ def __init__(self, **kwargs): self._resource_pool_summary = None self._scheduled_operations = None self._is_auto_scaling_for_storage_enabled = None - self._max_cpu_core_count = None self._database_edition = None self._db_tools_details = None self._secret_id = None @@ -446,7 +439,7 @@ def backup_retention_period_in_days(self, backup_retention_period_in_days): def compute_model(self): """ Gets the compute_model of this UpdateAutonomousDatabaseDetails. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. Allowed values for this property are: "ECPU", "OCPU" @@ -460,7 +453,7 @@ def compute_model(self): def compute_model(self, compute_model): """ Sets the compute_model of this UpdateAutonomousDatabaseDetails. - The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. + The compute model of the Autonomous Database. This is required if using the `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. ECPU compute model is the recommended model and OCPU compute model is legacy. :param compute_model: The compute_model of this UpdateAutonomousDatabaseDetails. @@ -477,7 +470,7 @@ def compute_model(self, compute_model): def in_memory_percentage(self): """ Gets the in_memory_percentage of this UpdateAutonomousDatabaseDetails. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :return: The in_memory_percentage of this UpdateAutonomousDatabaseDetails. @@ -489,7 +482,7 @@ def in_memory_percentage(self): def in_memory_percentage(self, in_memory_percentage): """ Sets the in_memory_percentage of this UpdateAutonomousDatabaseDetails. - The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. + The percentage of the System Global Area(SGA) assigned to In-Memory tables in Autonomous Database. This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. :param in_memory_percentage: The in_memory_percentage of this UpdateAutonomousDatabaseDetails. @@ -583,7 +576,8 @@ def long_term_backup_schedule(self, long_term_backup_schedule): def compute_count(self): """ Gets the compute_count of this UpdateAutonomousDatabaseDetails. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. For an Autonomous Database Serverless instance, the ECPU compute model requires values in multiples of two. Required when using the computeModel parameter. When using the cpuCoreCount parameter, computeCount must be null. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. This cannot be updated in parallel with any of the following: licenseModel, databaseEdition, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -597,7 +591,8 @@ def compute_count(self): def compute_count(self, compute_count): """ Sets the compute_count of this UpdateAutonomousDatabaseDetails. - The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. For an Autonomous Database Serverless instance, the ECPU compute model requires values in multiples of two. Required when using the computeModel parameter. When using the cpuCoreCount parameter, computeCount must be null. + The compute amount (CPUs) available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. + For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU. This cannot be updated in parallel with any of the following: licenseModel, databaseEdition, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -614,6 +609,7 @@ def ocpu_count(self): The number of OCPU cores to be made available to the Autonomous Database. For Autonomous Databases on Dedicated Exadata Infrastructure, you can specify a fractional value for this parameter. Fractional values are not supported for Autonomous Database Serverless instances. + For Autonomous Database Serverless instances, this parameter is not used. To provision less than 1 core, enter a fractional value in an increment of 0.1. To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available to the infrastructure shape. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. Likewise, you can provision 2 cores or 3 cores, but not 2.5 cores. The maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -634,6 +630,7 @@ def ocpu_count(self, ocpu_count): The number of OCPU cores to be made available to the Autonomous Database. For Autonomous Databases on Dedicated Exadata Infrastructure, you can specify a fractional value for this parameter. Fractional values are not supported for Autonomous Database Serverless instances. + For Autonomous Database Serverless instances, this parameter is not used. To provision less than 1 core, enter a fractional value in an increment of 0.1. To provision 1 or more cores, you must enter an integer between 1 and the maximum number of cores available to the infrastructure shape. For example, you can provision 0.3 or 0.4 cores, but not 0.35 cores. Likewise, you can provision 2 cores or 3 cores, but not 2.5 cores. The maximum number of cores is determined by the infrastructure shape. See `Characteristics of Infrastructure Shapes`__ for shape details. @@ -811,7 +808,7 @@ def db_name(self): Gets the db_name of this UpdateAutonomousDatabaseDetails. New name for this Autonomous Database. For Autonomous Databases on Dedicated Exadata Infrastructure, the name must begin with an alphabetic character, and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. - For Autonomous Database Serverless instances, the name must begin with an alphabetic character, and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + For Autonomous Database Serverless instances, the name must begin with an alphabetic character, and can contain a maximum of 30 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails. @@ -827,7 +824,7 @@ def db_name(self, db_name): Sets the db_name of this UpdateAutonomousDatabaseDetails. New name for this Autonomous Database. For Autonomous Databases on Dedicated Exadata Infrastructure, the name must begin with an alphabetic character, and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. - For Autonomous Database Serverless instances, the name must begin with an alphabetic character, and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + For Autonomous Database Serverless instances, the name must begin with an alphabetic character, and can contain a maximum of 30 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails. @@ -953,9 +950,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -975,9 +972,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -1003,7 +1000,7 @@ def is_access_control_enabled(self): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :return: The is_access_control_enabled of this UpdateAutonomousDatabaseDetails. @@ -1021,7 +1018,7 @@ def is_access_control_enabled(self, is_access_control_enabled): if database-level access control is enabled and no rules are specified, the database will become inaccessible. The rules can be added later using the `UpdateAutonomousDatabase` API operation or edit option in console. When creating a database clone, the desired access control setting should be specified. By default, database-level access control will be disabled for the clone. - This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. + This property is applicable only to Autonomous Databases on the Exadata Cloud@Customer platform. For Autonomous Database Serverless instances, `whitelistedIps` is used. :param is_access_control_enabled: The is_access_control_enabled of this UpdateAutonomousDatabaseDetails. @@ -1035,9 +1032,10 @@ def whitelisted_ips(self): Gets the whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1060,9 +1058,10 @@ def whitelisted_ips(self, whitelisted_ips): Sets the whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1113,9 +1112,10 @@ def standby_whitelisted_ips(self): Gets the standby_whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1138,9 +1138,10 @@ def standby_whitelisted_ips(self, standby_whitelisted_ips): Sets the standby_whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `Autonomous Database Serverless]`__ and on Exadata Cloud@Customer. Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. + If `arePrimaryWhitelistedIpsUsed` is 'TRUE' then Autonomous Database uses this primary's IP access control list (ACL) for the disaster recovery peer called `standbywhitelistedips`. For Autonomous Database Serverless, this is an array of CIDR (classless inter-domain routing) notations for a subnet or VCN OCID (virtual cloud network Oracle Cloud ID). - Use a semicolon (;) as a deliminator between the VCN-specific subnets or IPs. + Multiple IPs and VCN OCIDs should be separate strings separated by commas, but if it\u2019s other configurations that need multiple pieces of information then its each piece is connected with semicolon (;) as a delimiter. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.\",\"ocid1.vcn.oc1.sea.;1.1.1.1\",\"ocid1.vcn.oc1.sea.;1.1.0.0/16\"]` For Exadata Cloud@Customer, this is an array of IP addresses or CIDR notations. Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"1.1.2.25\"]` @@ -1161,9 +1162,9 @@ def standby_whitelisted_ips(self, standby_whitelisted_ips): def is_auto_scaling_enabled(self): """ Gets the is_auto_scaling_enabled of this UpdateAutonomousDatabaseDetails. - Indicates whether auto scaling is enabled for the Autonomous Database OCPU core count. Setting to `TRUE` enables auto scaling. Setting to `FALSE` disables auto scaling. The default value is true. Auto scaling is only available for `Autonomous Database Serverless instances`__. + Indicates whether auto scaling is enabled for the Autonomous Database CPU core count. Setting to `TRUE` enables auto scaling. Setting to `FALSE` disables auto scaling. The default value is `TRUE`. Auto scaling is only available for `Autonomous Database Serverless instances`__. - __ https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/ :return: The is_auto_scaling_enabled of this UpdateAutonomousDatabaseDetails. @@ -1175,9 +1176,9 @@ def is_auto_scaling_enabled(self): def is_auto_scaling_enabled(self, is_auto_scaling_enabled): """ Sets the is_auto_scaling_enabled of this UpdateAutonomousDatabaseDetails. - Indicates whether auto scaling is enabled for the Autonomous Database OCPU core count. Setting to `TRUE` enables auto scaling. Setting to `FALSE` disables auto scaling. The default value is true. Auto scaling is only available for `Autonomous Database Serverless instances`__. + Indicates whether auto scaling is enabled for the Autonomous Database CPU core count. Setting to `TRUE` enables auto scaling. Setting to `FALSE` disables auto scaling. The default value is `TRUE`. Auto scaling is only available for `Autonomous Database Serverless instances`__. - __ https://docs.oracle.com/en/cloud/paas/autonomous-database/shared/index.html + __ https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/ :param is_auto_scaling_enabled: The is_auto_scaling_enabled of this UpdateAutonomousDatabaseDetails. @@ -1336,12 +1337,10 @@ def is_data_guard_enabled(self, is_data_guard_enabled): def peer_db_id(self): """ Gets the peer_db_id of this UpdateAutonomousDatabaseDetails. - The `OCID`__ of the Autonomous Data Guard standby database located in a different (remote) region from the source primary Autonomous Database. + The database OCID(/Content/General/Concepts/identifiers.htm) of the Disaster Recovery peer (source Primary) database, which is located in a different (remote) region from the current peer database. To create or delete a local (in-region) standby, see the `isDataGuardEnabled` parameter. - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm - :return: The peer_db_id of this UpdateAutonomousDatabaseDetails. :rtype: str @@ -1352,12 +1351,10 @@ def peer_db_id(self): def peer_db_id(self, peer_db_id): """ Sets the peer_db_id of this UpdateAutonomousDatabaseDetails. - The `OCID`__ of the Autonomous Data Guard standby database located in a different (remote) region from the source primary Autonomous Database. + The database OCID(/Content/General/Concepts/identifiers.htm) of the Disaster Recovery peer (source Primary) database, which is located in a different (remote) region from the current peer database. To create or delete a local (in-region) standby, see the `isDataGuardEnabled` parameter. - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm - :param peer_db_id: The peer_db_id of this UpdateAutonomousDatabaseDetails. :type: str @@ -1508,7 +1505,10 @@ def subnet_id(self, subnet_id): def private_endpoint_label(self): """ Gets the private_endpoint_label of this UpdateAutonomousDatabaseDetails. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -1522,7 +1522,10 @@ def private_endpoint_label(self): def private_endpoint_label(self, private_endpoint_label): """ Sets the private_endpoint_label of this UpdateAutonomousDatabaseDetails. - The resource's private endpoint label. Setting this to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + The resource's private endpoint label. + - Setting the endpoint label to a non-empty string creates a private endpoint database. + - Resetting the endpoint label to an empty string, after the creation of the private endpoint database, changes the private endpoint database to a public endpoint database. + - Setting the endpoint label to a non-empty string value, updates to a new private endpoint database, when the database is disabled and re-enabled. This setting cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, adminPassword, whitelistedIps, isMTLSConnectionRequired, dbWorkload, dbVersion, isRefreshable, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. @@ -1624,7 +1627,7 @@ def is_mtls_connection_required(self): Gets the is_mtls_connection_required of this UpdateAutonomousDatabaseDetails. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -1646,7 +1649,7 @@ def is_mtls_connection_required(self, is_mtls_connection_required): Sets the is_mtls_connection_required of this UpdateAutonomousDatabaseDetails. Specifies if the Autonomous Database requires mTLS connections. - This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. + This may not be updated in parallel with any of the following: licenseModel, databaseEdition, cpuCoreCount, computeCount, dataStorageSizeInTBs, whitelistedIps, openMode, permissionLevel, db-workload, privateEndpointLabel, nsgIds, customerContacts, dbVersion, scheduledOperations, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. Service Change: The default value of the isMTLSConnectionRequired attribute will change from true to false on July 1, 2023 in the following APIs: - CreateAutonomousDatabase @@ -1714,7 +1717,7 @@ def resource_pool_summary(self, resource_pool_summary): def scheduled_operations(self): """ Gets the scheduled_operations of this UpdateAutonomousDatabaseDetails. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -1728,7 +1731,7 @@ def scheduled_operations(self): def scheduled_operations(self, scheduled_operations): """ Sets the scheduled_operations of this UpdateAutonomousDatabaseDetails. - The list of scheduled operations. + The list of scheduled operations. Consists of values such as dayOfWeek, scheduledStartTime, scheduledStopTime. This cannot be updated in parallel with any of the following: licenseModel, dbEdition, cpuCoreCount, computeCount, computeModel, whitelistedIps, isMTLSConnectionRequired, openMode, permissionLevel, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, isRefreshable, dbName, dbToolsDetails, isLocalDataGuardEnabled, or isFreeTier. @@ -1762,30 +1765,6 @@ def is_auto_scaling_for_storage_enabled(self, is_auto_scaling_for_storage_enable """ self._is_auto_scaling_for_storage_enabled = is_auto_scaling_for_storage_enabled - @property - def max_cpu_core_count(self): - """ - Gets the max_cpu_core_count of this UpdateAutonomousDatabaseDetails. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :return: The max_cpu_core_count of this UpdateAutonomousDatabaseDetails. - :rtype: int - """ - return self._max_cpu_core_count - - @max_cpu_core_count.setter - def max_cpu_core_count(self, max_cpu_core_count): - """ - Sets the max_cpu_core_count of this UpdateAutonomousDatabaseDetails. - The number of Max OCPU cores to be made available to the autonomous database with auto scaling of cpu enabled. - - - :param max_cpu_core_count: The max_cpu_core_count of this UpdateAutonomousDatabaseDetails. - :type: int - """ - self._max_cpu_core_count = max_cpu_core_count - @property def database_edition(self): """ diff --git a/src/oci/database/models/update_autonomous_vm_cluster_details.py b/src/oci/database/models/update_autonomous_vm_cluster_details.py index f36c5624ca..65d3976e5a 100644 --- a/src/oci/database/models/update_autonomous_vm_cluster_details.py +++ b/src/oci/database/models/update_autonomous_vm_cluster_details.py @@ -205,7 +205,7 @@ def defined_tags(self, defined_tags): def autonomous_data_storage_size_in_tbs(self): """ Gets the autonomous_data_storage_size_in_tbs of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for autonomous data storage in TBs for Autonomous VM cluster. + The new value of autonomous data storage (in TBs) for the Autonomous VM cluster. :return: The autonomous_data_storage_size_in_tbs of this UpdateAutonomousVmClusterDetails. @@ -217,7 +217,7 @@ def autonomous_data_storage_size_in_tbs(self): def autonomous_data_storage_size_in_tbs(self, autonomous_data_storage_size_in_tbs): """ Sets the autonomous_data_storage_size_in_tbs of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for autonomous data storage in TBs for Autonomous VM cluster. + The new value of autonomous data storage (in TBs) for the Autonomous VM cluster. :param autonomous_data_storage_size_in_tbs: The autonomous_data_storage_size_in_tbs of this UpdateAutonomousVmClusterDetails. @@ -229,7 +229,7 @@ def autonomous_data_storage_size_in_tbs(self, autonomous_data_storage_size_in_tb def cpu_core_count_per_node(self): """ Gets the cpu_core_count_per_node of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for cpus per Autonomous VM cluster per node. + The new value of cpus per Autonomous VM cluster per node for the Autonomous VM cluster. :return: The cpu_core_count_per_node of this UpdateAutonomousVmClusterDetails. @@ -241,7 +241,7 @@ def cpu_core_count_per_node(self): def cpu_core_count_per_node(self, cpu_core_count_per_node): """ Sets the cpu_core_count_per_node of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for cpus per Autonomous VM cluster per node. + The new value of cpus per Autonomous VM cluster per node for the Autonomous VM cluster. :param cpu_core_count_per_node: The cpu_core_count_per_node of this UpdateAutonomousVmClusterDetails. @@ -253,7 +253,7 @@ def cpu_core_count_per_node(self, cpu_core_count_per_node): def total_container_databases(self): """ Gets the total_container_databases of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for maxACD count for Autonomous VM cluster. + The new value of maximum number of ACDs for the Autonomous VM cluster. :return: The total_container_databases of this UpdateAutonomousVmClusterDetails. @@ -265,7 +265,7 @@ def total_container_databases(self): def total_container_databases(self, total_container_databases): """ Sets the total_container_databases of this UpdateAutonomousVmClusterDetails. - The new scaled up/down value for maxACD count for Autonomous VM cluster. + The new value of maximum number of ACDs for the Autonomous VM cluster. :param total_container_databases: The total_container_databases of this UpdateAutonomousVmClusterDetails. diff --git a/src/oci/database/models/update_cloud_autonomous_vm_cluster_details.py b/src/oci/database/models/update_cloud_autonomous_vm_cluster_details.py index 73d45856fa..ca883ad22f 100644 --- a/src/oci/database/models/update_cloud_autonomous_vm_cluster_details.py +++ b/src/oci/database/models/update_cloud_autonomous_vm_cluster_details.py @@ -179,7 +179,7 @@ def maintenance_window_details(self, maintenance_window_details): def autonomous_data_storage_size_in_tbs(self): """ Gets the autonomous_data_storage_size_in_tbs of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for exadata storage in TBs for cloud autonomous VM cluster. + The new value of autonomous data storage (in TBs) for the Autonomous VM cluster. :return: The autonomous_data_storage_size_in_tbs of this UpdateCloudAutonomousVmClusterDetails. @@ -191,7 +191,7 @@ def autonomous_data_storage_size_in_tbs(self): def autonomous_data_storage_size_in_tbs(self, autonomous_data_storage_size_in_tbs): """ Sets the autonomous_data_storage_size_in_tbs of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for exadata storage in TBs for cloud autonomous VM cluster. + The new value of autonomous data storage (in TBs) for the Autonomous VM cluster. :param autonomous_data_storage_size_in_tbs: The autonomous_data_storage_size_in_tbs of this UpdateCloudAutonomousVmClusterDetails. @@ -203,7 +203,7 @@ def autonomous_data_storage_size_in_tbs(self, autonomous_data_storage_size_in_tb def cpu_core_count_per_node(self): """ Gets the cpu_core_count_per_node of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for ocpus for cloud autonomous VM cluster per node. + The new value of cpus per Autonomous VM cluster per node for the Autonomous VM cluster. :return: The cpu_core_count_per_node of this UpdateCloudAutonomousVmClusterDetails. @@ -215,7 +215,7 @@ def cpu_core_count_per_node(self): def cpu_core_count_per_node(self, cpu_core_count_per_node): """ Sets the cpu_core_count_per_node of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for ocpus for cloud autonomous VM cluster per node. + The new value of cpus per Autonomous VM cluster per node for the Autonomous VM cluster. :param cpu_core_count_per_node: The cpu_core_count_per_node of this UpdateCloudAutonomousVmClusterDetails. @@ -227,7 +227,7 @@ def cpu_core_count_per_node(self, cpu_core_count_per_node): def total_container_databases(self): """ Gets the total_container_databases of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for maxACD count for cloud autonomous VM cluster. + The new value of maximum number of ACDs for the Autonomous VM cluster. :return: The total_container_databases of this UpdateCloudAutonomousVmClusterDetails. @@ -239,7 +239,7 @@ def total_container_databases(self): def total_container_databases(self, total_container_databases): """ Sets the total_container_databases of this UpdateCloudAutonomousVmClusterDetails. - The new scaled up/down value for maxACD count for cloud autonomous VM cluster. + The new value of maximum number of ACDs for the Autonomous VM cluster. :param total_container_databases: The total_container_databases of this UpdateCloudAutonomousVmClusterDetails. @@ -254,9 +254,9 @@ def license_model(self): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html @@ -276,9 +276,9 @@ def license_model(self, license_model): The Oracle license model that applies to the Oracle Autonomous Database. Bring your own license (BYOL) allows you to apply your current on-premises Oracle software licenses to equivalent, highly automated Oracle services in the cloud. License Included allows you to subscribe to new Oracle Database software licenses and the Oracle Database service. Note that when provisioning an `Autonomous Database on dedicated Exadata infrastructure`__, this attribute must be null. It is already set at the - Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. + Autonomous Exadata Infrastructure level. When provisioning an `Autonomous Database Serverless]`__ database, if a value is not specified, the system defaults the value to `BRING_YOUR_OWN_LICENSE`. Bring your own license (BYOL) also allows you to select the DB edition using the optional parameter. - This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, maxCpuCoreCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. + This cannot be updated in parallel with any of the following: cpuCoreCount, computeCount, dataStorageSizeInTBs, adminPassword, isMTLSConnectionRequired, dbWorkload, privateEndpointLabel, nsgIds, dbVersion, dbName, scheduledOperations, dbToolsDetails, or isFreeTier. __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html __ https://docs.oracle.com/en/cloud/paas/autonomous-database/index.html diff --git a/src/oci/database_management/db_management_client.py b/src/oci/database_management/db_management_client.py index 0ca1594527..c2c63b94af 100644 --- a/src/oci/database_management/db_management_client.py +++ b/src/oci/database_management/db_management_client.py @@ -6705,12 +6705,56 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe :param str filter_by_database_sub_type: (optional) The filter used to filter the databases in the fleet by a specific Oracle Database subtype. + :param str page: (optional) + The page token representing the page from where the next set of paginated results + are retrieved. This is usually retrieved from a previous list call. + + :param int limit: (optional) + The maximum number of records returned in the paginated response. + + :param str sort_by: (optional) + The field to sort information by. Only one sortOrder can be used. The default sort order + for \u2018TIMECREATED\u2019 is descending and the default sort order for \u2018NAME\u2019 is ascending. + The \u2018NAME\u2019 sort order is case-sensitive. + + Allowed values are: "TIMECREATED", "NAME" + + :param str sort_order: (optional) + The option to sort information in ascending (\u2018ASC\u2019) or descending (\u2018DESC\u2019) order. Ascending order is the default order. + + Allowed values are: "ASC", "DESC" + :param str filter_by_database_deployment_type: (optional) The filter used to filter the databases in the fleet by a specific Oracle Database deployment type. :param str filter_by_database_version: (optional) The filter used to filter the databases in the fleet by a specific Oracle Database version. + :param list[str] defined_tag_equals: (optional) + A list of tag filters to apply. Only resources with a defined tag matching the value will be returned. + Each item in the list has the format \"{namespace}.{tagName}.{value}\". All inputs are case-insensitive. + Multiple values for the same key (i.e. same namespace and tag name) are interpreted as \"OR\". + Values for different keys (i.e. different namespaces, different tag names, or both) are interpreted as \"AND\". + + :param list[str] freeform_tag_equals: (optional) + A list of tag filters to apply. Only resources with a freeform tag matching the value will be returned. + The key for each tag is \"{tagName}.{value}\". All inputs are case-insensitive. + Multiple values for the same tag name are interpreted as \"OR\". Values for different tag names are interpreted as \"AND\". + + :param list[str] defined_tag_exists: (optional) + A list of tag existence filters to apply. Only resources for which the specified defined tags exist will be returned. + Each item in the list has the format \"{namespace}.{tagName}.true\" (for checking existence of a defined tag) + or \"{namespace}.true\". All inputs are case-insensitive. + Currently, only existence (\"true\" at the end) is supported. Absence (\"false\" at the end) is not supported. + Multiple values for the same key (i.e. same namespace and tag name) are interpreted as \"OR\". + Values for different keys (i.e. different namespaces, different tag names, or both) are interpreted as \"AND\". + + :param list[str] freeform_tag_exists: (optional) + A list of tag existence filters to apply. Only resources for which the specified freeform tags exist the value will be returned. + The key for each tag is \"{tagName}.true\". All inputs are case-insensitive. + Currently, only existence (\"true\" at the end) is supported. Absence (\"false\" at the end) is not supported. + Multiple values for different tag names are interpreted as \"AND\". + :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. @@ -6747,8 +6791,16 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe "filter_by_metric_names", "filter_by_database_type", "filter_by_database_sub_type", + "page", + "limit", + "sort_by", + "sort_order", "filter_by_database_deployment_type", - "filter_by_database_version" + "filter_by_database_version", + "defined_tag_equals", + "freeform_tag_equals", + "defined_tag_exists", + "freeform_tag_exists" ] extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: @@ -6762,6 +6814,20 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe f"Invalid value for `compare_type`, must be one of { compare_type_allowed_values }" ) + if 'sort_by' in kwargs: + sort_by_allowed_values = ["TIMECREATED", "NAME"] + if kwargs['sort_by'] not in sort_by_allowed_values: + raise ValueError( + f"Invalid value for `sort_by`, must be one of { sort_by_allowed_values }" + ) + + if 'sort_order' in kwargs: + sort_order_allowed_values = ["ASC", "DESC"] + if kwargs['sort_order'] not in sort_order_allowed_values: + raise ValueError( + f"Invalid value for `sort_order`, must be one of { sort_order_allowed_values }" + ) + query_params = { "managedDatabaseGroupId": kwargs.get("managed_database_group_id", missing), "compartmentId": kwargs.get("compartment_id", missing), @@ -6771,8 +6837,16 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe "filterByMetricNames": kwargs.get("filter_by_metric_names", missing), "filterByDatabaseType": kwargs.get("filter_by_database_type", missing), "filterByDatabaseSubType": kwargs.get("filter_by_database_sub_type", missing), + "page": kwargs.get("page", missing), + "limit": kwargs.get("limit", missing), + "sortBy": kwargs.get("sort_by", missing), + "sortOrder": kwargs.get("sort_order", missing), "filterByDatabaseDeploymentType": kwargs.get("filter_by_database_deployment_type", missing), - "filterByDatabaseVersion": kwargs.get("filter_by_database_version", missing) + "filterByDatabaseVersion": kwargs.get("filter_by_database_version", missing), + "definedTagEquals": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_equals", missing), 'multi'), + "freeformTagEquals": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_equals", missing), 'multi'), + "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), + "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} @@ -22665,6 +22739,118 @@ def update_external_asm(self, external_asm_id, update_external_asm_details, **kw api_reference_link=api_reference_link, required_arguments=required_arguments) + def update_external_asm_instance(self, external_asm_instance_id, update_external_asm_instance_details, **kwargs): + """ + Updates the external ASM instance specified by `externalAsmInstanceId`. + + + :param str external_asm_instance_id: (required) + The `OCID`__ of the external ASM instance. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalAsmInstanceDetails update_external_asm_instance_details: (required) + The details required to update an external ASM instance. + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database_management.models.ExternalAsmInstance` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use update_external_asm_instance API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['externalAsmInstanceId'] + resource_path = "/externalAsmInstances/{externalAsmInstanceId}" + method = "PUT" + operation_name = "update_external_asm_instance" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database-management/20201101/ExternalAsmInstance/UpdateExternalAsmInstance" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"update_external_asm_instance got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "externalAsmInstanceId": external_asm_instance_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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_external_asm_instance_details, + response_type="ExternalAsmInstance", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_external_asm_instance_details, + response_type="ExternalAsmInstance", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def update_external_cluster(self, external_cluster_id, update_external_cluster_details, **kwargs): """ Updates the external cluster specified by `externalClusterId`. @@ -22885,6 +23071,118 @@ def update_external_cluster_instance(self, external_cluster_instance_id, update_ api_reference_link=api_reference_link, required_arguments=required_arguments) + def update_external_db_home(self, external_db_home_id, update_external_db_home_details, **kwargs): + """ + Updates the external DB home specified by `externalDbHomeId`. + + + :param str external_db_home_id: (required) + The `OCID`__ of the external database home. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalDbHomeDetails update_external_db_home_details: (required) + The details required to update an external DB home. + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database_management.models.ExternalDbHome` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use update_external_db_home API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['externalDbHomeId'] + resource_path = "/externalDbHomes/{externalDbHomeId}" + method = "PUT" + operation_name = "update_external_db_home" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database-management/20201101/ExternalDbHome/UpdateExternalDbHome" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"update_external_db_home got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "externalDbHomeId": external_db_home_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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_external_db_home_details, + response_type="ExternalDbHome", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_external_db_home_details, + response_type="ExternalDbHome", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def update_external_db_node(self, external_db_node_id, update_external_db_node_details, **kwargs): """ Updates the external DB node specified by `externalDbNodeId`. @@ -23565,18 +23863,18 @@ def update_external_exadata_storage_connector(self, external_exadata_storage_con api_reference_link=api_reference_link, required_arguments=required_arguments) - def update_external_listener(self, external_listener_id, update_external_listener_details, **kwargs): + def update_external_exadata_storage_grid(self, external_exadata_storage_grid_id, update_external_exadata_storage_grid_details, **kwargs): """ - Updates the external listener specified by `externalListenerId`. + Updates the Exadata storage server grid specified by exadataStorageGridId. - :param str external_listener_id: (required) - The `OCID`__ of the external listener. + :param str external_exadata_storage_grid_id: (required) + The `OCID`__ of the Exadata storage grid. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm - :param oci.database_management.models.UpdateExternalListenerDetails update_external_listener_details: (required) - The details required to update an external listener. + :param oci.database_management.models.UpdateExternalExadataStorageGridDetails update_external_exadata_storage_grid_details: (required) + The details required to update an external Exadata storage grid. :param str opc_request_id: (optional) The client request ID for tracing. @@ -23600,7 +23898,231 @@ def update_external_listener(self, external_listener_id, update_external_listene allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. By default, the response will not allow control characters in strings - :return: A :class:`~oci.response.Response` object with data of type None + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database_management.models.ExternalExadataStorageGrid` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use update_external_exadata_storage_grid API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['externalExadataStorageGridId'] + resource_path = "/externalExadataStorageGrids/{externalExadataStorageGridId}" + method = "PUT" + operation_name = "update_external_exadata_storage_grid" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database-management/20201101/ExternalExadataStorageGrid/UpdateExternalExadataStorageGrid" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"update_external_exadata_storage_grid got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "externalExadataStorageGridId": external_exadata_storage_grid_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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_external_exadata_storage_grid_details, + response_type="ExternalExadataStorageGrid", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_external_exadata_storage_grid_details, + response_type="ExternalExadataStorageGrid", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + + def update_external_exadata_storage_server(self, external_exadata_storage_server_id, update_external_exadata_storage_server_details, **kwargs): + """ + Updates the Exadata storage server specified by exadataStorageServerId. + + + :param str external_exadata_storage_server_id: (required) + The `OCID`__ of the Exadata storage server. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalExadataStorageServerDetails update_external_exadata_storage_server_details: (required) + The details required to update an external Exadata storage server. + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database_management.models.ExternalExadataStorageServer` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use update_external_exadata_storage_server API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['externalExadataStorageServerId'] + resource_path = "/externalExadataStorageServers/{externalExadataStorageServerId}" + method = "PUT" + operation_name = "update_external_exadata_storage_server" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database-management/20201101/ExternalExadataStorageServer/UpdateExternalExadataStorageServer" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"update_external_exadata_storage_server got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "externalExadataStorageServerId": external_exadata_storage_server_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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_external_exadata_storage_server_details, + response_type="ExternalExadataStorageServer", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_external_exadata_storage_server_details, + response_type="ExternalExadataStorageServer", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + + def update_external_listener(self, external_listener_id, update_external_listener_details, **kwargs): + """ + Updates the external listener specified by `externalListenerId`. + + + :param str external_listener_id: (required) + The `OCID`__ of the external listener. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalListenerDetails update_external_listener_details: (required) + The details required to update an external listener. + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type None :rtype: :class:`~oci.response.Response` :example: @@ -23785,6 +24307,118 @@ def update_job(self, job_id, update_job_details, **kwargs): api_reference_link=api_reference_link, required_arguments=required_arguments) + def update_managed_database(self, managed_database_id, update_managed_database_details, **kwargs): + """ + Updates the Managed Database specified by managedDatabaseId. + + + :param str managed_database_id: (required) + The `OCID`__ of the Managed Database. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateManagedDatabaseDetails update_managed_database_details: (required) + The details required to update a Managed Database. + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database_management.models.ManagedDatabase` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use update_managed_database API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['managedDatabaseId'] + resource_path = "/managedDatabases/{managedDatabaseId}" + method = "PUT" + operation_name = "update_managed_database" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database-management/20201101/ManagedDatabase/UpdateManagedDatabase" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"update_managed_database got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "managedDatabaseId": managed_database_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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_managed_database_details, + response_type="ManagedDatabase", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_managed_database_details, + response_type="ManagedDatabase", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def update_managed_database_group(self, managed_database_group_id, update_managed_database_group_details, **kwargs): """ Updates the Managed Database Group specified by managedDatabaseGroupId. diff --git a/src/oci/database_management/db_management_client_composite_operations.py b/src/oci/database_management/db_management_client_composite_operations.py index 7e62dd4830..def95ceecf 100644 --- a/src/oci/database_management/db_management_client_composite_operations.py +++ b/src/oci/database_management/db_management_client_composite_operations.py @@ -1385,6 +1385,53 @@ def update_external_asm_and_wait_for_state(self, external_asm_id, update_externa except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_asm_instance_and_wait_for_state(self, external_asm_instance_id, update_external_asm_instance_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database_management.DbManagementClient.update_external_asm_instance` and waits for the :py:class:`~oci.database_management.models.ExternalAsmInstance` acted upon + to enter the given state(s). + + :param str external_asm_instance_id: (required) + The `OCID`__ of the external ASM instance. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalAsmInstanceDetails update_external_asm_instance_details: (required) + The details required to update an external ASM instance. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database_management.models.ExternalAsmInstance.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database_management.DbManagementClient.update_external_asm_instance` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_external_asm_instance(external_asm_instance_id, update_external_asm_instance_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + external_asm_instance_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_external_asm_instance(external_asm_instance_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_cluster_and_wait_for_state(self, external_cluster_id, update_external_cluster_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database_management.DbManagementClient.update_external_cluster` and waits for the :py:class:`~oci.database_management.models.WorkRequest` @@ -1473,6 +1520,53 @@ def update_external_cluster_instance_and_wait_for_state(self, external_cluster_i except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_db_home_and_wait_for_state(self, external_db_home_id, update_external_db_home_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database_management.DbManagementClient.update_external_db_home` and waits for the :py:class:`~oci.database_management.models.ExternalDbHome` acted upon + to enter the given state(s). + + :param str external_db_home_id: (required) + The `OCID`__ of the external database home. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalDbHomeDetails update_external_db_home_details: (required) + The details required to update an external DB home. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database_management.models.ExternalDbHome.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database_management.DbManagementClient.update_external_db_home` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_external_db_home(external_db_home_id, update_external_db_home_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + external_db_home_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_external_db_home(external_db_home_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_db_node_and_wait_for_state(self, external_db_node_id, update_external_db_node_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database_management.DbManagementClient.update_external_db_node` and waits for the :py:class:`~oci.database_management.models.WorkRequest` @@ -1749,6 +1843,100 @@ def update_external_exadata_storage_connector_and_wait_for_state(self, external_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_exadata_storage_grid_and_wait_for_state(self, external_exadata_storage_grid_id, update_external_exadata_storage_grid_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database_management.DbManagementClient.update_external_exadata_storage_grid` and waits for the :py:class:`~oci.database_management.models.ExternalExadataStorageGrid` acted upon + to enter the given state(s). + + :param str external_exadata_storage_grid_id: (required) + The `OCID`__ of the Exadata storage grid. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalExadataStorageGridDetails update_external_exadata_storage_grid_details: (required) + The details required to update an external Exadata storage grid. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database_management.models.ExternalExadataStorageGrid.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database_management.DbManagementClient.update_external_exadata_storage_grid` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_external_exadata_storage_grid(external_exadata_storage_grid_id, update_external_exadata_storage_grid_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + external_exadata_storage_grid_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_external_exadata_storage_grid(external_exadata_storage_grid_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def update_external_exadata_storage_server_and_wait_for_state(self, external_exadata_storage_server_id, update_external_exadata_storage_server_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database_management.DbManagementClient.update_external_exadata_storage_server` and waits for the :py:class:`~oci.database_management.models.ExternalExadataStorageServer` acted upon + to enter the given state(s). + + :param str external_exadata_storage_server_id: (required) + The `OCID`__ of the Exadata storage server. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param oci.database_management.models.UpdateExternalExadataStorageServerDetails update_external_exadata_storage_server_details: (required) + The details required to update an external Exadata storage server. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database_management.models.ExternalExadataStorageServer.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database_management.DbManagementClient.update_external_exadata_storage_server` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_external_exadata_storage_server(external_exadata_storage_server_id, update_external_exadata_storage_server_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + external_exadata_storage_server_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_external_exadata_storage_server(external_exadata_storage_server_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_external_listener_and_wait_for_state(self, external_listener_id, update_external_listener_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database_management.DbManagementClient.update_external_listener` and waits for the :py:class:`~oci.database_management.models.WorkRequest` diff --git a/src/oci/database_management/models/__init__.py b/src/oci/database_management/models/__init__.py index 3a9aaa7ded..d89507a2d1 100644 --- a/src/oci/database_management/models/__init__.py +++ b/src/oci/database_management/models/__init__.py @@ -423,8 +423,10 @@ from .update_database_parameters_result import UpdateDatabaseParametersResult from .update_db_management_private_endpoint_details import UpdateDbManagementPrivateEndpointDetails from .update_external_asm_details import UpdateExternalAsmDetails +from .update_external_asm_instance_details import UpdateExternalAsmInstanceDetails from .update_external_cluster_details import UpdateExternalClusterDetails from .update_external_cluster_instance_details import UpdateExternalClusterInstanceDetails +from .update_external_db_home_details import UpdateExternalDbHomeDetails from .update_external_db_node_details import UpdateExternalDbNodeDetails from .update_external_db_system_connector_details import UpdateExternalDbSystemConnectorDetails from .update_external_db_system_details import UpdateExternalDbSystemDetails @@ -432,8 +434,11 @@ from .update_external_db_system_macs_connector_details import UpdateExternalDbSystemMacsConnectorDetails from .update_external_exadata_infrastructure_details import UpdateExternalExadataInfrastructureDetails from .update_external_exadata_storage_connector_details import UpdateExternalExadataStorageConnectorDetails +from .update_external_exadata_storage_grid_details import UpdateExternalExadataStorageGridDetails +from .update_external_exadata_storage_server_details import UpdateExternalExadataStorageServerDetails from .update_external_listener_details import UpdateExternalListenerDetails from .update_job_details import UpdateJobDetails +from .update_managed_database_details import UpdateManagedDatabaseDetails from .update_managed_database_group_details import UpdateManagedDatabaseGroupDetails from .update_named_credential_details import UpdateNamedCredentialDetails from .update_named_preferred_credential_details import UpdateNamedPreferredCredentialDetails @@ -873,8 +878,10 @@ "UpdateDatabaseParametersResult": UpdateDatabaseParametersResult, "UpdateDbManagementPrivateEndpointDetails": UpdateDbManagementPrivateEndpointDetails, "UpdateExternalAsmDetails": UpdateExternalAsmDetails, + "UpdateExternalAsmInstanceDetails": UpdateExternalAsmInstanceDetails, "UpdateExternalClusterDetails": UpdateExternalClusterDetails, "UpdateExternalClusterInstanceDetails": UpdateExternalClusterInstanceDetails, + "UpdateExternalDbHomeDetails": UpdateExternalDbHomeDetails, "UpdateExternalDbNodeDetails": UpdateExternalDbNodeDetails, "UpdateExternalDbSystemConnectorDetails": UpdateExternalDbSystemConnectorDetails, "UpdateExternalDbSystemDetails": UpdateExternalDbSystemDetails, @@ -882,8 +889,11 @@ "UpdateExternalDbSystemMacsConnectorDetails": UpdateExternalDbSystemMacsConnectorDetails, "UpdateExternalExadataInfrastructureDetails": UpdateExternalExadataInfrastructureDetails, "UpdateExternalExadataStorageConnectorDetails": UpdateExternalExadataStorageConnectorDetails, + "UpdateExternalExadataStorageGridDetails": UpdateExternalExadataStorageGridDetails, + "UpdateExternalExadataStorageServerDetails": UpdateExternalExadataStorageServerDetails, "UpdateExternalListenerDetails": UpdateExternalListenerDetails, "UpdateJobDetails": UpdateJobDetails, + "UpdateManagedDatabaseDetails": UpdateManagedDatabaseDetails, "UpdateManagedDatabaseGroupDetails": UpdateManagedDatabaseGroupDetails, "UpdateNamedCredentialDetails": UpdateNamedCredentialDetails, "UpdateNamedPreferredCredentialDetails": UpdateNamedPreferredCredentialDetails, diff --git a/src/oci/database_management/models/child_database.py b/src/oci/database_management/models/child_database.py index a43432951c..b3593e44cb 100644 --- a/src/oci/database_management/models/child_database.py +++ b/src/oci/database_management/models/child_database.py @@ -144,6 +144,14 @@ def __init__(self, **kwargs): The value to assign to the time_added property of this ChildDatabase. :type time_added: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ChildDatabase. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ChildDatabase. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -153,7 +161,9 @@ def __init__(self, **kwargs): 'workload_type': 'str', 'database_type': 'str', 'database_sub_type': 'str', - 'time_added': 'datetime' + 'time_added': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -164,7 +174,9 @@ def __init__(self, **kwargs): 'workload_type': 'workloadType', 'database_type': 'databaseType', 'database_sub_type': 'databaseSubType', - 'time_added': 'timeAdded' + 'time_added': 'timeAdded', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -175,6 +187,8 @@ def __init__(self, **kwargs): self._database_type = None self._database_sub_type = None self._time_added = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -402,6 +416,70 @@ def time_added(self, time_added): """ self._time_added = time_added + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ChildDatabase. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ChildDatabase. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ChildDatabase. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ChildDatabase. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ChildDatabase. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ChildDatabase. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ChildDatabase. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ChildDatabase. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_db_management_private_endpoint_details.py b/src/oci/database_management/models/create_db_management_private_endpoint_details.py index b009d23f10..3cdd2877a7 100644 --- a/src/oci/database_management/models/create_db_management_private_endpoint_details.py +++ b/src/oci/database_management/models/create_db_management_private_endpoint_details.py @@ -44,6 +44,14 @@ def __init__(self, **kwargs): The value to assign to the nsg_ids property of this CreateDbManagementPrivateEndpointDetails. :type nsg_ids: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateDbManagementPrivateEndpointDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateDbManagementPrivateEndpointDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -51,7 +59,9 @@ def __init__(self, **kwargs): 'is_cluster': 'bool', 'subnet_id': 'str', 'description': 'str', - 'nsg_ids': 'list[str]' + 'nsg_ids': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -60,7 +70,9 @@ def __init__(self, **kwargs): 'is_cluster': 'isCluster', 'subnet_id': 'subnetId', 'description': 'description', - 'nsg_ids': 'nsgIds' + 'nsg_ids': 'nsgIds', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -69,6 +81,8 @@ def __init__(self, **kwargs): self._subnet_id = None self._description = None self._nsg_ids = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -222,6 +236,70 @@ def nsg_ids(self, nsg_ids): """ self._nsg_ids = nsg_ids + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateDbManagementPrivateEndpointDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateDbManagementPrivateEndpointDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateDbManagementPrivateEndpointDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateDbManagementPrivateEndpointDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateDbManagementPrivateEndpointDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateDbManagementPrivateEndpointDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateDbManagementPrivateEndpointDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateDbManagementPrivateEndpointDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_external_db_system_details.py b/src/oci/database_management/models/create_external_db_system_details.py index 9f264ab7f1..e0922a5ec3 100644 --- a/src/oci/database_management/models/create_external_db_system_details.py +++ b/src/oci/database_management/models/create_external_db_system_details.py @@ -40,13 +40,23 @@ def __init__(self, **kwargs): The value to assign to the stack_monitoring_config property of this CreateExternalDbSystemDetails. :type stack_monitoring_config: oci.database_management.models.AssociatedServiceDetails + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateExternalDbSystemDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateExternalDbSystemDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'display_name': 'str', 'compartment_id': 'str', 'db_system_discovery_id': 'str', 'database_management_config': 'ExternalDbSystemDatabaseManagementConfigDetails', - 'stack_monitoring_config': 'AssociatedServiceDetails' + 'stack_monitoring_config': 'AssociatedServiceDetails', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -54,7 +64,9 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'db_system_discovery_id': 'dbSystemDiscoveryId', 'database_management_config': 'databaseManagementConfig', - 'stack_monitoring_config': 'stackMonitoringConfig' + 'stack_monitoring_config': 'stackMonitoringConfig', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._display_name = None @@ -62,6 +74,8 @@ def __init__(self, **kwargs): self._db_system_discovery_id = None self._database_management_config = None self._stack_monitoring_config = None + self._freeform_tags = None + self._defined_tags = None @property def display_name(self): @@ -183,6 +197,70 @@ def stack_monitoring_config(self, stack_monitoring_config): """ self._stack_monitoring_config = stack_monitoring_config + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateExternalDbSystemDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateExternalDbSystemDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateExternalDbSystemDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateExternalDbSystemDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateExternalDbSystemDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateExternalDbSystemDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateExternalDbSystemDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateExternalDbSystemDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_external_db_system_discovery_details.py b/src/oci/database_management/models/create_external_db_system_discovery_details.py index bbc6719352..29fede9415 100644 --- a/src/oci/database_management/models/create_external_db_system_discovery_details.py +++ b/src/oci/database_management/models/create_external_db_system_discovery_details.py @@ -32,22 +32,36 @@ def __init__(self, **kwargs): The value to assign to the compartment_id property of this CreateExternalDbSystemDiscoveryDetails. :type compartment_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateExternalDbSystemDiscoveryDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateExternalDbSystemDiscoveryDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'display_name': 'str', 'agent_id': 'str', - 'compartment_id': 'str' + 'compartment_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'display_name': 'displayName', 'agent_id': 'agentId', - 'compartment_id': 'compartmentId' + 'compartment_id': 'compartmentId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._display_name = None self._agent_id = None self._compartment_id = None + self._freeform_tags = None + self._defined_tags = None @property def display_name(self): @@ -131,6 +145,70 @@ def compartment_id(self, compartment_id): """ self._compartment_id = compartment_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateExternalDbSystemDiscoveryDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateExternalDbSystemDiscoveryDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateExternalDbSystemDiscoveryDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateExternalDbSystemDiscoveryDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateExternalDbSystemDiscoveryDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateExternalDbSystemDiscoveryDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateExternalDbSystemDiscoveryDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateExternalDbSystemDiscoveryDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_external_db_system_macs_connector_details.py b/src/oci/database_management/models/create_external_db_system_macs_connector_details.py index 4cc3069d3c..1be8cecaea 100644 --- a/src/oci/database_management/models/create_external_db_system_macs_connector_details.py +++ b/src/oci/database_management/models/create_external_db_system_macs_connector_details.py @@ -45,13 +45,23 @@ def __init__(self, **kwargs): The value to assign to the connection_info property of this CreateExternalDbSystemMacsConnectorDetails. :type connection_info: oci.database_management.models.ExternalDbSystemConnectionInfo + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateExternalDbSystemMacsConnectorDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateExternalDbSystemMacsConnectorDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'connector_type': 'str', 'display_name': 'str', 'external_db_system_id': 'str', 'agent_id': 'str', - 'connection_info': 'ExternalDbSystemConnectionInfo' + 'connection_info': 'ExternalDbSystemConnectionInfo', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -59,7 +69,9 @@ def __init__(self, **kwargs): 'display_name': 'displayName', 'external_db_system_id': 'externalDbSystemId', 'agent_id': 'agentId', - 'connection_info': 'connectionInfo' + 'connection_info': 'connectionInfo', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._connector_type = None @@ -67,6 +79,8 @@ def __init__(self, **kwargs): self._external_db_system_id = None self._agent_id = None self._connection_info = None + self._freeform_tags = None + self._defined_tags = None self._connector_type = 'MACS' @property @@ -119,6 +133,70 @@ def connection_info(self, connection_info): """ self._connection_info = connection_info + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateExternalDbSystemMacsConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateExternalDbSystemMacsConnectorDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateExternalDbSystemMacsConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateExternalDbSystemMacsConnectorDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateExternalDbSystemMacsConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateExternalDbSystemMacsConnectorDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateExternalDbSystemMacsConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateExternalDbSystemMacsConnectorDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_external_exadata_infrastructure_details.py b/src/oci/database_management/models/create_external_exadata_infrastructure_details.py index 7587e401c1..04d205de1d 100644 --- a/src/oci/database_management/models/create_external_exadata_infrastructure_details.py +++ b/src/oci/database_management/models/create_external_exadata_infrastructure_details.py @@ -53,6 +53,14 @@ def __init__(self, **kwargs): The value to assign to the storage_server_names property of this CreateExternalExadataInfrastructureDetails. :type storage_server_names: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateExternalExadataInfrastructureDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateExternalExadataInfrastructureDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'discovery_key': 'str', @@ -60,7 +68,9 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'display_name': 'str', 'db_system_ids': 'list[str]', - 'storage_server_names': 'list[str]' + 'storage_server_names': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -69,7 +79,9 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'display_name': 'displayName', 'db_system_ids': 'dbSystemIds', - 'storage_server_names': 'storageServerNames' + 'storage_server_names': 'storageServerNames', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._discovery_key = None @@ -78,6 +90,8 @@ def __init__(self, **kwargs): self._display_name = None self._db_system_ids = None self._storage_server_names = None + self._freeform_tags = None + self._defined_tags = None @property def discovery_key(self): @@ -234,6 +248,70 @@ def storage_server_names(self, storage_server_names): """ self._storage_server_names = storage_server_names + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateExternalExadataInfrastructureDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateExternalExadataInfrastructureDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateExternalExadataInfrastructureDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateExternalExadataInfrastructureDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateExternalExadataInfrastructureDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateExternalExadataInfrastructureDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateExternalExadataInfrastructureDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateExternalExadataInfrastructureDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_external_exadata_storage_connector_details.py b/src/oci/database_management/models/create_external_exadata_storage_connector_details.py index e52526a687..4c2812e779 100644 --- a/src/oci/database_management/models/create_external_exadata_storage_connector_details.py +++ b/src/oci/database_management/models/create_external_exadata_storage_connector_details.py @@ -40,13 +40,23 @@ def __init__(self, **kwargs): The value to assign to the credential_info property of this CreateExternalExadataStorageConnectorDetails. :type credential_info: oci.database_management.models.RestCredential + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateExternalExadataStorageConnectorDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateExternalExadataStorageConnectorDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'storage_server_id': 'str', 'agent_id': 'str', 'connector_name': 'str', 'connection_uri': 'str', - 'credential_info': 'RestCredential' + 'credential_info': 'RestCredential', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -54,7 +64,9 @@ def __init__(self, **kwargs): 'agent_id': 'agentId', 'connector_name': 'connectorName', 'connection_uri': 'connectionUri', - 'credential_info': 'credentialInfo' + 'credential_info': 'credentialInfo', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._storage_server_id = None @@ -62,6 +74,8 @@ def __init__(self, **kwargs): self._connector_name = None self._connection_uri = None self._credential_info = None + self._freeform_tags = None + self._defined_tags = None @property def storage_server_id(self): @@ -187,6 +201,70 @@ def credential_info(self, credential_info): """ self._credential_info = credential_info + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateExternalExadataStorageConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateExternalExadataStorageConnectorDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateExternalExadataStorageConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateExternalExadataStorageConnectorDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateExternalExadataStorageConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateExternalExadataStorageConnectorDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateExternalExadataStorageConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateExternalExadataStorageConnectorDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_managed_database_group_details.py b/src/oci/database_management/models/create_managed_database_group_details.py index b5e6fa1712..176e854474 100644 --- a/src/oci/database_management/models/create_managed_database_group_details.py +++ b/src/oci/database_management/models/create_managed_database_group_details.py @@ -32,22 +32,36 @@ def __init__(self, **kwargs): The value to assign to the compartment_id property of this CreateManagedDatabaseGroupDetails. :type compartment_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateManagedDatabaseGroupDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateManagedDatabaseGroupDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', 'description': 'str', - 'compartment_id': 'str' + 'compartment_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'name': 'name', 'description': 'description', - 'compartment_id': 'compartmentId' + 'compartment_id': 'compartmentId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None self._description = None self._compartment_id = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -133,6 +147,70 @@ def compartment_id(self, compartment_id): """ self._compartment_id = compartment_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateManagedDatabaseGroupDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateManagedDatabaseGroupDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateManagedDatabaseGroupDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateManagedDatabaseGroupDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateManagedDatabaseGroupDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateManagedDatabaseGroupDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateManagedDatabaseGroupDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateManagedDatabaseGroupDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_named_credential_details.py b/src/oci/database_management/models/create_named_credential_details.py index 3a7a99bcac..d53072b112 100644 --- a/src/oci/database_management/models/create_named_credential_details.py +++ b/src/oci/database_management/models/create_named_credential_details.py @@ -62,6 +62,14 @@ def __init__(self, **kwargs): The value to assign to the associated_resource property of this CreateNamedCredentialDetails. :type associated_resource: str + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateNamedCredentialDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateNamedCredentialDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -70,7 +78,9 @@ def __init__(self, **kwargs): 'type': 'str', 'content': 'NamedCredentialContent', 'compartment_id': 'str', - 'associated_resource': 'str' + 'associated_resource': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -80,7 +90,9 @@ def __init__(self, **kwargs): 'type': 'type', 'content': 'content', 'compartment_id': 'compartmentId', - 'associated_resource': 'associatedResource' + 'associated_resource': 'associatedResource', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -90,6 +102,8 @@ def __init__(self, **kwargs): self._content = None self._compartment_id = None self._associated_resource = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -287,6 +301,70 @@ def associated_resource(self, associated_resource): """ self._associated_resource = associated_resource + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateNamedCredentialDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateNamedCredentialDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateNamedCredentialDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateNamedCredentialDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateNamedCredentialDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateNamedCredentialDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateNamedCredentialDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateNamedCredentialDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/create_sql_job_details.py b/src/oci/database_management/models/create_sql_job_details.py index 65df80068a..fe7c0a73f9 100644 --- a/src/oci/database_management/models/create_sql_job_details.py +++ b/src/oci/database_management/models/create_sql_job_details.py @@ -107,6 +107,14 @@ def __init__(self, **kwargs): The value to assign to the role property of this CreateSqlJobDetails. :type role: str + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateSqlJobDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this CreateSqlJobDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -129,7 +137,9 @@ def __init__(self, **kwargs): 'password': 'str', 'secret_id': 'str', 'named_credential_id': 'str', - 'role': 'str' + 'role': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -153,7 +163,9 @@ def __init__(self, **kwargs): 'password': 'password', 'secret_id': 'secretId', 'named_credential_id': 'namedCredentialId', - 'role': 'role' + 'role': 'role', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -177,6 +189,8 @@ def __init__(self, **kwargs): self._secret_id = None self._named_credential_id = None self._role = None + self._freeform_tags = None + self._defined_tags = None self._job_type = 'SQL' @property @@ -419,6 +433,70 @@ def role(self, role): """ self._role = role + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateSqlJobDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateSqlJobDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateSqlJobDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateSqlJobDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateSqlJobDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateSqlJobDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateSqlJobDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateSqlJobDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/db_management_private_endpoint.py b/src/oci/database_management/models/db_management_private_endpoint.py index ac45abd340..d2cc9f2f5d 100644 --- a/src/oci/database_management/models/db_management_private_endpoint.py +++ b/src/oci/database_management/models/db_management_private_endpoint.py @@ -90,6 +90,14 @@ def __init__(self, **kwargs): The value to assign to the nsg_ids property of this DbManagementPrivateEndpoint. :type nsg_ids: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this DbManagementPrivateEndpoint. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this DbManagementPrivateEndpoint. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -102,7 +110,9 @@ def __init__(self, **kwargs): 'description': 'str', 'time_created': 'datetime', 'lifecycle_state': 'str', - 'nsg_ids': 'list[str]' + 'nsg_ids': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -116,7 +126,9 @@ def __init__(self, **kwargs): 'description': 'description', 'time_created': 'timeCreated', 'lifecycle_state': 'lifecycleState', - 'nsg_ids': 'nsgIds' + 'nsg_ids': 'nsgIds', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -130,6 +142,8 @@ def __init__(self, **kwargs): self._time_created = None self._lifecycle_state = None self._nsg_ids = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -421,6 +435,70 @@ def nsg_ids(self, nsg_ids): """ self._nsg_ids = nsg_ids + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this DbManagementPrivateEndpoint. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this DbManagementPrivateEndpoint. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this DbManagementPrivateEndpoint. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this DbManagementPrivateEndpoint. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this DbManagementPrivateEndpoint. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this DbManagementPrivateEndpoint. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this DbManagementPrivateEndpoint. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this DbManagementPrivateEndpoint. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/db_management_private_endpoint_summary.py b/src/oci/database_management/models/db_management_private_endpoint_summary.py index 2abbd27b10..4fcba9a741 100644 --- a/src/oci/database_management/models/db_management_private_endpoint_summary.py +++ b/src/oci/database_management/models/db_management_private_endpoint_summary.py @@ -78,6 +78,14 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type lifecycle_state: str + :param freeform_tags: + The value to assign to the freeform_tags property of this DbManagementPrivateEndpointSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this DbManagementPrivateEndpointSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -87,7 +95,9 @@ def __init__(self, **kwargs): 'subnet_id': 'str', 'description': 'str', 'time_created': 'datetime', - 'lifecycle_state': 'str' + 'lifecycle_state': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -98,7 +108,9 @@ def __init__(self, **kwargs): 'subnet_id': 'subnetId', 'description': 'description', 'time_created': 'timeCreated', - 'lifecycle_state': 'lifecycleState' + 'lifecycle_state': 'lifecycleState', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -109,6 +121,8 @@ def __init__(self, **kwargs): self._description = None self._time_created = None self._lifecycle_state = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -328,6 +342,70 @@ def lifecycle_state(self, lifecycle_state): lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._lifecycle_state = lifecycle_state + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this DbManagementPrivateEndpointSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this DbManagementPrivateEndpointSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this DbManagementPrivateEndpointSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this DbManagementPrivateEndpointSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this DbManagementPrivateEndpointSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this DbManagementPrivateEndpointSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this DbManagementPrivateEndpointSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this DbManagementPrivateEndpointSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_asm.py b/src/oci/database_management/models/external_asm.py index e89c76e2c9..927aa68dc0 100644 --- a/src/oci/database_management/models/external_asm.py +++ b/src/oci/database_management/models/external_asm.py @@ -118,6 +118,14 @@ def __init__(self, **kwargs): The value to assign to the version property of this ExternalAsm. :type version: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalAsm. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalAsm. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -135,7 +143,9 @@ def __init__(self, **kwargs): 'additional_details': 'dict(str, str)', 'time_created': 'datetime', 'time_updated': 'datetime', - 'version': 'str' + 'version': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -154,7 +164,9 @@ def __init__(self, **kwargs): 'additional_details': 'additionalDetails', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', - 'version': 'version' + 'version': 'version', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -173,6 +185,8 @@ def __init__(self, **kwargs): self._time_created = None self._time_updated = None self._version = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -582,6 +596,70 @@ def version(self, version): """ self._version = version + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalAsm. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalAsm. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalAsm. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalAsm. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalAsm. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalAsm. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalAsm. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalAsm. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_asm_instance.py b/src/oci/database_management/models/external_asm_instance.py index da497ccdd5..fbd8de0ba7 100644 --- a/src/oci/database_management/models/external_asm_instance.py +++ b/src/oci/database_management/models/external_asm_instance.py @@ -102,6 +102,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalAsmInstance. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalAsmInstance. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalAsmInstance. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -116,7 +124,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -132,7 +142,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -148,6 +160,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -487,6 +501,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalAsmInstance. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalAsmInstance. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalAsmInstance. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalAsmInstance. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalAsmInstance. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalAsmInstance. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalAsmInstance. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalAsmInstance. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_asm_instance_summary.py b/src/oci/database_management/models/external_asm_instance_summary.py index fdc59e8fcf..ac179c1cef 100644 --- a/src/oci/database_management/models/external_asm_instance_summary.py +++ b/src/oci/database_management/models/external_asm_instance_summary.py @@ -72,6 +72,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalAsmInstanceSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalAsmInstanceSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalAsmInstanceSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -86,7 +94,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -102,7 +112,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -118,6 +130,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -451,6 +465,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalAsmInstanceSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalAsmInstanceSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalAsmInstanceSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalAsmInstanceSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalAsmInstanceSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalAsmInstanceSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalAsmInstanceSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalAsmInstanceSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_asm_summary.py b/src/oci/database_management/models/external_asm_summary.py index 937a97661c..4a41a776f0 100644 --- a/src/oci/database_management/models/external_asm_summary.py +++ b/src/oci/database_management/models/external_asm_summary.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalAsmSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalAsmSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalAsmSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -71,7 +79,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -84,7 +94,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -97,6 +109,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -354,6 +368,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalAsmSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalAsmSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalAsmSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalAsmSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalAsmSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalAsmSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalAsmSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalAsmSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_cluster.py b/src/oci/database_management/models/external_cluster.py index 7bd2ec58e4..821677565c 100644 --- a/src/oci/database_management/models/external_cluster.py +++ b/src/oci/database_management/models/external_cluster.py @@ -126,6 +126,14 @@ def __init__(self, **kwargs): The value to assign to the version property of this ExternalCluster. :type version: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalCluster. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalCluster. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -145,7 +153,9 @@ def __init__(self, **kwargs): 'ocr_file_location': 'str', 'time_created': 'datetime', 'time_updated': 'datetime', - 'version': 'str' + 'version': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -166,7 +176,9 @@ def __init__(self, **kwargs): 'ocr_file_location': 'ocrFileLocation', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', - 'version': 'version' + 'version': 'version', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -187,6 +199,8 @@ def __init__(self, **kwargs): self._time_created = None self._time_updated = None self._version = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -644,6 +658,70 @@ def version(self, version): """ self._version = version + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalCluster. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalCluster. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalCluster. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalCluster. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalCluster. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalCluster. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalCluster. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalCluster. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_cluster_instance.py b/src/oci/database_management/models/external_cluster_instance.py index f85134e859..70c3d34954 100644 --- a/src/oci/database_management/models/external_cluster_instance.py +++ b/src/oci/database_management/models/external_cluster_instance.py @@ -128,6 +128,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalClusterInstance. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalClusterInstance. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalClusterInstance. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -145,7 +153,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -164,7 +174,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -183,6 +195,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -604,6 +618,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalClusterInstance. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalClusterInstance. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalClusterInstance. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalClusterInstance. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalClusterInstance. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalClusterInstance. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalClusterInstance. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalClusterInstance. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_cluster_instance_summary.py b/src/oci/database_management/models/external_cluster_instance_summary.py index 4f080b1a12..5c8bf9fc3a 100644 --- a/src/oci/database_management/models/external_cluster_instance_summary.py +++ b/src/oci/database_management/models/external_cluster_instance_summary.py @@ -84,6 +84,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalClusterInstanceSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalClusterInstanceSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalClusterInstanceSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -101,7 +109,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -120,7 +130,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -139,6 +151,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -548,6 +562,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalClusterInstanceSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalClusterInstanceSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalClusterInstanceSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalClusterInstanceSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalClusterInstanceSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalClusterInstanceSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalClusterInstanceSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalClusterInstanceSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_cluster_summary.py b/src/oci/database_management/models/external_cluster_summary.py index 64db84588b..212d9bf57e 100644 --- a/src/oci/database_management/models/external_cluster_summary.py +++ b/src/oci/database_management/models/external_cluster_summary.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalClusterSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalClusterSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalClusterSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -71,7 +79,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -84,7 +94,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -97,6 +109,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -354,6 +368,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalClusterSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalClusterSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalClusterSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalClusterSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalClusterSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalClusterSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalClusterSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalClusterSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_database_summary.py b/src/oci/database_management/models/external_database_summary.py index c59abd33d6..36e00c4064 100644 --- a/src/oci/database_management/models/external_database_summary.py +++ b/src/oci/database_management/models/external_database_summary.py @@ -150,6 +150,14 @@ def __init__(self, **kwargs): The value to assign to the time_created property of this ExternalDatabaseSummary. :type time_created: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDatabaseSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDatabaseSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -164,7 +172,9 @@ def __init__(self, **kwargs): 'db_management_config': 'DatabaseManagementConfig', 'instance_details': 'list[ExternalDatabaseInstance]', 'lifecycle_state': 'str', - 'time_created': 'datetime' + 'time_created': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -180,7 +190,9 @@ def __init__(self, **kwargs): 'db_management_config': 'dbManagementConfig', 'instance_details': 'instanceDetails', 'lifecycle_state': 'lifecycleState', - 'time_created': 'timeCreated' + 'time_created': 'timeCreated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -196,6 +208,8 @@ def __init__(self, **kwargs): self._instance_details = None self._lifecycle_state = None self._time_created = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -539,6 +553,70 @@ def time_created(self, time_created): """ self._time_created = time_created + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDatabaseSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDatabaseSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDatabaseSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDatabaseSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDatabaseSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDatabaseSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDatabaseSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDatabaseSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_home.py b/src/oci/database_management/models/external_db_home.py index 25bf7b30a8..6cdd1e1de9 100644 --- a/src/oci/database_management/models/external_db_home.py +++ b/src/oci/database_management/models/external_db_home.py @@ -94,6 +94,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbHome. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbHome. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbHome. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -106,7 +114,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -120,7 +130,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -134,6 +146,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -419,6 +433,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbHome. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbHome. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbHome. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbHome. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbHome. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbHome. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbHome. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbHome. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_home_summary.py b/src/oci/database_management/models/external_db_home_summary.py index 59f184e552..1ce1b6111c 100644 --- a/src/oci/database_management/models/external_db_home_summary.py +++ b/src/oci/database_management/models/external_db_home_summary.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbHomeSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbHomeSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbHomeSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -71,7 +79,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -84,7 +94,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -97,6 +109,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -350,6 +364,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbHomeSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbHomeSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbHomeSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbHomeSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbHomeSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbHomeSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbHomeSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbHomeSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_node.py b/src/oci/database_management/models/external_db_node.py index ac147f6bde..6dc7c0c783 100644 --- a/src/oci/database_management/models/external_db_node.py +++ b/src/oci/database_management/models/external_db_node.py @@ -114,6 +114,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbNode. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbNode. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbNode. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -130,7 +138,9 @@ def __init__(self, **kwargs): 'lifecycle_details': 'str', 'domain_name': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -148,7 +158,9 @@ def __init__(self, **kwargs): 'lifecycle_details': 'lifecycleDetails', 'domain_name': 'domainName', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -166,6 +178,8 @@ def __init__(self, **kwargs): self._domain_name = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -551,6 +565,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbNode. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbNode. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbNode. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbNode. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbNode. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbNode. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbNode. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbNode. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_node_summary.py b/src/oci/database_management/models/external_db_node_summary.py index 5371ab1ffe..a24c8cc14c 100644 --- a/src/oci/database_management/models/external_db_node_summary.py +++ b/src/oci/database_management/models/external_db_node_summary.py @@ -64,6 +64,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbNodeSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbNodeSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbNodeSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -76,7 +84,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -90,7 +100,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -104,6 +116,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -385,6 +399,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbNodeSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbNodeSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbNodeSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbNodeSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbNodeSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbNodeSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbNodeSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbNodeSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system.py b/src/oci/database_management/models/external_db_system.py index 30aaeecbdf..073c0fe39e 100644 --- a/src/oci/database_management/models/external_db_system.py +++ b/src/oci/database_management/models/external_db_system.py @@ -98,6 +98,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbSystem. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystem. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystem. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -112,7 +120,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -128,7 +138,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -144,6 +156,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -473,6 +487,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystem. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystem. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystem. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystem. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystem. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystem. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystem. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystem. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system_connector_summary.py b/src/oci/database_management/models/external_db_system_connector_summary.py index 2e1c9d961f..a7d968086e 100644 --- a/src/oci/database_management/models/external_db_system_connector_summary.py +++ b/src/oci/database_management/models/external_db_system_connector_summary.py @@ -66,6 +66,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbSystemConnectorSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystemConnectorSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystemConnectorSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -77,7 +85,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -90,7 +100,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -103,6 +115,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -368,6 +382,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystemConnectorSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystemConnectorSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystemConnectorSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystemConnectorSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystemConnectorSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystemConnectorSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystemConnectorSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystemConnectorSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system_discovery.py b/src/oci/database_management/models/external_db_system_discovery.py index 8b973e4d75..c3f8f02455 100644 --- a/src/oci/database_management/models/external_db_system_discovery.py +++ b/src/oci/database_management/models/external_db_system_discovery.py @@ -94,6 +94,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbSystemDiscovery. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystemDiscovery. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystemDiscovery. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -106,7 +114,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -120,7 +130,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -134,6 +146,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -423,6 +437,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystemDiscovery. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystemDiscovery. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystemDiscovery. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystemDiscovery. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystemDiscovery. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystemDiscovery. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystemDiscovery. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystemDiscovery. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system_discovery_summary.py b/src/oci/database_management/models/external_db_system_discovery_summary.py index 48cd43554c..651e7de194 100644 --- a/src/oci/database_management/models/external_db_system_discovery_summary.py +++ b/src/oci/database_management/models/external_db_system_discovery_summary.py @@ -52,6 +52,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbSystemDiscoverySummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystemDiscoverySummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystemDiscoverySummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -61,7 +69,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -72,7 +82,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -83,6 +95,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -290,6 +304,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystemDiscoverySummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystemDiscoverySummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystemDiscoverySummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystemDiscoverySummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystemDiscoverySummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystemDiscoverySummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystemDiscoverySummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystemDiscoverySummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system_macs_connector.py b/src/oci/database_management/models/external_db_system_macs_connector.py index cbce77e063..48b85cab38 100644 --- a/src/oci/database_management/models/external_db_system_macs_connector.py +++ b/src/oci/database_management/models/external_db_system_macs_connector.py @@ -83,6 +83,14 @@ def __init__(self, **kwargs): The value to assign to the connection_info property of this ExternalDbSystemMacsConnector. :type connection_info: oci.database_management.models.ExternalDbSystemConnectionInfo + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystemMacsConnector. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystemMacsConnector. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'connector_type': 'str', @@ -98,7 +106,9 @@ def __init__(self, **kwargs): 'time_created': 'datetime', 'time_updated': 'datetime', 'agent_id': 'str', - 'connection_info': 'ExternalDbSystemConnectionInfo' + 'connection_info': 'ExternalDbSystemConnectionInfo', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -115,7 +125,9 @@ def __init__(self, **kwargs): 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', 'agent_id': 'agentId', - 'connection_info': 'connectionInfo' + 'connection_info': 'connectionInfo', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._connector_type = None @@ -132,6 +144,8 @@ def __init__(self, **kwargs): self._time_updated = None self._agent_id = None self._connection_info = None + self._freeform_tags = None + self._defined_tags = None self._connector_type = 'MACS' @property @@ -184,6 +198,70 @@ def connection_info(self, connection_info): """ self._connection_info = connection_info + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystemMacsConnector. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystemMacsConnector. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystemMacsConnector. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystemMacsConnector. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystemMacsConnector. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystemMacsConnector. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystemMacsConnector. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystemMacsConnector. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_db_system_summary.py b/src/oci/database_management/models/external_db_system_summary.py index 329017392f..42b2967f5b 100644 --- a/src/oci/database_management/models/external_db_system_summary.py +++ b/src/oci/database_management/models/external_db_system_summary.py @@ -56,6 +56,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalDbSystemSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalDbSystemSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalDbSystemSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -66,7 +74,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -78,7 +88,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -90,6 +102,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -313,6 +327,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalDbSystemSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalDbSystemSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalDbSystemSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalDbSystemSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalDbSystemSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalDbSystemSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalDbSystemSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalDbSystemSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_infrastructure.py b/src/oci/database_management/models/external_exadata_infrastructure.py index 20ab3507fb..e29b5745c9 100644 --- a/src/oci/database_management/models/external_exadata_infrastructure.py +++ b/src/oci/database_management/models/external_exadata_infrastructure.py @@ -121,6 +121,14 @@ def __init__(self, **kwargs): The value to assign to the database_compartments property of this ExternalExadataInfrastructure. :type database_compartments: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataInfrastructure. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataInfrastructure. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -139,7 +147,9 @@ def __init__(self, **kwargs): 'license_model': 'str', 'storage_grid': 'ExternalExadataStorageGridSummary', 'database_systems': 'list[ExternalExadataDatabaseSystemSummary]', - 'database_compartments': 'list[str]' + 'database_compartments': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -159,7 +169,9 @@ def __init__(self, **kwargs): 'license_model': 'licenseModel', 'storage_grid': 'storageGrid', 'database_systems': 'databaseSystems', - 'database_compartments': 'databaseCompartments' + 'database_compartments': 'databaseCompartments', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -179,6 +191,8 @@ def __init__(self, **kwargs): self._storage_grid = None self._database_systems = None self._database_compartments = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'INFRASTRUCTURE' @property @@ -341,6 +355,70 @@ def database_compartments(self, database_compartments): """ self._database_compartments = database_compartments + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataInfrastructure. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataInfrastructure. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataInfrastructure. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataInfrastructure. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataInfrastructure. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataInfrastructure. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataInfrastructure. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataInfrastructure. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_infrastructure_summary.py b/src/oci/database_management/models/external_exadata_infrastructure_summary.py index 9a780e327e..4fc8a99f45 100644 --- a/src/oci/database_management/models/external_exadata_infrastructure_summary.py +++ b/src/oci/database_management/models/external_exadata_infrastructure_summary.py @@ -113,6 +113,14 @@ def __init__(self, **kwargs): The value to assign to the grid_home_path property of this ExternalExadataInfrastructureSummary. :type grid_home_path: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataInfrastructureSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataInfrastructureSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -129,7 +137,9 @@ def __init__(self, **kwargs): 'rack_size': 'str', 'compartment_id': 'str', 'license_model': 'str', - 'grid_home_path': 'str' + 'grid_home_path': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -147,7 +157,9 @@ def __init__(self, **kwargs): 'rack_size': 'rackSize', 'compartment_id': 'compartmentId', 'license_model': 'licenseModel', - 'grid_home_path': 'gridHomePath' + 'grid_home_path': 'gridHomePath', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -165,6 +177,8 @@ def __init__(self, **kwargs): self._compartment_id = None self._license_model = None self._grid_home_path = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'INFRASTRUCTURE_SUMMARY' @property @@ -279,6 +293,70 @@ def grid_home_path(self, grid_home_path): """ self._grid_home_path = grid_home_path + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataInfrastructureSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataInfrastructureSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataInfrastructureSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataInfrastructureSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataInfrastructureSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataInfrastructureSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataInfrastructureSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataInfrastructureSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_storage_connector.py b/src/oci/database_management/models/external_exadata_storage_connector.py index 9048559bb9..5370548ebe 100644 --- a/src/oci/database_management/models/external_exadata_storage_connector.py +++ b/src/oci/database_management/models/external_exadata_storage_connector.py @@ -85,6 +85,14 @@ def __init__(self, **kwargs): The value to assign to the storage_server_id property of this ExternalExadataStorageConnector. :type storage_server_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataStorageConnector. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataStorageConnector. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -101,7 +109,9 @@ def __init__(self, **kwargs): 'exadata_infrastructure_id': 'str', 'agent_id': 'str', 'connection_uri': 'str', - 'storage_server_id': 'str' + 'storage_server_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -119,7 +129,9 @@ def __init__(self, **kwargs): 'exadata_infrastructure_id': 'exadataInfrastructureId', 'agent_id': 'agentId', 'connection_uri': 'connectionUri', - 'storage_server_id': 'storageServerId' + 'storage_server_id': 'storageServerId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -137,6 +149,8 @@ def __init__(self, **kwargs): self._agent_id = None self._connection_uri = None self._storage_server_id = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'STORAGE_CONNECTOR' @property @@ -247,6 +261,70 @@ def storage_server_id(self, storage_server_id): """ self._storage_server_id = storage_server_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataStorageConnector. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataStorageConnector. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataStorageConnector. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataStorageConnector. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataStorageConnector. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataStorageConnector. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataStorageConnector. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataStorageConnector. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_storage_connector_summary.py b/src/oci/database_management/models/external_exadata_storage_connector_summary.py index af82b72961..c42ee454ae 100644 --- a/src/oci/database_management/models/external_exadata_storage_connector_summary.py +++ b/src/oci/database_management/models/external_exadata_storage_connector_summary.py @@ -81,6 +81,14 @@ def __init__(self, **kwargs): The value to assign to the agent_id property of this ExternalExadataStorageConnectorSummary. :type agent_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataStorageConnectorSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataStorageConnectorSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -96,7 +104,9 @@ def __init__(self, **kwargs): 'resource_type': 'str', 'connection_uri': 'str', 'storage_server_id': 'str', - 'agent_id': 'str' + 'agent_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -113,7 +123,9 @@ def __init__(self, **kwargs): 'resource_type': 'resourceType', 'connection_uri': 'connectionUri', 'storage_server_id': 'storageServerId', - 'agent_id': 'agentId' + 'agent_id': 'agentId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -130,6 +142,8 @@ def __init__(self, **kwargs): self._connection_uri = None self._storage_server_id = None self._agent_id = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'STORAGE_CONNECTOR_SUMMARY' @property @@ -212,6 +226,70 @@ def agent_id(self, agent_id): """ self._agent_id = agent_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataStorageConnectorSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataStorageConnectorSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataStorageConnectorSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataStorageConnectorSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataStorageConnectorSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataStorageConnectorSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataStorageConnectorSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataStorageConnectorSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_storage_grid.py b/src/oci/database_management/models/external_exadata_storage_grid.py index 27d49bed18..72c08bcba8 100644 --- a/src/oci/database_management/models/external_exadata_storage_grid.py +++ b/src/oci/database_management/models/external_exadata_storage_grid.py @@ -81,6 +81,14 @@ def __init__(self, **kwargs): The value to assign to the storage_servers property of this ExternalExadataStorageGrid. :type storage_servers: list[oci.database_management.models.ExternalExadataStorageServerSummary] + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataStorageGrid. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataStorageGrid. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -96,7 +104,9 @@ def __init__(self, **kwargs): 'resource_type': 'str', 'exadata_infrastructure_id': 'str', 'server_count': 'float', - 'storage_servers': 'list[ExternalExadataStorageServerSummary]' + 'storage_servers': 'list[ExternalExadataStorageServerSummary]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -113,7 +123,9 @@ def __init__(self, **kwargs): 'resource_type': 'resourceType', 'exadata_infrastructure_id': 'exadataInfrastructureId', 'server_count': 'serverCount', - 'storage_servers': 'storageServers' + 'storage_servers': 'storageServers', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -130,6 +142,8 @@ def __init__(self, **kwargs): self._exadata_infrastructure_id = None self._server_count = None self._storage_servers = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'STORAGE_GRID' @property @@ -208,6 +222,70 @@ def storage_servers(self, storage_servers): """ self._storage_servers = storage_servers + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataStorageGrid. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataStorageGrid. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataStorageGrid. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataStorageGrid. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataStorageGrid. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataStorageGrid. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataStorageGrid. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataStorageGrid. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_storage_server.py b/src/oci/database_management/models/external_exadata_storage_server.py index 7910045c49..cf1ea63ff1 100644 --- a/src/oci/database_management/models/external_exadata_storage_server.py +++ b/src/oci/database_management/models/external_exadata_storage_server.py @@ -113,6 +113,14 @@ def __init__(self, **kwargs): The value to assign to the connector property of this ExternalExadataStorageServer. :type connector: oci.database_management.models.ExternalExadataStorageConnectorSummary + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataStorageServer. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataStorageServer. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -136,7 +144,9 @@ def __init__(self, **kwargs): 'max_hard_disk_throughput': 'int', 'max_flash_disk_iops': 'int', 'max_flash_disk_throughput': 'int', - 'connector': 'ExternalExadataStorageConnectorSummary' + 'connector': 'ExternalExadataStorageConnectorSummary', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -161,7 +171,9 @@ def __init__(self, **kwargs): 'max_hard_disk_throughput': 'maxHardDiskThroughput', 'max_flash_disk_iops': 'maxFlashDiskIOPS', 'max_flash_disk_throughput': 'maxFlashDiskThroughput', - 'connector': 'connector' + 'connector': 'connector', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -186,6 +198,8 @@ def __init__(self, **kwargs): self._max_flash_disk_iops = None self._max_flash_disk_throughput = None self._connector = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'STORAGE_SERVER' @property @@ -456,6 +470,70 @@ def connector(self, connector): """ self._connector = connector + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataStorageServer. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataStorageServer. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataStorageServer. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataStorageServer. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataStorageServer. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataStorageServer. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataStorageServer. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataStorageServer. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_exadata_storage_server_summary.py b/src/oci/database_management/models/external_exadata_storage_server_summary.py index 8adbd4007d..0ec7e1c15f 100644 --- a/src/oci/database_management/models/external_exadata_storage_server_summary.py +++ b/src/oci/database_management/models/external_exadata_storage_server_summary.py @@ -105,6 +105,14 @@ def __init__(self, **kwargs): The value to assign to the connector_id property of this ExternalExadataStorageServerSummary. :type connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalExadataStorageServerSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalExadataStorageServerSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -126,7 +134,9 @@ def __init__(self, **kwargs): 'max_hard_disk_throughput': 'int', 'max_flash_disk_iops': 'int', 'max_flash_disk_throughput': 'int', - 'connector_id': 'str' + 'connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -149,7 +159,9 @@ def __init__(self, **kwargs): 'max_hard_disk_throughput': 'maxHardDiskThroughput', 'max_flash_disk_iops': 'maxFlashDiskIOPS', 'max_flash_disk_throughput': 'maxFlashDiskThroughput', - 'connector_id': 'connectorId' + 'connector_id': 'connectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -172,6 +184,8 @@ def __init__(self, **kwargs): self._max_flash_disk_iops = None self._max_flash_disk_throughput = None self._connector_id = None + self._freeform_tags = None + self._defined_tags = None self._resource_type = 'STORAGE_SERVER_SUMMARY' @property @@ -394,6 +408,70 @@ def connector_id(self, connector_id): """ self._connector_id = connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalExadataStorageServerSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalExadataStorageServerSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalExadataStorageServerSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalExadataStorageServerSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalExadataStorageServerSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalExadataStorageServerSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalExadataStorageServerSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalExadataStorageServerSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_listener.py b/src/oci/database_management/models/external_listener.py index 86966c0f4e..c88c51512e 100644 --- a/src/oci/database_management/models/external_listener.py +++ b/src/oci/database_management/models/external_listener.py @@ -168,6 +168,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalListener. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalListener. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalListener. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -194,7 +202,9 @@ def __init__(self, **kwargs): 'serviced_databases': 'list[ExternalListenerServicedDatabase]', 'serviced_asms': 'list[ExternalServicedAsm]', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -222,7 +232,9 @@ def __init__(self, **kwargs): 'serviced_databases': 'servicedDatabases', 'serviced_asms': 'servicedAsms', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -250,6 +262,8 @@ def __init__(self, **kwargs): self._serviced_asms = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -889,6 +903,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalListener. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalListener. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalListener. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalListener. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalListener. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalListener. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalListener. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalListener. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/external_listener_summary.py b/src/oci/database_management/models/external_listener_summary.py index b638e54706..14ac3c74ac 100644 --- a/src/oci/database_management/models/external_listener_summary.py +++ b/src/oci/database_management/models/external_listener_summary.py @@ -68,6 +68,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ExternalListenerSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ExternalListenerSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ExternalListenerSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -81,7 +89,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -96,7 +106,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -111,6 +123,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -420,6 +434,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ExternalListenerSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ExternalListenerSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ExternalListenerSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ExternalListenerSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ExternalListenerSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ExternalListenerSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ExternalListenerSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ExternalListenerSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/job_summary.py b/src/oci/database_management/models/job_summary.py index 7f471a1d4d..f3c6e44d22 100644 --- a/src/oci/database_management/models/job_summary.py +++ b/src/oci/database_management/models/job_summary.py @@ -108,6 +108,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this JobSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this JobSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this JobSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -124,7 +132,9 @@ def __init__(self, **kwargs): 'timeout': 'str', 'submission_error_message': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -142,7 +152,9 @@ def __init__(self, **kwargs): 'timeout': 'timeout', 'submission_error_message': 'submissionErrorMessage', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -160,6 +172,8 @@ def __init__(self, **kwargs): self._submission_error_message = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -545,6 +559,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this JobSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this JobSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this JobSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this JobSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this JobSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this JobSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this JobSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this JobSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/managed_database.py b/src/oci/database_management/models/managed_database.py index 7ec59001ad..2a80f8f25d 100644 --- a/src/oci/database_management/models/managed_database.py +++ b/src/oci/database_management/models/managed_database.py @@ -190,6 +190,10 @@ def __init__(self, **kwargs): The value to assign to the time_created property of this ManagedDatabase. :type time_created: datetime + :param database_version: + The value to assign to the database_version property of this ManagedDatabase. + :type database_version: str + :param database_status: The value to assign to the database_status property of this ManagedDatabase. Allowed values for this property are: "UP", "DOWN", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. @@ -224,6 +228,14 @@ def __init__(self, **kwargs): The value to assign to the additional_details property of this ManagedDatabase. :type additional_details: dict(str, str) + :param freeform_tags: + The value to assign to the freeform_tags property of this ManagedDatabase. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ManagedDatabase. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -240,6 +252,7 @@ def __init__(self, **kwargs): 'db_system_id': 'str', 'storage_system_id': 'str', 'time_created': 'datetime', + 'database_version': 'str', 'database_status': 'str', 'parent_container_name': 'str', 'parent_container_compartment_id': 'str', @@ -247,7 +260,9 @@ def __init__(self, **kwargs): 'instance_details': 'list[InstanceDetails]', 'pdb_count': 'int', 'pdb_status': 'list[PdbStatusDetails]', - 'additional_details': 'dict(str, str)' + 'additional_details': 'dict(str, str)', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -265,6 +280,7 @@ def __init__(self, **kwargs): 'db_system_id': 'dbSystemId', 'storage_system_id': 'storageSystemId', 'time_created': 'timeCreated', + 'database_version': 'databaseVersion', 'database_status': 'databaseStatus', 'parent_container_name': 'parentContainerName', 'parent_container_compartment_id': 'parentContainerCompartmentId', @@ -272,7 +288,9 @@ def __init__(self, **kwargs): 'instance_details': 'instanceDetails', 'pdb_count': 'pdbCount', 'pdb_status': 'pdbStatus', - 'additional_details': 'additionalDetails' + 'additional_details': 'additionalDetails', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -289,6 +307,7 @@ def __init__(self, **kwargs): self._db_system_id = None self._storage_system_id = None self._time_created = None + self._database_version = None self._database_status = None self._parent_container_name = None self._parent_container_compartment_id = None @@ -297,6 +316,8 @@ def __init__(self, **kwargs): self._pdb_count = None self._pdb_status = None self._additional_details = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -690,6 +711,30 @@ def time_created(self, time_created): """ self._time_created = time_created + @property + def database_version(self): + """ + Gets the database_version of this ManagedDatabase. + The Oracle Database version. + + + :return: The database_version of this ManagedDatabase. + :rtype: str + """ + return self._database_version + + @database_version.setter + def database_version(self, database_version): + """ + Sets the database_version of this ManagedDatabase. + The Oracle Database version. + + + :param database_version: The database_version of this ManagedDatabase. + :type: str + """ + self._database_version = database_version + @property def database_status(self): """ @@ -900,6 +945,70 @@ def additional_details(self, additional_details): """ self._additional_details = additional_details + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ManagedDatabase. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ManagedDatabase. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ManagedDatabase. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ManagedDatabase. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ManagedDatabase. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ManagedDatabase. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ManagedDatabase. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ManagedDatabase. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/managed_database_group.py b/src/oci/database_management/models/managed_database_group.py index f9b6d6857f..7e9a6a0660 100644 --- a/src/oci/database_management/models/managed_database_group.py +++ b/src/oci/database_management/models/managed_database_group.py @@ -78,6 +78,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this ManagedDatabaseGroup. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ManagedDatabaseGroup. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ManagedDatabaseGroup. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -87,7 +95,9 @@ def __init__(self, **kwargs): 'managed_databases': 'list[ChildDatabase]', 'lifecycle_state': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -98,7 +108,9 @@ def __init__(self, **kwargs): 'managed_databases': 'managedDatabases', 'lifecycle_state': 'lifecycleState', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -109,6 +121,8 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -316,6 +330,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ManagedDatabaseGroup. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ManagedDatabaseGroup. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ManagedDatabaseGroup. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ManagedDatabaseGroup. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ManagedDatabaseGroup. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ManagedDatabaseGroup. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ManagedDatabaseGroup. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ManagedDatabaseGroup. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/managed_database_group_summary.py b/src/oci/database_management/models/managed_database_group_summary.py index b603d81845..a66fd834a7 100644 --- a/src/oci/database_management/models/managed_database_group_summary.py +++ b/src/oci/database_management/models/managed_database_group_summary.py @@ -74,6 +74,14 @@ def __init__(self, **kwargs): The value to assign to the time_created property of this ManagedDatabaseGroupSummary. :type time_created: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this ManagedDatabaseGroupSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ManagedDatabaseGroupSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -82,7 +90,9 @@ def __init__(self, **kwargs): 'description': 'str', 'managed_database_count': 'int', 'lifecycle_state': 'str', - 'time_created': 'datetime' + 'time_created': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -92,7 +102,9 @@ def __init__(self, **kwargs): 'description': 'description', 'managed_database_count': 'managedDatabaseCount', 'lifecycle_state': 'lifecycleState', - 'time_created': 'timeCreated' + 'time_created': 'timeCreated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -102,6 +114,8 @@ def __init__(self, **kwargs): self._managed_database_count = None self._lifecycle_state = None self._time_created = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -285,6 +299,70 @@ def time_created(self, time_created): """ self._time_created = time_created + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ManagedDatabaseGroupSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ManagedDatabaseGroupSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ManagedDatabaseGroupSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ManagedDatabaseGroupSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ManagedDatabaseGroupSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ManagedDatabaseGroupSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ManagedDatabaseGroupSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ManagedDatabaseGroupSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/managed_database_summary.py b/src/oci/database_management/models/managed_database_summary.py index 7d36c1f3cb..2293d09154 100644 --- a/src/oci/database_management/models/managed_database_summary.py +++ b/src/oci/database_management/models/managed_database_summary.py @@ -174,6 +174,18 @@ def __init__(self, **kwargs): The value to assign to the time_created property of this ManagedDatabaseSummary. :type time_created: datetime + :param database_version: + The value to assign to the database_version property of this ManagedDatabaseSummary. + :type database_version: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this ManagedDatabaseSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this ManagedDatabaseSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -188,7 +200,10 @@ def __init__(self, **kwargs): 'parent_container_id': 'str', 'db_system_id': 'str', 'storage_system_id': 'str', - 'time_created': 'datetime' + 'time_created': 'datetime', + 'database_version': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -204,7 +219,10 @@ def __init__(self, **kwargs): 'parent_container_id': 'parentContainerId', 'db_system_id': 'dbSystemId', 'storage_system_id': 'storageSystemId', - 'time_created': 'timeCreated' + 'time_created': 'timeCreated', + 'database_version': 'databaseVersion', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -220,6 +238,9 @@ def __init__(self, **kwargs): self._db_system_id = None self._storage_system_id = None self._time_created = None + self._database_version = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -589,6 +610,94 @@ def time_created(self, time_created): """ self._time_created = time_created + @property + def database_version(self): + """ + Gets the database_version of this ManagedDatabaseSummary. + The Oracle Database version. + + + :return: The database_version of this ManagedDatabaseSummary. + :rtype: str + """ + return self._database_version + + @database_version.setter + def database_version(self, database_version): + """ + Sets the database_version of this ManagedDatabaseSummary. + The Oracle Database version. + + + :param database_version: The database_version of this ManagedDatabaseSummary. + :type: str + """ + self._database_version = database_version + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ManagedDatabaseSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ManagedDatabaseSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ManagedDatabaseSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ManagedDatabaseSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ManagedDatabaseSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ManagedDatabaseSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ManagedDatabaseSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ManagedDatabaseSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/named_credential.py b/src/oci/database_management/models/named_credential.py index c255544915..e3b34a3b74 100644 --- a/src/oci/database_management/models/named_credential.py +++ b/src/oci/database_management/models/named_credential.py @@ -110,6 +110,14 @@ def __init__(self, **kwargs): The value to assign to the associated_resource property of this NamedCredential. :type associated_resource: str + :param freeform_tags: + The value to assign to the freeform_tags property of this NamedCredential. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this NamedCredential. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', @@ -123,7 +131,9 @@ def __init__(self, **kwargs): 'content': 'NamedCredentialContent', 'time_created': 'datetime', 'time_updated': 'datetime', - 'associated_resource': 'str' + 'associated_resource': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -138,7 +148,9 @@ def __init__(self, **kwargs): 'content': 'content', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', - 'associated_resource': 'associatedResource' + 'associated_resource': 'associatedResource', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None @@ -153,6 +165,8 @@ def __init__(self, **kwargs): self._time_created = None self._time_updated = None self._associated_resource = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -470,6 +484,70 @@ def associated_resource(self, associated_resource): """ self._associated_resource = associated_resource + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this NamedCredential. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this NamedCredential. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this NamedCredential. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this NamedCredential. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this NamedCredential. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this NamedCredential. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this NamedCredential. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this NamedCredential. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/named_credential_summary.py b/src/oci/database_management/models/named_credential_summary.py index 1f2bff13f5..975e713366 100644 --- a/src/oci/database_management/models/named_credential_summary.py +++ b/src/oci/database_management/models/named_credential_summary.py @@ -102,6 +102,14 @@ def __init__(self, **kwargs): The value to assign to the time_updated property of this NamedCredentialSummary. :type time_updated: datetime + :param freeform_tags: + The value to assign to the freeform_tags property of this NamedCredentialSummary. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this NamedCredentialSummary. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -113,7 +121,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'time_created': 'datetime', - 'time_updated': 'datetime' + 'time_updated': 'datetime', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -126,7 +136,9 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'time_created': 'timeCreated', - 'time_updated': 'timeUpdated' + 'time_updated': 'timeUpdated', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -139,6 +151,8 @@ def __init__(self, **kwargs): self._lifecycle_details = None self._time_created = None self._time_updated = None + self._freeform_tags = None + self._defined_tags = None @property def id(self): @@ -414,6 +428,70 @@ def time_updated(self, time_updated): """ self._time_updated = time_updated + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this NamedCredentialSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this NamedCredentialSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this NamedCredentialSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this NamedCredentialSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this NamedCredentialSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this NamedCredentialSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this NamedCredentialSummary. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this NamedCredentialSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/sql_job.py b/src/oci/database_management/models/sql_job.py index fde3f2e4c9..6fbf71babf 100644 --- a/src/oci/database_management/models/sql_job.py +++ b/src/oci/database_management/models/sql_job.py @@ -163,6 +163,14 @@ def __init__(self, **kwargs): The value to assign to the named_credential_id property of this SqlJob. :type named_credential_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this SqlJob. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this SqlJob. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', @@ -189,7 +197,9 @@ def __init__(self, **kwargs): 'operation_type': 'str', 'user_name': 'str', 'role': 'str', - 'named_credential_id': 'str' + 'named_credential_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -217,7 +227,9 @@ def __init__(self, **kwargs): 'operation_type': 'operationType', 'user_name': 'userName', 'role': 'role', - 'named_credential_id': 'namedCredentialId' + 'named_credential_id': 'namedCredentialId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._id = None @@ -245,6 +257,8 @@ def __init__(self, **kwargs): self._user_name = None self._role = None self._named_credential_id = None + self._freeform_tags = None + self._defined_tags = None self._job_type = 'SQL' @property @@ -455,6 +469,70 @@ def named_credential_id(self, named_credential_id): """ self._named_credential_id = named_credential_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this SqlJob. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this SqlJob. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this SqlJob. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this SqlJob. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this SqlJob. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this SqlJob. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this SqlJob. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this SqlJob. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_db_management_private_endpoint_details.py b/src/oci/database_management/models/update_db_management_private_endpoint_details.py index f6dac4af8c..0b6e2e1f91 100644 --- a/src/oci/database_management/models/update_db_management_private_endpoint_details.py +++ b/src/oci/database_management/models/update_db_management_private_endpoint_details.py @@ -32,22 +32,36 @@ def __init__(self, **kwargs): The value to assign to the nsg_ids property of this UpdateDbManagementPrivateEndpointDetails. :type nsg_ids: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateDbManagementPrivateEndpointDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateDbManagementPrivateEndpointDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'name': 'str', 'description': 'str', - 'nsg_ids': 'list[str]' + 'nsg_ids': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'name': 'name', 'description': 'description', - 'nsg_ids': 'nsgIds' + 'nsg_ids': 'nsgIds', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._name = None self._description = None self._nsg_ids = None + self._freeform_tags = None + self._defined_tags = None @property def name(self): @@ -121,6 +135,70 @@ def nsg_ids(self, nsg_ids): """ self._nsg_ids = nsg_ids + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateDbManagementPrivateEndpointDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateDbManagementPrivateEndpointDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateDbManagementPrivateEndpointDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateDbManagementPrivateEndpointDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateDbManagementPrivateEndpointDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateDbManagementPrivateEndpointDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateDbManagementPrivateEndpointDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateDbManagementPrivateEndpointDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_asm_details.py b/src/oci/database_management/models/update_external_asm_details.py index 4113ca57ba..26414fe360 100644 --- a/src/oci/database_management/models/update_external_asm_details.py +++ b/src/oci/database_management/models/update_external_asm_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the external_connector_id property of this UpdateExternalAsmDetails. :type external_connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalAsmDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalAsmDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'external_connector_id': 'str' + 'external_connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'external_connector_id': 'externalConnectorId' + 'external_connector_id': 'externalConnectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._external_connector_id = None + self._freeform_tags = None + self._defined_tags = None @property def external_connector_id(self): @@ -63,6 +77,70 @@ def external_connector_id(self, external_connector_id): """ self._external_connector_id = external_connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalAsmDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalAsmDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalAsmDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalAsmDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalAsmDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalAsmDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalAsmDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalAsmDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_asm_instance_details.py b/src/oci/database_management/models/update_external_asm_instance_details.py new file mode 100644 index 0000000000..c3b18f572e --- /dev/null +++ b/src/oci/database_management/models/update_external_asm_instance_details.py @@ -0,0 +1,119 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20201101 + + +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 UpdateExternalAsmInstanceDetails(object): + """ + The details required to update an external ASM instance. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateExternalAsmInstanceDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalAsmInstanceDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalAsmInstanceDetails. + :type defined_tags: dict(str, dict(str, object)) + + """ + self.swagger_types = { + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' + } + + self.attribute_map = { + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' + } + + self._freeform_tags = None + self._defined_tags = None + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalAsmInstanceDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalAsmInstanceDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalAsmInstanceDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalAsmInstanceDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalAsmInstanceDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalAsmInstanceDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalAsmInstanceDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalAsmInstanceDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + 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/database_management/models/update_external_cluster_details.py b/src/oci/database_management/models/update_external_cluster_details.py index c1445041b7..54322571d0 100644 --- a/src/oci/database_management/models/update_external_cluster_details.py +++ b/src/oci/database_management/models/update_external_cluster_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the external_connector_id property of this UpdateExternalClusterDetails. :type external_connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalClusterDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalClusterDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'external_connector_id': 'str' + 'external_connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'external_connector_id': 'externalConnectorId' + 'external_connector_id': 'externalConnectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._external_connector_id = None + self._freeform_tags = None + self._defined_tags = None @property def external_connector_id(self): @@ -63,6 +77,70 @@ def external_connector_id(self, external_connector_id): """ self._external_connector_id = external_connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalClusterDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalClusterDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalClusterDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalClusterDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalClusterDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalClusterDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalClusterDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalClusterDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_cluster_instance_details.py b/src/oci/database_management/models/update_external_cluster_instance_details.py index 3cbc322236..3199acd469 100644 --- a/src/oci/database_management/models/update_external_cluster_instance_details.py +++ b/src/oci/database_management/models/update_external_cluster_instance_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the external_connector_id property of this UpdateExternalClusterInstanceDetails. :type external_connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalClusterInstanceDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalClusterInstanceDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'external_connector_id': 'str' + 'external_connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'external_connector_id': 'externalConnectorId' + 'external_connector_id': 'externalConnectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._external_connector_id = None + self._freeform_tags = None + self._defined_tags = None @property def external_connector_id(self): @@ -63,6 +77,70 @@ def external_connector_id(self, external_connector_id): """ self._external_connector_id = external_connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalClusterInstanceDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalClusterInstanceDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalClusterInstanceDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalClusterInstanceDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalClusterInstanceDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalClusterInstanceDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalClusterInstanceDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalClusterInstanceDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_db_home_details.py b/src/oci/database_management/models/update_external_db_home_details.py new file mode 100644 index 0000000000..9cadef551a --- /dev/null +++ b/src/oci/database_management/models/update_external_db_home_details.py @@ -0,0 +1,119 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20201101 + + +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 UpdateExternalDbHomeDetails(object): + """ + The details required to update an external DB home. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateExternalDbHomeDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalDbHomeDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalDbHomeDetails. + :type defined_tags: dict(str, dict(str, object)) + + """ + self.swagger_types = { + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' + } + + self.attribute_map = { + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' + } + + self._freeform_tags = None + self._defined_tags = None + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalDbHomeDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalDbHomeDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalDbHomeDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalDbHomeDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalDbHomeDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalDbHomeDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalDbHomeDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalDbHomeDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + 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/database_management/models/update_external_db_node_details.py b/src/oci/database_management/models/update_external_db_node_details.py index 08ccab6f38..9d6ac41153 100644 --- a/src/oci/database_management/models/update_external_db_node_details.py +++ b/src/oci/database_management/models/update_external_db_node_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the external_connector_id property of this UpdateExternalDbNodeDetails. :type external_connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalDbNodeDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalDbNodeDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'external_connector_id': 'str' + 'external_connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'external_connector_id': 'externalConnectorId' + 'external_connector_id': 'externalConnectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._external_connector_id = None + self._freeform_tags = None + self._defined_tags = None @property def external_connector_id(self): @@ -63,6 +77,70 @@ def external_connector_id(self, external_connector_id): """ self._external_connector_id = external_connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalDbNodeDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalDbNodeDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalDbNodeDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalDbNodeDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalDbNodeDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalDbNodeDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalDbNodeDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalDbNodeDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_db_system_details.py b/src/oci/database_management/models/update_external_db_system_details.py index 0e397404b9..0c5cf782bb 100644 --- a/src/oci/database_management/models/update_external_db_system_details.py +++ b/src/oci/database_management/models/update_external_db_system_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the display_name property of this UpdateExternalDbSystemDetails. :type display_name: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalDbSystemDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalDbSystemDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'display_name': 'str' + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'display_name': 'displayName' + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._display_name = None + self._freeform_tags = None + self._defined_tags = None @property def display_name(self): @@ -59,6 +73,70 @@ def display_name(self, display_name): """ self._display_name = display_name + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalDbSystemDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalDbSystemDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalDbSystemDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalDbSystemDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalDbSystemDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalDbSystemDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalDbSystemDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalDbSystemDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_db_system_discovery_details.py b/src/oci/database_management/models/update_external_db_system_discovery_details.py index 8aea4261e2..87be873f4d 100644 --- a/src/oci/database_management/models/update_external_db_system_discovery_details.py +++ b/src/oci/database_management/models/update_external_db_system_discovery_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the display_name property of this UpdateExternalDbSystemDiscoveryDetails. :type display_name: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalDbSystemDiscoveryDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalDbSystemDiscoveryDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'display_name': 'str' + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'display_name': 'displayName' + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._display_name = None + self._freeform_tags = None + self._defined_tags = None @property def display_name(self): @@ -59,6 +73,70 @@ def display_name(self, display_name): """ self._display_name = display_name + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalDbSystemDiscoveryDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalDbSystemDiscoveryDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalDbSystemDiscoveryDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalDbSystemDiscoveryDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalDbSystemDiscoveryDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalDbSystemDiscoveryDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalDbSystemDiscoveryDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalDbSystemDiscoveryDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_db_system_macs_connector_details.py b/src/oci/database_management/models/update_external_db_system_macs_connector_details.py index 4cfad6eccb..efb5511244 100644 --- a/src/oci/database_management/models/update_external_db_system_macs_connector_details.py +++ b/src/oci/database_management/models/update_external_db_system_macs_connector_details.py @@ -33,19 +33,33 @@ def __init__(self, **kwargs): The value to assign to the connection_info property of this UpdateExternalDbSystemMacsConnectorDetails. :type connection_info: oci.database_management.models.ExternalDbSystemConnectionInfo + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalDbSystemMacsConnectorDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalDbSystemMacsConnectorDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'connector_type': 'str', - 'connection_info': 'ExternalDbSystemConnectionInfo' + 'connection_info': 'ExternalDbSystemConnectionInfo', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'connector_type': 'connectorType', - 'connection_info': 'connectionInfo' + 'connection_info': 'connectionInfo', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._connector_type = None self._connection_info = None + self._freeform_tags = None + self._defined_tags = None self._connector_type = 'MACS' @property @@ -68,6 +82,70 @@ def connection_info(self, connection_info): """ self._connection_info = connection_info + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalDbSystemMacsConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalDbSystemMacsConnectorDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalDbSystemMacsConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalDbSystemMacsConnectorDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalDbSystemMacsConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalDbSystemMacsConnectorDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalDbSystemMacsConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalDbSystemMacsConnectorDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_exadata_infrastructure_details.py b/src/oci/database_management/models/update_external_exadata_infrastructure_details.py index 9eb28ecb62..b27f193dc9 100644 --- a/src/oci/database_management/models/update_external_exadata_infrastructure_details.py +++ b/src/oci/database_management/models/update_external_exadata_infrastructure_details.py @@ -53,6 +53,14 @@ def __init__(self, **kwargs): The value to assign to the storage_server_names property of this UpdateExternalExadataInfrastructureDetails. :type storage_server_names: list[str] + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalExadataInfrastructureDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalExadataInfrastructureDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'discovery_key': 'str', @@ -60,7 +68,9 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'display_name': 'str', 'db_system_ids': 'list[str]', - 'storage_server_names': 'list[str]' + 'storage_server_names': 'list[str]', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -69,7 +79,9 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'display_name': 'displayName', 'db_system_ids': 'dbSystemIds', - 'storage_server_names': 'storageServerNames' + 'storage_server_names': 'storageServerNames', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._discovery_key = None @@ -78,6 +90,8 @@ def __init__(self, **kwargs): self._display_name = None self._db_system_ids = None self._storage_server_names = None + self._freeform_tags = None + self._defined_tags = None @property def discovery_key(self): @@ -234,6 +248,70 @@ def storage_server_names(self, storage_server_names): """ self._storage_server_names = storage_server_names + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalExadataInfrastructureDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalExadataInfrastructureDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalExadataInfrastructureDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalExadataInfrastructureDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalExadataInfrastructureDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalExadataInfrastructureDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalExadataInfrastructureDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalExadataInfrastructureDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_exadata_storage_connector_details.py b/src/oci/database_management/models/update_external_exadata_storage_connector_details.py index 6098c1016b..c40443c21e 100644 --- a/src/oci/database_management/models/update_external_exadata_storage_connector_details.py +++ b/src/oci/database_management/models/update_external_exadata_storage_connector_details.py @@ -32,22 +32,36 @@ def __init__(self, **kwargs): The value to assign to the credential_info property of this UpdateExternalExadataStorageConnectorDetails. :type credential_info: oci.database_management.models.RestCredential + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalExadataStorageConnectorDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalExadataStorageConnectorDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'connector_name': 'str', 'connection_uri': 'str', - 'credential_info': 'RestCredential' + 'credential_info': 'RestCredential', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'connector_name': 'connectorName', 'connection_uri': 'connectionUri', - 'credential_info': 'credentialInfo' + 'credential_info': 'credentialInfo', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._connector_name = None self._connection_uri = None self._credential_info = None + self._freeform_tags = None + self._defined_tags = None @property def connector_name(self): @@ -117,6 +131,70 @@ def credential_info(self, credential_info): """ self._credential_info = credential_info + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalExadataStorageConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalExadataStorageConnectorDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalExadataStorageConnectorDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalExadataStorageConnectorDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalExadataStorageConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalExadataStorageConnectorDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalExadataStorageConnectorDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalExadataStorageConnectorDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_external_exadata_storage_grid_details.py b/src/oci/database_management/models/update_external_exadata_storage_grid_details.py new file mode 100644 index 0000000000..a8627335fb --- /dev/null +++ b/src/oci/database_management/models/update_external_exadata_storage_grid_details.py @@ -0,0 +1,119 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20201101 + + +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 UpdateExternalExadataStorageGridDetails(object): + """ + The details required to update an Exadata storage server grid. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateExternalExadataStorageGridDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalExadataStorageGridDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalExadataStorageGridDetails. + :type defined_tags: dict(str, dict(str, object)) + + """ + self.swagger_types = { + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' + } + + self.attribute_map = { + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' + } + + self._freeform_tags = None + self._defined_tags = None + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalExadataStorageGridDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalExadataStorageGridDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalExadataStorageGridDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalExadataStorageGridDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalExadataStorageGridDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalExadataStorageGridDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalExadataStorageGridDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalExadataStorageGridDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + 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/database_management/models/update_external_exadata_storage_server_details.py b/src/oci/database_management/models/update_external_exadata_storage_server_details.py new file mode 100644 index 0000000000..f3aec1c09c --- /dev/null +++ b/src/oci/database_management/models/update_external_exadata_storage_server_details.py @@ -0,0 +1,119 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20201101 + + +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 UpdateExternalExadataStorageServerDetails(object): + """ + The details required to update an Exadata storage server. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateExternalExadataStorageServerDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalExadataStorageServerDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalExadataStorageServerDetails. + :type defined_tags: dict(str, dict(str, object)) + + """ + self.swagger_types = { + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' + } + + self.attribute_map = { + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' + } + + self._freeform_tags = None + self._defined_tags = None + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalExadataStorageServerDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalExadataStorageServerDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalExadataStorageServerDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalExadataStorageServerDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalExadataStorageServerDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalExadataStorageServerDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalExadataStorageServerDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalExadataStorageServerDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + 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/database_management/models/update_external_listener_details.py b/src/oci/database_management/models/update_external_listener_details.py index 5686d1336d..b1fa94eb5f 100644 --- a/src/oci/database_management/models/update_external_listener_details.py +++ b/src/oci/database_management/models/update_external_listener_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the external_connector_id property of this UpdateExternalListenerDetails. :type external_connector_id: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateExternalListenerDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateExternalListenerDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'external_connector_id': 'str' + 'external_connector_id': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'external_connector_id': 'externalConnectorId' + 'external_connector_id': 'externalConnectorId', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._external_connector_id = None + self._freeform_tags = None + self._defined_tags = None @property def external_connector_id(self): @@ -63,6 +77,70 @@ def external_connector_id(self, external_connector_id): """ self._external_connector_id = external_connector_id + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateExternalListenerDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateExternalListenerDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateExternalListenerDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateExternalListenerDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateExternalListenerDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateExternalListenerDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateExternalListenerDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateExternalListenerDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_managed_database_details.py b/src/oci/database_management/models/update_managed_database_details.py new file mode 100644 index 0000000000..c81a997fa5 --- /dev/null +++ b/src/oci/database_management/models/update_managed_database_details.py @@ -0,0 +1,119 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20201101 + + +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 UpdateManagedDatabaseDetails(object): + """ + The details required to update a Managed Database. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateManagedDatabaseDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateManagedDatabaseDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateManagedDatabaseDetails. + :type defined_tags: dict(str, dict(str, object)) + + """ + self.swagger_types = { + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' + } + + self.attribute_map = { + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' + } + + self._freeform_tags = None + self._defined_tags = None + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateManagedDatabaseDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateManagedDatabaseDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateManagedDatabaseDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateManagedDatabaseDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateManagedDatabaseDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateManagedDatabaseDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateManagedDatabaseDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateManagedDatabaseDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + 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/database_management/models/update_managed_database_group_details.py b/src/oci/database_management/models/update_managed_database_group_details.py index acd2f105d5..ac5de4800f 100644 --- a/src/oci/database_management/models/update_managed_database_group_details.py +++ b/src/oci/database_management/models/update_managed_database_group_details.py @@ -24,16 +24,30 @@ def __init__(self, **kwargs): The value to assign to the description property of this UpdateManagedDatabaseGroupDetails. :type description: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateManagedDatabaseGroupDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateManagedDatabaseGroupDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { - 'description': 'str' + 'description': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { - 'description': 'description' + 'description': 'description', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._description = None + self._freeform_tags = None + self._defined_tags = None @property def description(self): @@ -59,6 +73,70 @@ def description(self, description): """ self._description = description + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateManagedDatabaseGroupDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateManagedDatabaseGroupDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateManagedDatabaseGroupDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateManagedDatabaseGroupDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateManagedDatabaseGroupDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateManagedDatabaseGroupDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateManagedDatabaseGroupDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateManagedDatabaseGroupDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_named_credential_details.py b/src/oci/database_management/models/update_named_credential_details.py index c35ae80345..a85eacf8d6 100644 --- a/src/oci/database_management/models/update_named_credential_details.py +++ b/src/oci/database_management/models/update_named_credential_details.py @@ -45,25 +45,39 @@ def __init__(self, **kwargs): The value to assign to the associated_resource property of this UpdateNamedCredentialDetails. :type associated_resource: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateNamedCredentialDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateNamedCredentialDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'description': 'str', 'scope': 'str', 'content': 'NamedCredentialContent', - 'associated_resource': 'str' + 'associated_resource': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'description': 'description', 'scope': 'scope', 'content': 'content', - 'associated_resource': 'associatedResource' + 'associated_resource': 'associatedResource', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._description = None self._scope = None self._content = None self._associated_resource = None + self._freeform_tags = None + self._defined_tags = None @property def description(self): @@ -170,6 +184,70 @@ def associated_resource(self, associated_resource): """ self._associated_resource = associated_resource + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateNamedCredentialDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateNamedCredentialDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateNamedCredentialDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateNamedCredentialDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateNamedCredentialDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateNamedCredentialDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateNamedCredentialDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateNamedCredentialDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database_management/models/update_sql_job_details.py b/src/oci/database_management/models/update_sql_job_details.py index 159c372d8a..caf0fd8e91 100644 --- a/src/oci/database_management/models/update_sql_job_details.py +++ b/src/oci/database_management/models/update_sql_job_details.py @@ -78,6 +78,14 @@ def __init__(self, **kwargs): The value to assign to the role property of this UpdateSqlJobDetails. :type role: str + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateSqlJobDetails. + :type freeform_tags: dict(str, str) + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateSqlJobDetails. + :type defined_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'description': 'str', @@ -93,7 +101,9 @@ def __init__(self, **kwargs): 'password': 'str', 'secret_id': 'str', 'named_credential_id': 'str', - 'role': 'str' + 'role': 'str', + 'freeform_tags': 'dict(str, str)', + 'defined_tags': 'dict(str, dict(str, object))' } self.attribute_map = { @@ -110,7 +120,9 @@ def __init__(self, **kwargs): 'password': 'password', 'secret_id': 'secretId', 'named_credential_id': 'namedCredentialId', - 'role': 'role' + 'role': 'role', + 'freeform_tags': 'freeformTags', + 'defined_tags': 'definedTags' } self._description = None @@ -127,6 +139,8 @@ def __init__(self, **kwargs): self._secret_id = None self._named_credential_id = None self._role = None + self._freeform_tags = None + self._defined_tags = None self._job_type = 'SQL' @property @@ -345,6 +359,70 @@ def role(self, role): """ self._role = role + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateSqlJobDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateSqlJobDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateSqlJobDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + For more information, see `Resource Tags`__. + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateSqlJobDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateSqlJobDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateSqlJobDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateSqlJobDetails. + Defined tags for this resource. Each key is predefined and scoped to a namespace. + For more information, see `Resource Tags`__. + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateSqlJobDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/key_management/models/__init__.py b/src/oci/key_management/models/__init__.py index 202aeb4097..045fd2d0c7 100644 --- a/src/oci/key_management/models/__init__.py +++ b/src/oci/key_management/models/__init__.py @@ -6,6 +6,7 @@ from __future__ import absolute_import +from .auto_key_rotation_details import AutoKeyRotationDetails from .backup_key_details import BackupKeyDetails from .backup_location import BackupLocation from .backup_location_bucket import BackupLocationBucket @@ -81,6 +82,7 @@ # Maps type names to classes for key_management services. key_management_type_mapping = { + "AutoKeyRotationDetails": AutoKeyRotationDetails, "BackupKeyDetails": BackupKeyDetails, "BackupLocation": BackupLocation, "BackupLocationBucket": BackupLocationBucket, diff --git a/src/oci/key_management/models/auto_key_rotation_details.py b/src/oci/key_management/models/auto_key_rotation_details.py new file mode 100644 index 0000000000..2e11f53fd3 --- /dev/null +++ b/src/oci/key_management/models/auto_key_rotation_details.py @@ -0,0 +1,247 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: release + + +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 AutoKeyRotationDetails(object): + """ + The details of auto rotation schedule for the Key being create updated or imported. + """ + + #: A constant which can be used with the last_rotation_status property of a AutoKeyRotationDetails. + #: This constant has a value of "SUCCESS" + LAST_ROTATION_STATUS_SUCCESS = "SUCCESS" + + #: A constant which can be used with the last_rotation_status property of a AutoKeyRotationDetails. + #: This constant has a value of "FAILED" + LAST_ROTATION_STATUS_FAILED = "FAILED" + + #: A constant which can be used with the last_rotation_status property of a AutoKeyRotationDetails. + #: This constant has a value of "IN_PROGRESS" + LAST_ROTATION_STATUS_IN_PROGRESS = "IN_PROGRESS" + + def __init__(self, **kwargs): + """ + Initializes a new AutoKeyRotationDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param rotation_interval_in_days: + The value to assign to the rotation_interval_in_days property of this AutoKeyRotationDetails. + :type rotation_interval_in_days: int + + :param time_of_schedule_start: + The value to assign to the time_of_schedule_start property of this AutoKeyRotationDetails. + :type time_of_schedule_start: datetime + + :param time_of_next_rotation: + The value to assign to the time_of_next_rotation property of this AutoKeyRotationDetails. + :type time_of_next_rotation: datetime + + :param time_of_last_rotation: + The value to assign to the time_of_last_rotation property of this AutoKeyRotationDetails. + :type time_of_last_rotation: datetime + + :param last_rotation_status: + The value to assign to the last_rotation_status property of this AutoKeyRotationDetails. + Allowed values for this property are: "SUCCESS", "FAILED", "IN_PROGRESS", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type last_rotation_status: str + + :param last_rotation_message: + The value to assign to the last_rotation_message property of this AutoKeyRotationDetails. + :type last_rotation_message: str + + """ + self.swagger_types = { + 'rotation_interval_in_days': 'int', + 'time_of_schedule_start': 'datetime', + 'time_of_next_rotation': 'datetime', + 'time_of_last_rotation': 'datetime', + 'last_rotation_status': 'str', + 'last_rotation_message': 'str' + } + + self.attribute_map = { + 'rotation_interval_in_days': 'rotationIntervalInDays', + 'time_of_schedule_start': 'timeOfScheduleStart', + 'time_of_next_rotation': 'timeOfNextRotation', + 'time_of_last_rotation': 'timeOfLastRotation', + 'last_rotation_status': 'lastRotationStatus', + 'last_rotation_message': 'lastRotationMessage' + } + + self._rotation_interval_in_days = None + self._time_of_schedule_start = None + self._time_of_next_rotation = None + self._time_of_last_rotation = None + self._last_rotation_status = None + self._last_rotation_message = None + + @property + def rotation_interval_in_days(self): + """ + Gets the rotation_interval_in_days of this AutoKeyRotationDetails. + The interval of auto key rotation. For auto key rotation the interval should between 30 day and 365 days (1 year) + + + :return: The rotation_interval_in_days of this AutoKeyRotationDetails. + :rtype: int + """ + return self._rotation_interval_in_days + + @rotation_interval_in_days.setter + def rotation_interval_in_days(self, rotation_interval_in_days): + """ + Sets the rotation_interval_in_days of this AutoKeyRotationDetails. + The interval of auto key rotation. For auto key rotation the interval should between 30 day and 365 days (1 year) + + + :param rotation_interval_in_days: The rotation_interval_in_days of this AutoKeyRotationDetails. + :type: int + """ + self._rotation_interval_in_days = rotation_interval_in_days + + @property + def time_of_schedule_start(self): + """ + Gets the time_of_schedule_start of this AutoKeyRotationDetails. + A property indicating scheduled start date expressed as date YYYY-MM-DD String. Example: `2023-04-04T00:00:00Z` . + + + :return: The time_of_schedule_start of this AutoKeyRotationDetails. + :rtype: datetime + """ + return self._time_of_schedule_start + + @time_of_schedule_start.setter + def time_of_schedule_start(self, time_of_schedule_start): + """ + Sets the time_of_schedule_start of this AutoKeyRotationDetails. + A property indicating scheduled start date expressed as date YYYY-MM-DD String. Example: `2023-04-04T00:00:00Z` . + + + :param time_of_schedule_start: The time_of_schedule_start of this AutoKeyRotationDetails. + :type: datetime + """ + self._time_of_schedule_start = time_of_schedule_start + + @property + def time_of_next_rotation(self): + """ + Gets the time_of_next_rotation of this AutoKeyRotationDetails. + A property indicating Next estimated scheduled Time, as per the interval, expressed as date YYYY-MM-DD String. Example: `2023-04-04T00:00:00Z` . + + + :return: The time_of_next_rotation of this AutoKeyRotationDetails. + :rtype: datetime + """ + return self._time_of_next_rotation + + @time_of_next_rotation.setter + def time_of_next_rotation(self, time_of_next_rotation): + """ + Sets the time_of_next_rotation of this AutoKeyRotationDetails. + A property indicating Next estimated scheduled Time, as per the interval, expressed as date YYYY-MM-DD String. Example: `2023-04-04T00:00:00Z` . + + + :param time_of_next_rotation: The time_of_next_rotation of this AutoKeyRotationDetails. + :type: datetime + """ + self._time_of_next_rotation = time_of_next_rotation + + @property + def time_of_last_rotation(self): + """ + Gets the time_of_last_rotation of this AutoKeyRotationDetails. + A property indicating Last rotation Date Example: `2023-04-04T00:00:00Z`. + + + :return: The time_of_last_rotation of this AutoKeyRotationDetails. + :rtype: datetime + """ + return self._time_of_last_rotation + + @time_of_last_rotation.setter + def time_of_last_rotation(self, time_of_last_rotation): + """ + Sets the time_of_last_rotation of this AutoKeyRotationDetails. + A property indicating Last rotation Date Example: `2023-04-04T00:00:00Z`. + + + :param time_of_last_rotation: The time_of_last_rotation of this AutoKeyRotationDetails. + :type: datetime + """ + self._time_of_last_rotation = time_of_last_rotation + + @property + def last_rotation_status(self): + """ + Gets the last_rotation_status of this AutoKeyRotationDetails. + The status of last execution of auto key rotation. + + Allowed values for this property are: "SUCCESS", "FAILED", "IN_PROGRESS", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The last_rotation_status of this AutoKeyRotationDetails. + :rtype: str + """ + return self._last_rotation_status + + @last_rotation_status.setter + def last_rotation_status(self, last_rotation_status): + """ + Sets the last_rotation_status of this AutoKeyRotationDetails. + The status of last execution of auto key rotation. + + + :param last_rotation_status: The last_rotation_status of this AutoKeyRotationDetails. + :type: str + """ + allowed_values = ["SUCCESS", "FAILED", "IN_PROGRESS"] + if not value_allowed_none_or_none_sentinel(last_rotation_status, allowed_values): + last_rotation_status = 'UNKNOWN_ENUM_VALUE' + self._last_rotation_status = last_rotation_status + + @property + def last_rotation_message(self): + """ + Gets the last_rotation_message of this AutoKeyRotationDetails. + The last execution status message. + + + :return: The last_rotation_message of this AutoKeyRotationDetails. + :rtype: str + """ + return self._last_rotation_message + + @last_rotation_message.setter + def last_rotation_message(self, last_rotation_message): + """ + Sets the last_rotation_message of this AutoKeyRotationDetails. + The last execution status message. + + + :param last_rotation_message: The last_rotation_message of this AutoKeyRotationDetails. + :type: str + """ + self._last_rotation_message = last_rotation_message + + 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/key_management/models/create_key_details.py b/src/oci/key_management/models/create_key_details.py index 1fac6d7dec..bc8f4b486a 100644 --- a/src/oci/key_management/models/create_key_details.py +++ b/src/oci/key_management/models/create_key_details.py @@ -52,6 +52,14 @@ def __init__(self, **kwargs): The value to assign to the key_shape property of this CreateKeyDetails. :type key_shape: oci.key_management.models.KeyShape + :param is_auto_rotation_enabled: + The value to assign to the is_auto_rotation_enabled property of this CreateKeyDetails. + :type is_auto_rotation_enabled: bool + + :param auto_key_rotation_details: + The value to assign to the auto_key_rotation_details property of this CreateKeyDetails. + :type auto_key_rotation_details: oci.key_management.models.AutoKeyRotationDetails + :param protection_mode: The value to assign to the protection_mode property of this CreateKeyDetails. Allowed values for this property are: "HSM", "SOFTWARE", "EXTERNAL" @@ -68,6 +76,8 @@ def __init__(self, **kwargs): 'display_name': 'str', 'freeform_tags': 'dict(str, str)', 'key_shape': 'KeyShape', + 'is_auto_rotation_enabled': 'bool', + 'auto_key_rotation_details': 'AutoKeyRotationDetails', 'protection_mode': 'str', 'external_key_reference': 'ExternalKeyReference' } @@ -78,6 +88,8 @@ def __init__(self, **kwargs): 'display_name': 'displayName', 'freeform_tags': 'freeformTags', 'key_shape': 'keyShape', + 'is_auto_rotation_enabled': 'isAutoRotationEnabled', + 'auto_key_rotation_details': 'autoKeyRotationDetails', 'protection_mode': 'protectionMode', 'external_key_reference': 'externalKeyReference' } @@ -87,6 +99,8 @@ def __init__(self, **kwargs): self._display_name = None self._freeform_tags = None self._key_shape = None + self._is_auto_rotation_enabled = None + self._auto_key_rotation_details = None self._protection_mode = None self._external_key_reference = None @@ -224,6 +238,50 @@ def key_shape(self, key_shape): """ self._key_shape = key_shape + @property + def is_auto_rotation_enabled(self): + """ + Gets the is_auto_rotation_enabled of this CreateKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :return: The is_auto_rotation_enabled of this CreateKeyDetails. + :rtype: bool + """ + return self._is_auto_rotation_enabled + + @is_auto_rotation_enabled.setter + def is_auto_rotation_enabled(self, is_auto_rotation_enabled): + """ + Sets the is_auto_rotation_enabled of this CreateKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :param is_auto_rotation_enabled: The is_auto_rotation_enabled of this CreateKeyDetails. + :type: bool + """ + self._is_auto_rotation_enabled = is_auto_rotation_enabled + + @property + def auto_key_rotation_details(self): + """ + Gets the auto_key_rotation_details of this CreateKeyDetails. + + :return: The auto_key_rotation_details of this CreateKeyDetails. + :rtype: oci.key_management.models.AutoKeyRotationDetails + """ + return self._auto_key_rotation_details + + @auto_key_rotation_details.setter + def auto_key_rotation_details(self, auto_key_rotation_details): + """ + Sets the auto_key_rotation_details of this CreateKeyDetails. + + :param auto_key_rotation_details: The auto_key_rotation_details of this CreateKeyDetails. + :type: oci.key_management.models.AutoKeyRotationDetails + """ + self._auto_key_rotation_details = auto_key_rotation_details + @property def protection_mode(self): """ diff --git a/src/oci/key_management/models/import_key_details.py b/src/oci/key_management/models/import_key_details.py index a765764e0a..9cd35b7088 100644 --- a/src/oci/key_management/models/import_key_details.py +++ b/src/oci/key_management/models/import_key_details.py @@ -28,6 +28,14 @@ def __init__(self, **kwargs): Initializes a new ImportKeyDetails object with values from keyword arguments. The following keyword arguments are supported (corresponding to the getters/setters of this class): + :param is_auto_rotation_enabled: + The value to assign to the is_auto_rotation_enabled property of this ImportKeyDetails. + :type is_auto_rotation_enabled: bool + + :param auto_key_rotation_details: + The value to assign to the auto_key_rotation_details property of this ImportKeyDetails. + :type auto_key_rotation_details: oci.key_management.models.AutoKeyRotationDetails + :param compartment_id: The value to assign to the compartment_id property of this ImportKeyDetails. :type compartment_id: str @@ -59,6 +67,8 @@ def __init__(self, **kwargs): """ self.swagger_types = { + 'is_auto_rotation_enabled': 'bool', + 'auto_key_rotation_details': 'AutoKeyRotationDetails', 'compartment_id': 'str', 'defined_tags': 'dict(str, dict(str, object))', 'display_name': 'str', @@ -69,6 +79,8 @@ def __init__(self, **kwargs): } self.attribute_map = { + 'is_auto_rotation_enabled': 'isAutoRotationEnabled', + 'auto_key_rotation_details': 'autoKeyRotationDetails', 'compartment_id': 'compartmentId', 'defined_tags': 'definedTags', 'display_name': 'displayName', @@ -78,6 +90,8 @@ def __init__(self, **kwargs): 'protection_mode': 'protectionMode' } + self._is_auto_rotation_enabled = None + self._auto_key_rotation_details = None self._compartment_id = None self._defined_tags = None self._display_name = None @@ -86,6 +100,50 @@ def __init__(self, **kwargs): self._wrapped_import_key = None self._protection_mode = None + @property + def is_auto_rotation_enabled(self): + """ + Gets the is_auto_rotation_enabled of this ImportKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :return: The is_auto_rotation_enabled of this ImportKeyDetails. + :rtype: bool + """ + return self._is_auto_rotation_enabled + + @is_auto_rotation_enabled.setter + def is_auto_rotation_enabled(self, is_auto_rotation_enabled): + """ + Sets the is_auto_rotation_enabled of this ImportKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :param is_auto_rotation_enabled: The is_auto_rotation_enabled of this ImportKeyDetails. + :type: bool + """ + self._is_auto_rotation_enabled = is_auto_rotation_enabled + + @property + def auto_key_rotation_details(self): + """ + Gets the auto_key_rotation_details of this ImportKeyDetails. + + :return: The auto_key_rotation_details of this ImportKeyDetails. + :rtype: oci.key_management.models.AutoKeyRotationDetails + """ + return self._auto_key_rotation_details + + @auto_key_rotation_details.setter + def auto_key_rotation_details(self, auto_key_rotation_details): + """ + Sets the auto_key_rotation_details of this ImportKeyDetails. + + :param auto_key_rotation_details: The auto_key_rotation_details of this ImportKeyDetails. + :type: oci.key_management.models.AutoKeyRotationDetails + """ + self._auto_key_rotation_details = auto_key_rotation_details + @property def compartment_id(self): """ diff --git a/src/oci/key_management/models/key.py b/src/oci/key_management/models/key.py index f0061472f6..fa762ddc3f 100644 --- a/src/oci/key_management/models/key.py +++ b/src/oci/key_management/models/key.py @@ -148,6 +148,14 @@ def __init__(self, **kwargs): The value to assign to the is_primary property of this Key. :type is_primary: bool + :param is_auto_rotation_enabled: + The value to assign to the is_auto_rotation_enabled property of this Key. + :type is_auto_rotation_enabled: bool + + :param auto_key_rotation_details: + The value to assign to the auto_key_rotation_details property of this Key. + :type auto_key_rotation_details: oci.key_management.models.AutoKeyRotationDetails + :param external_key_reference_details: The value to assign to the external_key_reference_details property of this Key. :type external_key_reference_details: oci.key_management.models.ExternalKeyReferenceDetails @@ -169,6 +177,8 @@ def __init__(self, **kwargs): 'restored_from_key_id': 'str', 'replica_details': 'KeyReplicaDetails', 'is_primary': 'bool', + 'is_auto_rotation_enabled': 'bool', + 'auto_key_rotation_details': 'AutoKeyRotationDetails', 'external_key_reference_details': 'ExternalKeyReferenceDetails' } @@ -188,6 +198,8 @@ def __init__(self, **kwargs): 'restored_from_key_id': 'restoredFromKeyId', 'replica_details': 'replicaDetails', 'is_primary': 'isPrimary', + 'is_auto_rotation_enabled': 'isAutoRotationEnabled', + 'auto_key_rotation_details': 'autoKeyRotationDetails', 'external_key_reference_details': 'externalKeyReferenceDetails' } @@ -206,6 +218,8 @@ def __init__(self, **kwargs): self._restored_from_key_id = None self._replica_details = None self._is_primary = None + self._is_auto_rotation_enabled = None + self._auto_key_rotation_details = None self._external_key_reference_details = None @property @@ -626,6 +640,50 @@ def is_primary(self, is_primary): """ self._is_primary = is_primary + @property + def is_auto_rotation_enabled(self): + """ + Gets the is_auto_rotation_enabled of this Key. + A parameter specifying whether the auto key rotation is enabled or not. + + + :return: The is_auto_rotation_enabled of this Key. + :rtype: bool + """ + return self._is_auto_rotation_enabled + + @is_auto_rotation_enabled.setter + def is_auto_rotation_enabled(self, is_auto_rotation_enabled): + """ + Sets the is_auto_rotation_enabled of this Key. + A parameter specifying whether the auto key rotation is enabled or not. + + + :param is_auto_rotation_enabled: The is_auto_rotation_enabled of this Key. + :type: bool + """ + self._is_auto_rotation_enabled = is_auto_rotation_enabled + + @property + def auto_key_rotation_details(self): + """ + Gets the auto_key_rotation_details of this Key. + + :return: The auto_key_rotation_details of this Key. + :rtype: oci.key_management.models.AutoKeyRotationDetails + """ + return self._auto_key_rotation_details + + @auto_key_rotation_details.setter + def auto_key_rotation_details(self, auto_key_rotation_details): + """ + Sets the auto_key_rotation_details of this Key. + + :param auto_key_rotation_details: The auto_key_rotation_details of this Key. + :type: oci.key_management.models.AutoKeyRotationDetails + """ + self._auto_key_rotation_details = auto_key_rotation_details + @property def external_key_reference_details(self): """ diff --git a/src/oci/key_management/models/key_summary.py b/src/oci/key_management/models/key_summary.py index 90b6bf4f23..686134550c 100644 --- a/src/oci/key_management/models/key_summary.py +++ b/src/oci/key_management/models/key_summary.py @@ -146,6 +146,10 @@ def __init__(self, **kwargs): The value to assign to the external_key_reference_details property of this KeySummary. :type external_key_reference_details: oci.key_management.models.ExternalKeyReferenceDetails + :param is_auto_rotation_enabled: + The value to assign to the is_auto_rotation_enabled property of this KeySummary. + :type is_auto_rotation_enabled: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -158,7 +162,8 @@ def __init__(self, **kwargs): 'vault_id': 'str', 'protection_mode': 'str', 'algorithm': 'str', - 'external_key_reference_details': 'ExternalKeyReferenceDetails' + 'external_key_reference_details': 'ExternalKeyReferenceDetails', + 'is_auto_rotation_enabled': 'bool' } self.attribute_map = { @@ -172,7 +177,8 @@ def __init__(self, **kwargs): 'vault_id': 'vaultId', 'protection_mode': 'protectionMode', 'algorithm': 'algorithm', - 'external_key_reference_details': 'externalKeyReferenceDetails' + 'external_key_reference_details': 'externalKeyReferenceDetails', + 'is_auto_rotation_enabled': 'isAutoRotationEnabled' } self._compartment_id = None @@ -186,6 +192,7 @@ def __init__(self, **kwargs): self._protection_mode = None self._algorithm = None self._external_key_reference_details = None + self._is_auto_rotation_enabled = None @property def compartment_id(self): @@ -509,6 +516,30 @@ def external_key_reference_details(self, external_key_reference_details): """ self._external_key_reference_details = external_key_reference_details + @property + def is_auto_rotation_enabled(self): + """ + Gets the is_auto_rotation_enabled of this KeySummary. + A parameter specifying whether the auto key rotation is enabled or not. + + + :return: The is_auto_rotation_enabled of this KeySummary. + :rtype: bool + """ + return self._is_auto_rotation_enabled + + @is_auto_rotation_enabled.setter + def is_auto_rotation_enabled(self, is_auto_rotation_enabled): + """ + Sets the is_auto_rotation_enabled of this KeySummary. + A parameter specifying whether the auto key rotation is enabled or not. + + + :param is_auto_rotation_enabled: The is_auto_rotation_enabled of this KeySummary. + :type: bool + """ + self._is_auto_rotation_enabled = is_auto_rotation_enabled + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/key_management/models/key_version.py b/src/oci/key_management/models/key_version.py index 4e09b5216d..bd5acab1b9 100644 --- a/src/oci/key_management/models/key_version.py +++ b/src/oci/key_management/models/key_version.py @@ -124,6 +124,10 @@ def __init__(self, **kwargs): The value to assign to the external_key_reference_details property of this KeyVersion. :type external_key_reference_details: oci.key_management.models.ExternalKeyReferenceDetails + :param is_auto_rotated: + The value to assign to the is_auto_rotated property of this KeyVersion. + :type is_auto_rotated: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -138,7 +142,8 @@ def __init__(self, **kwargs): 'restored_from_key_version_id': 'str', 'replica_details': 'KeyVersionReplicaDetails', 'is_primary': 'bool', - 'external_key_reference_details': 'ExternalKeyReferenceDetails' + 'external_key_reference_details': 'ExternalKeyReferenceDetails', + 'is_auto_rotated': 'bool' } self.attribute_map = { @@ -154,7 +159,8 @@ def __init__(self, **kwargs): 'restored_from_key_version_id': 'restoredFromKeyVersionId', 'replica_details': 'replicaDetails', 'is_primary': 'isPrimary', - 'external_key_reference_details': 'externalKeyReferenceDetails' + 'external_key_reference_details': 'externalKeyReferenceDetails', + 'is_auto_rotated': 'isAutoRotated' } self._compartment_id = None @@ -170,6 +176,7 @@ def __init__(self, **kwargs): self._replica_details = None self._is_primary = None self._external_key_reference_details = None + self._is_auto_rotated = None @property def compartment_id(self): @@ -509,6 +516,30 @@ def external_key_reference_details(self, external_key_reference_details): """ self._external_key_reference_details = external_key_reference_details + @property + def is_auto_rotated(self): + """ + Gets the is_auto_rotated of this KeyVersion. + A Boolean Value indicating whether this keyversion is generated from auto rotation of key + + + :return: The is_auto_rotated of this KeyVersion. + :rtype: bool + """ + return self._is_auto_rotated + + @is_auto_rotated.setter + def is_auto_rotated(self, is_auto_rotated): + """ + Sets the is_auto_rotated of this KeyVersion. + A Boolean Value indicating whether this keyversion is generated from auto rotation of key + + + :param is_auto_rotated: The is_auto_rotated of this KeyVersion. + :type: bool + """ + self._is_auto_rotated = is_auto_rotated + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/key_management/models/key_version_summary.py b/src/oci/key_management/models/key_version_summary.py index bab1c605d4..f6e8f63550 100644 --- a/src/oci/key_management/models/key_version_summary.py +++ b/src/oci/key_management/models/key_version_summary.py @@ -108,6 +108,10 @@ def __init__(self, **kwargs): The value to assign to the external_key_reference_details property of this KeyVersionSummary. :type external_key_reference_details: oci.key_management.models.ExternalKeyReferenceDetails + :param is_auto_rotated: + The value to assign to the is_auto_rotated property of this KeyVersionSummary. + :type is_auto_rotated: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -118,7 +122,8 @@ def __init__(self, **kwargs): 'time_created': 'datetime', 'time_of_deletion': 'datetime', 'vault_id': 'str', - 'external_key_reference_details': 'ExternalKeyReferenceDetails' + 'external_key_reference_details': 'ExternalKeyReferenceDetails', + 'is_auto_rotated': 'bool' } self.attribute_map = { @@ -130,7 +135,8 @@ def __init__(self, **kwargs): 'time_created': 'timeCreated', 'time_of_deletion': 'timeOfDeletion', 'vault_id': 'vaultId', - 'external_key_reference_details': 'externalKeyReferenceDetails' + 'external_key_reference_details': 'externalKeyReferenceDetails', + 'is_auto_rotated': 'isAutoRotated' } self._compartment_id = None @@ -142,6 +148,7 @@ def __init__(self, **kwargs): self._time_of_deletion = None self._vault_id = None self._external_key_reference_details = None + self._is_auto_rotated = None @property def compartment_id(self): @@ -385,6 +392,30 @@ def external_key_reference_details(self, external_key_reference_details): """ self._external_key_reference_details = external_key_reference_details + @property + def is_auto_rotated(self): + """ + Gets the is_auto_rotated of this KeyVersionSummary. + An optional property indicating whether this keyversion is generated from auto rotatation. + + + :return: The is_auto_rotated of this KeyVersionSummary. + :rtype: bool + """ + return self._is_auto_rotated + + @is_auto_rotated.setter + def is_auto_rotated(self, is_auto_rotated): + """ + Sets the is_auto_rotated of this KeyVersionSummary. + An optional property indicating whether this keyversion is generated from auto rotatation. + + + :param is_auto_rotated: The is_auto_rotated of this KeyVersionSummary. + :type: bool + """ + self._is_auto_rotated = is_auto_rotated + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/key_management/models/update_key_details.py b/src/oci/key_management/models/update_key_details.py index 2850375e7e..e3a1181aac 100644 --- a/src/oci/key_management/models/update_key_details.py +++ b/src/oci/key_management/models/update_key_details.py @@ -20,6 +20,14 @@ def __init__(self, **kwargs): Initializes a new UpdateKeyDetails object with values from keyword arguments. The following keyword arguments are supported (corresponding to the getters/setters of this class): + :param is_auto_rotation_enabled: + The value to assign to the is_auto_rotation_enabled property of this UpdateKeyDetails. + :type is_auto_rotation_enabled: bool + + :param auto_key_rotation_details: + The value to assign to the auto_key_rotation_details property of this UpdateKeyDetails. + :type auto_key_rotation_details: oci.key_management.models.AutoKeyRotationDetails + :param defined_tags: The value to assign to the defined_tags property of this UpdateKeyDetails. :type defined_tags: dict(str, dict(str, object)) @@ -34,21 +42,71 @@ def __init__(self, **kwargs): """ self.swagger_types = { + 'is_auto_rotation_enabled': 'bool', + 'auto_key_rotation_details': 'AutoKeyRotationDetails', 'defined_tags': 'dict(str, dict(str, object))', 'display_name': 'str', 'freeform_tags': 'dict(str, str)' } self.attribute_map = { + 'is_auto_rotation_enabled': 'isAutoRotationEnabled', + 'auto_key_rotation_details': 'autoKeyRotationDetails', 'defined_tags': 'definedTags', 'display_name': 'displayName', 'freeform_tags': 'freeformTags' } + self._is_auto_rotation_enabled = None + self._auto_key_rotation_details = None self._defined_tags = None self._display_name = None self._freeform_tags = None + @property + def is_auto_rotation_enabled(self): + """ + Gets the is_auto_rotation_enabled of this UpdateKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :return: The is_auto_rotation_enabled of this UpdateKeyDetails. + :rtype: bool + """ + return self._is_auto_rotation_enabled + + @is_auto_rotation_enabled.setter + def is_auto_rotation_enabled(self, is_auto_rotation_enabled): + """ + Sets the is_auto_rotation_enabled of this UpdateKeyDetails. + A parameter specifying whether the auto key rotation is enabled or not. + + + :param is_auto_rotation_enabled: The is_auto_rotation_enabled of this UpdateKeyDetails. + :type: bool + """ + self._is_auto_rotation_enabled = is_auto_rotation_enabled + + @property + def auto_key_rotation_details(self): + """ + Gets the auto_key_rotation_details of this UpdateKeyDetails. + + :return: The auto_key_rotation_details of this UpdateKeyDetails. + :rtype: oci.key_management.models.AutoKeyRotationDetails + """ + return self._auto_key_rotation_details + + @auto_key_rotation_details.setter + def auto_key_rotation_details(self, auto_key_rotation_details): + """ + Sets the auto_key_rotation_details of this UpdateKeyDetails. + + :param auto_key_rotation_details: The auto_key_rotation_details of this UpdateKeyDetails. + :type: oci.key_management.models.AutoKeyRotationDetails + """ + self._auto_key_rotation_details = auto_key_rotation_details + @property def defined_tags(self): """ diff --git a/src/oci/oda/management_client.py b/src/oci/oda/management_client.py index 435488366a..0b26533ecc 100644 --- a/src/oci/oda/management_client.py +++ b/src/oci/oda/management_client.py @@ -116,6 +116,243 @@ def __init__(self, config, **kwargs): self.retry_strategy = kwargs.get('retry_strategy') self.circuit_breaker_callback = kwargs.get('circuit_breaker_callback') + def bulk_create_skill_entities(self, oda_instance_id, skill_id, bulk_create_skill_entities_details, **kwargs): + """ + Bulk create composite and value list entities into a skill. + + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param oci.oda.models.BulkCreateSkillEntitiesDetails bulk_create_skill_entities_details: (required) + Property values for bulk creating a list of skill entities. + + :param str opc_request_id: (optional) + The client request ID for tracing. This value is included in the opc-request-id response header. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so that you can retry the request if there's + a timeout or server error without the risk of executing that same action again. + + Retry tokens expire after 24 hours, but they can become invalid before then if there are + conflicting operations. For example, if an instance was deleted and purged from the system, + then the service might reject a retry of the original creation request. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use bulk_create_skill_entities API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['odaInstanceId', 'skillId'] + resource_path = "/odaInstances/{odaInstanceId}/skills/{skillId}/actions/bulkCreateEntities" + method = "POST" + operation_name = "bulk_create_skill_entities" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/digital-assistant/20190506/Skill/BulkCreateSkillEntities" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"bulk_create_skill_entities got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "odaInstanceId": oda_instance_id, + "skillId": skill_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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=bulk_create_skill_entities_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=bulk_create_skill_entities_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + + def cascading_delete_skill_custom_entities(self, oda_instance_id, skill_id, **kwargs): + """ + Cascading delete of the custom entities in a skill. + + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param str if_match: (optional) + For optimistic concurrency control in a PUT or DELETE call for + a Digital Assistant instance, set the `if-match` query parameter + to the value of the `ETAG` header from a previous GET or POST + response for that instance. The service updates or deletes the + instance only if the etag that you provide matches the instance's + current etag value. + + :param str opc_request_id: (optional) + The client request ID for tracing. This value is included in the opc-request-id response header. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so that you can retry the request if there's + a timeout or server error without the risk of executing that same action again. + + Retry tokens expire after 24 hours, but they can become invalid before then if there are + conflicting operations. For example, if an instance was deleted and purged from the system, + then the service might reject a retry of the original creation request. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use cascading_delete_skill_custom_entities API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['odaInstanceId', 'skillId'] + resource_path = "/odaInstances/{odaInstanceId}/skills/{skillId}/actions/cascadingDeleteCustomEntities" + method = "POST" + operation_name = "cascading_delete_skill_custom_entities" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/digital-assistant/20190506/Skill/CascadingDeleteSkillCustomEntities" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "if_match", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"cascading_delete_skill_custom_entities got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "odaInstanceId": oda_instance_id, + "skillId": skill_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing), + "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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def change_oda_private_endpoint_compartment(self, oda_private_endpoint_id, change_oda_private_endpoint_compartment_details, **kwargs): """ Starts an asynchronous job to move the specified ODA Private Endpoint into a different compartment. @@ -6169,6 +6406,132 @@ def stop_channel(self, oda_instance_id, channel_id, **kwargs): api_reference_link=api_reference_link, required_arguments=required_arguments) + def train_skill(self, oda_instance_id, skill_id, train_skill_details, **kwargs): + """ + Train a skill. + + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param oci.oda.models.TrainSkillDetails train_skill_details: (required) + Metadata for training a skill. + + :param str if_match: (optional) + For optimistic concurrency control in a PUT or DELETE call for + a Digital Assistant instance, set the `if-match` query parameter + to the value of the `ETAG` header from a previous GET or POST + response for that instance. The service updates or deletes the + instance only if the etag that you provide matches the instance's + current etag value. + + :param str opc_request_id: (optional) + The client request ID for tracing. This value is included in the opc-request-id response header. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so that you can retry the request if there's + a timeout or server error without the risk of executing that same action again. + + Retry tokens expire after 24 hours, but they can become invalid before then if there are + conflicting operations. For example, if an instance was deleted and purged from the system, + then the service might reject a retry of the original creation request. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use train_skill API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['odaInstanceId', 'skillId'] + resource_path = "/odaInstances/{odaInstanceId}/skills/{skillId}/actions/train" + method = "POST" + operation_name = "train_skill" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/digital-assistant/20190506/Skill/TrainSkill" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "if_match", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"train_skill got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "odaInstanceId": oda_instance_id, + "skillId": skill_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing), + "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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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=train_skill_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=train_skill_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def update_authentication_provider(self, oda_instance_id, authentication_provider_id, update_authentication_provider_details, **kwargs): """ Updates the specified Authentication Provider with the information in the request body. diff --git a/src/oci/oda/management_client_composite_operations.py b/src/oci/oda/management_client_composite_operations.py index d366a34802..29ba018f35 100644 --- a/src/oci/oda/management_client_composite_operations.py +++ b/src/oci/oda/management_client_composite_operations.py @@ -25,6 +25,93 @@ def __init__(self, client, **kwargs): """ self.client = client + def bulk_create_skill_entities_and_wait_for_state(self, oda_instance_id, skill_id, bulk_create_skill_entities_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.oda.ManagementClient.bulk_create_skill_entities` and waits for the :py:class:`~oci.oda.models.WorkRequest` + to enter the given state(s). + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param oci.oda.models.BulkCreateSkillEntitiesDetails bulk_create_skill_entities_details: (required) + Property values for bulk creating a list of skill entities. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.oda.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.oda.ManagementClient.bulk_create_skill_entities` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.bulk_create_skill_entities(oda_instance_id, skill_id, bulk_create_skill_entities_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + if 'opc-work-request-id' not in operation_result.headers: + return operation_result + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def cascading_delete_skill_custom_entities_and_wait_for_state(self, oda_instance_id, skill_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.oda.ManagementClient.cascading_delete_skill_custom_entities` and waits for the :py:class:`~oci.oda.models.WorkRequest` + to enter the given state(s). + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.oda.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.oda.ManagementClient.cascading_delete_skill_custom_entities` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.cascading_delete_skill_custom_entities(oda_instance_id, skill_id, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + if 'opc-work-request-id' not in operation_result.headers: + return operation_result + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_oda_private_endpoint_compartment_and_wait_for_state(self, oda_private_endpoint_id, change_oda_private_endpoint_compartment_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.oda.ManagementClient.change_oda_private_endpoint_compartment` and waits for the :py:class:`~oci.oda.models.WorkRequest` @@ -875,6 +962,51 @@ def stop_channel_and_wait_for_state(self, oda_instance_id, channel_id, wait_for_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def train_skill_and_wait_for_state(self, oda_instance_id, skill_id, train_skill_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.oda.ManagementClient.train_skill` and waits for the :py:class:`~oci.oda.models.WorkRequest` + to enter the given state(s). + + :param str oda_instance_id: (required) + Unique Digital Assistant instance identifier. + + :param str skill_id: (required) + Unique Skill identifier. + + :param oci.oda.models.TrainSkillDetails train_skill_details: (required) + Metadata for training a skill. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.oda.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.oda.ManagementClient.train_skill` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.train_skill(oda_instance_id, skill_id, train_skill_details, **operation_kwargs) + if not wait_for_states: + return operation_result + lowered_wait_for_states = [w.lower() for w in wait_for_states] + if 'opc-work-request-id' not in operation_result.headers: + return operation_result + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_authentication_provider_and_wait_for_state(self, oda_instance_id, authentication_provider_id, update_authentication_provider_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.oda.ManagementClient.update_authentication_provider` and waits for the :py:class:`~oci.oda.models.AuthenticationProvider` acted upon diff --git a/src/oci/oda/models/__init__.py b/src/oci/oda/models/__init__.py index e4927ad456..0d869881b8 100644 --- a/src/oci/oda/models/__init__.py +++ b/src/oci/oda/models/__init__.py @@ -13,6 +13,7 @@ from .authentication_provider_collection import AuthenticationProviderCollection from .authentication_provider_summary import AuthenticationProviderSummary from .bot import Bot +from .bulk_create_skill_entities_details import BulkCreateSkillEntitiesDetails from .change_oda_instance_compartment_details import ChangeOdaInstanceCompartmentDetails from .change_oda_private_endpoint_compartment_details import ChangeOdaPrivateEndpointCompartmentDetails from .channel import Channel @@ -20,6 +21,7 @@ from .channel_summary import ChannelSummary from .clone_digital_assistant_details import CloneDigitalAssistantDetails from .clone_skill_details import CloneSkillDetails +from .composite_entity import CompositeEntity from .configure_digital_assistant_parameters_details import ConfigureDigitalAssistantParametersDetails from .cortana_channel import CortanaChannel from .create_android_channel_details import CreateAndroidChannelDetails @@ -55,8 +57,11 @@ from .create_osvc_channel_result import CreateOsvcChannelResult from .create_service_cloud_channel_details import CreateServiceCloudChannelDetails from .create_service_cloud_channel_result import CreateServiceCloudChannelResult +from .create_skill_composite_entity_details import CreateSkillCompositeEntityDetails from .create_skill_details import CreateSkillDetails +from .create_skill_entity_details import CreateSkillEntityDetails from .create_skill_parameter_details import CreateSkillParameterDetails +from .create_skill_value_list_entity_details import CreateSkillValueListEntityDetails from .create_skill_version_details import CreateSkillVersionDetails from .create_slack_channel_details import CreateSlackChannelDetails from .create_slack_channel_result import CreateSlackChannelResult @@ -76,6 +81,14 @@ from .digital_assistant_parameter_summary import DigitalAssistantParameterSummary from .digital_assistant_parameter_value import DigitalAssistantParameterValue from .digital_assistant_summary import DigitalAssistantSummary +from .entity import Entity +from .entity_action import EntityAction +from .entity_action_argument import EntityActionArgument +from .entity_action_argument_natural_language_mapping import EntityActionArgumentNaturalLanguageMapping +from .entity_action_natural_language_mapping import EntityActionNaturalLanguageMapping +from .entity_attribute import EntityAttribute +from .entity_attribute_natural_language_mapping import EntityAttributeNaturalLanguageMapping +from .entity_natural_language_mapping import EntityNaturalLanguageMapping from .error_body import ErrorBody from .export_bot_details import ExportBotDetails from .export_digital_assistant_details import ExportDigitalAssistantDetails @@ -88,8 +101,10 @@ from .imported_package import ImportedPackage from .imported_package_summary import ImportedPackageSummary from .ios_channel import IosChannel +from .language_mapping import LanguageMapping from .ms_teams_channel import MSTeamsChannel from .metadata_property import MetadataProperty +from .name_mapping import NameMapping from .oss_channel import OSSChannel from .oda_instance import OdaInstance from .oda_instance_attachment import OdaInstanceAttachment @@ -125,8 +140,13 @@ from .skill_parameter_summary import SkillParameterSummary from .skill_summary import SkillSummary from .slack_channel import SlackChannel +from .static_entity_value import StaticEntityValue +from .static_entity_value_natural_language_mapping import StaticEntityValueNaturalLanguageMapping from .storage_location import StorageLocation from .test_channel import TestChannel +from .train_skill_details import TrainSkillDetails +from .train_skill_parameter import TrainSkillParameter +from .train_skill_query_entity_parameter import TrainSkillQueryEntityParameter from .translator import Translator from .translator_collection import TranslatorCollection from .translator_summary import TranslatorSummary @@ -156,6 +176,7 @@ from .update_twilio_channel_details import UpdateTwilioChannelDetails from .update_web_channel_details import UpdateWebChannelDetails from .update_webhook_channel_details import UpdateWebhookChannelDetails +from .value_list_entity import ValueListEntity from .web_channel import WebChannel from .webhook_channel import WebhookChannel from .work_request import WorkRequest @@ -173,6 +194,7 @@ "AuthenticationProviderCollection": AuthenticationProviderCollection, "AuthenticationProviderSummary": AuthenticationProviderSummary, "Bot": Bot, + "BulkCreateSkillEntitiesDetails": BulkCreateSkillEntitiesDetails, "ChangeOdaInstanceCompartmentDetails": ChangeOdaInstanceCompartmentDetails, "ChangeOdaPrivateEndpointCompartmentDetails": ChangeOdaPrivateEndpointCompartmentDetails, "Channel": Channel, @@ -180,6 +202,7 @@ "ChannelSummary": ChannelSummary, "CloneDigitalAssistantDetails": CloneDigitalAssistantDetails, "CloneSkillDetails": CloneSkillDetails, + "CompositeEntity": CompositeEntity, "ConfigureDigitalAssistantParametersDetails": ConfigureDigitalAssistantParametersDetails, "CortanaChannel": CortanaChannel, "CreateAndroidChannelDetails": CreateAndroidChannelDetails, @@ -215,8 +238,11 @@ "CreateOsvcChannelResult": CreateOsvcChannelResult, "CreateServiceCloudChannelDetails": CreateServiceCloudChannelDetails, "CreateServiceCloudChannelResult": CreateServiceCloudChannelResult, + "CreateSkillCompositeEntityDetails": CreateSkillCompositeEntityDetails, "CreateSkillDetails": CreateSkillDetails, + "CreateSkillEntityDetails": CreateSkillEntityDetails, "CreateSkillParameterDetails": CreateSkillParameterDetails, + "CreateSkillValueListEntityDetails": CreateSkillValueListEntityDetails, "CreateSkillVersionDetails": CreateSkillVersionDetails, "CreateSlackChannelDetails": CreateSlackChannelDetails, "CreateSlackChannelResult": CreateSlackChannelResult, @@ -236,6 +262,14 @@ "DigitalAssistantParameterSummary": DigitalAssistantParameterSummary, "DigitalAssistantParameterValue": DigitalAssistantParameterValue, "DigitalAssistantSummary": DigitalAssistantSummary, + "Entity": Entity, + "EntityAction": EntityAction, + "EntityActionArgument": EntityActionArgument, + "EntityActionArgumentNaturalLanguageMapping": EntityActionArgumentNaturalLanguageMapping, + "EntityActionNaturalLanguageMapping": EntityActionNaturalLanguageMapping, + "EntityAttribute": EntityAttribute, + "EntityAttributeNaturalLanguageMapping": EntityAttributeNaturalLanguageMapping, + "EntityNaturalLanguageMapping": EntityNaturalLanguageMapping, "ErrorBody": ErrorBody, "ExportBotDetails": ExportBotDetails, "ExportDigitalAssistantDetails": ExportDigitalAssistantDetails, @@ -248,8 +282,10 @@ "ImportedPackage": ImportedPackage, "ImportedPackageSummary": ImportedPackageSummary, "IosChannel": IosChannel, + "LanguageMapping": LanguageMapping, "MSTeamsChannel": MSTeamsChannel, "MetadataProperty": MetadataProperty, + "NameMapping": NameMapping, "OSSChannel": OSSChannel, "OdaInstance": OdaInstance, "OdaInstanceAttachment": OdaInstanceAttachment, @@ -285,8 +321,13 @@ "SkillParameterSummary": SkillParameterSummary, "SkillSummary": SkillSummary, "SlackChannel": SlackChannel, + "StaticEntityValue": StaticEntityValue, + "StaticEntityValueNaturalLanguageMapping": StaticEntityValueNaturalLanguageMapping, "StorageLocation": StorageLocation, "TestChannel": TestChannel, + "TrainSkillDetails": TrainSkillDetails, + "TrainSkillParameter": TrainSkillParameter, + "TrainSkillQueryEntityParameter": TrainSkillQueryEntityParameter, "Translator": Translator, "TranslatorCollection": TranslatorCollection, "TranslatorSummary": TranslatorSummary, @@ -316,6 +357,7 @@ "UpdateTwilioChannelDetails": UpdateTwilioChannelDetails, "UpdateWebChannelDetails": UpdateWebChannelDetails, "UpdateWebhookChannelDetails": UpdateWebhookChannelDetails, + "ValueListEntity": ValueListEntity, "WebChannel": WebChannel, "WebhookChannel": WebhookChannel, "WorkRequest": WorkRequest, diff --git a/src/oci/oda/models/bot.py b/src/oci/oda/models/bot.py index bc7ead4170..7c3a4e47f6 100644 --- a/src/oci/oda/models/bot.py +++ b/src/oci/oda/models/bot.py @@ -106,6 +106,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this Bot. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this Bot. + :type dialog_version: str + :param base_id: The value to assign to the base_id property of this Bot. :type base_id: str @@ -151,6 +155,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'base_id': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', @@ -172,6 +177,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'base_id': 'baseId', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', @@ -192,6 +198,7 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._lifecycle_details = None self._platform_version = None + self._dialog_version = None self._base_id = None self._multilingual_mode = None self._primary_language_tag = None @@ -455,6 +462,30 @@ def platform_version(self, platform_version): """ self._platform_version = platform_version + @property + def dialog_version(self): + """ + Gets the dialog_version of this Bot. + The resource's dialog version. + + + :return: The dialog_version of this Bot. + :rtype: str + """ + return self._dialog_version + + @dialog_version.setter + def dialog_version(self, dialog_version): + """ + Sets the dialog_version of this Bot. + The resource's dialog version. + + + :param dialog_version: The dialog_version of this Bot. + :type: str + """ + self._dialog_version = dialog_version + @property def base_id(self): """ diff --git a/src/oci/oda/models/bulk_create_skill_entities_details.py b/src/oci/oda/models/bulk_create_skill_entities_details.py new file mode 100644 index 0000000000..d0d63dfd19 --- /dev/null +++ b/src/oci/oda/models/bulk_create_skill_entities_details.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 BulkCreateSkillEntitiesDetails(object): + """ + A collection of skill entities to create. + """ + + def __init__(self, **kwargs): + """ + Initializes a new BulkCreateSkillEntitiesDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param items: + The value to assign to the items property of this BulkCreateSkillEntitiesDetails. + :type items: list[oci.oda.models.CreateSkillEntityDetails] + + """ + self.swagger_types = { + 'items': 'list[CreateSkillEntityDetails]' + } + + self.attribute_map = { + 'items': 'items' + } + + self._items = None + + @property + def items(self): + """ + **[Required]** Gets the items of this BulkCreateSkillEntitiesDetails. + List of the skill entity objects to create. + + + :return: The items of this BulkCreateSkillEntitiesDetails. + :rtype: list[oci.oda.models.CreateSkillEntityDetails] + """ + return self._items + + @items.setter + def items(self, items): + """ + Sets the items of this BulkCreateSkillEntitiesDetails. + List of the skill entity objects to create. + + + :param items: The items of this BulkCreateSkillEntitiesDetails. + :type: list[oci.oda.models.CreateSkillEntityDetails] + """ + self._items = items + + 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/oda/models/clone_skill_details.py b/src/oci/oda/models/clone_skill_details.py index 11b7089895..37a08c54e3 100644 --- a/src/oci/oda/models/clone_skill_details.py +++ b/src/oci/oda/models/clone_skill_details.py @@ -38,6 +38,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this CloneSkillDetails. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this CloneSkillDetails. + :type dialog_version: str + :param multilingual_mode: The value to assign to the multilingual_mode property of this CloneSkillDetails. Allowed values for this property are: "NATIVE", "TRANSLATION" @@ -77,6 +81,7 @@ def __init__(self, **kwargs): 'category': 'str', 'description': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', 'freeform_tags': 'dict(str, str)', @@ -92,6 +97,7 @@ def __init__(self, **kwargs): 'category': 'category', 'description': 'description', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', 'freeform_tags': 'freeformTags', @@ -106,6 +112,7 @@ def __init__(self, **kwargs): self._category = None self._description = None self._platform_version = None + self._dialog_version = None self._multilingual_mode = None self._primary_language_tag = None self._freeform_tags = None diff --git a/src/oci/oda/models/composite_entity.py b/src/oci/oda/models/composite_entity.py new file mode 100644 index 0000000000..29a12f2be5 --- /dev/null +++ b/src/oci/oda/models/composite_entity.py @@ -0,0 +1,154 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + +from .entity import Entity +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 CompositeEntity(Entity): + """ + Metadata for a composite entity. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CompositeEntity object with values from keyword arguments. The default value of the :py:attr:`~oci.oda.models.CompositeEntity.type` attribute + of this class is ``COMPOSITE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this CompositeEntity. + :type id: str + + :param name: + The value to assign to the name property of this CompositeEntity. + :type name: str + + :param type: + The value to assign to the type property of this CompositeEntity. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + :param attributes: + The value to assign to the attributes property of this CompositeEntity. + :type attributes: list[oci.oda.models.EntityAttribute] + + :param actions: + The value to assign to the actions property of this CompositeEntity. + :type actions: list[oci.oda.models.EntityAction] + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this CompositeEntity. + :type natural_language_mapping: oci.oda.models.EntityNaturalLanguageMapping + + """ + self.swagger_types = { + 'id': 'str', + 'name': 'str', + 'type': 'str', + 'attributes': 'list[EntityAttribute]', + 'actions': 'list[EntityAction]', + 'natural_language_mapping': 'EntityNaturalLanguageMapping' + } + + self.attribute_map = { + 'id': 'id', + 'name': 'name', + 'type': 'type', + 'attributes': 'attributes', + 'actions': 'actions', + 'natural_language_mapping': 'naturalLanguageMapping' + } + + self._id = None + self._name = None + self._type = None + self._attributes = None + self._actions = None + self._natural_language_mapping = None + self._type = 'COMPOSITE' + + @property + def attributes(self): + """ + **[Required]** Gets the attributes of this CompositeEntity. + List of entity attributes. + + + :return: The attributes of this CompositeEntity. + :rtype: list[oci.oda.models.EntityAttribute] + """ + return self._attributes + + @attributes.setter + def attributes(self, attributes): + """ + Sets the attributes of this CompositeEntity. + List of entity attributes. + + + :param attributes: The attributes of this CompositeEntity. + :type: list[oci.oda.models.EntityAttribute] + """ + self._attributes = attributes + + @property + def actions(self): + """ + Gets the actions of this CompositeEntity. + List of entity actions. + + + :return: The actions of this CompositeEntity. + :rtype: list[oci.oda.models.EntityAction] + """ + return self._actions + + @actions.setter + def actions(self, actions): + """ + Sets the actions of this CompositeEntity. + List of entity actions. + + + :param actions: The actions of this CompositeEntity. + :type: list[oci.oda.models.EntityAction] + """ + self._actions = actions + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this CompositeEntity. + + :return: The natural_language_mapping of this CompositeEntity. + :rtype: oci.oda.models.EntityNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this CompositeEntity. + + :param natural_language_mapping: The natural_language_mapping of this CompositeEntity. + :type: oci.oda.models.EntityNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + 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/oda/models/create_new_skill_details.py b/src/oci/oda/models/create_new_skill_details.py index c16b4483d4..c5d5c31909 100644 --- a/src/oci/oda/models/create_new_skill_details.py +++ b/src/oci/oda/models/create_new_skill_details.py @@ -38,6 +38,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this CreateNewSkillDetails. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this CreateNewSkillDetails. + :type dialog_version: str + :param multilingual_mode: The value to assign to the multilingual_mode property of this CreateNewSkillDetails. Allowed values for this property are: "NATIVE", "TRANSLATION" @@ -77,6 +81,7 @@ def __init__(self, **kwargs): 'category': 'str', 'description': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', 'freeform_tags': 'dict(str, str)', @@ -92,6 +97,7 @@ def __init__(self, **kwargs): 'category': 'category', 'description': 'description', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', 'freeform_tags': 'freeformTags', @@ -106,6 +112,7 @@ def __init__(self, **kwargs): self._category = None self._description = None self._platform_version = None + self._dialog_version = None self._multilingual_mode = None self._primary_language_tag = None self._freeform_tags = None diff --git a/src/oci/oda/models/create_oda_instance_attachment_details.py b/src/oci/oda/models/create_oda_instance_attachment_details.py index de7f8f85cf..0a2e3801df 100644 --- a/src/oci/oda/models/create_oda_instance_attachment_details.py +++ b/src/oci/oda/models/create_oda_instance_attachment_details.py @@ -19,6 +19,10 @@ class CreateOdaInstanceAttachmentDetails(object): #: This constant has a value of "FUSION" ATTACHMENT_TYPE_FUSION = "FUSION" + #: A constant which can be used with the attachment_type property of a CreateOdaInstanceAttachmentDetails. + #: This constant has a value of "MAX" + ATTACHMENT_TYPE_MAX = "MAX" + def __init__(self, **kwargs): """ Initializes a new CreateOdaInstanceAttachmentDetails object with values from keyword arguments. @@ -30,7 +34,7 @@ def __init__(self, **kwargs): :param attachment_type: The value to assign to the attachment_type property of this CreateOdaInstanceAttachmentDetails. - Allowed values for this property are: "FUSION" + Allowed values for this property are: "FUSION", "MAX" :type attachment_type: str :param attachment_metadata: @@ -112,7 +116,7 @@ def attachment_type(self): **[Required]** Gets the attachment_type of this CreateOdaInstanceAttachmentDetails. The type of target instance which this ODA instance is being attached. - Allowed values for this property are: "FUSION" + Allowed values for this property are: "FUSION", "MAX" :return: The attachment_type of this CreateOdaInstanceAttachmentDetails. @@ -130,7 +134,7 @@ def attachment_type(self, attachment_type): :param attachment_type: The attachment_type of this CreateOdaInstanceAttachmentDetails. :type: str """ - allowed_values = ["FUSION"] + allowed_values = ["FUSION", "MAX"] if not value_allowed_none_or_none_sentinel(attachment_type, allowed_values): raise ValueError( f"Invalid value for `attachment_type`, must be None or one of {allowed_values}" diff --git a/src/oci/oda/models/create_skill_composite_entity_details.py b/src/oci/oda/models/create_skill_composite_entity_details.py new file mode 100644 index 0000000000..f8789492db --- /dev/null +++ b/src/oci/oda/models/create_skill_composite_entity_details.py @@ -0,0 +1,147 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + +from .create_skill_entity_details import CreateSkillEntityDetails +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 CreateSkillCompositeEntityDetails(CreateSkillEntityDetails): + """ + Properties that are required to create a skill composite entity. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateSkillCompositeEntityDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.oda.models.CreateSkillCompositeEntityDetails.type` attribute + of this class is ``COMPOSITE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this CreateSkillCompositeEntityDetails. + :type name: str + + :param type: + The value to assign to the type property of this CreateSkillCompositeEntityDetails. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + :param attributes: + The value to assign to the attributes property of this CreateSkillCompositeEntityDetails. + :type attributes: list[oci.oda.models.EntityAttribute] + + :param actions: + The value to assign to the actions property of this CreateSkillCompositeEntityDetails. + :type actions: list[oci.oda.models.EntityAction] + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this CreateSkillCompositeEntityDetails. + :type natural_language_mapping: oci.oda.models.EntityNaturalLanguageMapping + + """ + self.swagger_types = { + 'name': 'str', + 'type': 'str', + 'attributes': 'list[EntityAttribute]', + 'actions': 'list[EntityAction]', + 'natural_language_mapping': 'EntityNaturalLanguageMapping' + } + + self.attribute_map = { + 'name': 'name', + 'type': 'type', + 'attributes': 'attributes', + 'actions': 'actions', + 'natural_language_mapping': 'naturalLanguageMapping' + } + + self._name = None + self._type = None + self._attributes = None + self._actions = None + self._natural_language_mapping = None + self._type = 'COMPOSITE' + + @property + def attributes(self): + """ + **[Required]** Gets the attributes of this CreateSkillCompositeEntityDetails. + List of entity attributes. + + + :return: The attributes of this CreateSkillCompositeEntityDetails. + :rtype: list[oci.oda.models.EntityAttribute] + """ + return self._attributes + + @attributes.setter + def attributes(self, attributes): + """ + Sets the attributes of this CreateSkillCompositeEntityDetails. + List of entity attributes. + + + :param attributes: The attributes of this CreateSkillCompositeEntityDetails. + :type: list[oci.oda.models.EntityAttribute] + """ + self._attributes = attributes + + @property + def actions(self): + """ + Gets the actions of this CreateSkillCompositeEntityDetails. + List of entity actions. + + + :return: The actions of this CreateSkillCompositeEntityDetails. + :rtype: list[oci.oda.models.EntityAction] + """ + return self._actions + + @actions.setter + def actions(self, actions): + """ + Sets the actions of this CreateSkillCompositeEntityDetails. + List of entity actions. + + + :param actions: The actions of this CreateSkillCompositeEntityDetails. + :type: list[oci.oda.models.EntityAction] + """ + self._actions = actions + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this CreateSkillCompositeEntityDetails. + + :return: The natural_language_mapping of this CreateSkillCompositeEntityDetails. + :rtype: oci.oda.models.EntityNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this CreateSkillCompositeEntityDetails. + + :param natural_language_mapping: The natural_language_mapping of this CreateSkillCompositeEntityDetails. + :type: oci.oda.models.EntityNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + 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/oda/models/create_skill_details.py b/src/oci/oda/models/create_skill_details.py index 47a541901e..978ee23b42 100644 --- a/src/oci/oda/models/create_skill_details.py +++ b/src/oci/oda/models/create_skill_details.py @@ -68,6 +68,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this CreateSkillDetails. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this CreateSkillDetails. + :type dialog_version: str + :param multilingual_mode: The value to assign to the multilingual_mode property of this CreateSkillDetails. Allowed values for this property are: "NATIVE", "TRANSLATION" @@ -91,6 +95,7 @@ def __init__(self, **kwargs): 'category': 'str', 'description': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', 'freeform_tags': 'dict(str, str)', @@ -102,6 +107,7 @@ def __init__(self, **kwargs): 'category': 'category', 'description': 'description', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', 'freeform_tags': 'freeformTags', @@ -112,6 +118,7 @@ def __init__(self, **kwargs): self._category = None self._description = None self._platform_version = None + self._dialog_version = None self._multilingual_mode = None self._primary_language_tag = None self._freeform_tags = None @@ -242,6 +249,30 @@ def platform_version(self, platform_version): """ self._platform_version = platform_version + @property + def dialog_version(self): + """ + Gets the dialog_version of this CreateSkillDetails. + The resource's dialog version. + + + :return: The dialog_version of this CreateSkillDetails. + :rtype: str + """ + return self._dialog_version + + @dialog_version.setter + def dialog_version(self, dialog_version): + """ + Sets the dialog_version of this CreateSkillDetails. + The resource's dialog version. + + + :param dialog_version: The dialog_version of this CreateSkillDetails. + :type: str + """ + self._dialog_version = dialog_version + @property def multilingual_mode(self): """ diff --git a/src/oci/oda/models/create_skill_entity_details.py b/src/oci/oda/models/create_skill_entity_details.py new file mode 100644 index 0000000000..a05f79b92a --- /dev/null +++ b/src/oci/oda/models/create_skill_entity_details.py @@ -0,0 +1,140 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 CreateSkillEntityDetails(object): + """ + Properties that are required to create a skill entity. + """ + + #: A constant which can be used with the type property of a CreateSkillEntityDetails. + #: This constant has a value of "COMPOSITE" + TYPE_COMPOSITE = "COMPOSITE" + + #: A constant which can be used with the type property of a CreateSkillEntityDetails. + #: This constant has a value of "ENUM_VALUES" + TYPE_ENUM_VALUES = "ENUM_VALUES" + + def __init__(self, **kwargs): + """ + Initializes a new CreateSkillEntityDetails object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.oda.models.CreateSkillValueListEntityDetails` + * :class:`~oci.oda.models.CreateSkillCompositeEntityDetails` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this CreateSkillEntityDetails. + :type name: str + + :param type: + The value to assign to the type property of this CreateSkillEntityDetails. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + """ + self.swagger_types = { + 'name': 'str', + 'type': 'str' + } + + self.attribute_map = { + 'name': 'name', + 'type': 'type' + } + + self._name = None + self._type = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['type'] + + if type == 'ENUM_VALUES': + return 'CreateSkillValueListEntityDetails' + + if type == 'COMPOSITE': + return 'CreateSkillCompositeEntityDetails' + else: + return 'CreateSkillEntityDetails' + + @property + def name(self): + """ + **[Required]** Gets the name of this CreateSkillEntityDetails. + The entity name. This must be unique within the parent resource. + + + :return: The name of this CreateSkillEntityDetails. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this CreateSkillEntityDetails. + The entity name. This must be unique within the parent resource. + + + :param name: The name of this CreateSkillEntityDetails. + :type: str + """ + self._name = name + + @property + def type(self): + """ + **[Required]** Gets the type of this CreateSkillEntityDetails. + Type of skill entity. + + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + + + :return: The type of this CreateSkillEntityDetails. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this CreateSkillEntityDetails. + Type of skill entity. + + + :param type: The type of this CreateSkillEntityDetails. + :type: str + """ + allowed_values = ["COMPOSITE", "ENUM_VALUES"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + raise ValueError( + f"Invalid value for `type`, must be None or one of {allowed_values}" + ) + self._type = type + + 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/oda/models/create_skill_value_list_entity_details.py b/src/oci/oda/models/create_skill_value_list_entity_details.py new file mode 100644 index 0000000000..ba0126322d --- /dev/null +++ b/src/oci/oda/models/create_skill_value_list_entity_details.py @@ -0,0 +1,89 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + +from .create_skill_entity_details import CreateSkillEntityDetails +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 CreateSkillValueListEntityDetails(CreateSkillEntityDetails): + """ + Properties that are required to create a value list entity. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateSkillValueListEntityDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.oda.models.CreateSkillValueListEntityDetails.type` attribute + of this class is ``ENUM_VALUES`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this CreateSkillValueListEntityDetails. + :type name: str + + :param type: + The value to assign to the type property of this CreateSkillValueListEntityDetails. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + :param values: + The value to assign to the values property of this CreateSkillValueListEntityDetails. + :type values: list[oci.oda.models.StaticEntityValue] + + """ + self.swagger_types = { + 'name': 'str', + 'type': 'str', + 'values': 'list[StaticEntityValue]' + } + + self.attribute_map = { + 'name': 'name', + 'type': 'type', + 'values': 'values' + } + + self._name = None + self._type = None + self._values = None + self._type = 'ENUM_VALUES' + + @property + def values(self): + """ + **[Required]** Gets the values of this CreateSkillValueListEntityDetails. + List of values for a value list entity. + + + :return: The values of this CreateSkillValueListEntityDetails. + :rtype: list[oci.oda.models.StaticEntityValue] + """ + return self._values + + @values.setter + def values(self, values): + """ + Sets the values of this CreateSkillValueListEntityDetails. + List of values for a value list entity. + + + :param values: The values of this CreateSkillValueListEntityDetails. + :type: list[oci.oda.models.StaticEntityValue] + """ + self._values = values + + 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/oda/models/create_skill_version_details.py b/src/oci/oda/models/create_skill_version_details.py index 4f67ac0a59..57c50d82d7 100644 --- a/src/oci/oda/models/create_skill_version_details.py +++ b/src/oci/oda/models/create_skill_version_details.py @@ -38,6 +38,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this CreateSkillVersionDetails. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this CreateSkillVersionDetails. + :type dialog_version: str + :param multilingual_mode: The value to assign to the multilingual_mode property of this CreateSkillVersionDetails. Allowed values for this property are: "NATIVE", "TRANSLATION" @@ -69,6 +73,7 @@ def __init__(self, **kwargs): 'category': 'str', 'description': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', 'freeform_tags': 'dict(str, str)', @@ -82,6 +87,7 @@ def __init__(self, **kwargs): 'category': 'category', 'description': 'description', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', 'freeform_tags': 'freeformTags', @@ -94,6 +100,7 @@ def __init__(self, **kwargs): self._category = None self._description = None self._platform_version = None + self._dialog_version = None self._multilingual_mode = None self._primary_language_tag = None self._freeform_tags = None diff --git a/src/oci/oda/models/digital_assistant.py b/src/oci/oda/models/digital_assistant.py index 667a0f8e63..41980e0278 100644 --- a/src/oci/oda/models/digital_assistant.py +++ b/src/oci/oda/models/digital_assistant.py @@ -108,6 +108,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this DigitalAssistant. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this DigitalAssistant. + :type dialog_version: str + :param base_id: The value to assign to the base_id property of this DigitalAssistant. :type base_id: str @@ -154,6 +158,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'base_id': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', @@ -175,6 +180,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'base_id': 'baseId', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', @@ -195,6 +201,7 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._lifecycle_details = None self._platform_version = None + self._dialog_version = None self._base_id = None self._multilingual_mode = None self._primary_language_tag = None @@ -456,6 +463,30 @@ def platform_version(self, platform_version): """ self._platform_version = platform_version + @property + def dialog_version(self): + """ + Gets the dialog_version of this DigitalAssistant. + The resource's dialog version. + + + :return: The dialog_version of this DigitalAssistant. + :rtype: str + """ + return self._dialog_version + + @dialog_version.setter + def dialog_version(self, dialog_version): + """ + Sets the dialog_version of this DigitalAssistant. + The resource's dialog version. + + + :param dialog_version: The dialog_version of this DigitalAssistant. + :type: str + """ + self._dialog_version = dialog_version + @property def base_id(self): """ diff --git a/src/oci/oda/models/entity.py b/src/oci/oda/models/entity.py new file mode 100644 index 0000000000..a40c2a64f4 --- /dev/null +++ b/src/oci/oda/models/entity.py @@ -0,0 +1,171 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 Entity(object): + """ + Metadata for an entity. + """ + + #: A constant which can be used with the type property of a Entity. + #: This constant has a value of "COMPOSITE" + TYPE_COMPOSITE = "COMPOSITE" + + #: A constant which can be used with the type property of a Entity. + #: This constant has a value of "ENUM_VALUES" + TYPE_ENUM_VALUES = "ENUM_VALUES" + + def __init__(self, **kwargs): + """ + Initializes a new Entity object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.oda.models.CompositeEntity` + * :class:`~oci.oda.models.ValueListEntity` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this Entity. + :type id: str + + :param name: + The value to assign to the name property of this Entity. + :type name: str + + :param type: + The value to assign to the type property of this Entity. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + """ + self.swagger_types = { + 'id': 'str', + 'name': 'str', + 'type': 'str' + } + + self.attribute_map = { + 'id': 'id', + 'name': 'name', + 'type': 'type' + } + + self._id = None + self._name = None + self._type = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['type'] + + if type == 'COMPOSITE': + return 'CompositeEntity' + + if type == 'ENUM_VALUES': + return 'ValueListEntity' + else: + return 'Entity' + + @property + def id(self): + """ + **[Required]** Gets the id of this Entity. + Unique immutable identifier that was assigned when the resource was created. + + + :return: The id of this Entity. + :rtype: str + """ + return self._id + + @id.setter + def id(self, id): + """ + Sets the id of this Entity. + Unique immutable identifier that was assigned when the resource was created. + + + :param id: The id of this Entity. + :type: str + """ + self._id = id + + @property + def name(self): + """ + **[Required]** Gets the name of this Entity. + The entity name. This must be unique within the parent resource. + + + :return: The name of this Entity. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this Entity. + The entity name. This must be unique within the parent resource. + + + :param name: The name of this Entity. + :type: str + """ + self._name = name + + @property + def type(self): + """ + **[Required]** Gets the type of this Entity. + Type of skill entity. + + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + + + :return: The type of this Entity. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this Entity. + Type of skill entity. + + + :param type: The type of this Entity. + :type: str + """ + allowed_values = ["COMPOSITE", "ENUM_VALUES"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + raise ValueError( + f"Invalid value for `type`, must be None or one of {allowed_values}" + ) + self._type = type + + 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/oda/models/entity_action.py b/src/oci/oda/models/entity_action.py new file mode 100644 index 0000000000..8b6e957bfe --- /dev/null +++ b/src/oci/oda/models/entity_action.py @@ -0,0 +1,161 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityAction(object): + """ + Action of an entity + """ + + def __init__(self, **kwargs): + """ + Initializes a new EntityAction object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this EntityAction. + :type name: str + + :param crud_type: + The value to assign to the crud_type property of this EntityAction. + :type crud_type: str + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this EntityAction. + :type natural_language_mapping: oci.oda.models.EntityActionNaturalLanguageMapping + + :param arguments: + The value to assign to the arguments property of this EntityAction. + :type arguments: list[oci.oda.models.EntityActionArgument] + + """ + self.swagger_types = { + 'name': 'str', + 'crud_type': 'str', + 'natural_language_mapping': 'EntityActionNaturalLanguageMapping', + 'arguments': 'list[EntityActionArgument]' + } + + self.attribute_map = { + 'name': 'name', + 'crud_type': 'crudType', + 'natural_language_mapping': 'naturalLanguageMapping', + 'arguments': 'arguments' + } + + self._name = None + self._crud_type = None + self._natural_language_mapping = None + self._arguments = None + + @property + def name(self): + """ + **[Required]** Gets the name of this EntityAction. + Name of an entity action + + + :return: The name of this EntityAction. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this EntityAction. + Name of an entity action + + + :param name: The name of this EntityAction. + :type: str + """ + self._name = name + + @property + def crud_type(self): + """ + Gets the crud_type of this EntityAction. + Type of CRUD operation for entity action + + + :return: The crud_type of this EntityAction. + :rtype: str + """ + return self._crud_type + + @crud_type.setter + def crud_type(self, crud_type): + """ + Sets the crud_type of this EntityAction. + Type of CRUD operation for entity action + + + :param crud_type: The crud_type of this EntityAction. + :type: str + """ + self._crud_type = crud_type + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this EntityAction. + + :return: The natural_language_mapping of this EntityAction. + :rtype: oci.oda.models.EntityActionNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this EntityAction. + + :param natural_language_mapping: The natural_language_mapping of this EntityAction. + :type: oci.oda.models.EntityActionNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + @property + def arguments(self): + """ + **[Required]** Gets the arguments of this EntityAction. + List of entity action arguments + + + :return: The arguments of this EntityAction. + :rtype: list[oci.oda.models.EntityActionArgument] + """ + return self._arguments + + @arguments.setter + def arguments(self, arguments): + """ + Sets the arguments of this EntityAction. + List of entity action arguments + + + :param arguments: The arguments of this EntityAction. + :type: list[oci.oda.models.EntityActionArgument] + """ + self._arguments = arguments + + 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/oda/models/entity_action_argument.py b/src/oci/oda/models/entity_action_argument.py new file mode 100644 index 0000000000..f7bc141abc --- /dev/null +++ b/src/oci/oda/models/entity_action_argument.py @@ -0,0 +1,263 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityActionArgument(object): + """ + Argument of an entity action + """ + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "TEXT" + TYPE_TEXT = "TEXT" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "NUMBER" + TYPE_NUMBER = "NUMBER" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "DATE_TIME" + TYPE_DATE_TIME = "DATE_TIME" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "DATE" + TYPE_DATE = "DATE" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "ENTITY" + TYPE_ENTITY = "ENTITY" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "COMPOSITE_ENTITY" + TYPE_COMPOSITE_ENTITY = "COMPOSITE_ENTITY" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "ATTRIBUTE_REFERENCE" + TYPE_ATTRIBUTE_REFERENCE = "ATTRIBUTE_REFERENCE" + + #: A constant which can be used with the type property of a EntityActionArgument. + #: This constant has a value of "BOOLEAN" + TYPE_BOOLEAN = "BOOLEAN" + + def __init__(self, **kwargs): + """ + Initializes a new EntityActionArgument object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this EntityActionArgument. + :type name: str + + :param type: + The value to assign to the type property of this EntityActionArgument. + Allowed values for this property are: "TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN" + :type type: str + + :param meta_type: + The value to assign to the meta_type property of this EntityActionArgument. + :type meta_type: str + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this EntityActionArgument. + :type natural_language_mapping: oci.oda.models.EntityActionArgumentNaturalLanguageMapping + + :param is_multi_value: + The value to assign to the is_multi_value property of this EntityActionArgument. + :type is_multi_value: bool + + :param entity_name: + The value to assign to the entity_name property of this EntityActionArgument. + :type entity_name: str + + """ + self.swagger_types = { + 'name': 'str', + 'type': 'str', + 'meta_type': 'str', + 'natural_language_mapping': 'EntityActionArgumentNaturalLanguageMapping', + 'is_multi_value': 'bool', + 'entity_name': 'str' + } + + self.attribute_map = { + 'name': 'name', + 'type': 'type', + 'meta_type': 'metaType', + 'natural_language_mapping': 'naturalLanguageMapping', + 'is_multi_value': 'isMultiValue', + 'entity_name': 'entityName' + } + + self._name = None + self._type = None + self._meta_type = None + self._natural_language_mapping = None + self._is_multi_value = None + self._entity_name = None + + @property + def name(self): + """ + **[Required]** Gets the name of this EntityActionArgument. + Name of an entity action argument + + + :return: The name of this EntityActionArgument. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this EntityActionArgument. + Name of an entity action argument + + + :param name: The name of this EntityActionArgument. + :type: str + """ + self._name = name + + @property + def type(self): + """ + **[Required]** Gets the type of this EntityActionArgument. + Type of an entity action argument + + Allowed values for this property are: "TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN" + + + :return: The type of this EntityActionArgument. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this EntityActionArgument. + Type of an entity action argument + + + :param type: The type of this EntityActionArgument. + :type: str + """ + allowed_values = ["TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + raise ValueError( + f"Invalid value for `type`, must be None or one of {allowed_values}" + ) + self._type = type + + @property + def meta_type(self): + """ + Gets the meta_type of this EntityActionArgument. + Metatype of an entity action argument + + + :return: The meta_type of this EntityActionArgument. + :rtype: str + """ + return self._meta_type + + @meta_type.setter + def meta_type(self, meta_type): + """ + Sets the meta_type of this EntityActionArgument. + Metatype of an entity action argument + + + :param meta_type: The meta_type of this EntityActionArgument. + :type: str + """ + self._meta_type = meta_type + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this EntityActionArgument. + + :return: The natural_language_mapping of this EntityActionArgument. + :rtype: oci.oda.models.EntityActionArgumentNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this EntityActionArgument. + + :param natural_language_mapping: The natural_language_mapping of this EntityActionArgument. + :type: oci.oda.models.EntityActionArgumentNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + @property + def is_multi_value(self): + """ + Gets the is_multi_value of this EntityActionArgument. + Is the entity action argument multi-value + + + :return: The is_multi_value of this EntityActionArgument. + :rtype: bool + """ + return self._is_multi_value + + @is_multi_value.setter + def is_multi_value(self, is_multi_value): + """ + Sets the is_multi_value of this EntityActionArgument. + Is the entity action argument multi-value + + + :param is_multi_value: The is_multi_value of this EntityActionArgument. + :type: bool + """ + self._is_multi_value = is_multi_value + + @property + def entity_name(self): + """ + Gets the entity_name of this EntityActionArgument. + Name of referenced entity. + + + :return: The entity_name of this EntityActionArgument. + :rtype: str + """ + return self._entity_name + + @entity_name.setter + def entity_name(self, entity_name): + """ + Sets the entity_name of this EntityActionArgument. + Name of referenced entity. + + + :param entity_name: The entity_name of this EntityActionArgument. + :type: str + """ + self._entity_name = entity_name + + 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/oda/models/entity_action_argument_natural_language_mapping.py b/src/oci/oda/models/entity_action_argument_natural_language_mapping.py new file mode 100644 index 0000000000..94b4e7b324 --- /dev/null +++ b/src/oci/oda/models/entity_action_argument_natural_language_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityActionArgumentNaturalLanguageMapping(object): + """ + Natural language mapping of an entity action argument. + """ + + def __init__(self, **kwargs): + """ + Initializes a new EntityActionArgumentNaturalLanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param languages: + The value to assign to the languages property of this EntityActionArgumentNaturalLanguageMapping. + :type languages: list[oci.oda.models.LanguageMapping] + + """ + self.swagger_types = { + 'languages': 'list[LanguageMapping]' + } + + self.attribute_map = { + 'languages': 'languages' + } + + self._languages = None + + @property + def languages(self): + """ + **[Required]** Gets the languages of this EntityActionArgumentNaturalLanguageMapping. + List of natural language mapped values. + + + :return: The languages of this EntityActionArgumentNaturalLanguageMapping. + :rtype: list[oci.oda.models.LanguageMapping] + """ + return self._languages + + @languages.setter + def languages(self, languages): + """ + Sets the languages of this EntityActionArgumentNaturalLanguageMapping. + List of natural language mapped values. + + + :param languages: The languages of this EntityActionArgumentNaturalLanguageMapping. + :type: list[oci.oda.models.LanguageMapping] + """ + self._languages = languages + + 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/oda/models/entity_action_natural_language_mapping.py b/src/oci/oda/models/entity_action_natural_language_mapping.py new file mode 100644 index 0000000000..95319aafa9 --- /dev/null +++ b/src/oci/oda/models/entity_action_natural_language_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityActionNaturalLanguageMapping(object): + """ + Natural language mapping of an entity action. + """ + + def __init__(self, **kwargs): + """ + Initializes a new EntityActionNaturalLanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param languages: + The value to assign to the languages property of this EntityActionNaturalLanguageMapping. + :type languages: list[oci.oda.models.LanguageMapping] + + """ + self.swagger_types = { + 'languages': 'list[LanguageMapping]' + } + + self.attribute_map = { + 'languages': 'languages' + } + + self._languages = None + + @property + def languages(self): + """ + **[Required]** Gets the languages of this EntityActionNaturalLanguageMapping. + List of natural language mapped values. + + + :return: The languages of this EntityActionNaturalLanguageMapping. + :rtype: list[oci.oda.models.LanguageMapping] + """ + return self._languages + + @languages.setter + def languages(self, languages): + """ + Sets the languages of this EntityActionNaturalLanguageMapping. + List of natural language mapped values. + + + :param languages: The languages of this EntityActionNaturalLanguageMapping. + :type: list[oci.oda.models.LanguageMapping] + """ + self._languages = languages + + 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/oda/models/entity_attribute.py b/src/oci/oda/models/entity_attribute.py new file mode 100644 index 0000000000..72599041ca --- /dev/null +++ b/src/oci/oda/models/entity_attribute.py @@ -0,0 +1,345 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityAttribute(object): + """ + Attribute of an entity + """ + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "TEXT" + TYPE_TEXT = "TEXT" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "NUMBER" + TYPE_NUMBER = "NUMBER" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "DATE_TIME" + TYPE_DATE_TIME = "DATE_TIME" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "DATE" + TYPE_DATE = "DATE" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "ENTITY" + TYPE_ENTITY = "ENTITY" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "COMPOSITE_ENTITY" + TYPE_COMPOSITE_ENTITY = "COMPOSITE_ENTITY" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "ATTRIBUTE_REFERENCE" + TYPE_ATTRIBUTE_REFERENCE = "ATTRIBUTE_REFERENCE" + + #: A constant which can be used with the type property of a EntityAttribute. + #: This constant has a value of "BOOLEAN" + TYPE_BOOLEAN = "BOOLEAN" + + #: A constant which can be used with the temporal_preference property of a EntityAttribute. + #: This constant has a value of "PAST" + TEMPORAL_PREFERENCE_PAST = "PAST" + + #: A constant which can be used with the temporal_preference property of a EntityAttribute. + #: This constant has a value of "FUTURE" + TEMPORAL_PREFERENCE_FUTURE = "FUTURE" + + #: A constant which can be used with the temporal_preference property of a EntityAttribute. + #: This constant has a value of "NEAREST" + TEMPORAL_PREFERENCE_NEAREST = "NEAREST" + + def __init__(self, **kwargs): + """ + Initializes a new EntityAttribute object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this EntityAttribute. + :type name: str + + :param type: + The value to assign to the type property of this EntityAttribute. + Allowed values for this property are: "TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN" + :type type: str + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this EntityAttribute. + :type natural_language_mapping: oci.oda.models.EntityAttributeNaturalLanguageMapping + + :param is_multi_value: + The value to assign to the is_multi_value property of this EntityAttribute. + :type is_multi_value: bool + + :param is_fuzzy_match: + The value to assign to the is_fuzzy_match property of this EntityAttribute. + :type is_fuzzy_match: bool + + :param is_invert_comparisons: + The value to assign to the is_invert_comparisons property of this EntityAttribute. + :type is_invert_comparisons: bool + + :param temporal_preference: + The value to assign to the temporal_preference property of this EntityAttribute. + Allowed values for this property are: "PAST", "FUTURE", "NEAREST" + :type temporal_preference: str + + :param entity_name: + The value to assign to the entity_name property of this EntityAttribute. + :type entity_name: str + + """ + self.swagger_types = { + 'name': 'str', + 'type': 'str', + 'natural_language_mapping': 'EntityAttributeNaturalLanguageMapping', + 'is_multi_value': 'bool', + 'is_fuzzy_match': 'bool', + 'is_invert_comparisons': 'bool', + 'temporal_preference': 'str', + 'entity_name': 'str' + } + + self.attribute_map = { + 'name': 'name', + 'type': 'type', + 'natural_language_mapping': 'naturalLanguageMapping', + 'is_multi_value': 'isMultiValue', + 'is_fuzzy_match': 'isFuzzyMatch', + 'is_invert_comparisons': 'isInvertComparisons', + 'temporal_preference': 'temporalPreference', + 'entity_name': 'entityName' + } + + self._name = None + self._type = None + self._natural_language_mapping = None + self._is_multi_value = None + self._is_fuzzy_match = None + self._is_invert_comparisons = None + self._temporal_preference = None + self._entity_name = None + + @property + def name(self): + """ + **[Required]** Gets the name of this EntityAttribute. + The name of an entity attribute + + + :return: The name of this EntityAttribute. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this EntityAttribute. + The name of an entity attribute + + + :param name: The name of this EntityAttribute. + :type: str + """ + self._name = name + + @property + def type(self): + """ + **[Required]** Gets the type of this EntityAttribute. + The type of an entity attribute + + Allowed values for this property are: "TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN" + + + :return: The type of this EntityAttribute. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this EntityAttribute. + The type of an entity attribute + + + :param type: The type of this EntityAttribute. + :type: str + """ + allowed_values = ["TEXT", "NUMBER", "DATE_TIME", "DATE", "ENTITY", "COMPOSITE_ENTITY", "ATTRIBUTE_REFERENCE", "BOOLEAN"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + raise ValueError( + f"Invalid value for `type`, must be None or one of {allowed_values}" + ) + self._type = type + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this EntityAttribute. + + :return: The natural_language_mapping of this EntityAttribute. + :rtype: oci.oda.models.EntityAttributeNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this EntityAttribute. + + :param natural_language_mapping: The natural_language_mapping of this EntityAttribute. + :type: oci.oda.models.EntityAttributeNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + @property + def is_multi_value(self): + """ + Gets the is_multi_value of this EntityAttribute. + Is the entity attribute multi-value + + + :return: The is_multi_value of this EntityAttribute. + :rtype: bool + """ + return self._is_multi_value + + @is_multi_value.setter + def is_multi_value(self, is_multi_value): + """ + Sets the is_multi_value of this EntityAttribute. + Is the entity attribute multi-value + + + :param is_multi_value: The is_multi_value of this EntityAttribute. + :type: bool + """ + self._is_multi_value = is_multi_value + + @property + def is_fuzzy_match(self): + """ + Gets the is_fuzzy_match of this EntityAttribute. + Is the entity attribute a fuzzy match + + + :return: The is_fuzzy_match of this EntityAttribute. + :rtype: bool + """ + return self._is_fuzzy_match + + @is_fuzzy_match.setter + def is_fuzzy_match(self, is_fuzzy_match): + """ + Sets the is_fuzzy_match of this EntityAttribute. + Is the entity attribute a fuzzy match + + + :param is_fuzzy_match: The is_fuzzy_match of this EntityAttribute. + :type: bool + """ + self._is_fuzzy_match = is_fuzzy_match + + @property + def is_invert_comparisons(self): + """ + Gets the is_invert_comparisons of this EntityAttribute. + Are comparisons inverted in the entity attribute + + + :return: The is_invert_comparisons of this EntityAttribute. + :rtype: bool + """ + return self._is_invert_comparisons + + @is_invert_comparisons.setter + def is_invert_comparisons(self, is_invert_comparisons): + """ + Sets the is_invert_comparisons of this EntityAttribute. + Are comparisons inverted in the entity attribute + + + :param is_invert_comparisons: The is_invert_comparisons of this EntityAttribute. + :type: bool + """ + self._is_invert_comparisons = is_invert_comparisons + + @property + def temporal_preference(self): + """ + Gets the temporal_preference of this EntityAttribute. + Temporal preference of an attribute + + Allowed values for this property are: "PAST", "FUTURE", "NEAREST" + + + :return: The temporal_preference of this EntityAttribute. + :rtype: str + """ + return self._temporal_preference + + @temporal_preference.setter + def temporal_preference(self, temporal_preference): + """ + Sets the temporal_preference of this EntityAttribute. + Temporal preference of an attribute + + + :param temporal_preference: The temporal_preference of this EntityAttribute. + :type: str + """ + allowed_values = ["PAST", "FUTURE", "NEAREST"] + if not value_allowed_none_or_none_sentinel(temporal_preference, allowed_values): + raise ValueError( + f"Invalid value for `temporal_preference`, must be None or one of {allowed_values}" + ) + self._temporal_preference = temporal_preference + + @property + def entity_name(self): + """ + Gets the entity_name of this EntityAttribute. + Name of referenced entity. + + + :return: The entity_name of this EntityAttribute. + :rtype: str + """ + return self._entity_name + + @entity_name.setter + def entity_name(self, entity_name): + """ + Sets the entity_name of this EntityAttribute. + Name of referenced entity. + + + :param entity_name: The entity_name of this EntityAttribute. + :type: str + """ + self._entity_name = entity_name + + 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/oda/models/entity_attribute_natural_language_mapping.py b/src/oci/oda/models/entity_attribute_natural_language_mapping.py new file mode 100644 index 0000000000..153d884abf --- /dev/null +++ b/src/oci/oda/models/entity_attribute_natural_language_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityAttributeNaturalLanguageMapping(object): + """ + Natural language mapping of an entity attribute + """ + + def __init__(self, **kwargs): + """ + Initializes a new EntityAttributeNaturalLanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param languages: + The value to assign to the languages property of this EntityAttributeNaturalLanguageMapping. + :type languages: list[oci.oda.models.LanguageMapping] + + """ + self.swagger_types = { + 'languages': 'list[LanguageMapping]' + } + + self.attribute_map = { + 'languages': 'languages' + } + + self._languages = None + + @property + def languages(self): + """ + **[Required]** Gets the languages of this EntityAttributeNaturalLanguageMapping. + List of natural language mapped values. + + + :return: The languages of this EntityAttributeNaturalLanguageMapping. + :rtype: list[oci.oda.models.LanguageMapping] + """ + return self._languages + + @languages.setter + def languages(self, languages): + """ + Sets the languages of this EntityAttributeNaturalLanguageMapping. + List of natural language mapped values. + + + :param languages: The languages of this EntityAttributeNaturalLanguageMapping. + :type: list[oci.oda.models.LanguageMapping] + """ + self._languages = languages + + 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/oda/models/entity_natural_language_mapping.py b/src/oci/oda/models/entity_natural_language_mapping.py new file mode 100644 index 0000000000..471832eac6 --- /dev/null +++ b/src/oci/oda/models/entity_natural_language_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 EntityNaturalLanguageMapping(object): + """ + Natural language mapping of an entity attribute. + """ + + def __init__(self, **kwargs): + """ + Initializes a new EntityNaturalLanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param languages: + The value to assign to the languages property of this EntityNaturalLanguageMapping. + :type languages: list[oci.oda.models.LanguageMapping] + + """ + self.swagger_types = { + 'languages': 'list[LanguageMapping]' + } + + self.attribute_map = { + 'languages': 'languages' + } + + self._languages = None + + @property + def languages(self): + """ + **[Required]** Gets the languages of this EntityNaturalLanguageMapping. + List of natural language mapped values. + + + :return: The languages of this EntityNaturalLanguageMapping. + :rtype: list[oci.oda.models.LanguageMapping] + """ + return self._languages + + @languages.setter + def languages(self, languages): + """ + Sets the languages of this EntityNaturalLanguageMapping. + List of natural language mapped values. + + + :param languages: The languages of this EntityNaturalLanguageMapping. + :type: list[oci.oda.models.LanguageMapping] + """ + self._languages = languages + + 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/oda/models/extend_skill_details.py b/src/oci/oda/models/extend_skill_details.py index 1a0dd2929d..b1c3ba9d79 100644 --- a/src/oci/oda/models/extend_skill_details.py +++ b/src/oci/oda/models/extend_skill_details.py @@ -38,6 +38,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this ExtendSkillDetails. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this ExtendSkillDetails. + :type dialog_version: str + :param multilingual_mode: The value to assign to the multilingual_mode property of this ExtendSkillDetails. Allowed values for this property are: "NATIVE", "TRANSLATION" @@ -77,6 +81,7 @@ def __init__(self, **kwargs): 'category': 'str', 'description': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', 'freeform_tags': 'dict(str, str)', @@ -92,6 +97,7 @@ def __init__(self, **kwargs): 'category': 'category', 'description': 'description', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', 'freeform_tags': 'freeformTags', @@ -106,6 +112,7 @@ def __init__(self, **kwargs): self._category = None self._description = None self._platform_version = None + self._dialog_version = None self._multilingual_mode = None self._primary_language_tag = None self._freeform_tags = None diff --git a/src/oci/oda/models/language_mapping.py b/src/oci/oda/models/language_mapping.py new file mode 100644 index 0000000000..42988b20ef --- /dev/null +++ b/src/oci/oda/models/language_mapping.py @@ -0,0 +1,134 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 LanguageMapping(object): + """ + A natural language mapping. + """ + + def __init__(self, **kwargs): + """ + Initializes a new LanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param language_tag: + The value to assign to the language_tag property of this LanguageMapping. + :type language_tag: str + + :param primary_name: + The value to assign to the primary_name property of this LanguageMapping. + :type primary_name: str + + :param names: + The value to assign to the names property of this LanguageMapping. + :type names: list[oci.oda.models.NameMapping] + + """ + self.swagger_types = { + 'language_tag': 'str', + 'primary_name': 'str', + 'names': 'list[NameMapping]' + } + + self.attribute_map = { + 'language_tag': 'languageTag', + 'primary_name': 'primaryName', + 'names': 'names' + } + + self._language_tag = None + self._primary_name = None + self._names = None + + @property + def language_tag(self): + """ + **[Required]** Gets the language_tag of this LanguageMapping. + Language tag of mapping. + + + :return: The language_tag of this LanguageMapping. + :rtype: str + """ + return self._language_tag + + @language_tag.setter + def language_tag(self, language_tag): + """ + Sets the language_tag of this LanguageMapping. + Language tag of mapping. + + + :param language_tag: The language_tag of this LanguageMapping. + :type: str + """ + self._language_tag = language_tag + + @property + def primary_name(self): + """ + **[Required]** Gets the primary_name of this LanguageMapping. + Primary name of mapping. + + + :return: The primary_name of this LanguageMapping. + :rtype: str + """ + return self._primary_name + + @primary_name.setter + def primary_name(self, primary_name): + """ + Sets the primary_name of this LanguageMapping. + Primary name of mapping. + + + :param primary_name: The primary_name of this LanguageMapping. + :type: str + """ + self._primary_name = primary_name + + @property + def names(self): + """ + **[Required]** Gets the names of this LanguageMapping. + List of named values for mapping. + + + :return: The names of this LanguageMapping. + :rtype: list[oci.oda.models.NameMapping] + """ + return self._names + + @names.setter + def names(self, names): + """ + Sets the names of this LanguageMapping. + List of named values for mapping. + + + :param names: The names of this LanguageMapping. + :type: list[oci.oda.models.NameMapping] + """ + self._names = names + + 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/oda/models/name_mapping.py b/src/oci/oda/models/name_mapping.py new file mode 100644 index 0000000000..39fcbe3cb3 --- /dev/null +++ b/src/oci/oda/models/name_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 NameMapping(object): + """ + A language name mapping. + """ + + def __init__(self, **kwargs): + """ + Initializes a new NameMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param name: + The value to assign to the name property of this NameMapping. + :type name: str + + """ + self.swagger_types = { + 'name': 'str' + } + + self.attribute_map = { + 'name': 'name' + } + + self._name = None + + @property + def name(self): + """ + **[Required]** Gets the name of this NameMapping. + Name of mapping. + + + :return: The name of this NameMapping. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this NameMapping. + Name of mapping. + + + :param name: The name of this NameMapping. + :type: str + """ + self._name = name + + 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/oda/models/oda_instance_attachment.py b/src/oci/oda/models/oda_instance_attachment.py index 4bfb3d09cb..7c7c69b595 100644 --- a/src/oci/oda/models/oda_instance_attachment.py +++ b/src/oci/oda/models/oda_instance_attachment.py @@ -19,6 +19,10 @@ class OdaInstanceAttachment(object): #: This constant has a value of "FUSION" ATTACHMENT_TYPE_FUSION = "FUSION" + #: A constant which can be used with the attachment_type property of a OdaInstanceAttachment. + #: This constant has a value of "MAX" + ATTACHMENT_TYPE_MAX = "MAX" + #: A constant which can be used with the lifecycle_state property of a OdaInstanceAttachment. #: This constant has a value of "ATTACHING" LIFECYCLE_STATE_ATTACHING = "ATTACHING" @@ -58,7 +62,7 @@ def __init__(self, **kwargs): :param attachment_type: The value to assign to the attachment_type property of this OdaInstanceAttachment. - Allowed values for this property are: "FUSION", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "FUSION", "MAX", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type attachment_type: str @@ -218,7 +222,7 @@ def attachment_type(self): **[Required]** Gets the attachment_type of this OdaInstanceAttachment. The type of attachment defined as an enum. - Allowed values for this property are: "FUSION", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "FUSION", "MAX", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -237,7 +241,7 @@ def attachment_type(self, attachment_type): :param attachment_type: The attachment_type of this OdaInstanceAttachment. :type: str """ - allowed_values = ["FUSION"] + allowed_values = ["FUSION", "MAX"] if not value_allowed_none_or_none_sentinel(attachment_type, allowed_values): attachment_type = 'UNKNOWN_ENUM_VALUE' self._attachment_type = attachment_type diff --git a/src/oci/oda/models/oda_instance_attachment_summary.py b/src/oci/oda/models/oda_instance_attachment_summary.py index 2f469bc5c1..510c491b8f 100644 --- a/src/oci/oda/models/oda_instance_attachment_summary.py +++ b/src/oci/oda/models/oda_instance_attachment_summary.py @@ -19,6 +19,10 @@ class OdaInstanceAttachmentSummary(object): #: This constant has a value of "FUSION" ATTACHMENT_TYPE_FUSION = "FUSION" + #: A constant which can be used with the attachment_type property of a OdaInstanceAttachmentSummary. + #: This constant has a value of "MAX" + ATTACHMENT_TYPE_MAX = "MAX" + def __init__(self, **kwargs): """ Initializes a new OdaInstanceAttachmentSummary object with values from keyword arguments. @@ -38,7 +42,7 @@ def __init__(self, **kwargs): :param attachment_type: The value to assign to the attachment_type property of this OdaInstanceAttachmentSummary. - Allowed values for this property are: "FUSION", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "FUSION", "MAX", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type attachment_type: str @@ -196,7 +200,7 @@ def attachment_type(self): **[Required]** Gets the attachment_type of this OdaInstanceAttachmentSummary. The type of attachment defined as an enum. - Allowed values for this property are: "FUSION", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "FUSION", "MAX", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -215,7 +219,7 @@ def attachment_type(self, attachment_type): :param attachment_type: The attachment_type of this OdaInstanceAttachmentSummary. :type: str """ - allowed_values = ["FUSION"] + allowed_values = ["FUSION", "MAX"] if not value_allowed_none_or_none_sentinel(attachment_type, allowed_values): attachment_type = 'UNKNOWN_ENUM_VALUE' self._attachment_type = attachment_type diff --git a/src/oci/oda/models/skill.py b/src/oci/oda/models/skill.py index cf8e061840..87bc8cc991 100644 --- a/src/oci/oda/models/skill.py +++ b/src/oci/oda/models/skill.py @@ -108,6 +108,10 @@ def __init__(self, **kwargs): The value to assign to the platform_version property of this Skill. :type platform_version: str + :param dialog_version: + The value to assign to the dialog_version property of this Skill. + :type dialog_version: str + :param base_id: The value to assign to the base_id property of this Skill. :type base_id: str @@ -154,6 +158,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'platform_version': 'str', + 'dialog_version': 'str', 'base_id': 'str', 'multilingual_mode': 'str', 'primary_language_tag': 'str', @@ -175,6 +180,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'platform_version': 'platformVersion', + 'dialog_version': 'dialogVersion', 'base_id': 'baseId', 'multilingual_mode': 'multilingualMode', 'primary_language_tag': 'primaryLanguageTag', @@ -195,6 +201,7 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._lifecycle_details = None self._platform_version = None + self._dialog_version = None self._base_id = None self._multilingual_mode = None self._primary_language_tag = None @@ -456,6 +463,30 @@ def platform_version(self, platform_version): """ self._platform_version = platform_version + @property + def dialog_version(self): + """ + Gets the dialog_version of this Skill. + The resource's dialog version. + + + :return: The dialog_version of this Skill. + :rtype: str + """ + return self._dialog_version + + @dialog_version.setter + def dialog_version(self, dialog_version): + """ + Sets the dialog_version of this Skill. + The resource's dialog version. + + + :param dialog_version: The dialog_version of this Skill. + :type: str + """ + self._dialog_version = dialog_version + @property def base_id(self): """ diff --git a/src/oci/oda/models/static_entity_value.py b/src/oci/oda/models/static_entity_value.py new file mode 100644 index 0000000000..ab4705f42f --- /dev/null +++ b/src/oci/oda/models/static_entity_value.py @@ -0,0 +1,99 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 StaticEntityValue(object): + """ + Value in a static entity. + """ + + def __init__(self, **kwargs): + """ + Initializes a new StaticEntityValue object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param canonical_name: + The value to assign to the canonical_name property of this StaticEntityValue. + :type canonical_name: str + + :param natural_language_mapping: + The value to assign to the natural_language_mapping property of this StaticEntityValue. + :type natural_language_mapping: oci.oda.models.StaticEntityValueNaturalLanguageMapping + + """ + self.swagger_types = { + 'canonical_name': 'str', + 'natural_language_mapping': 'StaticEntityValueNaturalLanguageMapping' + } + + self.attribute_map = { + 'canonical_name': 'canonicalName', + 'natural_language_mapping': 'naturalLanguageMapping' + } + + self._canonical_name = None + self._natural_language_mapping = None + + @property + def canonical_name(self): + """ + **[Required]** Gets the canonical_name of this StaticEntityValue. + Value for a static entity. + + + :return: The canonical_name of this StaticEntityValue. + :rtype: str + """ + return self._canonical_name + + @canonical_name.setter + def canonical_name(self, canonical_name): + """ + Sets the canonical_name of this StaticEntityValue. + Value for a static entity. + + + :param canonical_name: The canonical_name of this StaticEntityValue. + :type: str + """ + self._canonical_name = canonical_name + + @property + def natural_language_mapping(self): + """ + Gets the natural_language_mapping of this StaticEntityValue. + + :return: The natural_language_mapping of this StaticEntityValue. + :rtype: oci.oda.models.StaticEntityValueNaturalLanguageMapping + """ + return self._natural_language_mapping + + @natural_language_mapping.setter + def natural_language_mapping(self, natural_language_mapping): + """ + Sets the natural_language_mapping of this StaticEntityValue. + + :param natural_language_mapping: The natural_language_mapping of this StaticEntityValue. + :type: oci.oda.models.StaticEntityValueNaturalLanguageMapping + """ + self._natural_language_mapping = natural_language_mapping + + 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/oda/models/static_entity_value_natural_language_mapping.py b/src/oci/oda/models/static_entity_value_natural_language_mapping.py new file mode 100644 index 0000000000..6b32c30970 --- /dev/null +++ b/src/oci/oda/models/static_entity_value_natural_language_mapping.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 StaticEntityValueNaturalLanguageMapping(object): + """ + Natural language mapping of a static entity value. + """ + + def __init__(self, **kwargs): + """ + Initializes a new StaticEntityValueNaturalLanguageMapping object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param languages: + The value to assign to the languages property of this StaticEntityValueNaturalLanguageMapping. + :type languages: list[oci.oda.models.LanguageMapping] + + """ + self.swagger_types = { + 'languages': 'list[LanguageMapping]' + } + + self.attribute_map = { + 'languages': 'languages' + } + + self._languages = None + + @property + def languages(self): + """ + **[Required]** Gets the languages of this StaticEntityValueNaturalLanguageMapping. + List of natural language mapped values. + + + :return: The languages of this StaticEntityValueNaturalLanguageMapping. + :rtype: list[oci.oda.models.LanguageMapping] + """ + return self._languages + + @languages.setter + def languages(self, languages): + """ + Sets the languages of this StaticEntityValueNaturalLanguageMapping. + List of natural language mapped values. + + + :param languages: The languages of this StaticEntityValueNaturalLanguageMapping. + :type: list[oci.oda.models.LanguageMapping] + """ + self._languages = languages + + 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/oda/models/train_skill_details.py b/src/oci/oda/models/train_skill_details.py new file mode 100644 index 0000000000..f909349f7d --- /dev/null +++ b/src/oci/oda/models/train_skill_details.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 TrainSkillDetails(object): + """ + Parameters for training the skill. + """ + + def __init__(self, **kwargs): + """ + Initializes a new TrainSkillDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param items: + The value to assign to the items property of this TrainSkillDetails. + :type items: list[oci.oda.models.TrainSkillParameter] + + """ + self.swagger_types = { + 'items': 'list[TrainSkillParameter]' + } + + self.attribute_map = { + 'items': 'items' + } + + self._items = None + + @property + def items(self): + """ + **[Required]** Gets the items of this TrainSkillDetails. + List of parameters for training the skill. + + + :return: The items of this TrainSkillDetails. + :rtype: list[oci.oda.models.TrainSkillParameter] + """ + return self._items + + @items.setter + def items(self, items): + """ + Sets the items of this TrainSkillDetails. + List of parameters for training the skill. + + + :param items: The items of this TrainSkillDetails. + :type: list[oci.oda.models.TrainSkillParameter] + """ + self._items = items + + 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/oda/models/train_skill_parameter.py b/src/oci/oda/models/train_skill_parameter.py new file mode 100644 index 0000000000..ab73751f9b --- /dev/null +++ b/src/oci/oda/models/train_skill_parameter.py @@ -0,0 +1,101 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + + +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 TrainSkillParameter(object): + """ + Train skill parameter. + """ + + #: A constant which can be used with the type property of a TrainSkillParameter. + #: This constant has a value of "QUERY_ENTITY" + TYPE_QUERY_ENTITY = "QUERY_ENTITY" + + def __init__(self, **kwargs): + """ + Initializes a new TrainSkillParameter object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.oda.models.TrainSkillQueryEntityParameter` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this TrainSkillParameter. + Allowed values for this property are: "QUERY_ENTITY" + :type type: str + + """ + self.swagger_types = { + 'type': 'str' + } + + self.attribute_map = { + 'type': 'type' + } + + self._type = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['type'] + + if type == 'QUERY_ENTITY': + return 'TrainSkillQueryEntityParameter' + else: + return 'TrainSkillParameter' + + @property + def type(self): + """ + **[Required]** Gets the type of this TrainSkillParameter. + Type train skill parameter type. + + Allowed values for this property are: "QUERY_ENTITY" + + + :return: The type of this TrainSkillParameter. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this TrainSkillParameter. + Type train skill parameter type. + + + :param type: The type of this TrainSkillParameter. + :type: str + """ + allowed_values = ["QUERY_ENTITY"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + raise ValueError( + f"Invalid value for `type`, must be None or one of {allowed_values}" + ) + self._type = type + + 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/oda/models/train_skill_query_entity_parameter.py b/src/oci/oda/models/train_skill_query_entity_parameter.py new file mode 100644 index 0000000000..0553de4229 --- /dev/null +++ b/src/oci/oda/models/train_skill_query_entity_parameter.py @@ -0,0 +1,51 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + +from .train_skill_parameter import TrainSkillParameter +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 TrainSkillQueryEntityParameter(TrainSkillParameter): + """ + Query entity parameter for training the skill. + """ + + def __init__(self, **kwargs): + """ + Initializes a new TrainSkillQueryEntityParameter object with values from keyword arguments. The default value of the :py:attr:`~oci.oda.models.TrainSkillQueryEntityParameter.type` attribute + of this class is ``QUERY_ENTITY`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this TrainSkillQueryEntityParameter. + Allowed values for this property are: "QUERY_ENTITY" + :type type: str + + """ + self.swagger_types = { + 'type': 'str' + } + + self.attribute_map = { + 'type': 'type' + } + + self._type = None + self._type = 'QUERY_ENTITY' + + 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/oda/models/value_list_entity.py b/src/oci/oda/models/value_list_entity.py new file mode 100644 index 0000000000..725636ef44 --- /dev/null +++ b/src/oci/oda/models/value_list_entity.py @@ -0,0 +1,96 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20190506 + +from .entity import Entity +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 ValueListEntity(Entity): + """ + Metadata for a value list entity. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ValueListEntity object with values from keyword arguments. The default value of the :py:attr:`~oci.oda.models.ValueListEntity.type` attribute + of this class is ``ENUM_VALUES`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this ValueListEntity. + :type id: str + + :param name: + The value to assign to the name property of this ValueListEntity. + :type name: str + + :param type: + The value to assign to the type property of this ValueListEntity. + Allowed values for this property are: "COMPOSITE", "ENUM_VALUES" + :type type: str + + :param values: + The value to assign to the values property of this ValueListEntity. + :type values: list[oci.oda.models.StaticEntityValue] + + """ + self.swagger_types = { + 'id': 'str', + 'name': 'str', + 'type': 'str', + 'values': 'list[StaticEntityValue]' + } + + self.attribute_map = { + 'id': 'id', + 'name': 'name', + 'type': 'type', + 'values': 'values' + } + + self._id = None + self._name = None + self._type = None + self._values = None + self._type = 'ENUM_VALUES' + + @property + def values(self): + """ + **[Required]** Gets the values of this ValueListEntity. + List of values for a value list entity. + + + :return: The values of this ValueListEntity. + :rtype: list[oci.oda.models.StaticEntityValue] + """ + return self._values + + @values.setter + def values(self, values): + """ + Sets the values of this ValueListEntity. + List of values for a value list entity. + + + :param values: The values of this ValueListEntity. + :type: list[oci.oda.models.StaticEntityValue] + """ + self._values = values + + 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/oda/models/work_request.py b/src/oci/oda/models/work_request.py index d43942a686..33f646a15d 100644 --- a/src/oci/oda/models/work_request.py +++ b/src/oci/oda/models/work_request.py @@ -175,6 +175,18 @@ class WorkRequest(object): #: This constant has a value of "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT" REQUEST_ACTION_DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT = "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT" + #: A constant which can be used with the request_action property of a WorkRequest. + #: This constant has a value of "TRAIN_SKILL" + REQUEST_ACTION_TRAIN_SKILL = "TRAIN_SKILL" + + #: A constant which can be used with the request_action property of a WorkRequest. + #: This constant has a value of "DELETE_SKILL_ENTITIES" + REQUEST_ACTION_DELETE_SKILL_ENTITIES = "DELETE_SKILL_ENTITIES" + + #: A constant which can be used with the request_action property of a WorkRequest. + #: This constant has a value of "IMPORT_SKILL_ENTITIES" + REQUEST_ACTION_IMPORT_SKILL_ENTITIES = "IMPORT_SKILL_ENTITIES" + #: A constant which can be used with the status property of a WorkRequest. #: This constant has a value of "ACCEPTED" STATUS_ACCEPTED = "ACCEPTED" @@ -222,7 +234,7 @@ def __init__(self, **kwargs): :param request_action: The value to assign to the request_action property of this WorkRequest. - Allowed values for this property are: "CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "TRAIN_SKILL", "DELETE_SKILL_ENTITIES", "IMPORT_SKILL_ENTITIES", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type request_action: str @@ -402,7 +414,7 @@ def request_action(self): **[Required]** Gets the request_action of this WorkRequest. The type of the operation that's associated with the work request. - Allowed values for this property are: "CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "TRAIN_SKILL", "DELETE_SKILL_ENTITIES", "IMPORT_SKILL_ENTITIES", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -421,7 +433,7 @@ def request_action(self, request_action): :param request_action: The request_action of this WorkRequest. :type: str """ - allowed_values = ["CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT"] + allowed_values = ["CREATE_ODA_INSTANCE", "UPGRADE_ODA_INSTANCE", "DELETE_ODA_INSTANCE", "PURGE_ODA_INSTANCE", "RECOVER_ODA_INSTANCE", "STOP_ODA_INSTANCE", "START_ODA_INSTANCE", "CHANGE_ODA_INSTANCE_COMPARTMENT", "CHANGE_CUST_ENC_KEY", "DEACT_CUST_ENC_KEY", "CREATE_ASSOCIATION", "DELETE_ASSOCIATION", "CREATE_PCS_INSTANCE", "UPDATE_ENTITLEMENTS_FOR_CACCT", "LOOKUP_ODA_INSTANCES_FOR_CACCT", "CREATE_ODA_INSTANCE_ATTACHMENT", "UPDATE_ODA_INSTANCE_ATTACHMENT", "DELETE_ODA_INSTANCE_ATTACHMENT", "CREATE_IMPORTED_PACKAGE", "UPDATE_IMPORTED_PACKAGE", "DELETE_IMPORTED_PACKAGE", "IMPORT_BOT", "CREATE_SKILL", "CLONE_SKILL", "EXTEND_SKILL", "VERSION_SKILL", "EXPORT_SKILL", "CREATE_DIGITAL_ASSISTANT", "CLONE_DIGITAL_ASSISTANT", "EXTEND_DIGITAL_ASSISTANT", "VERSION_DIGITAL_ASSISTANT", "EXPORT_DIGITAL_ASSISTANT", "CREATE_ODA_PRIVATE_ENDPOINT", "DELETE_ODA_PRIVATE_ENDPOINT", "UPDATE_ODA_PRIVATE_ENDPOINT", "CHANGE_ODA_PRIVATE_ENDPOINT_COMPARTMENT", "CREATE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "DELETE_ODA_PRIVATE_ENDPOINT_SCAN_PROXY", "CREATE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "DELETE_ODA_PRIVATE_ENDPOINT_ATTACHMENT", "TRAIN_SKILL", "DELETE_SKILL_ENTITIES", "IMPORT_SKILL_ENTITIES"] if not value_allowed_none_or_none_sentinel(request_action, allowed_values): request_action = 'UNKNOWN_ENUM_VALUE' self._request_action = request_action diff --git a/src/oci/operator_access_control/access_requests_client.py b/src/oci/operator_access_control/access_requests_client.py index 3413e471fe..82a9076d99 100644 --- a/src/oci/operator_access_control/access_requests_client.py +++ b/src/oci/operator_access_control/access_requests_client.py @@ -337,6 +337,115 @@ def get_access_request(self, access_request_id, **kwargs): api_reference_link=api_reference_link, required_arguments=required_arguments) + def get_audit_log_report(self, access_request_id, **kwargs): + """ + Gets the Audit Log Report for the given access requestId. + + + :param str access_request_id: (required) + unique AccessRequest identifier + + :param int enable_process_tree: (optional) + To enable process tree computation in audit report + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.operator_access_control.models.AuditLogReport` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use get_audit_log_report API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['accessRequestId'] + resource_path = "/accessRequests/{accessRequestId}/auditLogReport" + method = "GET" + operation_name = "get_audit_log_report" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AuditLogReport/GetAuditLogReport" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "enable_process_tree", + "opc_request_id" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"get_audit_log_report got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "accessRequestId": access_request_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(f'Parameter {k} cannot be None, whitespace or empty string') + + query_params = { + "enableProcessTree": kwargs.get("enable_process_tree", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + response_type="AuditLogReport", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + response_type="AuditLogReport", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def interaction_request(self, access_request_id, interaction_request_details, **kwargs): """ Posts query for additional information for the given access request. diff --git a/src/oci/operator_access_control/models/__init__.py b/src/oci/operator_access_control/models/__init__.py index 3c73a3e950..14ea179ed3 100644 --- a/src/oci/operator_access_control/models/__init__.py +++ b/src/oci/operator_access_control/models/__init__.py @@ -12,6 +12,9 @@ from .access_request_history_summary import AccessRequestHistorySummary from .access_request_summary import AccessRequestSummary from .approve_access_request_details import ApproveAccessRequestDetails +from .approver_detail import ApproverDetail +from .assignment_validation_status import AssignmentValidationStatus +from .audit_log_report import AuditLogReport from .change_operator_control_assignment_compartment_details import ChangeOperatorControlAssignmentCompartmentDetails from .change_operator_control_compartment_details import ChangeOperatorControlCompartmentDetails from .create_operator_control_assignment_details import CreateOperatorControlAssignmentDetails @@ -32,8 +35,10 @@ from .reject_access_request_details import RejectAccessRequestDetails from .review_access_request_details import ReviewAccessRequestDetails from .revoke_access_request_details import RevokeAccessRequestDetails +from .status_detail import StatusDetail from .update_operator_control_assignment_details import UpdateOperatorControlAssignmentDetails from .update_operator_control_details import UpdateOperatorControlDetails +from .validate_operator_assignment_details import ValidateOperatorAssignmentDetails # Maps type names to classes for operator_access_control services. operator_access_control_type_mapping = { @@ -43,6 +48,9 @@ "AccessRequestHistorySummary": AccessRequestHistorySummary, "AccessRequestSummary": AccessRequestSummary, "ApproveAccessRequestDetails": ApproveAccessRequestDetails, + "ApproverDetail": ApproverDetail, + "AssignmentValidationStatus": AssignmentValidationStatus, + "AuditLogReport": AuditLogReport, "ChangeOperatorControlAssignmentCompartmentDetails": ChangeOperatorControlAssignmentCompartmentDetails, "ChangeOperatorControlCompartmentDetails": ChangeOperatorControlCompartmentDetails, "CreateOperatorControlAssignmentDetails": CreateOperatorControlAssignmentDetails, @@ -63,6 +71,8 @@ "RejectAccessRequestDetails": RejectAccessRequestDetails, "ReviewAccessRequestDetails": ReviewAccessRequestDetails, "RevokeAccessRequestDetails": RevokeAccessRequestDetails, + "StatusDetail": StatusDetail, "UpdateOperatorControlAssignmentDetails": UpdateOperatorControlAssignmentDetails, - "UpdateOperatorControlDetails": UpdateOperatorControlDetails + "UpdateOperatorControlDetails": UpdateOperatorControlDetails, + "ValidateOperatorAssignmentDetails": ValidateOperatorAssignmentDetails } diff --git a/src/oci/operator_access_control/models/access_request.py b/src/oci/operator_access_control/models/access_request.py index 492724d874..93d62bb2de 100644 --- a/src/oci/operator_access_control/models/access_request.py +++ b/src/oci/operator_access_control/models/access_request.py @@ -278,6 +278,34 @@ def __init__(self, **kwargs): The value to assign to the audit_type property of this AccessRequest. :type audit_type: list[str] + :param number_of_approvers_required: + The value to assign to the number_of_approvers_required property of this AccessRequest. + :type number_of_approvers_required: int + + :param number_of_approvers: + The value to assign to the number_of_approvers property of this AccessRequest. + :type number_of_approvers: int + + :param number_of_extension_approvers: + The value to assign to the number_of_extension_approvers property of this AccessRequest. + :type number_of_extension_approvers: int + + :param approver_details: + The value to assign to the approver_details property of this AccessRequest. + :type approver_details: list[oci.operator_access_control.models.ApproverDetail] + + :param extension_approver_details: + The value to assign to the extension_approver_details property of this AccessRequest. + :type extension_approver_details: list[oci.operator_access_control.models.ApproverDetail] + + :param is_validate_assignment: + The value to assign to the is_validate_assignment property of this AccessRequest. + :type is_validate_assignment: bool + + :param time_requested_for_future_access: + The value to assign to the time_requested_for_future_access property of this AccessRequest. + :type time_requested_for_future_access: datetime + :param freeform_tags: The value to assign to the freeform_tags property of this AccessRequest. :type freeform_tags: dict(str, str) @@ -317,6 +345,13 @@ def __init__(self, **kwargs): 'system_message': 'str', 'opctl_additional_message': 'str', 'audit_type': 'list[str]', + 'number_of_approvers_required': 'int', + 'number_of_approvers': 'int', + 'number_of_extension_approvers': 'int', + 'approver_details': 'list[ApproverDetail]', + 'extension_approver_details': 'list[ApproverDetail]', + 'is_validate_assignment': 'bool', + 'time_requested_for_future_access': 'datetime', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' } @@ -351,6 +386,13 @@ def __init__(self, **kwargs): 'system_message': 'systemMessage', 'opctl_additional_message': 'opctlAdditionalMessage', 'audit_type': 'auditType', + 'number_of_approvers_required': 'numberOfApproversRequired', + 'number_of_approvers': 'numberOfApprovers', + 'number_of_extension_approvers': 'numberOfExtensionApprovers', + 'approver_details': 'approverDetails', + 'extension_approver_details': 'extensionApproverDetails', + 'is_validate_assignment': 'isValidateAssignment', + 'time_requested_for_future_access': 'timeRequestedForFutureAccess', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' } @@ -384,6 +426,13 @@ def __init__(self, **kwargs): self._system_message = None self._opctl_additional_message = None self._audit_type = None + self._number_of_approvers_required = None + self._number_of_approvers = None + self._number_of_extension_approvers = None + self._approver_details = None + self._extension_approver_details = None + self._is_validate_assignment = None + self._time_requested_for_future_access = None self._freeform_tags = None self._defined_tags = None @@ -1123,6 +1172,178 @@ def audit_type(self, audit_type): """ self._audit_type = audit_type + @property + def number_of_approvers_required(self): + """ + Gets the number_of_approvers_required of this AccessRequest. + Number of approvers required to approve an access request. + + + :return: The number_of_approvers_required of this AccessRequest. + :rtype: int + """ + return self._number_of_approvers_required + + @number_of_approvers_required.setter + def number_of_approvers_required(self, number_of_approvers_required): + """ + Sets the number_of_approvers_required of this AccessRequest. + Number of approvers required to approve an access request. + + + :param number_of_approvers_required: The number_of_approvers_required of this AccessRequest. + :type: int + """ + self._number_of_approvers_required = number_of_approvers_required + + @property + def number_of_approvers(self): + """ + Gets the number_of_approvers of this AccessRequest. + Number of approvers who have authorized an access request. + + + :return: The number_of_approvers of this AccessRequest. + :rtype: int + """ + return self._number_of_approvers + + @number_of_approvers.setter + def number_of_approvers(self, number_of_approvers): + """ + Sets the number_of_approvers of this AccessRequest. + Number of approvers who have authorized an access request. + + + :param number_of_approvers: The number_of_approvers of this AccessRequest. + :type: int + """ + self._number_of_approvers = number_of_approvers + + @property + def number_of_extension_approvers(self): + """ + Gets the number_of_extension_approvers of this AccessRequest. + Number of approvers who have authorized an access request for extension. + + + :return: The number_of_extension_approvers of this AccessRequest. + :rtype: int + """ + return self._number_of_extension_approvers + + @number_of_extension_approvers.setter + def number_of_extension_approvers(self, number_of_extension_approvers): + """ + Sets the number_of_extension_approvers of this AccessRequest. + Number of approvers who have authorized an access request for extension. + + + :param number_of_extension_approvers: The number_of_extension_approvers of this AccessRequest. + :type: int + """ + self._number_of_extension_approvers = number_of_extension_approvers + + @property + def approver_details(self): + """ + Gets the approver_details of this AccessRequest. + Contains the user ids who have approved the accessRequest for extension. + + + :return: The approver_details of this AccessRequest. + :rtype: list[oci.operator_access_control.models.ApproverDetail] + """ + return self._approver_details + + @approver_details.setter + def approver_details(self, approver_details): + """ + Sets the approver_details of this AccessRequest. + Contains the user ids who have approved the accessRequest for extension. + + + :param approver_details: The approver_details of this AccessRequest. + :type: list[oci.operator_access_control.models.ApproverDetail] + """ + self._approver_details = approver_details + + @property + def extension_approver_details(self): + """ + Gets the extension_approver_details of this AccessRequest. + Contains the user ids who have approved the accessRequest for extension. + + + :return: The extension_approver_details of this AccessRequest. + :rtype: list[oci.operator_access_control.models.ApproverDetail] + """ + return self._extension_approver_details + + @extension_approver_details.setter + def extension_approver_details(self, extension_approver_details): + """ + Sets the extension_approver_details of this AccessRequest. + Contains the user ids who have approved the accessRequest for extension. + + + :param extension_approver_details: The extension_approver_details of this AccessRequest. + :type: list[oci.operator_access_control.models.ApproverDetail] + """ + self._extension_approver_details = extension_approver_details + + @property + def is_validate_assignment(self): + """ + Gets the is_validate_assignment of this AccessRequest. + Whether the access request was requested for Validate Assignment. + + + :return: The is_validate_assignment of this AccessRequest. + :rtype: bool + """ + return self._is_validate_assignment + + @is_validate_assignment.setter + def is_validate_assignment(self, is_validate_assignment): + """ + Sets the is_validate_assignment of this AccessRequest. + Whether the access request was requested for Validate Assignment. + + + :param is_validate_assignment: The is_validate_assignment of this AccessRequest. + :type: bool + """ + self._is_validate_assignment = is_validate_assignment + + @property + def time_requested_for_future_access(self): + """ + Gets the time_requested_for_future_access of this AccessRequest. + Time in future when the user for the access request needs to be created in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_requested_for_future_access of this AccessRequest. + :rtype: datetime + """ + return self._time_requested_for_future_access + + @time_requested_for_future_access.setter + def time_requested_for_future_access(self, time_requested_for_future_access): + """ + Sets the time_requested_for_future_access of this AccessRequest. + Time in future when the user for the access request needs to be created in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_requested_for_future_access: The time_requested_for_future_access of this AccessRequest. + :type: datetime + """ + self._time_requested_for_future_access = time_requested_for_future_access + @property def freeform_tags(self): """ diff --git a/src/oci/operator_access_control/models/access_request_summary.py b/src/oci/operator_access_control/models/access_request_summary.py index e2713b39de..e4f36fb222 100644 --- a/src/oci/operator_access_control/models/access_request_summary.py +++ b/src/oci/operator_access_control/models/access_request_summary.py @@ -222,6 +222,10 @@ def __init__(self, **kwargs): The value to assign to the is_auto_approved property of this AccessRequestSummary. :type is_auto_approved: bool + :param time_requested_for_future_access: + The value to assign to the time_requested_for_future_access property of this AccessRequestSummary. + :type time_requested_for_future_access: datetime + :param freeform_tags: The value to assign to the freeform_tags property of this AccessRequestSummary. :type freeform_tags: dict(str, str) @@ -249,6 +253,7 @@ def __init__(self, **kwargs): 'extend_duration': 'int', 'severity': 'str', 'is_auto_approved': 'bool', + 'time_requested_for_future_access': 'datetime', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' } @@ -271,6 +276,7 @@ def __init__(self, **kwargs): 'extend_duration': 'extendDuration', 'severity': 'severity', 'is_auto_approved': 'isAutoApproved', + 'time_requested_for_future_access': 'timeRequestedForFutureAccess', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' } @@ -292,6 +298,7 @@ def __init__(self, **kwargs): self._extend_duration = None self._severity = None self._is_auto_approved = None + self._time_requested_for_future_access = None self._freeform_tags = None self._defined_tags = None @@ -735,6 +742,34 @@ def is_auto_approved(self, is_auto_approved): """ self._is_auto_approved = is_auto_approved + @property + def time_requested_for_future_access(self): + """ + Gets the time_requested_for_future_access of this AccessRequestSummary. + Time in future when the user for the access request needs to be created in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_requested_for_future_access of this AccessRequestSummary. + :rtype: datetime + """ + return self._time_requested_for_future_access + + @time_requested_for_future_access.setter + def time_requested_for_future_access(self, time_requested_for_future_access): + """ + Sets the time_requested_for_future_access of this AccessRequestSummary. + Time in future when the user for the access request needs to be created in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_requested_for_future_access: The time_requested_for_future_access of this AccessRequestSummary. + :type: datetime + """ + self._time_requested_for_future_access = time_requested_for_future_access + @property def freeform_tags(self): """ diff --git a/src/oci/operator_access_control/models/approver_detail.py b/src/oci/operator_access_control/models/approver_detail.py new file mode 100644 index 0000000000..90776899e8 --- /dev/null +++ b/src/oci/operator_access_control/models/approver_detail.py @@ -0,0 +1,235 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200630 + + +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 ApproverDetail(object): + """ + details of Approver Detail. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ApproverDetail object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param approver_id: + The value to assign to the approver_id property of this ApproverDetail. + :type approver_id: str + + :param approval_action: + The value to assign to the approval_action property of this ApproverDetail. + :type approval_action: str + + :param approval_comment: + The value to assign to the approval_comment property of this ApproverDetail. + :type approval_comment: str + + :param approval_additional_message: + The value to assign to the approval_additional_message property of this ApproverDetail. + :type approval_additional_message: str + + :param time_of_authorization: + The value to assign to the time_of_authorization property of this ApproverDetail. + :type time_of_authorization: datetime + + :param time_approved_for_access: + The value to assign to the time_approved_for_access property of this ApproverDetail. + :type time_approved_for_access: datetime + + """ + self.swagger_types = { + 'approver_id': 'str', + 'approval_action': 'str', + 'approval_comment': 'str', + 'approval_additional_message': 'str', + 'time_of_authorization': 'datetime', + 'time_approved_for_access': 'datetime' + } + + self.attribute_map = { + 'approver_id': 'approverId', + 'approval_action': 'approvalAction', + 'approval_comment': 'approvalComment', + 'approval_additional_message': 'approvalAdditionalMessage', + 'time_of_authorization': 'timeOfAuthorization', + 'time_approved_for_access': 'timeApprovedForAccess' + } + + self._approver_id = None + self._approval_action = None + self._approval_comment = None + self._approval_additional_message = None + self._time_of_authorization = None + self._time_approved_for_access = None + + @property + def approver_id(self): + """ + Gets the approver_id of this ApproverDetail. + The userId of the approver. + + + :return: The approver_id of this ApproverDetail. + :rtype: str + """ + return self._approver_id + + @approver_id.setter + def approver_id(self, approver_id): + """ + Sets the approver_id of this ApproverDetail. + The userId of the approver. + + + :param approver_id: The approver_id of this ApproverDetail. + :type: str + """ + self._approver_id = approver_id + + @property + def approval_action(self): + """ + Gets the approval_action of this ApproverDetail. + The action done by the approver. + + + :return: The approval_action of this ApproverDetail. + :rtype: str + """ + return self._approval_action + + @approval_action.setter + def approval_action(self, approval_action): + """ + Sets the approval_action of this ApproverDetail. + The action done by the approver. + + + :param approval_action: The approval_action of this ApproverDetail. + :type: str + """ + self._approval_action = approval_action + + @property + def approval_comment(self): + """ + Gets the approval_comment of this ApproverDetail. + Comment specified by the approver of the request. + + + :return: The approval_comment of this ApproverDetail. + :rtype: str + """ + return self._approval_comment + + @approval_comment.setter + def approval_comment(self, approval_comment): + """ + Sets the approval_comment of this ApproverDetail. + Comment specified by the approver of the request. + + + :param approval_comment: The approval_comment of this ApproverDetail. + :type: str + """ + self._approval_comment = approval_comment + + @property + def approval_additional_message(self): + """ + Gets the approval_additional_message of this ApproverDetail. + Additional message specified by the approver of the request. + + + :return: The approval_additional_message of this ApproverDetail. + :rtype: str + """ + return self._approval_additional_message + + @approval_additional_message.setter + def approval_additional_message(self, approval_additional_message): + """ + Sets the approval_additional_message of this ApproverDetail. + Additional message specified by the approver of the request. + + + :param approval_additional_message: The approval_additional_message of this ApproverDetail. + :type: str + """ + self._approval_additional_message = approval_additional_message + + @property + def time_of_authorization(self): + """ + Gets the time_of_authorization of this ApproverDetail. + Time when the access request was authorized by the customer in `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_of_authorization of this ApproverDetail. + :rtype: datetime + """ + return self._time_of_authorization + + @time_of_authorization.setter + def time_of_authorization(self, time_of_authorization): + """ + Sets the time_of_authorization of this ApproverDetail. + Time when the access request was authorized by the customer in `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_of_authorization: The time_of_authorization of this ApproverDetail. + :type: datetime + """ + self._time_of_authorization = time_of_authorization + + @property + def time_approved_for_access(self): + """ + Gets the time_approved_for_access of this ApproverDetail. + Time for when the access request should start that is authorized by the customer in `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_approved_for_access of this ApproverDetail. + :rtype: datetime + """ + return self._time_approved_for_access + + @time_approved_for_access.setter + def time_approved_for_access(self, time_approved_for_access): + """ + Sets the time_approved_for_access of this ApproverDetail. + Time for when the access request should start that is authorized by the customer in `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_approved_for_access: The time_approved_for_access of this ApproverDetail. + :type: datetime + """ + self._time_approved_for_access = time_approved_for_access + + 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/operator_access_control/models/assignment_validation_status.py b/src/oci/operator_access_control/models/assignment_validation_status.py new file mode 100644 index 0000000000..914c34f910 --- /dev/null +++ b/src/oci/operator_access_control/models/assignment_validation_status.py @@ -0,0 +1,317 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200630 + + +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 AssignmentValidationStatus(object): + """ + Summary of assignment Validation status. + """ + + #: A constant which can be used with the execution_status property of a AssignmentValidationStatus. + #: This constant has a value of "PROGRESS" + EXECUTION_STATUS_PROGRESS = "PROGRESS" + + #: A constant which can be used with the execution_status property of a AssignmentValidationStatus. + #: This constant has a value of "SUCCESS" + EXECUTION_STATUS_SUCCESS = "SUCCESS" + + #: A constant which can be used with the execution_status property of a AssignmentValidationStatus. + #: This constant has a value of "FAILED" + EXECUTION_STATUS_FAILED = "FAILED" + + def __init__(self, **kwargs): + """ + Initializes a new AssignmentValidationStatus object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param execution_id: + The value to assign to the execution_id property of this AssignmentValidationStatus. + :type execution_id: str + + :param user_id: + The value to assign to the user_id property of this AssignmentValidationStatus. + :type user_id: str + + :param access_request_id: + The value to assign to the access_request_id property of this AssignmentValidationStatus. + :type access_request_id: str + + :param error_message: + The value to assign to the error_message property of this AssignmentValidationStatus. + :type error_message: str + + :param execution_status: + The value to assign to the execution_status property of this AssignmentValidationStatus. + Allowed values for this property are: "PROGRESS", "SUCCESS", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type execution_status: str + + :param status_detail: + The value to assign to the status_detail property of this AssignmentValidationStatus. + :type status_detail: list[oci.operator_access_control.models.StatusDetail] + + :param time_of_validation_start: + The value to assign to the time_of_validation_start property of this AssignmentValidationStatus. + :type time_of_validation_start: datetime + + :param time_of_validation_finish: + The value to assign to the time_of_validation_finish property of this AssignmentValidationStatus. + :type time_of_validation_finish: datetime + + """ + self.swagger_types = { + 'execution_id': 'str', + 'user_id': 'str', + 'access_request_id': 'str', + 'error_message': 'str', + 'execution_status': 'str', + 'status_detail': 'list[StatusDetail]', + 'time_of_validation_start': 'datetime', + 'time_of_validation_finish': 'datetime' + } + + self.attribute_map = { + 'execution_id': 'executionId', + 'user_id': 'userId', + 'access_request_id': 'accessRequestId', + 'error_message': 'errorMessage', + 'execution_status': 'executionStatus', + 'status_detail': 'statusDetail', + 'time_of_validation_start': 'timeOfValidationStart', + 'time_of_validation_finish': 'timeOfValidationFinish' + } + + self._execution_id = None + self._user_id = None + self._access_request_id = None + self._error_message = None + self._execution_status = None + self._status_detail = None + self._time_of_validation_start = None + self._time_of_validation_finish = None + + @property + def execution_id(self): + """ + **[Required]** Gets the execution_id of this AssignmentValidationStatus. + Id of the unique execution. + + + :return: The execution_id of this AssignmentValidationStatus. + :rtype: str + """ + return self._execution_id + + @execution_id.setter + def execution_id(self, execution_id): + """ + Sets the execution_id of this AssignmentValidationStatus. + Id of the unique execution. + + + :param execution_id: The execution_id of this AssignmentValidationStatus. + :type: str + """ + self._execution_id = execution_id + + @property + def user_id(self): + """ + Gets the user_id of this AssignmentValidationStatus. + Id of the user who triggered the Assignment Validation. + + + :return: The user_id of this AssignmentValidationStatus. + :rtype: str + """ + return self._user_id + + @user_id.setter + def user_id(self, user_id): + """ + Sets the user_id of this AssignmentValidationStatus. + Id of the user who triggered the Assignment Validation. + + + :param user_id: The user_id of this AssignmentValidationStatus. + :type: str + """ + self._user_id = user_id + + @property + def access_request_id(self): + """ + Gets the access_request_id of this AssignmentValidationStatus. + Id of the accessRequest which got created as part of Assignment Validation. + + + :return: The access_request_id of this AssignmentValidationStatus. + :rtype: str + """ + return self._access_request_id + + @access_request_id.setter + def access_request_id(self, access_request_id): + """ + Sets the access_request_id of this AssignmentValidationStatus. + Id of the accessRequest which got created as part of Assignment Validation. + + + :param access_request_id: The access_request_id of this AssignmentValidationStatus. + :type: str + """ + self._access_request_id = access_request_id + + @property + def error_message(self): + """ + Gets the error_message of this AssignmentValidationStatus. + any errorMessage during validation. + + + :return: The error_message of this AssignmentValidationStatus. + :rtype: str + """ + return self._error_message + + @error_message.setter + def error_message(self, error_message): + """ + Sets the error_message of this AssignmentValidationStatus. + any errorMessage during validation. + + + :param error_message: The error_message of this AssignmentValidationStatus. + :type: str + """ + self._error_message = error_message + + @property + def execution_status(self): + """ + **[Required]** Gets the execution_status of this AssignmentValidationStatus. + Status of the execution Success or Failure. + + Allowed values for this property are: "PROGRESS", "SUCCESS", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The execution_status of this AssignmentValidationStatus. + :rtype: str + """ + return self._execution_status + + @execution_status.setter + def execution_status(self, execution_status): + """ + Sets the execution_status of this AssignmentValidationStatus. + Status of the execution Success or Failure. + + + :param execution_status: The execution_status of this AssignmentValidationStatus. + :type: str + """ + allowed_values = ["PROGRESS", "SUCCESS", "FAILED"] + if not value_allowed_none_or_none_sentinel(execution_status, allowed_values): + execution_status = 'UNKNOWN_ENUM_VALUE' + self._execution_status = execution_status + + @property + def status_detail(self): + """ + Gets the status_detail of this AssignmentValidationStatus. + List of execution detail for the validate assignment. + + + :return: The status_detail of this AssignmentValidationStatus. + :rtype: list[oci.operator_access_control.models.StatusDetail] + """ + return self._status_detail + + @status_detail.setter + def status_detail(self, status_detail): + """ + Sets the status_detail of this AssignmentValidationStatus. + List of execution detail for the validate assignment. + + + :param status_detail: The status_detail of this AssignmentValidationStatus. + :type: list[oci.operator_access_control.models.StatusDetail] + """ + self._status_detail = status_detail + + @property + def time_of_validation_start(self): + """ + Gets the time_of_validation_start of this AssignmentValidationStatus. + Time when the respective action happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_of_validation_start of this AssignmentValidationStatus. + :rtype: datetime + """ + return self._time_of_validation_start + + @time_of_validation_start.setter + def time_of_validation_start(self, time_of_validation_start): + """ + Sets the time_of_validation_start of this AssignmentValidationStatus. + Time when the respective action happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_of_validation_start: The time_of_validation_start of this AssignmentValidationStatus. + :type: datetime + """ + self._time_of_validation_start = time_of_validation_start + + @property + def time_of_validation_finish(self): + """ + Gets the time_of_validation_finish of this AssignmentValidationStatus. + Time when the respective action happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_of_validation_finish of this AssignmentValidationStatus. + :rtype: datetime + """ + return self._time_of_validation_finish + + @time_of_validation_finish.setter + def time_of_validation_finish(self, time_of_validation_finish): + """ + Sets the time_of_validation_finish of this AssignmentValidationStatus. + Time when the respective action happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_of_validation_finish: The time_of_validation_finish of this AssignmentValidationStatus. + :type: datetime + """ + self._time_of_validation_finish = time_of_validation_finish + + 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/operator_access_control/models/audit_log_report.py b/src/oci/operator_access_control/models/audit_log_report.py new file mode 100644 index 0000000000..f6085d9a5f --- /dev/null +++ b/src/oci/operator_access_control/models/audit_log_report.py @@ -0,0 +1,193 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200630 + + +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 AuditLogReport(object): + """ + The auditLog report details. + """ + + #: A constant which can be used with the audit_report_status property of a AuditLogReport. + #: This constant has a value of "NOTAVAILABLE" + AUDIT_REPORT_STATUS_NOTAVAILABLE = "NOTAVAILABLE" + + #: A constant which can be used with the audit_report_status property of a AuditLogReport. + #: This constant has a value of "AVAILABLE" + AUDIT_REPORT_STATUS_AVAILABLE = "AVAILABLE" + + #: A constant which can be used with the audit_report_status property of a AuditLogReport. + #: This constant has a value of "EXPIRED" + AUDIT_REPORT_STATUS_EXPIRED = "EXPIRED" + + #: A constant which can be used with the audit_report_status property of a AuditLogReport. + #: This constant has a value of "FAILED" + AUDIT_REPORT_STATUS_FAILED = "FAILED" + + def __init__(self, **kwargs): + """ + Initializes a new AuditLogReport object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param report: + The value to assign to the report property of this AuditLogReport. + :type report: str + + :param process_tree: + The value to assign to the process_tree property of this AuditLogReport. + :type process_tree: str + + :param audit_report_status: + The value to assign to the audit_report_status property of this AuditLogReport. + Allowed values for this property are: "NOTAVAILABLE", "AVAILABLE", "EXPIRED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type audit_report_status: str + + :param time_of_report_generation: + The value to assign to the time_of_report_generation property of this AuditLogReport. + :type time_of_report_generation: datetime + + """ + self.swagger_types = { + 'report': 'str', + 'process_tree': 'str', + 'audit_report_status': 'str', + 'time_of_report_generation': 'datetime' + } + + self.attribute_map = { + 'report': 'report', + 'process_tree': 'processTree', + 'audit_report_status': 'auditReportStatus', + 'time_of_report_generation': 'timeOfReportGeneration' + } + + self._report = None + self._process_tree = None + self._audit_report_status = None + self._time_of_report_generation = None + + @property + def report(self): + """ + Gets the report of this AuditLogReport. + Contains the report data. + + + :return: The report of this AuditLogReport. + :rtype: str + """ + return self._report + + @report.setter + def report(self, report): + """ + Sets the report of this AuditLogReport. + Contains the report data. + + + :param report: The report of this AuditLogReport. + :type: str + """ + self._report = report + + @property + def process_tree(self): + """ + Gets the process_tree of this AuditLogReport. + Contains the process tree data + + + :return: The process_tree of this AuditLogReport. + :rtype: str + """ + return self._process_tree + + @process_tree.setter + def process_tree(self, process_tree): + """ + Sets the process_tree of this AuditLogReport. + Contains the process tree data + + + :param process_tree: The process_tree of this AuditLogReport. + :type: str + """ + self._process_tree = process_tree + + @property + def audit_report_status(self): + """ + **[Required]** Gets the audit_report_status of this AuditLogReport. + auditReportStatus for the accessRequestId + + Allowed values for this property are: "NOTAVAILABLE", "AVAILABLE", "EXPIRED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The audit_report_status of this AuditLogReport. + :rtype: str + """ + return self._audit_report_status + + @audit_report_status.setter + def audit_report_status(self, audit_report_status): + """ + Sets the audit_report_status of this AuditLogReport. + auditReportStatus for the accessRequestId + + + :param audit_report_status: The audit_report_status of this AuditLogReport. + :type: str + """ + allowed_values = ["NOTAVAILABLE", "AVAILABLE", "EXPIRED", "FAILED"] + if not value_allowed_none_or_none_sentinel(audit_report_status, allowed_values): + audit_report_status = 'UNKNOWN_ENUM_VALUE' + self._audit_report_status = audit_report_status + + @property + def time_of_report_generation(self): + """ + Gets the time_of_report_generation of this AuditLogReport. + Time when the audit report was generated `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_of_report_generation of this AuditLogReport. + :rtype: datetime + """ + return self._time_of_report_generation + + @time_of_report_generation.setter + def time_of_report_generation(self, time_of_report_generation): + """ + Sets the time_of_report_generation of this AuditLogReport. + Time when the audit report was generated `RFC 3339`__ timestamp format.Example: '2020-05-22T21:10:29.600Z' + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_of_report_generation: The time_of_report_generation of this AuditLogReport. + :type: datetime + """ + self._time_of_report_generation = time_of_report_generation + + 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/operator_access_control/models/create_operator_control_assignment_details.py b/src/oci/operator_access_control/models/create_operator_control_assignment_details.py index 0b58c16a65..d6a766af71 100644 --- a/src/oci/operator_access_control/models/create_operator_control_assignment_details.py +++ b/src/oci/operator_access_control/models/create_operator_control_assignment_details.py @@ -98,6 +98,10 @@ def __init__(self, **kwargs): The value to assign to the remote_syslog_server_ca_cert property of this CreateOperatorControlAssignmentDetails. :type remote_syslog_server_ca_cert: str + :param is_hypervisor_log_forwarded: + The value to assign to the is_hypervisor_log_forwarded property of this CreateOperatorControlAssignmentDetails. + :type is_hypervisor_log_forwarded: bool + :param is_auto_approve_during_maintenance: The value to assign to the is_auto_approve_during_maintenance property of this CreateOperatorControlAssignmentDetails. :type is_auto_approve_during_maintenance: bool @@ -126,6 +130,7 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'str', 'remote_syslog_server_port': 'int', 'remote_syslog_server_ca_cert': 'str', + 'is_hypervisor_log_forwarded': 'bool', 'is_auto_approve_during_maintenance': 'bool', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' @@ -146,6 +151,7 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'remoteSyslogServerAddress', 'remote_syslog_server_port': 'remoteSyslogServerPort', 'remote_syslog_server_ca_cert': 'remoteSyslogServerCACert', + 'is_hypervisor_log_forwarded': 'isHypervisorLogForwarded', 'is_auto_approve_during_maintenance': 'isAutoApproveDuringMaintenance', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' @@ -165,6 +171,7 @@ def __init__(self, **kwargs): self._remote_syslog_server_address = None self._remote_syslog_server_port = None self._remote_syslog_server_ca_cert = None + self._is_hypervisor_log_forwarded = None self._is_auto_approve_during_maintenance = None self._freeform_tags = None self._defined_tags = None @@ -520,6 +527,30 @@ def remote_syslog_server_ca_cert(self, remote_syslog_server_ca_cert): """ self._remote_syslog_server_ca_cert = remote_syslog_server_ca_cert + @property + def is_hypervisor_log_forwarded(self): + """ + Gets the is_hypervisor_log_forwarded of this CreateOperatorControlAssignmentDetails. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :return: The is_hypervisor_log_forwarded of this CreateOperatorControlAssignmentDetails. + :rtype: bool + """ + return self._is_hypervisor_log_forwarded + + @is_hypervisor_log_forwarded.setter + def is_hypervisor_log_forwarded(self, is_hypervisor_log_forwarded): + """ + Sets the is_hypervisor_log_forwarded of this CreateOperatorControlAssignmentDetails. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :param is_hypervisor_log_forwarded: The is_hypervisor_log_forwarded of this CreateOperatorControlAssignmentDetails. + :type: bool + """ + self._is_hypervisor_log_forwarded = is_hypervisor_log_forwarded + @property def is_auto_approve_during_maintenance(self): """ diff --git a/src/oci/operator_access_control/models/create_operator_control_details.py b/src/oci/operator_access_control/models/create_operator_control_details.py index ee88133ce4..44e239506c 100644 --- a/src/oci/operator_access_control/models/create_operator_control_details.py +++ b/src/oci/operator_access_control/models/create_operator_control_details.py @@ -73,6 +73,10 @@ def __init__(self, **kwargs): Allowed values for this property are: "EXACC", "EXADATAINFRASTRUCTURE", "AUTONOMOUSVMCLUSTER", "CLOUDAUTONOMOUSVMCLUSTER", "CCCINFRASTRUCTURE" :type resource_type: str + :param number_of_approvers: + The value to assign to the number_of_approvers property of this CreateOperatorControlDetails. + :type number_of_approvers: int + :param email_id_list: The value to assign to the email_id_list property of this CreateOperatorControlDetails. :type email_id_list: list[str] @@ -102,6 +106,7 @@ def __init__(self, **kwargs): 'pre_approved_op_action_list': 'list[str]', 'is_fully_pre_approved': 'bool', 'resource_type': 'str', + 'number_of_approvers': 'int', 'email_id_list': 'list[str]', 'system_message': 'str', 'compartment_id': 'str', @@ -117,6 +122,7 @@ def __init__(self, **kwargs): 'pre_approved_op_action_list': 'preApprovedOpActionList', 'is_fully_pre_approved': 'isFullyPreApproved', 'resource_type': 'resourceType', + 'number_of_approvers': 'numberOfApprovers', 'email_id_list': 'emailIdList', 'system_message': 'systemMessage', 'compartment_id': 'compartmentId', @@ -131,6 +137,7 @@ def __init__(self, **kwargs): self._pre_approved_op_action_list = None self._is_fully_pre_approved = None self._resource_type = None + self._number_of_approvers = None self._email_id_list = None self._system_message = None self._compartment_id = None @@ -316,6 +323,30 @@ def resource_type(self, resource_type): ) self._resource_type = resource_type + @property + def number_of_approvers(self): + """ + Gets the number_of_approvers of this CreateOperatorControlDetails. + Number of approvers required to approve an access request. + + + :return: The number_of_approvers of this CreateOperatorControlDetails. + :rtype: int + """ + return self._number_of_approvers + + @number_of_approvers.setter + def number_of_approvers(self, number_of_approvers): + """ + Sets the number_of_approvers of this CreateOperatorControlDetails. + Number of approvers required to approve an access request. + + + :param number_of_approvers: The number_of_approvers of this CreateOperatorControlDetails. + :type: int + """ + self._number_of_approvers = number_of_approvers + @property def email_id_list(self): """ diff --git a/src/oci/operator_access_control/models/operator_control.py b/src/oci/operator_access_control/models/operator_control.py index f172e58b60..87c5a32622 100644 --- a/src/oci/operator_access_control/models/operator_control.py +++ b/src/oci/operator_access_control/models/operator_control.py @@ -120,6 +120,10 @@ def __init__(self, **kwargs): The value to assign to the time_of_modification property of this OperatorControl. :type time_of_modification: datetime + :param number_of_approvers: + The value to assign to the number_of_approvers property of this OperatorControl. + :type number_of_approvers: int + :param is_default_operator_control: The value to assign to the is_default_operator_control property of this OperatorControl. :type is_default_operator_control: bool @@ -157,6 +161,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'time_of_creation': 'datetime', 'time_of_modification': 'datetime', + 'number_of_approvers': 'int', 'is_default_operator_control': 'bool', 'time_of_deletion': 'datetime', 'last_modified_info': 'str', @@ -180,6 +185,7 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'time_of_creation': 'timeOfCreation', 'time_of_modification': 'timeOfModification', + 'number_of_approvers': 'numberOfApprovers', 'is_default_operator_control': 'isDefaultOperatorControl', 'time_of_deletion': 'timeOfDeletion', 'last_modified_info': 'lastModifiedInfo', @@ -202,6 +208,7 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._time_of_creation = None self._time_of_modification = None + self._number_of_approvers = None self._is_default_operator_control = None self._time_of_deletion = None self._last_modified_info = None @@ -596,6 +603,30 @@ def time_of_modification(self, time_of_modification): """ self._time_of_modification = time_of_modification + @property + def number_of_approvers(self): + """ + Gets the number_of_approvers of this OperatorControl. + Number of approvers required to approve an access request. + + + :return: The number_of_approvers of this OperatorControl. + :rtype: int + """ + return self._number_of_approvers + + @number_of_approvers.setter + def number_of_approvers(self, number_of_approvers): + """ + Sets the number_of_approvers of this OperatorControl. + Number of approvers required to approve an access request. + + + :param number_of_approvers: The number_of_approvers of this OperatorControl. + :type: int + """ + self._number_of_approvers = number_of_approvers + @property def is_default_operator_control(self): """ diff --git a/src/oci/operator_access_control/models/operator_control_assignment.py b/src/oci/operator_access_control/models/operator_control_assignment.py index 36d1a29886..ca850a721e 100644 --- a/src/oci/operator_access_control/models/operator_control_assignment.py +++ b/src/oci/operator_access_control/models/operator_control_assignment.py @@ -165,6 +165,14 @@ def __init__(self, **kwargs): The value to assign to the remote_syslog_server_ca_cert property of this OperatorControlAssignment. :type remote_syslog_server_ca_cert: str + :param is_hypervisor_log_forwarded: + The value to assign to the is_hypervisor_log_forwarded property of this OperatorControlAssignment. + :type is_hypervisor_log_forwarded: bool + + :param op_control_name: + The value to assign to the op_control_name property of this OperatorControlAssignment. + :type op_control_name: str + :param is_auto_approve_during_maintenance: The value to assign to the is_auto_approve_during_maintenance property of this OperatorControlAssignment. :type is_auto_approve_during_maintenance: bool @@ -213,6 +221,8 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'str', 'remote_syslog_server_port': 'int', 'remote_syslog_server_ca_cert': 'str', + 'is_hypervisor_log_forwarded': 'bool', + 'op_control_name': 'str', 'is_auto_approve_during_maintenance': 'bool', 'error_code': 'int', 'error_message': 'str', @@ -244,6 +254,8 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'remoteSyslogServerAddress', 'remote_syslog_server_port': 'remoteSyslogServerPort', 'remote_syslog_server_ca_cert': 'remoteSyslogServerCACert', + 'is_hypervisor_log_forwarded': 'isHypervisorLogForwarded', + 'op_control_name': 'opControlName', 'is_auto_approve_during_maintenance': 'isAutoApproveDuringMaintenance', 'error_code': 'errorCode', 'error_message': 'errorMessage', @@ -274,6 +286,8 @@ def __init__(self, **kwargs): self._remote_syslog_server_address = None self._remote_syslog_server_port = None self._remote_syslog_server_ca_cert = None + self._is_hypervisor_log_forwarded = None + self._op_control_name = None self._is_auto_approve_during_maintenance = None self._error_code = None self._error_message = None @@ -841,6 +855,54 @@ def remote_syslog_server_ca_cert(self, remote_syslog_server_ca_cert): """ self._remote_syslog_server_ca_cert = remote_syslog_server_ca_cert + @property + def is_hypervisor_log_forwarded(self): + """ + Gets the is_hypervisor_log_forwarded of this OperatorControlAssignment. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :return: The is_hypervisor_log_forwarded of this OperatorControlAssignment. + :rtype: bool + """ + return self._is_hypervisor_log_forwarded + + @is_hypervisor_log_forwarded.setter + def is_hypervisor_log_forwarded(self, is_hypervisor_log_forwarded): + """ + Sets the is_hypervisor_log_forwarded of this OperatorControlAssignment. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :param is_hypervisor_log_forwarded: The is_hypervisor_log_forwarded of this OperatorControlAssignment. + :type: bool + """ + self._is_hypervisor_log_forwarded = is_hypervisor_log_forwarded + + @property + def op_control_name(self): + """ + Gets the op_control_name of this OperatorControlAssignment. + Name of the operator control name associated. + + + :return: The op_control_name of this OperatorControlAssignment. + :rtype: str + """ + return self._op_control_name + + @op_control_name.setter + def op_control_name(self, op_control_name): + """ + Sets the op_control_name of this OperatorControlAssignment. + Name of the operator control name associated. + + + :param op_control_name: The op_control_name of this OperatorControlAssignment. + :type: str + """ + self._op_control_name = op_control_name + @property def is_auto_approve_during_maintenance(self): """ diff --git a/src/oci/operator_access_control/models/operator_control_assignment_summary.py b/src/oci/operator_access_control/models/operator_control_assignment_summary.py index a498c10254..5086ce2475 100644 --- a/src/oci/operator_access_control/models/operator_control_assignment_summary.py +++ b/src/oci/operator_access_control/models/operator_control_assignment_summary.py @@ -94,6 +94,14 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type resource_type: str + :param resource_name: + The value to assign to the resource_name property of this OperatorControlAssignmentSummary. + :type resource_name: str + + :param op_control_name: + The value to assign to the op_control_name property of this OperatorControlAssignmentSummary. + :type op_control_name: str + :param time_assignment_from: The value to assign to the time_assignment_from property of this OperatorControlAssignmentSummary. :type time_assignment_from: datetime @@ -130,6 +138,10 @@ def __init__(self, **kwargs): The value to assign to the remote_syslog_server_port property of this OperatorControlAssignmentSummary. :type remote_syslog_server_port: int + :param is_hypervisor_log_forwarded: + The value to assign to the is_hypervisor_log_forwarded property of this OperatorControlAssignmentSummary. + :type is_hypervisor_log_forwarded: bool + :param lifecycle_state: The value to assign to the lifecycle_state property of this OperatorControlAssignmentSummary. Allowed values for this property are: "CREATED", "APPLIED", "APPLYFAILED", "UPDATING", "UPDATEFAILED", "DELETING", "DELETED", "DELETIONFAILED", 'UNKNOWN_ENUM_VALUE'. @@ -155,6 +167,8 @@ def __init__(self, **kwargs): 'resource_id': 'str', 'compartment_id': 'str', 'resource_type': 'str', + 'resource_name': 'str', + 'op_control_name': 'str', 'time_assignment_from': 'datetime', 'time_assignment_to': 'datetime', 'is_enforced_always': 'bool', @@ -164,6 +178,7 @@ def __init__(self, **kwargs): 'is_log_forwarded': 'bool', 'remote_syslog_server_address': 'str', 'remote_syslog_server_port': 'int', + 'is_hypervisor_log_forwarded': 'bool', 'lifecycle_state': 'str', 'lifecycle_details': 'str', 'freeform_tags': 'dict(str, str)', @@ -176,6 +191,8 @@ def __init__(self, **kwargs): 'resource_id': 'resourceId', 'compartment_id': 'compartmentId', 'resource_type': 'resourceType', + 'resource_name': 'resourceName', + 'op_control_name': 'opControlName', 'time_assignment_from': 'timeAssignmentFrom', 'time_assignment_to': 'timeAssignmentTo', 'is_enforced_always': 'isEnforcedAlways', @@ -185,6 +202,7 @@ def __init__(self, **kwargs): 'is_log_forwarded': 'isLogForwarded', 'remote_syslog_server_address': 'remoteSyslogServerAddress', 'remote_syslog_server_port': 'remoteSyslogServerPort', + 'is_hypervisor_log_forwarded': 'isHypervisorLogForwarded', 'lifecycle_state': 'lifecycleState', 'lifecycle_details': 'lifecycleDetails', 'freeform_tags': 'freeformTags', @@ -196,6 +214,8 @@ def __init__(self, **kwargs): self._resource_id = None self._compartment_id = None self._resource_type = None + self._resource_name = None + self._op_control_name = None self._time_assignment_from = None self._time_assignment_to = None self._is_enforced_always = None @@ -205,6 +225,7 @@ def __init__(self, **kwargs): self._is_log_forwarded = None self._remote_syslog_server_address = None self._remote_syslog_server_port = None + self._is_hypervisor_log_forwarded = None self._lifecycle_state = None self._lifecycle_details = None self._freeform_tags = None @@ -336,6 +357,54 @@ def resource_type(self, resource_type): resource_type = 'UNKNOWN_ENUM_VALUE' self._resource_type = resource_type + @property + def resource_name(self): + """ + Gets the resource_name of this OperatorControlAssignmentSummary. + Name of the target resource. + + + :return: The resource_name of this OperatorControlAssignmentSummary. + :rtype: str + """ + return self._resource_name + + @resource_name.setter + def resource_name(self, resource_name): + """ + Sets the resource_name of this OperatorControlAssignmentSummary. + Name of the target resource. + + + :param resource_name: The resource_name of this OperatorControlAssignmentSummary. + :type: str + """ + self._resource_name = resource_name + + @property + def op_control_name(self): + """ + Gets the op_control_name of this OperatorControlAssignmentSummary. + Name of the operator control name associated. + + + :return: The op_control_name of this OperatorControlAssignmentSummary. + :rtype: str + """ + return self._op_control_name + + @op_control_name.setter + def op_control_name(self, op_control_name): + """ + Sets the op_control_name of this OperatorControlAssignmentSummary. + Name of the operator control name associated. + + + :param op_control_name: The op_control_name of this OperatorControlAssignmentSummary. + :type: str + """ + self._op_control_name = op_control_name + @property def time_assignment_from(self): """ @@ -564,6 +633,30 @@ def remote_syslog_server_port(self, remote_syslog_server_port): """ self._remote_syslog_server_port = remote_syslog_server_port + @property + def is_hypervisor_log_forwarded(self): + """ + Gets the is_hypervisor_log_forwarded of this OperatorControlAssignmentSummary. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :return: The is_hypervisor_log_forwarded of this OperatorControlAssignmentSummary. + :rtype: bool + """ + return self._is_hypervisor_log_forwarded + + @is_hypervisor_log_forwarded.setter + def is_hypervisor_log_forwarded(self, is_hypervisor_log_forwarded): + """ + Sets the is_hypervisor_log_forwarded of this OperatorControlAssignmentSummary. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :param is_hypervisor_log_forwarded: The is_hypervisor_log_forwarded of this OperatorControlAssignmentSummary. + :type: bool + """ + self._is_hypervisor_log_forwarded = is_hypervisor_log_forwarded + @property def lifecycle_state(self): """ diff --git a/src/oci/operator_access_control/models/operator_control_summary.py b/src/oci/operator_access_control/models/operator_control_summary.py index 6f24b1f577..dfa41d9ba0 100644 --- a/src/oci/operator_access_control/models/operator_control_summary.py +++ b/src/oci/operator_access_control/models/operator_control_summary.py @@ -78,6 +78,10 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type resource_type: str + :param number_of_approvers: + The value to assign to the number_of_approvers property of this OperatorControlSummary. + :type number_of_approvers: int + :param time_of_creation: The value to assign to the time_of_creation property of this OperatorControlSummary. :type time_of_creation: datetime @@ -111,6 +115,7 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'is_fully_pre_approved': 'bool', 'resource_type': 'str', + 'number_of_approvers': 'int', 'time_of_creation': 'datetime', 'time_of_modification': 'datetime', 'time_of_deletion': 'datetime', @@ -125,6 +130,7 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'is_fully_pre_approved': 'isFullyPreApproved', 'resource_type': 'resourceType', + 'number_of_approvers': 'numberOfApprovers', 'time_of_creation': 'timeOfCreation', 'time_of_modification': 'timeOfModification', 'time_of_deletion': 'timeOfDeletion', @@ -138,6 +144,7 @@ def __init__(self, **kwargs): self._compartment_id = None self._is_fully_pre_approved = None self._resource_type = None + self._number_of_approvers = None self._time_of_creation = None self._time_of_modification = None self._time_of_deletion = None @@ -271,6 +278,30 @@ def resource_type(self, resource_type): resource_type = 'UNKNOWN_ENUM_VALUE' self._resource_type = resource_type + @property + def number_of_approvers(self): + """ + Gets the number_of_approvers of this OperatorControlSummary. + Number of approvers required to approve an access request. + + + :return: The number_of_approvers of this OperatorControlSummary. + :rtype: int + """ + return self._number_of_approvers + + @number_of_approvers.setter + def number_of_approvers(self, number_of_approvers): + """ + Sets the number_of_approvers of this OperatorControlSummary. + Number of approvers required to approve an access request. + + + :param number_of_approvers: The number_of_approvers of this OperatorControlSummary. + :type: int + """ + self._number_of_approvers = number_of_approvers + @property def time_of_creation(self): """ diff --git a/src/oci/operator_access_control/models/status_detail.py b/src/oci/operator_access_control/models/status_detail.py new file mode 100644 index 0000000000..a458e8bc38 --- /dev/null +++ b/src/oci/operator_access_control/models/status_detail.py @@ -0,0 +1,169 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200630 + + +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 StatusDetail(object): + """ + Detail of execution. + """ + + def __init__(self, **kwargs): + """ + Initializes a new StatusDetail object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param status_id: + The value to assign to the status_id property of this StatusDetail. + :type status_id: int + + :param command_name: + The value to assign to the command_name property of this StatusDetail. + :type command_name: str + + :param status: + The value to assign to the status property of this StatusDetail. + :type status: str + + :param time_of_validation: + The value to assign to the time_of_validation property of this StatusDetail. + :type time_of_validation: datetime + + """ + self.swagger_types = { + 'status_id': 'int', + 'command_name': 'str', + 'status': 'str', + 'time_of_validation': 'datetime' + } + + self.attribute_map = { + 'status_id': 'statusId', + 'command_name': 'commandName', + 'status': 'status', + 'time_of_validation': 'timeOfValidation' + } + + self._status_id = None + self._command_name = None + self._status = None + self._time_of_validation = None + + @property + def status_id(self): + """ + Gets the status_id of this StatusDetail. + running unique number of the command executed + + + :return: The status_id of this StatusDetail. + :rtype: int + """ + return self._status_id + + @status_id.setter + def status_id(self, status_id): + """ + Sets the status_id of this StatusDetail. + running unique number of the command executed + + + :param status_id: The status_id of this StatusDetail. + :type: int + """ + self._status_id = status_id + + @property + def command_name(self): + """ + Gets the command_name of this StatusDetail. + Name of the process or command executed. + + + :return: The command_name of this StatusDetail. + :rtype: str + """ + return self._command_name + + @command_name.setter + def command_name(self, command_name): + """ + Sets the command_name of this StatusDetail. + Name of the process or command executed. + + + :param command_name: The command_name of this StatusDetail. + :type: str + """ + self._command_name = command_name + + @property + def status(self): + """ + Gets the status of this StatusDetail. + Status of the process or command executed Success or Failure. + + + :return: The status of this StatusDetail. + :rtype: str + """ + return self._status + + @status.setter + def status(self, status): + """ + Sets the status of this StatusDetail. + Status of the process or command executed Success or Failure. + + + :param status: The status of this StatusDetail. + :type: str + """ + self._status = status + + @property + def time_of_validation(self): + """ + Gets the time_of_validation of this StatusDetail. + Time when the execution happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_of_validation of this StatusDetail. + :rtype: datetime + """ + return self._time_of_validation + + @time_of_validation.setter + def time_of_validation(self, time_of_validation): + """ + Sets the time_of_validation of this StatusDetail. + Time when the execution happened in `RFC 3339`__timestamp format. Example: '2020-05-22T21:10:29.600Z'. + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_of_validation: The time_of_validation of this StatusDetail. + :type: datetime + """ + self._time_of_validation = time_of_validation + + 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/operator_access_control/models/update_operator_control_assignment_details.py b/src/oci/operator_access_control/models/update_operator_control_assignment_details.py index c6bc66a868..8f612f3acc 100644 --- a/src/oci/operator_access_control/models/update_operator_control_assignment_details.py +++ b/src/oci/operator_access_control/models/update_operator_control_assignment_details.py @@ -52,6 +52,10 @@ def __init__(self, **kwargs): The value to assign to the remote_syslog_server_ca_cert property of this UpdateOperatorControlAssignmentDetails. :type remote_syslog_server_ca_cert: str + :param is_hypervisor_log_forwarded: + The value to assign to the is_hypervisor_log_forwarded property of this UpdateOperatorControlAssignmentDetails. + :type is_hypervisor_log_forwarded: bool + :param is_auto_approve_during_maintenance: The value to assign to the is_auto_approve_during_maintenance property of this UpdateOperatorControlAssignmentDetails. :type is_auto_approve_during_maintenance: bool @@ -74,6 +78,7 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'str', 'remote_syslog_server_port': 'int', 'remote_syslog_server_ca_cert': 'str', + 'is_hypervisor_log_forwarded': 'bool', 'is_auto_approve_during_maintenance': 'bool', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' @@ -88,6 +93,7 @@ def __init__(self, **kwargs): 'remote_syslog_server_address': 'remoteSyslogServerAddress', 'remote_syslog_server_port': 'remoteSyslogServerPort', 'remote_syslog_server_ca_cert': 'remoteSyslogServerCACert', + 'is_hypervisor_log_forwarded': 'isHypervisorLogForwarded', 'is_auto_approve_during_maintenance': 'isAutoApproveDuringMaintenance', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' @@ -101,6 +107,7 @@ def __init__(self, **kwargs): self._remote_syslog_server_address = None self._remote_syslog_server_port = None self._remote_syslog_server_ca_cert = None + self._is_hypervisor_log_forwarded = None self._is_auto_approve_during_maintenance = None self._freeform_tags = None self._defined_tags = None @@ -305,6 +312,30 @@ def remote_syslog_server_ca_cert(self, remote_syslog_server_ca_cert): """ self._remote_syslog_server_ca_cert = remote_syslog_server_ca_cert + @property + def is_hypervisor_log_forwarded(self): + """ + Gets the is_hypervisor_log_forwarded of this UpdateOperatorControlAssignmentDetails. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :return: The is_hypervisor_log_forwarded of this UpdateOperatorControlAssignmentDetails. + :rtype: bool + """ + return self._is_hypervisor_log_forwarded + + @is_hypervisor_log_forwarded.setter + def is_hypervisor_log_forwarded(self, is_hypervisor_log_forwarded): + """ + Sets the is_hypervisor_log_forwarded of this UpdateOperatorControlAssignmentDetails. + If set, then the hypervisor audit logs will be forwarded to the relevant remote syslog server + + + :param is_hypervisor_log_forwarded: The is_hypervisor_log_forwarded of this UpdateOperatorControlAssignmentDetails. + :type: bool + """ + self._is_hypervisor_log_forwarded = is_hypervisor_log_forwarded + @property def is_auto_approve_during_maintenance(self): """ diff --git a/src/oci/operator_access_control/models/update_operator_control_details.py b/src/oci/operator_access_control/models/update_operator_control_details.py index 5db5e8ffed..d4f37f86bb 100644 --- a/src/oci/operator_access_control/models/update_operator_control_details.py +++ b/src/oci/operator_access_control/models/update_operator_control_details.py @@ -48,6 +48,10 @@ def __init__(self, **kwargs): The value to assign to the email_id_list property of this UpdateOperatorControlDetails. :type email_id_list: list[str] + :param number_of_approvers: + The value to assign to the number_of_approvers property of this UpdateOperatorControlDetails. + :type number_of_approvers: int + :param system_message: The value to assign to the system_message property of this UpdateOperatorControlDetails. :type system_message: str @@ -69,6 +73,7 @@ def __init__(self, **kwargs): 'pre_approved_op_action_list': 'list[str]', 'is_fully_pre_approved': 'bool', 'email_id_list': 'list[str]', + 'number_of_approvers': 'int', 'system_message': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' @@ -82,6 +87,7 @@ def __init__(self, **kwargs): 'pre_approved_op_action_list': 'preApprovedOpActionList', 'is_fully_pre_approved': 'isFullyPreApproved', 'email_id_list': 'emailIdList', + 'number_of_approvers': 'numberOfApprovers', 'system_message': 'systemMessage', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' @@ -94,6 +100,7 @@ def __init__(self, **kwargs): self._pre_approved_op_action_list = None self._is_fully_pre_approved = None self._email_id_list = None + self._number_of_approvers = None self._system_message = None self._freeform_tags = None self._defined_tags = None @@ -270,6 +277,30 @@ def email_id_list(self, email_id_list): """ self._email_id_list = email_id_list + @property + def number_of_approvers(self): + """ + Gets the number_of_approvers of this UpdateOperatorControlDetails. + Number of approvers required to approve an access request. + + + :return: The number_of_approvers of this UpdateOperatorControlDetails. + :rtype: int + """ + return self._number_of_approvers + + @number_of_approvers.setter + def number_of_approvers(self, number_of_approvers): + """ + Sets the number_of_approvers of this UpdateOperatorControlDetails. + Number of approvers required to approve an access request. + + + :param number_of_approvers: The number_of_approvers of this UpdateOperatorControlDetails. + :type: int + """ + self._number_of_approvers = number_of_approvers + @property def system_message(self): """ diff --git a/src/oci/operator_access_control/models/validate_operator_assignment_details.py b/src/oci/operator_access_control/models/validate_operator_assignment_details.py new file mode 100644 index 0000000000..3f6a5a2f3b --- /dev/null +++ b/src/oci/operator_access_control/models/validate_operator_assignment_details.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200630 + + +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 ValidateOperatorAssignmentDetails(object): + """ + Details of the ValidateOperatorAssignment. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ValidateOperatorAssignmentDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param action_name: + The value to assign to the action_name property of this ValidateOperatorAssignmentDetails. + :type action_name: str + + """ + self.swagger_types = { + 'action_name': 'str' + } + + self.attribute_map = { + 'action_name': 'actionName' + } + + self._action_name = None + + @property + def action_name(self): + """ + Gets the action_name of this ValidateOperatorAssignmentDetails. + Specifies the name of the operator action name for creating accessRequest. + + + :return: The action_name of this ValidateOperatorAssignmentDetails. + :rtype: str + """ + return self._action_name + + @action_name.setter + def action_name(self, action_name): + """ + Sets the action_name of this ValidateOperatorAssignmentDetails. + Specifies the name of the operator action name for creating accessRequest. + + + :param action_name: The action_name of this ValidateOperatorAssignmentDetails. + :type: str + """ + self._action_name = action_name + + 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/operator_access_control/operator_control_assignment_client.py b/src/oci/operator_access_control/operator_control_assignment_client.py index d32f3bc8c1..d4ae9efa12 100644 --- a/src/oci/operator_access_control/operator_control_assignment_client.py +++ b/src/oci/operator_access_control/operator_control_assignment_client.py @@ -453,6 +453,104 @@ def delete_operator_control_assignment(self, operator_control_assignment_id, **k api_reference_link=api_reference_link, required_arguments=required_arguments) + def get_assignment_validation_status(self, operator_control_assignment_id, **kwargs): + """ + Returns the status of assignment validation associated with the assignmentId and the executionId. + + + :param str operator_control_assignment_id: (required) + unique OperatorControl identifier + + :param str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.operator_access_control.models.AssignmentValidationStatus` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use get_assignment_validation_status API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['operatorControlAssignmentId'] + resource_path = "/operatorControlAssignments/{operatorControlAssignmentId}/actions/getAssignmentValidationStatus" + method = "GET" + operation_name = "get_assignment_validation_status" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetAssignmentValidationStatus" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"get_assignment_validation_status got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "operatorControlAssignmentId": operator_control_assignment_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(f'Parameter {k} cannot be None, whitespace or empty string') + + 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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="AssignmentValidationStatus", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="AssignmentValidationStatus", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + def get_operator_control_assignment(self, operator_control_assignment_id, **kwargs): """ Gets the details of an Operator Control Assignment of the specified ID. @@ -822,3 +920,123 @@ def update_operator_control_assignment(self, operator_control_assignment_id, upd operation_name=operation_name, api_reference_link=api_reference_link, required_arguments=required_arguments) + + def validate_operator_assignment(self, operator_control_assignment_id, validate_operator_assignment_details, **kwargs): + """ + Validates the assignment for the specified Operator Control Assignment ID. + + + :param str operator_control_assignment_id: (required) + unique OperatorControl identifier + + :param oci.operator_access_control.models.ValidateOperatorAssignmentDetails validate_operator_assignment_details: (required) + Contains details required for validating Operator Assignment Details. + + :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. For example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + might be rejected. + + :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 str opc_request_id: (optional) + The client request ID for tracing. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use validate_operator_assignment API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['operatorControlAssignmentId'] + resource_path = "/operatorControlAssignments/{operatorControlAssignmentId}/actions/validateAssignment" + method = "POST" + operation_name = "validate_operator_assignment" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ValidateOperatorAssignment" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_retry_token", + "if_match", + "opc_request_id" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"validate_operator_assignment got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "operatorControlAssignmentId": operator_control_assignment_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(f'Parameter {k} cannot be None, whitespace or empty string') + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing), + "if-match": kwargs.get("if_match", missing), + "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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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=validate_operator_assignment_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=validate_operator_assignment_details, + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) diff --git a/src/oci/sch/__init__.py b/src/oci/sch/__init__.py index 789212f89f..897f8f6852 100644 --- a/src/oci/sch/__init__.py +++ b/src/oci/sch/__init__.py @@ -7,8 +7,10 @@ from __future__ import absolute_import +from .connector_plugins_client import ConnectorPluginsClient +from .connector_plugins_client_composite_operations import ConnectorPluginsClientCompositeOperations from .service_connector_client import ServiceConnectorClient from .service_connector_client_composite_operations import ServiceConnectorClientCompositeOperations from . import models -__all__ = ["ServiceConnectorClient", "ServiceConnectorClientCompositeOperations", "models"] +__all__ = ["ConnectorPluginsClient", "ConnectorPluginsClientCompositeOperations", "ServiceConnectorClient", "ServiceConnectorClientCompositeOperations", "models"] diff --git a/src/oci/sch/connector_plugins_client.py b/src/oci/sch/connector_plugins_client.py new file mode 100644 index 0000000000..904500c716 --- /dev/null +++ b/src/oci/sch/connector_plugins_client.py @@ -0,0 +1,386 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from __future__ import absolute_import + +from oci._vendor import requests # noqa: F401 +from oci._vendor import six + +from oci import retry, circuit_breaker # noqa: F401 +from oci.base_client import BaseClient +from oci.config import get_config_value_or_default, validate_config +from oci.signer import Signer +from oci.util import Sentinel, get_signer_from_authentication_type, AUTHENTICATION_TYPE_FIELD_NAME +from oci.exceptions import InvalidAlloyConfig +from oci.alloy import OCI_SDK_ENABLED_SERVICES_SET +from .models import sch_type_mapping +missing = Sentinel("Missing") + + +class ConnectorPluginsClient(object): + """ + Use the Connector Hub API to transfer data between services in Oracle Cloud Infrastructure. + For more information about Connector Hub, see + [the Connector Hub documentation](/iaas/Content/connector-hub/home.htm). + Connector Hub is formerly known as Service Connector Hub. + """ + + def __init__(self, config, **kwargs): + """ + Creates a new service client + + :param dict config: + Configuration keys and values as per `SDK and Tool Configuration `__. + The :py:meth:`~oci.config.from_file` method can be used to load configuration from a file. Alternatively, a ``dict`` can be passed. You can validate_config + the dict using :py:meth:`~oci.config.validate_config` + + :param str service_endpoint: (optional) + The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is + not provided then it will be derived using the region in the config parameter. You should only provide this keyword argument if you have an explicit + need to specify a service endpoint. + + :param timeout: (optional) + The connection and read timeouts for the client. The default values are connection timeout 10 seconds and read timeout 60 seconds. This keyword argument can be provided + as a single float, in which case the value provided is used for both the read and connection timeouts, or as a tuple of two floats. If + a tuple is provided then the first value is used as the connection timeout and the second value as the read timeout. + :type timeout: float or tuple(float, float) + + :param signer: (optional) + The signer to use when signing requests made by the service client. The default is to use a :py:class:`~oci.signer.Signer` based on the values + provided in the config parameter. + + One use case for this parameter is for `Instance Principals authentication `__ + by passing an instance of :py:class:`~oci.auth.signers.InstancePrincipalsSecurityTokenSigner` as the value for this keyword argument + :type signer: :py:class:`~oci.signer.AbstractBaseSigner` + + :param obj retry_strategy: (optional) + A retry strategy to apply to all calls made by this service client (i.e. at the client level). There is no retry strategy applied by default. + Retry strategies can also be applied at the operation level by passing a ``retry_strategy`` keyword argument as part of calling the operation. + Any value provided at the operation level will override whatever is specified 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 `__. + + :param obj circuit_breaker_strategy: (optional) + A circuit breaker strategy to apply to all calls made by this service client (i.e. at the client level). + This client uses :py:data:`~oci.circuit_breaker.DEFAULT_CIRCUIT_BREAKER_STRATEGY` as default if no circuit breaker strategy is provided. + The specifics of circuit breaker strategy are described `here `__. + + :param function circuit_breaker_callback: (optional) + Callback function to receive any exceptions triggerred by the circuit breaker. + + :param bool client_level_realm_specific_endpoint_template_enabled: (optional) + A boolean flag to indicate whether or not this client should be created with realm specific endpoint template enabled or disable. By default, this will be set as None. + + :param allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this client should allow control characters in the response object. By default, the client will not + allow control characters to be in the response object. + """ + if not OCI_SDK_ENABLED_SERVICES_SET.is_service_enabled("sch"): + raise InvalidAlloyConfig("The Alloy configuration has disabled this service, this behavior is controlled by OCI_SDK_ENABLED_SERVICES_SET variable. Please check if your local alloy-config file configured the service you're targeting or contact the cloud provider on the availability of this service") + + validate_config(config, signer=kwargs.get('signer')) + if 'signer' in kwargs: + signer = kwargs['signer'] + + elif AUTHENTICATION_TYPE_FIELD_NAME in config: + signer = get_signer_from_authentication_type(config) + + else: + signer = Signer( + tenancy=config["tenancy"], + user=config["user"], + fingerprint=config["fingerprint"], + private_key_file_location=config.get("key_file"), + pass_phrase=get_config_value_or_default(config, "pass_phrase"), + private_key_content=config.get("key_content") + ) + + base_client_init_kwargs = { + 'regional_client': True, + 'service_endpoint': kwargs.get('service_endpoint'), + 'base_path': '/20200909', + 'service_endpoint_template': 'https://service-connector-hub.{region}.oci.{secondLevelDomain}', + 'service_endpoint_template_per_realm': { }, # noqa: E201 E202 + 'skip_deserialization': kwargs.get('skip_deserialization', False), + 'circuit_breaker_strategy': kwargs.get('circuit_breaker_strategy', circuit_breaker.GLOBAL_CIRCUIT_BREAKER_STRATEGY), + 'client_level_realm_specific_endpoint_template_enabled': kwargs.get('client_level_realm_specific_endpoint_template_enabled') + } + if 'timeout' in kwargs: + base_client_init_kwargs['timeout'] = kwargs.get('timeout') + if base_client_init_kwargs.get('circuit_breaker_strategy') is None: + base_client_init_kwargs['circuit_breaker_strategy'] = circuit_breaker.DEFAULT_CIRCUIT_BREAKER_STRATEGY + if 'allow_control_chars' in kwargs: + base_client_init_kwargs['allow_control_chars'] = kwargs.get('allow_control_chars') + self.base_client = BaseClient("connector_plugins", config, signer, sch_type_mapping, **base_client_init_kwargs) + self.retry_strategy = kwargs.get('retry_strategy') + self.circuit_breaker_callback = kwargs.get('circuit_breaker_callback') + + def get_connector_plugin(self, connector_plugin_name, **kwargs): + """ + Gets the specified connector plugin configuration information. + + + :param str connector_plugin_name: (required) + The name of the connector plugin. This name indicates the service to be called by the connector plugin. For example, `QueueSource` indicates the Queue service. + + :param str opc_request_id: (optional) + The unique Oracle-assigned identifier for the request. + If you need to contact Oracle about a particular request, please provide the request ID. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.sch.models.ConnectorPlugin` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use get_connector_plugin API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = ['connectorPluginName'] + resource_path = "/connectorPlugins/{connectorPluginName}" + method = "GET" + operation_name = "get_connector_plugin" + api_reference_link = "" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"get_connector_plugin got unknown kwargs: {extra_kwargs!r}") + + path_params = { + "connectorPluginName": connector_plugin_name + } + + 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(f'Parameter {k} cannot be None, whitespace or empty string') + + 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + 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="ConnectorPlugin", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="ConnectorPlugin", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + + def list_connector_plugins(self, **kwargs): + """ + Lists connector plugins according to the specified filter. + + + :param str lifecycle_state: (optional) + A filter to return only resources that match the given lifecycle state. + + Example: `ACTIVE` + + Allowed values are: "CREATING", "UPDATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", "FAILED" + + :param str display_name: (optional) + A filter to return only resources that match the given display name exactly. + + Example: `example_service_connector` + + :param str name: (optional) + A filter to return only resources that match the given connector plugin name ignoring case. + + Example: `QueueSource` + + :param int limit: (optional) + For list pagination. The maximum number of results per page, or items to return + in a paginated \"List\" call. For important details about how pagination works, see + `List Pagination`__. + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str page: (optional) + For list pagination. The value of the opc-next-page response header from the previous + \"List\" call. For important details about how pagination works, see + `List Pagination`__. + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str sort_order: (optional) + The sort order to use, either 'asc' or 'desc'. + + Allowed values are: "ASC", "DESC" + + :param str sort_by: (optional) + The field to sort by. Only one sort order may be provided. Default order for `timeCreated` is descending. + Default order for `displayName` is ascending. If no value is specified `timeCreated` is default. + + Allowed values are: "timeCreated", "displayName" + + :param str opc_request_id: (optional) + The unique Oracle-assigned identifier for the request. + If you need to contact Oracle about a particular request, please provide the request ID. + + :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. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. + 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`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.sch.models.ConnectorPluginCollection` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use list_connector_plugins API. + """ + # Required path and query arguments. These are in camelCase to replace values in service endpoints. + required_arguments = [] + resource_path = "/connectorPlugins" + method = "GET" + operation_name = "list_connector_plugins" + api_reference_link = "" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "lifecycle_state", + "display_name", + "name", + "limit", + "page", + "sort_order", + "sort_by", + "opc_request_id" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + f"list_connector_plugins got unknown kwargs: {extra_kwargs!r}") + + if 'lifecycle_state' in kwargs: + lifecycle_state_allowed_values = ["CREATING", "UPDATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", "FAILED"] + if kwargs['lifecycle_state'] not in lifecycle_state_allowed_values: + raise ValueError( + f"Invalid value for `lifecycle_state`, must be one of { lifecycle_state_allowed_values }" + ) + + if 'sort_order' in kwargs: + sort_order_allowed_values = ["ASC", "DESC"] + if kwargs['sort_order'] not in sort_order_allowed_values: + raise ValueError( + f"Invalid value for `sort_order`, must be one of { sort_order_allowed_values }" + ) + + if 'sort_by' in kwargs: + sort_by_allowed_values = ["timeCreated", "displayName"] + if kwargs['sort_by'] not in sort_by_allowed_values: + raise ValueError( + f"Invalid value for `sort_by`, must be one of { sort_by_allowed_values }" + ) + + query_params = { + "lifecycleState": kwargs.get("lifecycle_state", missing), + "displayName": kwargs.get("display_name", missing), + "name": kwargs.get("name", missing), + "limit": kwargs.get("limit", missing), + "page": kwargs.get("page", missing), + "sortOrder": kwargs.get("sort_order", missing), + "sortBy": kwargs.get("sort_by", 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 and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + query_params=query_params, + header_params=header_params, + response_type="ConnectorPluginCollection", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + query_params=query_params, + header_params=header_params, + response_type="ConnectorPluginCollection", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link, + required_arguments=required_arguments) diff --git a/src/oci/sch/connector_plugins_client_composite_operations.py b/src/oci/sch/connector_plugins_client_composite_operations.py new file mode 100644 index 0000000000..daf9d44810 --- /dev/null +++ b/src/oci/sch/connector_plugins_client_composite_operations.py @@ -0,0 +1,26 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +import oci # noqa: F401 +from oci.util import WAIT_RESOURCE_NOT_FOUND # noqa: F401 + + +class ConnectorPluginsClientCompositeOperations(object): + """ + This class provides a wrapper around :py:class:`~oci.sch.ConnectorPluginsClient` and offers convenience methods + for operations that would otherwise need to be chained together. For example, instead of performing an action + on a resource (e.g. launching an instance, creating a load balancer) and then using a waiter to wait for the resource + to enter a given state, you can call a single method in this class to accomplish the same functionality + """ + + def __init__(self, client, **kwargs): + """ + Creates a new ConnectorPluginsClientCompositeOperations object + + :param ConnectorPluginsClient client: + The service client which will be wrapped by this object + """ + self.client = client diff --git a/src/oci/sch/models/__init__.py b/src/oci/sch/models/__init__.py index 8bf618d063..2515df5d4e 100644 --- a/src/oci/sch/models/__init__.py +++ b/src/oci/sch/models/__init__.py @@ -7,6 +7,9 @@ from __future__ import absolute_import from .change_service_connector_compartment_details import ChangeServiceConnectorCompartmentDetails +from .connector_plugin import ConnectorPlugin +from .connector_plugin_collection import ConnectorPluginCollection +from .connector_plugin_summary import ConnectorPluginSummary from .create_service_connector_details import CreateServiceConnectorDetails from .dimension_details import DimensionDetails from .dimension_value_details import DimensionValueDetails @@ -28,14 +31,19 @@ from .monitoring_target_details import MonitoringTargetDetails from .notifications_target_details import NotificationsTargetDetails from .object_storage_target_details import ObjectStorageTargetDetails +from .plugin_source_details import PluginSourceDetails from .service_connector import ServiceConnector from .service_connector_collection import ServiceConnectorCollection from .service_connector_summary import ServiceConnectorSummary +from .source_connector_plugin import SourceConnectorPlugin +from .source_connector_plugin_summary import SourceConnectorPluginSummary from .source_details import SourceDetails from .static_dimension_value import StaticDimensionValue from .streaming_cursor_details import StreamingCursorDetails from .streaming_source_details import StreamingSourceDetails from .streaming_target_details import StreamingTargetDetails +from .target_connector_plugin import TargetConnectorPlugin +from .target_connector_plugin_summary import TargetConnectorPluginSummary from .target_details import TargetDetails from .task_details import TaskDetails from .trim_horizon_streaming_cursor import TrimHorizonStreamingCursor @@ -51,6 +59,9 @@ # Maps type names to classes for sch services. sch_type_mapping = { "ChangeServiceConnectorCompartmentDetails": ChangeServiceConnectorCompartmentDetails, + "ConnectorPlugin": ConnectorPlugin, + "ConnectorPluginCollection": ConnectorPluginCollection, + "ConnectorPluginSummary": ConnectorPluginSummary, "CreateServiceConnectorDetails": CreateServiceConnectorDetails, "DimensionDetails": DimensionDetails, "DimensionValueDetails": DimensionValueDetails, @@ -72,14 +83,19 @@ "MonitoringTargetDetails": MonitoringTargetDetails, "NotificationsTargetDetails": NotificationsTargetDetails, "ObjectStorageTargetDetails": ObjectStorageTargetDetails, + "PluginSourceDetails": PluginSourceDetails, "ServiceConnector": ServiceConnector, "ServiceConnectorCollection": ServiceConnectorCollection, "ServiceConnectorSummary": ServiceConnectorSummary, + "SourceConnectorPlugin": SourceConnectorPlugin, + "SourceConnectorPluginSummary": SourceConnectorPluginSummary, "SourceDetails": SourceDetails, "StaticDimensionValue": StaticDimensionValue, "StreamingCursorDetails": StreamingCursorDetails, "StreamingSourceDetails": StreamingSourceDetails, "StreamingTargetDetails": StreamingTargetDetails, + "TargetConnectorPlugin": TargetConnectorPlugin, + "TargetConnectorPluginSummary": TargetConnectorPluginSummary, "TargetDetails": TargetDetails, "TaskDetails": TaskDetails, "TrimHorizonStreamingCursor": TrimHorizonStreamingCursor, diff --git a/src/oci/sch/models/change_service_connector_compartment_details.py b/src/oci/sch/models/change_service_connector_compartment_details.py index e5f95dd95f..c8c0ba35be 100644 --- a/src/oci/sch/models/change_service_connector_compartment_details.py +++ b/src/oci/sch/models/change_service_connector_compartment_details.py @@ -12,7 +12,7 @@ @init_model_state_from_kwargs class ChangeServiceConnectorCompartmentDetails(object): """ - The configuration details for moving a service connector to a different compartment. + The configuration details for moving a connector to a different compartment. """ def __init__(self, **kwargs): @@ -40,7 +40,7 @@ def compartment_id(self): """ **[Required]** Gets the compartment_id of this ChangeServiceConnectorCompartmentDetails. The `OCID`__ of the compartment - to move the service connector to. + to move the connector to. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -55,7 +55,7 @@ def compartment_id(self, compartment_id): """ Sets the compartment_id of this ChangeServiceConnectorCompartmentDetails. The `OCID`__ of the compartment - to move the service connector to. + to move the connector to. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/sch/models/connector_plugin.py b/src/oci/sch/models/connector_plugin.py new file mode 100644 index 0000000000..7f8f4d9a88 --- /dev/null +++ b/src/oci/sch/models/connector_plugin.py @@ -0,0 +1,355 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + + +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 ConnectorPlugin(object): + """ + A service source or service target used to create a connector. + Example connector plugins include the Queue source and the Notifications target. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + #: A constant which can be used with the kind property of a ConnectorPlugin. + #: This constant has a value of "SOURCE" + KIND_SOURCE = "SOURCE" + + #: A constant which can be used with the kind property of a ConnectorPlugin. + #: This constant has a value of "TARGET" + KIND_TARGET = "TARGET" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPlugin. + #: This constant has a value of "LOW" + ESTIMATED_THROUGHPUT_LOW = "LOW" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPlugin. + #: This constant has a value of "MEDIUM" + ESTIMATED_THROUGHPUT_MEDIUM = "MEDIUM" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPlugin. + #: This constant has a value of "HIGH" + ESTIMATED_THROUGHPUT_HIGH = "HIGH" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPlugin. + #: This constant has a value of "UNKNOWN" + ESTIMATED_THROUGHPUT_UNKNOWN = "UNKNOWN" + + #: A constant which can be used with the lifecycle_state property of a ConnectorPlugin. + #: This constant has a value of "ACTIVE" + LIFECYCLE_STATE_ACTIVE = "ACTIVE" + + #: A constant which can be used with the lifecycle_state property of a ConnectorPlugin. + #: This constant has a value of "DELETED" + LIFECYCLE_STATE_DELETED = "DELETED" + + def __init__(self, **kwargs): + """ + Initializes a new ConnectorPlugin object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.sch.models.TargetConnectorPlugin` + * :class:`~oci.sch.models.SourceConnectorPlugin` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this ConnectorPlugin. + Allowed values for this property are: "SOURCE", "TARGET", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type kind: str + + :param name: + The value to assign to the name property of this ConnectorPlugin. + :type name: str + + :param time_created: + The value to assign to the time_created property of this ConnectorPlugin. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this ConnectorPlugin. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this ConnectorPlugin. + Allowed values for this property are: "ACTIVE", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this ConnectorPlugin. + :type display_name: str + + :param schema: + The value to assign to the schema property of this ConnectorPlugin. + :type schema: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str', + 'schema': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName', + 'schema': 'schema' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + self._schema = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['kind'] + + if type == 'TARGET': + return 'TargetConnectorPlugin' + + if type == 'SOURCE': + return 'SourceConnectorPlugin' + else: + return 'ConnectorPlugin' + + @property + def kind(self): + """ + **[Required]** Gets the kind of this ConnectorPlugin. + The plugin type discriminator. + + Allowed values for this property are: "SOURCE", "TARGET", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The kind of this ConnectorPlugin. + :rtype: str + """ + return self._kind + + @kind.setter + def kind(self, kind): + """ + Sets the kind of this ConnectorPlugin. + The plugin type discriminator. + + + :param kind: The kind of this ConnectorPlugin. + :type: str + """ + allowed_values = ["SOURCE", "TARGET"] + if not value_allowed_none_or_none_sentinel(kind, allowed_values): + kind = 'UNKNOWN_ENUM_VALUE' + self._kind = kind + + @property + def name(self): + """ + **[Required]** Gets the name of this ConnectorPlugin. + The service to be called by the connector plugin. + Example: `QueueSource` + + + :return: The name of this ConnectorPlugin. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this ConnectorPlugin. + The service to be called by the connector plugin. + Example: `QueueSource` + + + :param name: The name of this ConnectorPlugin. + :type: str + """ + self._name = name + + @property + def time_created(self): + """ + **[Required]** Gets the time_created of this ConnectorPlugin. + The date and time when this plugin became available. + Format is defined by `RFC3339`__. + Example: `2023-09-09T21:10:29.600Z` + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_created of this ConnectorPlugin. + :rtype: datetime + """ + return self._time_created + + @time_created.setter + def time_created(self, time_created): + """ + Sets the time_created of this ConnectorPlugin. + The date and time when this plugin became available. + Format is defined by `RFC3339`__. + Example: `2023-09-09T21:10:29.600Z` + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_created: The time_created of this ConnectorPlugin. + :type: datetime + """ + self._time_created = time_created + + @property + def estimated_throughput(self): + """ + Gets the estimated_throughput of this ConnectorPlugin. + The estimated throughput range (LOW, MEDIUM, HIGH). + + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The estimated_throughput of this ConnectorPlugin. + :rtype: str + """ + return self._estimated_throughput + + @estimated_throughput.setter + def estimated_throughput(self, estimated_throughput): + """ + Sets the estimated_throughput of this ConnectorPlugin. + The estimated throughput range (LOW, MEDIUM, HIGH). + + + :param estimated_throughput: The estimated_throughput of this ConnectorPlugin. + :type: str + """ + allowed_values = ["LOW", "MEDIUM", "HIGH", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(estimated_throughput, allowed_values): + estimated_throughput = 'UNKNOWN_ENUM_VALUE' + self._estimated_throughput = estimated_throughput + + @property + def lifecycle_state(self): + """ + **[Required]** Gets the lifecycle_state of this ConnectorPlugin. + The current state of the service connector. + + Allowed values for this property are: "ACTIVE", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The lifecycle_state of this ConnectorPlugin. + :rtype: str + """ + return self._lifecycle_state + + @lifecycle_state.setter + def lifecycle_state(self, lifecycle_state): + """ + Sets the lifecycle_state of this ConnectorPlugin. + The current state of the service connector. + + + :param lifecycle_state: The lifecycle_state of this ConnectorPlugin. + :type: str + """ + allowed_values = ["ACTIVE", "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 display_name(self): + """ + **[Required]** Gets the display_name of this ConnectorPlugin. + A user-friendly name. It does not have to be unique, and it is changeable. + Avoid entering confidential information. + + + :return: The display_name of this ConnectorPlugin. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this ConnectorPlugin. + A user-friendly name. It does not have to be unique, and it is changeable. + Avoid entering confidential information. + + + :param display_name: The display_name of this ConnectorPlugin. + :type: str + """ + self._display_name = display_name + + @property + def schema(self): + """ + Gets the schema of this ConnectorPlugin. + Gets the specified connector plugin configuration information in OpenAPI specification format. + + + :return: The schema of this ConnectorPlugin. + :rtype: str + """ + return self._schema + + @schema.setter + def schema(self, schema): + """ + Sets the schema of this ConnectorPlugin. + Gets the specified connector plugin configuration information in OpenAPI specification format. + + + :param schema: The schema of this ConnectorPlugin. + :type: str + """ + self._schema = schema + + 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/sch/models/connector_plugin_collection.py b/src/oci/sch/models/connector_plugin_collection.py new file mode 100644 index 0000000000..286a9ce9c8 --- /dev/null +++ b/src/oci/sch/models/connector_plugin_collection.py @@ -0,0 +1,72 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + + +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 ConnectorPluginCollection(object): + """ + A list of connector plugins that match filter criteria. Results contain `ConnectorPlugin` objects. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ConnectorPluginCollection object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param items: + The value to assign to the items property of this ConnectorPluginCollection. + :type items: list[oci.sch.models.ConnectorPluginSummary] + + """ + self.swagger_types = { + 'items': 'list[ConnectorPluginSummary]' + } + + self.attribute_map = { + 'items': 'items' + } + + self._items = None + + @property + def items(self): + """ + **[Required]** Gets the items of this ConnectorPluginCollection. + A list of connector plugins. + + + :return: The items of this ConnectorPluginCollection. + :rtype: list[oci.sch.models.ConnectorPluginSummary] + """ + return self._items + + @items.setter + def items(self, items): + """ + Sets the items of this ConnectorPluginCollection. + A list of connector plugins. + + + :param items: The items of this ConnectorPluginCollection. + :type: list[oci.sch.models.ConnectorPluginSummary] + """ + self._items = items + + 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/sch/models/connector_plugin_summary.py b/src/oci/sch/models/connector_plugin_summary.py new file mode 100644 index 0000000000..44e23bc294 --- /dev/null +++ b/src/oci/sch/models/connector_plugin_summary.py @@ -0,0 +1,322 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + + +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 ConnectorPluginSummary(object): + """ + Summary information for a connector plugin. + Example connector plugins include the Streaming source and the Notifications target. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + #: A constant which can be used with the kind property of a ConnectorPluginSummary. + #: This constant has a value of "SOURCE" + KIND_SOURCE = "SOURCE" + + #: A constant which can be used with the kind property of a ConnectorPluginSummary. + #: This constant has a value of "TARGET" + KIND_TARGET = "TARGET" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPluginSummary. + #: This constant has a value of "LOW" + ESTIMATED_THROUGHPUT_LOW = "LOW" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPluginSummary. + #: This constant has a value of "MEDIUM" + ESTIMATED_THROUGHPUT_MEDIUM = "MEDIUM" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPluginSummary. + #: This constant has a value of "HIGH" + ESTIMATED_THROUGHPUT_HIGH = "HIGH" + + #: A constant which can be used with the estimated_throughput property of a ConnectorPluginSummary. + #: This constant has a value of "UNKNOWN" + ESTIMATED_THROUGHPUT_UNKNOWN = "UNKNOWN" + + #: A constant which can be used with the lifecycle_state property of a ConnectorPluginSummary. + #: This constant has a value of "ACTIVE" + LIFECYCLE_STATE_ACTIVE = "ACTIVE" + + #: A constant which can be used with the lifecycle_state property of a ConnectorPluginSummary. + #: This constant has a value of "DELETED" + LIFECYCLE_STATE_DELETED = "DELETED" + + def __init__(self, **kwargs): + """ + Initializes a new ConnectorPluginSummary object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.sch.models.SourceConnectorPluginSummary` + * :class:`~oci.sch.models.TargetConnectorPluginSummary` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this ConnectorPluginSummary. + Allowed values for this property are: "SOURCE", "TARGET", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type kind: str + + :param name: + The value to assign to the name property of this ConnectorPluginSummary. + :type name: str + + :param time_created: + The value to assign to the time_created property of this ConnectorPluginSummary. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this ConnectorPluginSummary. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this ConnectorPluginSummary. + Allowed values for this property are: "ACTIVE", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this ConnectorPluginSummary. + :type display_name: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['kind'] + + if type == 'SOURCE': + return 'SourceConnectorPluginSummary' + + if type == 'TARGET': + return 'TargetConnectorPluginSummary' + else: + return 'ConnectorPluginSummary' + + @property + def kind(self): + """ + **[Required]** Gets the kind of this ConnectorPluginSummary. + The plugin type discriminator. + + Allowed values for this property are: "SOURCE", "TARGET", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The kind of this ConnectorPluginSummary. + :rtype: str + """ + return self._kind + + @kind.setter + def kind(self, kind): + """ + Sets the kind of this ConnectorPluginSummary. + The plugin type discriminator. + + + :param kind: The kind of this ConnectorPluginSummary. + :type: str + """ + allowed_values = ["SOURCE", "TARGET"] + if not value_allowed_none_or_none_sentinel(kind, allowed_values): + kind = 'UNKNOWN_ENUM_VALUE' + self._kind = kind + + @property + def name(self): + """ + **[Required]** Gets the name of this ConnectorPluginSummary. + The service to be called by the connector plugin. + + + :return: The name of this ConnectorPluginSummary. + :rtype: str + """ + return self._name + + @name.setter + def name(self, name): + """ + Sets the name of this ConnectorPluginSummary. + The service to be called by the connector plugin. + + + :param name: The name of this ConnectorPluginSummary. + :type: str + """ + self._name = name + + @property + def time_created(self): + """ + **[Required]** Gets the time_created of this ConnectorPluginSummary. + The date and time when this plugin became available. + Format is defined by `RFC3339`__. + Example: `2023-09-10T21:10:29.600Z` + + __ https://tools.ietf.org/html/rfc3339 + + + :return: The time_created of this ConnectorPluginSummary. + :rtype: datetime + """ + return self._time_created + + @time_created.setter + def time_created(self, time_created): + """ + Sets the time_created of this ConnectorPluginSummary. + The date and time when this plugin became available. + Format is defined by `RFC3339`__. + Example: `2023-09-10T21:10:29.600Z` + + __ https://tools.ietf.org/html/rfc3339 + + + :param time_created: The time_created of this ConnectorPluginSummary. + :type: datetime + """ + self._time_created = time_created + + @property + def estimated_throughput(self): + """ + Gets the estimated_throughput of this ConnectorPluginSummary. + The estimated throughput range (LOW, MEDIUM, HIGH). + + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The estimated_throughput of this ConnectorPluginSummary. + :rtype: str + """ + return self._estimated_throughput + + @estimated_throughput.setter + def estimated_throughput(self, estimated_throughput): + """ + Sets the estimated_throughput of this ConnectorPluginSummary. + The estimated throughput range (LOW, MEDIUM, HIGH). + + + :param estimated_throughput: The estimated_throughput of this ConnectorPluginSummary. + :type: str + """ + allowed_values = ["LOW", "MEDIUM", "HIGH", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(estimated_throughput, allowed_values): + estimated_throughput = 'UNKNOWN_ENUM_VALUE' + self._estimated_throughput = estimated_throughput + + @property + def lifecycle_state(self): + """ + **[Required]** Gets the lifecycle_state of this ConnectorPluginSummary. + The current state of the service connector. + + Allowed values for this property are: "ACTIVE", "DELETED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The lifecycle_state of this ConnectorPluginSummary. + :rtype: str + """ + return self._lifecycle_state + + @lifecycle_state.setter + def lifecycle_state(self, lifecycle_state): + """ + Sets the lifecycle_state of this ConnectorPluginSummary. + The current state of the service connector. + + + :param lifecycle_state: The lifecycle_state of this ConnectorPluginSummary. + :type: str + """ + allowed_values = ["ACTIVE", "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 display_name(self): + """ + **[Required]** Gets the display_name of this ConnectorPluginSummary. + A user-friendly name. It does not have to be unique, and it is changeable. + Avoid entering confidential information. + + + :return: The display_name of this ConnectorPluginSummary. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this ConnectorPluginSummary. + A user-friendly name. It does not have to be unique, and it is changeable. + Avoid entering confidential information. + + + :param display_name: The display_name of this ConnectorPluginSummary. + :type: str + """ + self._display_name = display_name + + 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/sch/models/create_service_connector_details.py b/src/oci/sch/models/create_service_connector_details.py index c700435a8c..2971a1fd6b 100644 --- a/src/oci/sch/models/create_service_connector_details.py +++ b/src/oci/sch/models/create_service_connector_details.py @@ -12,7 +12,7 @@ @init_model_state_from_kwargs class CreateServiceConnectorDetails(object): """ - The configuration details for creating a service connector. + The configuration details for creating a connector. """ def __init__(self, **kwargs): @@ -115,7 +115,7 @@ def compartment_id(self): """ **[Required]** Gets the compartment_id of this CreateServiceConnectorDetails. The `OCID`__ of the - comparment to create the service connector in. + comparment to create the connector in. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -130,7 +130,7 @@ def compartment_id(self, compartment_id): """ Sets the compartment_id of this CreateServiceConnectorDetails. The `OCID`__ of the - comparment to create the service connector in. + comparment to create the connector in. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/sch/models/dimension_details.py b/src/oci/sch/models/dimension_details.py index 9f9a2c0cee..879e7bb2b2 100644 --- a/src/oci/sch/models/dimension_details.py +++ b/src/oci/sch/models/dimension_details.py @@ -48,7 +48,7 @@ def name(self): **[Required]** Gets the name of this DimensionDetails. Dimension key. A valid dimension key includes only printable ASCII, excluding periods (.) and spaces. Custom dimension keys are acceptable. Avoid entering confidential information. - Due to use by Service Connector Hub, the following dimension names are reserved: `connectorId`, `connectorName`, `connectorSourceType`. + Due to use by Connector Hub, the following dimension names are reserved: `connectorId`, `connectorName`, `connectorSourceType`. For information on valid dimension keys and values, see :func:`metric_data_details`. Example: `type` @@ -64,7 +64,7 @@ def name(self, name): Sets the name of this DimensionDetails. Dimension key. A valid dimension key includes only printable ASCII, excluding periods (.) and spaces. Custom dimension keys are acceptable. Avoid entering confidential information. - Due to use by Service Connector Hub, the following dimension names are reserved: `connectorId`, `connectorName`, `connectorSourceType`. + Due to use by Connector Hub, the following dimension names are reserved: `connectorId`, `connectorName`, `connectorSourceType`. For information on valid dimension keys and values, see :func:`metric_data_details`. Example: `type` diff --git a/src/oci/sch/models/function_task_details.py b/src/oci/sch/models/function_task_details.py index 671b815520..f72ea60836 100644 --- a/src/oci/sch/models/function_task_details.py +++ b/src/oci/sch/models/function_task_details.py @@ -15,9 +15,9 @@ class FunctionTaskDetails(TaskDetails): The Functions task. Batch input for a function can be limited by either size or time. The first limit reached determines the boundary of the batch. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/functions_target_details.py b/src/oci/sch/models/functions_target_details.py index d7518d28d1..637b66dabc 100644 --- a/src/oci/sch/models/functions_target_details.py +++ b/src/oci/sch/models/functions_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class FunctionsTargetDetails(TargetDetails): """ - The function used for the Functions target. + The destination function for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): @@ -34,19 +34,40 @@ def __init__(self, **kwargs): The value to assign to the function_id property of this FunctionsTargetDetails. :type function_id: str + :param batch_size_in_kbs: + The value to assign to the batch_size_in_kbs property of this FunctionsTargetDetails. + :type batch_size_in_kbs: int + + :param batch_size_in_num: + The value to assign to the batch_size_in_num property of this FunctionsTargetDetails. + :type batch_size_in_num: int + + :param batch_time_in_sec: + The value to assign to the batch_time_in_sec property of this FunctionsTargetDetails. + :type batch_time_in_sec: int + """ self.swagger_types = { 'kind': 'str', - 'function_id': 'str' + 'function_id': 'str', + 'batch_size_in_kbs': 'int', + 'batch_size_in_num': 'int', + 'batch_time_in_sec': 'int' } self.attribute_map = { 'kind': 'kind', - 'function_id': 'functionId' + 'function_id': 'functionId', + 'batch_size_in_kbs': 'batchSizeInKbs', + 'batch_size_in_num': 'batchSizeInNum', + 'batch_time_in_sec': 'batchTimeInSec' } self._kind = None self._function_id = None + self._batch_size_in_kbs = None + self._batch_size_in_num = None + self._batch_time_in_sec = None self._kind = 'functions' @property @@ -77,6 +98,78 @@ def function_id(self, function_id): """ self._function_id = function_id + @property + def batch_size_in_kbs(self): + """ + Gets the batch_size_in_kbs of this FunctionsTargetDetails. + The batch rollover size in kilobytes. + + + :return: The batch_size_in_kbs of this FunctionsTargetDetails. + :rtype: int + """ + return self._batch_size_in_kbs + + @batch_size_in_kbs.setter + def batch_size_in_kbs(self, batch_size_in_kbs): + """ + Sets the batch_size_in_kbs of this FunctionsTargetDetails. + The batch rollover size in kilobytes. + + + :param batch_size_in_kbs: The batch_size_in_kbs of this FunctionsTargetDetails. + :type: int + """ + self._batch_size_in_kbs = batch_size_in_kbs + + @property + def batch_size_in_num(self): + """ + Gets the batch_size_in_num of this FunctionsTargetDetails. + The batch rollover size in number of messages. + + + :return: The batch_size_in_num of this FunctionsTargetDetails. + :rtype: int + """ + return self._batch_size_in_num + + @batch_size_in_num.setter + def batch_size_in_num(self, batch_size_in_num): + """ + Sets the batch_size_in_num of this FunctionsTargetDetails. + The batch rollover size in number of messages. + + + :param batch_size_in_num: The batch_size_in_num of this FunctionsTargetDetails. + :type: int + """ + self._batch_size_in_num = batch_size_in_num + + @property + def batch_time_in_sec(self): + """ + Gets the batch_time_in_sec of this FunctionsTargetDetails. + The batch rollover time in seconds. + + + :return: The batch_time_in_sec of this FunctionsTargetDetails. + :rtype: int + """ + return self._batch_time_in_sec + + @batch_time_in_sec.setter + def batch_time_in_sec(self, batch_time_in_sec): + """ + Sets the batch_time_in_sec of this FunctionsTargetDetails. + The batch rollover time in seconds. + + + :param batch_time_in_sec: The batch_time_in_sec of this FunctionsTargetDetails. + :type: int + """ + self._batch_time_in_sec = batch_time_in_sec + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/sch/models/latest_streaming_cursor.py b/src/oci/sch/models/latest_streaming_cursor.py index 2abad84436..ad113db1e7 100644 --- a/src/oci/sch/models/latest_streaming_cursor.py +++ b/src/oci/sch/models/latest_streaming_cursor.py @@ -12,9 +12,11 @@ @init_model_state_from_kwargs class LatestStreamingCursor(StreamingCursorDetails): """ - `LATEST` cursor type. Sets the starting point for consuming the stream at messages published after saving the service connector. For more information about Streaming cursors, see `Using Cursors`__. + `LATEST` cursor type. Starts reading messages published after creating the connector. + For configuration instructions, see + `Creating a Connector with a Streaming Source`__. - __ https://docs.cloud.oracle.com/iaas/Content/Streaming/Tasks/using_a_single_consumer.htm#usingcursors + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-streaming-source.htm """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/log_rule_task_details.py b/src/oci/sch/models/log_rule_task_details.py index fe895cb2c6..869e59c287 100644 --- a/src/oci/sch/models/log_rule_task_details.py +++ b/src/oci/sch/models/log_rule_task_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class LogRuleTaskDetails(TaskDetails): """ - The log rule task. + The log filter task. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): @@ -53,7 +53,7 @@ def __init__(self, **kwargs): def condition(self): """ **[Required]** Gets the condition of this LogRuleTaskDetails. - A filter or mask to limit the source used in the flow defined by the service connector. + A filter or mask to limit the source used in the flow defined by the connector. :return: The condition of this LogRuleTaskDetails. @@ -65,7 +65,7 @@ def condition(self): def condition(self, condition): """ Sets the condition of this LogRuleTaskDetails. - A filter or mask to limit the source used in the flow defined by the service connector. + A filter or mask to limit the source used in the flow defined by the connector. :param condition: The condition of this LogRuleTaskDetails. diff --git a/src/oci/sch/models/log_source.py b/src/oci/sch/models/log_source.py index 8bffef6094..d7ad210e72 100644 --- a/src/oci/sch/models/log_source.py +++ b/src/oci/sch/models/log_source.py @@ -82,6 +82,8 @@ def log_group_id(self): """ Gets the log_group_id of this LogSource. The `OCID`__ of the log group. + Note: For the Notifications target, only _Audit is allowed. + Example OCID for _Audit log group: ocid1.tenancy.oc1..exampleuniqueid/_Audit __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -96,6 +98,8 @@ def log_group_id(self, log_group_id): """ Sets the log_group_id of this LogSource. The `OCID`__ of the log group. + Note: For the Notifications target, only _Audit is allowed. + Example OCID for _Audit log group: ocid1.tenancy.oc1..exampleuniqueid/_Audit __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/sch/models/logging_analytics_target_details.py b/src/oci/sch/models/logging_analytics_target_details.py index 2d1d655add..f925d4c5d6 100644 --- a/src/oci/sch/models/logging_analytics_target_details.py +++ b/src/oci/sch/models/logging_analytics_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class LoggingAnalyticsTargetDetails(TargetDetails): """ - The log group used for the Logging Analytics target. + The destination log group for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): @@ -88,7 +88,7 @@ def log_group_id(self, log_group_id): def log_source_identifier(self): """ Gets the log_source_identifier of this LoggingAnalyticsTargetDetails. - Identifier of the log source that you want to use for processing data received from the service connector source. + Identifier of the log source that you want to use for processing data received from the connector source. Applies to `StreamingSource` only. Equivalent to `name` at :class:`LogAnalyticsSource`. @@ -102,7 +102,7 @@ def log_source_identifier(self): def log_source_identifier(self, log_source_identifier): """ Sets the log_source_identifier of this LoggingAnalyticsTargetDetails. - Identifier of the log source that you want to use for processing data received from the service connector source. + Identifier of the log source that you want to use for processing data received from the connector source. Applies to `StreamingSource` only. Equivalent to `name` at :class:`LogAnalyticsSource`. diff --git a/src/oci/sch/models/logging_source_details.py b/src/oci/sch/models/logging_source_details.py index 10304ab789..755abe15b5 100644 --- a/src/oci/sch/models/logging_source_details.py +++ b/src/oci/sch/models/logging_source_details.py @@ -14,9 +14,9 @@ class LoggingSourceDetails(SourceDetails): """ The Logging source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector with a Logging Source`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-logging-source.htm """ def __init__(self, **kwargs): @@ -27,7 +27,7 @@ def __init__(self, **kwargs): :param kind: The value to assign to the kind property of this LoggingSourceDetails. - Allowed values for this property are: "logging", "monitoring", "streaming" + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin" :type kind: str :param log_sources: diff --git a/src/oci/sch/models/monitoring_source.py b/src/oci/sch/models/monitoring_source.py index 92dcaaf781..d5e8d1cd39 100644 --- a/src/oci/sch/models/monitoring_source.py +++ b/src/oci/sch/models/monitoring_source.py @@ -46,7 +46,7 @@ def __init__(self, **kwargs): def compartment_id(self): """ **[Required]** Gets the compartment_id of this MonitoringSource. - The `OCID`__ of the compartment containing the metric namespaces you want to use for the Monitoring source. + The `OCID`__ of a compartment containing metric namespaces you want to use for the Monitoring source. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -60,7 +60,7 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this MonitoringSource. - The `OCID`__ of the compartment containing the metric namespaces you want to use for the Monitoring source. + The `OCID`__ of a compartment containing metric namespaces you want to use for the Monitoring source. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/sch/models/monitoring_source_details.py b/src/oci/sch/models/monitoring_source_details.py index 9570ca0a7d..8ac0bfe63d 100644 --- a/src/oci/sch/models/monitoring_source_details.py +++ b/src/oci/sch/models/monitoring_source_details.py @@ -14,9 +14,9 @@ class MonitoringSourceDetails(SourceDetails): """ The Monitoring source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector with a Monitoring Source`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-monitoring-source.htm """ def __init__(self, **kwargs): @@ -27,7 +27,7 @@ def __init__(self, **kwargs): :param kind: The value to assign to the kind property of this MonitoringSourceDetails. - Allowed values for this property are: "logging", "monitoring", "streaming" + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin" :type kind: str :param monitoring_sources: @@ -53,7 +53,7 @@ def __init__(self, **kwargs): def monitoring_sources(self): """ **[Required]** Gets the monitoring_sources of this MonitoringSourceDetails. - The list of metric namespaces to retrieve data from. + One or more compartment-specific lists of metric namespaces to retrieve data from. :return: The monitoring_sources of this MonitoringSourceDetails. @@ -65,7 +65,7 @@ def monitoring_sources(self): def monitoring_sources(self, monitoring_sources): """ Sets the monitoring_sources of this MonitoringSourceDetails. - The list of metric namespaces to retrieve data from. + One or more compartment-specific lists of metric namespaces to retrieve data from. :param monitoring_sources: The monitoring_sources of this MonitoringSourceDetails. diff --git a/src/oci/sch/models/monitoring_source_metric_details.py b/src/oci/sch/models/monitoring_source_metric_details.py index 115191d0a0..33ec055cbc 100644 --- a/src/oci/sch/models/monitoring_source_metric_details.py +++ b/src/oci/sch/models/monitoring_source_metric_details.py @@ -62,7 +62,7 @@ def get_subtype(object_dictionary): def kind(self): """ **[Required]** Gets the kind of this MonitoringSourceMetricDetails. - The type descriminator. + The type discriminator. Allowed values for this property are: "all", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -77,7 +77,7 @@ def kind(self): def kind(self, kind): """ Sets the kind of this MonitoringSourceMetricDetails. - The type descriminator. + The type discriminator. :param kind: The kind of this MonitoringSourceMetricDetails. diff --git a/src/oci/sch/models/monitoring_target_details.py b/src/oci/sch/models/monitoring_target_details.py index b466314d20..4e59e06eb4 100644 --- a/src/oci/sch/models/monitoring_target_details.py +++ b/src/oci/sch/models/monitoring_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class MonitoringTargetDetails(TargetDetails): """ - The metric and metric namespace used for the Monitoring target. + The destination metric for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/notifications_target_details.py b/src/oci/sch/models/notifications_target_details.py index ffa2207605..fb7d7c3ed9 100644 --- a/src/oci/sch/models/notifications_target_details.py +++ b/src/oci/sch/models/notifications_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class NotificationsTargetDetails(TargetDetails): """ - The topic used for the Notifications target. + The destination topic for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): @@ -88,7 +88,7 @@ def topic_id(self, topic_id): def enable_formatted_messaging(self): """ Gets the enable_formatted_messaging of this NotificationsTargetDetails. - Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol. + Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the connector source and the subscription protocol. Example: `true` @@ -102,7 +102,7 @@ def enable_formatted_messaging(self): def enable_formatted_messaging(self, enable_formatted_messaging): """ Sets the enable_formatted_messaging of this NotificationsTargetDetails. - Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol. + Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the connector source and the subscription protocol. Example: `true` diff --git a/src/oci/sch/models/object_storage_target_details.py b/src/oci/sch/models/object_storage_target_details.py index cde8eb60db..f5e2da8aa6 100644 --- a/src/oci/sch/models/object_storage_target_details.py +++ b/src/oci/sch/models/object_storage_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class ObjectStorageTargetDetails(TargetDetails): """ - The bucket used for the Object Storage target. + The destination bucket for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): @@ -105,7 +105,9 @@ def namespace(self, namespace): def bucket_name(self): """ **[Required]** Gets the bucket_name of this ObjectStorageTargetDetails. - The name of the bucket. Avoid entering confidential information. + The name of the bucket. Valid characters are letters (upper or lower case), numbers, hyphens (-), + underscores(_), and periods (.). Bucket names must be unique within an Object Storage namespace. + Avoid entering confidential information. Example: my-new-bucket1 :return: The bucket_name of this ObjectStorageTargetDetails. @@ -117,7 +119,9 @@ def bucket_name(self): def bucket_name(self, bucket_name): """ Sets the bucket_name of this ObjectStorageTargetDetails. - The name of the bucket. Avoid entering confidential information. + The name of the bucket. Valid characters are letters (upper or lower case), numbers, hyphens (-), + underscores(_), and periods (.). Bucket names must be unique within an Object Storage namespace. + Avoid entering confidential information. Example: my-new-bucket1 :param bucket_name: The bucket_name of this ObjectStorageTargetDetails. diff --git a/src/oci/sch/models/plugin_source_details.py b/src/oci/sch/models/plugin_source_details.py new file mode 100644 index 0000000000..8f10c98e7d --- /dev/null +++ b/src/oci/sch/models/plugin_source_details.py @@ -0,0 +1,123 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from .source_details import SourceDetails +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 PluginSourceDetails(SourceDetails): + """ + Details about a connector plugin used to fetch data from a source. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new PluginSourceDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.sch.models.PluginSourceDetails.kind` attribute + of this class is ``plugin`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this PluginSourceDetails. + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin" + :type kind: str + + :param plugin_name: + The value to assign to the plugin_name property of this PluginSourceDetails. + :type plugin_name: str + + :param config_map: + The value to assign to the config_map property of this PluginSourceDetails. + :type config_map: object + + """ + self.swagger_types = { + 'kind': 'str', + 'plugin_name': 'str', + 'config_map': 'object' + } + + self.attribute_map = { + 'kind': 'kind', + 'plugin_name': 'pluginName', + 'config_map': 'configMap' + } + + self._kind = None + self._plugin_name = None + self._config_map = None + self._kind = 'plugin' + + @property + def plugin_name(self): + """ + **[Required]** Gets the plugin_name of this PluginSourceDetails. + The name of the connector plugin. This name indicates the service to be called by the connector plugin. For example, `QueueSource` indicates the Queue service. + To find names of connector plugins, list the plugin using (ListConnectorPlugin)[#/en/serviceconnectors/latest/ConnectorPluginSummary/ListConnectorPlugins]. + + + :return: The plugin_name of this PluginSourceDetails. + :rtype: str + """ + return self._plugin_name + + @plugin_name.setter + def plugin_name(self, plugin_name): + """ + Sets the plugin_name of this PluginSourceDetails. + The name of the connector plugin. This name indicates the service to be called by the connector plugin. For example, `QueueSource` indicates the Queue service. + To find names of connector plugins, list the plugin using (ListConnectorPlugin)[#/en/serviceconnectors/latest/ConnectorPluginSummary/ListConnectorPlugins]. + + + :param plugin_name: The plugin_name of this PluginSourceDetails. + :type: str + """ + self._plugin_name = plugin_name + + @property + def config_map(self): + """ + **[Required]** Gets the config_map of this PluginSourceDetails. + The configuration map for the connector plugin. This map includes parameters specific to the connector plugin type. + For example, for `QueueSource`, the map lists the OCID of the selected queue. + To find the parameters for a connector plugin, get the plugin using (GetConnectorPlugin)[#/en/serviceconnectors/latest/ConnectorPlugin/GetConnectorPlugin] and review its schema value. + + + :return: The config_map of this PluginSourceDetails. + :rtype: object + """ + return self._config_map + + @config_map.setter + def config_map(self, config_map): + """ + Sets the config_map of this PluginSourceDetails. + The configuration map for the connector plugin. This map includes parameters specific to the connector plugin type. + For example, for `QueueSource`, the map lists the OCID of the selected queue. + To find the parameters for a connector plugin, get the plugin using (GetConnectorPlugin)[#/en/serviceconnectors/latest/ConnectorPlugin/GetConnectorPlugin] and review its schema value. + + + :param config_map: The config_map of this PluginSourceDetails. + :type: object + """ + self._config_map = config_map + + 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/sch/models/service_connector.py b/src/oci/sch/models/service_connector.py index 4ffc3f9e22..37d723b06e 100644 --- a/src/oci/sch/models/service_connector.py +++ b/src/oci/sch/models/service_connector.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class ServiceConnector(object): """ - The configuration details of the flow defined by the service connector. - For more information about flows defined by service connectors, see - `Service Connector Hub Overview`__. + The configuration details of the flow defined by the connector. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm """ #: A constant which can be used with the lifecycle_state property of a ServiceConnector. @@ -164,7 +164,7 @@ def __init__(self, **kwargs): def id(self): """ **[Required]** Gets the id of this ServiceConnector. - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -178,7 +178,7 @@ def id(self): def id(self, id): """ Sets the id of this ServiceConnector. - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -242,7 +242,7 @@ def description(self, description): def compartment_id(self): """ **[Required]** Gets the compartment_id of this ServiceConnector. - The `OCID`__ of the compartment containing the service connector. + The `OCID`__ of the compartment containing the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -256,7 +256,7 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this ServiceConnector. - The `OCID`__ of the compartment containing the service connector. + The `OCID`__ of the compartment containing the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -270,7 +270,7 @@ def compartment_id(self, compartment_id): def time_created(self): """ **[Required]** Gets the time_created of this ServiceConnector. - The date and time when the service connector was created. + The date and time when the connector was created. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -286,7 +286,7 @@ def time_created(self): def time_created(self, time_created): """ Sets the time_created of this ServiceConnector. - The date and time when the service connector was created. + The date and time when the connector was created. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -302,7 +302,7 @@ def time_created(self, time_created): def time_updated(self): """ **[Required]** Gets the time_updated of this ServiceConnector. - The date and time when the service connector was updated. + The date and time when the connector was updated. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -318,7 +318,7 @@ def time_updated(self): def time_updated(self, time_updated): """ Sets the time_updated of this ServiceConnector. - The date and time when the service connector was updated. + The date and time when the connector was updated. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -334,7 +334,7 @@ def time_updated(self, time_updated): def lifecycle_state(self): """ **[Required]** Gets the lifecycle_state of this ServiceConnector. - The current state of the service connector. + The current state of the connector. Allowed values for this property are: "CREATING", "UPDATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -349,7 +349,7 @@ def lifecycle_state(self): def lifecycle_state(self, lifecycle_state): """ Sets the lifecycle_state of this ServiceConnector. - The current state of the service connector. + The current state of the connector. :param lifecycle_state: The lifecycle_state of this ServiceConnector. diff --git a/src/oci/sch/models/service_connector_collection.py b/src/oci/sch/models/service_connector_collection.py index 1dfa149147..a1ec6ee353 100644 --- a/src/oci/sch/models/service_connector_collection.py +++ b/src/oci/sch/models/service_connector_collection.py @@ -12,7 +12,7 @@ @init_model_state_from_kwargs class ServiceConnectorCollection(object): """ - Collection of service connector property summaries. + Collection of connector property summaries. """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/service_connector_summary.py b/src/oci/sch/models/service_connector_summary.py index fa3ca32ba9..4e0ecad648 100644 --- a/src/oci/sch/models/service_connector_summary.py +++ b/src/oci/sch/models/service_connector_summary.py @@ -12,7 +12,7 @@ @init_model_state_from_kwargs class ServiceConnectorSummary(object): """ - A summary of properties for the specified service connector. + A summary of properties for the specified connector. """ #: A constant which can be used with the lifecycle_state property of a ServiceConnectorSummary. @@ -139,7 +139,7 @@ def __init__(self, **kwargs): def id(self): """ **[Required]** Gets the id of this ServiceConnectorSummary. - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -153,7 +153,7 @@ def id(self): def id(self, id): """ Sets the id of this ServiceConnectorSummary. - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -217,7 +217,7 @@ def description(self, description): def compartment_id(self): """ **[Required]** Gets the compartment_id of this ServiceConnectorSummary. - The `OCID`__ of the compartment containing the service connector. + The `OCID`__ of the compartment containing the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -231,7 +231,7 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this ServiceConnectorSummary. - The `OCID`__ of the compartment containing the service connector. + The `OCID`__ of the compartment containing the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -245,7 +245,7 @@ def compartment_id(self, compartment_id): def time_created(self): """ **[Required]** Gets the time_created of this ServiceConnectorSummary. - The date and time when the service connector was created. + The date and time when the connector was created. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -261,7 +261,7 @@ def time_created(self): def time_created(self, time_created): """ Sets the time_created of this ServiceConnectorSummary. - The date and time when the service connector was created. + The date and time when the connector was created. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -277,7 +277,7 @@ def time_created(self, time_created): def time_updated(self): """ **[Required]** Gets the time_updated of this ServiceConnectorSummary. - The date and time when the service connector was updated. + The date and time when the connector was updated. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -293,7 +293,7 @@ def time_updated(self): def time_updated(self, time_updated): """ Sets the time_updated of this ServiceConnectorSummary. - The date and time when the service connector was updated. + The date and time when the connector was updated. Format is defined by `RFC3339`__. Example: `2020-01-25T21:10:29.600Z` @@ -309,7 +309,7 @@ def time_updated(self, time_updated): def lifecycle_state(self): """ **[Required]** Gets the lifecycle_state of this ServiceConnectorSummary. - The current state of the service connector. + The current state of the connector. Allowed values for this property are: "CREATING", "UPDATING", "ACTIVE", "INACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -324,7 +324,7 @@ def lifecycle_state(self): def lifecycle_state(self, lifecycle_state): """ Sets the lifecycle_state of this ServiceConnectorSummary. - The current state of the service connector. + The current state of the connector. :param lifecycle_state: The lifecycle_state of this ServiceConnectorSummary. diff --git a/src/oci/sch/models/source_connector_plugin.py b/src/oci/sch/models/source_connector_plugin.py new file mode 100644 index 0000000000..ae241aecb2 --- /dev/null +++ b/src/oci/sch/models/source_connector_plugin.py @@ -0,0 +1,132 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from .connector_plugin import ConnectorPlugin +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 SourceConnectorPlugin(ConnectorPlugin): + """ + A connector plugin for fetching data from a source service. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new SourceConnectorPlugin object with values from keyword arguments. The default value of the :py:attr:`~oci.sch.models.SourceConnectorPlugin.kind` attribute + of this class is ``SOURCE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this SourceConnectorPlugin. + Allowed values for this property are: "SOURCE", "TARGET" + :type kind: str + + :param name: + The value to assign to the name property of this SourceConnectorPlugin. + :type name: str + + :param time_created: + The value to assign to the time_created property of this SourceConnectorPlugin. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this SourceConnectorPlugin. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN" + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this SourceConnectorPlugin. + Allowed values for this property are: "ACTIVE", "DELETED" + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this SourceConnectorPlugin. + :type display_name: str + + :param schema: + The value to assign to the schema property of this SourceConnectorPlugin. + :type schema: str + + :param max_retention: + The value to assign to the max_retention property of this SourceConnectorPlugin. + :type max_retention: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str', + 'schema': 'str', + 'max_retention': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName', + 'schema': 'schema', + 'max_retention': 'maxRetention' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + self._schema = None + self._max_retention = None + self._kind = 'SOURCE' + + @property + def max_retention(self): + """ + Gets the max_retention of this SourceConnectorPlugin. + The estimated maximum period of time the data will be kept at the source. + The duration is specified as a string in ISO 8601 format (P1D for one day or P30D for thrity days). + + + :return: The max_retention of this SourceConnectorPlugin. + :rtype: str + """ + return self._max_retention + + @max_retention.setter + def max_retention(self, max_retention): + """ + Sets the max_retention of this SourceConnectorPlugin. + The estimated maximum period of time the data will be kept at the source. + The duration is specified as a string in ISO 8601 format (P1D for one day or P30D for thrity days). + + + :param max_retention: The max_retention of this SourceConnectorPlugin. + :type: str + """ + self._max_retention = max_retention + + 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/sch/models/source_connector_plugin_summary.py b/src/oci/sch/models/source_connector_plugin_summary.py new file mode 100644 index 0000000000..e15577caad --- /dev/null +++ b/src/oci/sch/models/source_connector_plugin_summary.py @@ -0,0 +1,125 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from .connector_plugin_summary import ConnectorPluginSummary +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 SourceConnectorPluginSummary(ConnectorPluginSummary): + """ + Summary information for a connector plugin that fetches data from a source service. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new SourceConnectorPluginSummary object with values from keyword arguments. The default value of the :py:attr:`~oci.sch.models.SourceConnectorPluginSummary.kind` attribute + of this class is ``SOURCE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this SourceConnectorPluginSummary. + Allowed values for this property are: "SOURCE", "TARGET" + :type kind: str + + :param name: + The value to assign to the name property of this SourceConnectorPluginSummary. + :type name: str + + :param time_created: + The value to assign to the time_created property of this SourceConnectorPluginSummary. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this SourceConnectorPluginSummary. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN" + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this SourceConnectorPluginSummary. + Allowed values for this property are: "ACTIVE", "DELETED" + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this SourceConnectorPluginSummary. + :type display_name: str + + :param max_retention: + The value to assign to the max_retention property of this SourceConnectorPluginSummary. + :type max_retention: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str', + 'max_retention': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName', + 'max_retention': 'maxRetention' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + self._max_retention = None + self._kind = 'SOURCE' + + @property + def max_retention(self): + """ + Gets the max_retention of this SourceConnectorPluginSummary. + The estimated maximum period of time the data will be kept at the source. + description: | + + + :return: The max_retention of this SourceConnectorPluginSummary. + :rtype: str + """ + return self._max_retention + + @max_retention.setter + def max_retention(self, max_retention): + """ + Sets the max_retention of this SourceConnectorPluginSummary. + The estimated maximum period of time the data will be kept at the source. + description: | + + + :param max_retention: The max_retention of this SourceConnectorPluginSummary. + :type: str + """ + self._max_retention = max_retention + + 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/sch/models/source_details.py b/src/oci/sch/models/source_details.py index 930feffd60..e0adf06424 100644 --- a/src/oci/sch/models/source_details.py +++ b/src/oci/sch/models/source_details.py @@ -12,15 +12,15 @@ @init_model_state_from_kwargs class SourceDetails(object): """ - An object that represents the source of the flow defined by the service connector. + An object that represents the source of the flow defined by the connector. An example source is the VCNFlow logs within the NetworkLogs group. - For more information about flows defined by service connectors, see - `Service Connector Hub Overview`__. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ #: A constant which can be used with the kind property of a SourceDetails. @@ -35,6 +35,10 @@ class SourceDetails(object): #: This constant has a value of "streaming" KIND_STREAMING = "streaming" + #: A constant which can be used with the kind property of a SourceDetails. + #: This constant has a value of "plugin" + KIND_PLUGIN = "plugin" + def __init__(self, **kwargs): """ Initializes a new SourceDetails object with values from keyword arguments. This class has the following subclasses and if you are using this class as input @@ -43,12 +47,13 @@ def __init__(self, **kwargs): * :class:`~oci.sch.models.LoggingSourceDetails` * :class:`~oci.sch.models.MonitoringSourceDetails` * :class:`~oci.sch.models.StreamingSourceDetails` + * :class:`~oci.sch.models.PluginSourceDetails` The following keyword arguments are supported (corresponding to the getters/setters of this class): :param kind: The value to assign to the kind property of this SourceDetails. - Allowed values for this property are: "logging", "monitoring", "streaming", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type kind: str @@ -79,6 +84,9 @@ def get_subtype(object_dictionary): if type == 'streaming': return 'StreamingSourceDetails' + + if type == 'plugin': + return 'PluginSourceDetails' else: return 'SourceDetails' @@ -86,9 +94,9 @@ def get_subtype(object_dictionary): def kind(self): """ **[Required]** Gets the kind of this SourceDetails. - The type descriminator. + The type discriminator. - Allowed values for this property are: "logging", "monitoring", "streaming", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -101,13 +109,13 @@ def kind(self): def kind(self, kind): """ Sets the kind of this SourceDetails. - The type descriminator. + The type discriminator. :param kind: The kind of this SourceDetails. :type: str """ - allowed_values = ["logging", "monitoring", "streaming"] + allowed_values = ["logging", "monitoring", "streaming", "plugin"] if not value_allowed_none_or_none_sentinel(kind, allowed_values): kind = 'UNKNOWN_ENUM_VALUE' self._kind = kind diff --git a/src/oci/sch/models/streaming_cursor_details.py b/src/oci/sch/models/streaming_cursor_details.py index f6bf3e9611..70a3ea2104 100644 --- a/src/oci/sch/models/streaming_cursor_details.py +++ b/src/oci/sch/models/streaming_cursor_details.py @@ -12,9 +12,12 @@ @init_model_state_from_kwargs class StreamingCursorDetails(object): """ - The type of `cursor`__, which determines the starting point from which the stream will be consumed. + The `read setting`__, which determines where in the stream to start moving data. + For configuration instructions, see + `Creating a Connector with a Streaming Source`__. - __ https://docs.cloud.oracle.com/iaas/Content/Streaming/Tasks/using_a_single_consumer.htm#usingcursors + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-streaming-source.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-streaming-source.htm """ #: A constant which can be used with the kind property of a StreamingCursorDetails. @@ -72,7 +75,7 @@ def get_subtype(object_dictionary): def kind(self): """ **[Required]** Gets the kind of this StreamingCursorDetails. - The type descriminator. + The type discriminator. Allowed values for this property are: "LATEST", "TRIM_HORIZON", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -87,7 +90,7 @@ def kind(self): def kind(self, kind): """ Sets the kind of this StreamingCursorDetails. - The type descriminator. + The type discriminator. :param kind: The kind of this StreamingCursorDetails. diff --git a/src/oci/sch/models/streaming_source_details.py b/src/oci/sch/models/streaming_source_details.py index 119e43556c..d03b1b707a 100644 --- a/src/oci/sch/models/streaming_source_details.py +++ b/src/oci/sch/models/streaming_source_details.py @@ -13,6 +13,10 @@ class StreamingSourceDetails(SourceDetails): """ The Streaming source. + For configuration instructions, see + `Creating a Connector with a Streaming Source`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-streaming-source.htm """ def __init__(self, **kwargs): @@ -23,7 +27,7 @@ def __init__(self, **kwargs): :param kind: The value to assign to the kind property of this StreamingSourceDetails. - Allowed values for this property are: "logging", "monitoring", "streaming" + Allowed values for this property are: "logging", "monitoring", "streaming", "plugin" :type kind: str :param stream_id: diff --git a/src/oci/sch/models/streaming_target_details.py b/src/oci/sch/models/streaming_target_details.py index 7713df262c..b860b82e2d 100644 --- a/src/oci/sch/models/streaming_target_details.py +++ b/src/oci/sch/models/streaming_target_details.py @@ -12,11 +12,11 @@ @init_model_state_from_kwargs class StreamingTargetDetails(TargetDetails): """ - The stream used for the Streaming target. + The destination stream for data transferred from the source. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/target_connector_plugin.py b/src/oci/sch/models/target_connector_plugin.py new file mode 100644 index 0000000000..20d37bef03 --- /dev/null +++ b/src/oci/sch/models/target_connector_plugin.py @@ -0,0 +1,99 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from .connector_plugin import ConnectorPlugin +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 TargetConnectorPlugin(ConnectorPlugin): + """ + A connector plugin for sending data to a target service. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new TargetConnectorPlugin object with values from keyword arguments. The default value of the :py:attr:`~oci.sch.models.TargetConnectorPlugin.kind` attribute + of this class is ``TARGET`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this TargetConnectorPlugin. + Allowed values for this property are: "SOURCE", "TARGET" + :type kind: str + + :param name: + The value to assign to the name property of this TargetConnectorPlugin. + :type name: str + + :param time_created: + The value to assign to the time_created property of this TargetConnectorPlugin. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this TargetConnectorPlugin. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN" + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this TargetConnectorPlugin. + Allowed values for this property are: "ACTIVE", "DELETED" + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this TargetConnectorPlugin. + :type display_name: str + + :param schema: + The value to assign to the schema property of this TargetConnectorPlugin. + :type schema: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str', + 'schema': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName', + 'schema': 'schema' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + self._schema = None + self._kind = 'TARGET' + + 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/sch/models/target_connector_plugin_summary.py b/src/oci/sch/models/target_connector_plugin_summary.py new file mode 100644 index 0000000000..9240dfc84b --- /dev/null +++ b/src/oci/sch/models/target_connector_plugin_summary.py @@ -0,0 +1,92 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200909 + +from .connector_plugin_summary import ConnectorPluginSummary +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 TargetConnectorPluginSummary(ConnectorPluginSummary): + """ + Summary information for a connector plugin that sends data to a target service. + For configuration instructions, see + `Creating a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new TargetConnectorPluginSummary object with values from keyword arguments. The default value of the :py:attr:`~oci.sch.models.TargetConnectorPluginSummary.kind` attribute + of this class is ``TARGET`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param kind: + The value to assign to the kind property of this TargetConnectorPluginSummary. + Allowed values for this property are: "SOURCE", "TARGET" + :type kind: str + + :param name: + The value to assign to the name property of this TargetConnectorPluginSummary. + :type name: str + + :param time_created: + The value to assign to the time_created property of this TargetConnectorPluginSummary. + :type time_created: datetime + + :param estimated_throughput: + The value to assign to the estimated_throughput property of this TargetConnectorPluginSummary. + Allowed values for this property are: "LOW", "MEDIUM", "HIGH", "UNKNOWN" + :type estimated_throughput: str + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this TargetConnectorPluginSummary. + Allowed values for this property are: "ACTIVE", "DELETED" + :type lifecycle_state: str + + :param display_name: + The value to assign to the display_name property of this TargetConnectorPluginSummary. + :type display_name: str + + """ + self.swagger_types = { + 'kind': 'str', + 'name': 'str', + 'time_created': 'datetime', + 'estimated_throughput': 'str', + 'lifecycle_state': 'str', + 'display_name': 'str' + } + + self.attribute_map = { + 'kind': 'kind', + 'name': 'name', + 'time_created': 'timeCreated', + 'estimated_throughput': 'estimatedThroughput', + 'lifecycle_state': 'lifecycleState', + 'display_name': 'displayName' + } + + self._kind = None + self._name = None + self._time_created = None + self._estimated_throughput = None + self._lifecycle_state = None + self._display_name = None + self._kind = 'TARGET' + + 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/sch/models/target_details.py b/src/oci/sch/models/target_details.py index 5e1571c65f..e77d68cba3 100644 --- a/src/oci/sch/models/target_details.py +++ b/src/oci/sch/models/target_details.py @@ -12,15 +12,15 @@ @init_model_state_from_kwargs class TargetDetails(object): """ - An object that represents the target of the flow defined by the service connector. + An object that represents the target of the flow defined by the connector. An example target is a stream (Streaming service). - For more information about flows defined by service connectors, see - `Service Connector Hub Overview`__. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ #: A constant which can be used with the kind property of a TargetDetails. @@ -110,7 +110,7 @@ def get_subtype(object_dictionary): def kind(self): """ **[Required]** Gets the kind of this TargetDetails. - The type descriminator. + The type discriminator. Allowed values for this property are: "functions", "loggingAnalytics", "monitoring", "notifications", "objectStorage", "streaming", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -125,7 +125,7 @@ def kind(self): def kind(self, kind): """ Sets the kind of this TargetDetails. - The type descriminator. + The type discriminator. :param kind: The kind of this TargetDetails. diff --git a/src/oci/sch/models/task_details.py b/src/oci/sch/models/task_details.py index 919d61a96e..c162c7346c 100644 --- a/src/oci/sch/models/task_details.py +++ b/src/oci/sch/models/task_details.py @@ -12,15 +12,15 @@ @init_model_state_from_kwargs class TaskDetails(object): """ - An object that represents a task within the flow defined by the service connector. + An object that represents a task within the flow defined by the connector. An example task is a filter for error logs. - For more information about flows defined by service connectors, see - `Service Connector Hub Overview`__. + For more information about flows defined by connectors, see + `Overview of Connector Hub`__. For configuration instructions, see - `To create a service connector`__. + `Creating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm """ #: A constant which can be used with the kind property of a TaskDetails. @@ -78,7 +78,7 @@ def get_subtype(object_dictionary): def kind(self): """ **[Required]** Gets the kind of this TaskDetails. - The type descriminator. + The type discriminator. Allowed values for this property are: "function", "logRule", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -93,7 +93,7 @@ def kind(self): def kind(self, kind): """ Sets the kind of this TaskDetails. - The type descriminator. + The type discriminator. :param kind: The kind of this TaskDetails. diff --git a/src/oci/sch/models/trim_horizon_streaming_cursor.py b/src/oci/sch/models/trim_horizon_streaming_cursor.py index 9849884234..803adc0529 100644 --- a/src/oci/sch/models/trim_horizon_streaming_cursor.py +++ b/src/oci/sch/models/trim_horizon_streaming_cursor.py @@ -12,9 +12,11 @@ @init_model_state_from_kwargs class TrimHorizonStreamingCursor(StreamingCursorDetails): """ - `TRIM_HORIZON` cursor type. Sets the starting point for consuming the stream at the oldest available message in the stream. For more information about Streaming cursors, see `Using Cursors`__. + `TRIM_HORIZON` cursor type. Starts reading from the oldest available message in the stream. + For configuration instructions, see + `Creating a Connector with a Streaming Source`__. - __ https://docs.cloud.oracle.com/iaas/Content/Streaming/Tasks/using_a_single_consumer.htm#usingcursors + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector-streaming-source.htm """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/update_service_connector_details.py b/src/oci/sch/models/update_service_connector_details.py index 82a7604691..fff775e91c 100644 --- a/src/oci/sch/models/update_service_connector_details.py +++ b/src/oci/sch/models/update_service_connector_details.py @@ -12,7 +12,7 @@ @init_model_state_from_kwargs class UpdateServiceConnectorDetails(object): """ - The configuration details for updating a service connector. + The configuration details for updating a connector. """ def __init__(self, **kwargs): diff --git a/src/oci/sch/models/work_request.py b/src/oci/sch/models/work_request.py index 01637e005f..450f736236 100644 --- a/src/oci/sch/models/work_request.py +++ b/src/oci/sch/models/work_request.py @@ -15,14 +15,14 @@ class WorkRequest(object): An object representing an asynchronous work flow. Many of the API requests you use to create and configure - service connectors do not take effect immediately. In these + connectors do not take effect immediately. In these cases, the request spawns an asynchronous work flow to fulfill the request. WorkRequest objects provide visibility for in-progress work flows. For more information about work requests, see `Viewing the State of a Work Request`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/workrequests.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/workrequests.htm """ #: A constant which can be used with the operation_type property of a WorkRequest. diff --git a/src/oci/sch/service_connector_client.py b/src/oci/sch/service_connector_client.py index 102fd5fba8..185fe4d9b4 100644 --- a/src/oci/sch/service_connector_client.py +++ b/src/oci/sch/service_connector_client.py @@ -22,9 +22,10 @@ class ServiceConnectorClient(object): """ - Use the Service Connector Hub API to transfer data between services in Oracle Cloud Infrastructure. - For more information about Service Connector Hub, see - [Service Connector Hub Overview](/iaas/Content/service-connector-hub/overview.htm). + Use the Connector Hub API to transfer data between services in Oracle Cloud Infrastructure. + For more information about Connector Hub, see + [the Connector Hub documentation](/iaas/Content/connector-hub/home.htm). + Connector Hub is formerly known as Service Connector Hub. """ def __init__(self, config, **kwargs): @@ -120,19 +121,19 @@ def __init__(self, config, **kwargs): def activate_service_connector(self, service_connector_id, **kwargs): """ - Activates the specified service connector. + Activates the specified connector. - After you send your request, the service connector's state is temporarily + After you send your request, the connector's state is temporarily UPDATING. When the state changes to ACTIVE, data begins transferring from the - source service to the target service. For instructions on activating service - connectors, see - `To activate a service connector`__. + source service to the target service. + For more information, see + `Activating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#activate + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/activate-service-connector.htm :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -157,7 +158,7 @@ def activate_service_connector(self, service_connector_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -177,7 +178,7 @@ def activate_service_connector(self, service_connector_id, **kwargs): resource_path = "/serviceConnectors/{serviceConnectorId}/actions/activate" method = "POST" operation_name = "activate_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/ActivateServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -215,6 +216,8 @@ def activate_service_connector(self, service_connector_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -244,22 +247,22 @@ def activate_service_connector(self, service_connector_id, **kwargs): def change_service_connector_compartment(self, service_connector_id, change_service_connector_compartment_details, **kwargs): """ - Moves a service connector into a different compartment within the same tenancy. - For information about moving resources between compartments, see - `Moving Resources to a Different Compartment`__. + Moves a connector into a different compartment within the same tenancy. + For more information, see + `Moving a Connector`__. When provided, If-Match is checked against ETag values of the resource. - __ https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingcompartments.htm#moveRes + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/change-compartment-service-connector.htm :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.sch.models.ChangeServiceConnectorCompartmentDetails change_service_connector_compartment_details: (required) - The configuration details for moving a service connector to a different compartment. + The configuration details for moving a connector to a different compartment. :param str if_match: (optional) For optimistic concurrency control. In the PUT or DELETE call @@ -275,7 +278,7 @@ def change_service_connector_compartment(self, service_connector_id, change_serv :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -295,7 +298,7 @@ def change_service_connector_compartment(self, service_connector_id, change_serv resource_path = "/serviceConnectors/{serviceConnectorId}/actions/changeCompartment" method = "POST" operation_name = "change_service_connector_compartment" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/ChangeServiceConnectorCompartment" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -331,6 +334,8 @@ def change_service_connector_compartment(self, service_connector_id, change_serv operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -361,36 +366,36 @@ def change_service_connector_compartment(self, service_connector_id, change_serv def create_service_connector(self, create_service_connector_details, **kwargs): """ - Creates a new service connector in the specified compartment. - A service connector is a logically defined flow for moving data from + Creates a new connector in the specified compartment. + A connector is a logically defined flow for moving data from a source service to a destination service in Oracle Cloud Infrastructure. - For instructions, see - `To create a service connector`__. - For general information about service connectors, see - `Service Connector Hub Overview`__. + For more information, see + `Creating a Connector`__. + For general information about connectors, see + `Overview of Connector Hub`__. For purposes of access control, you must provide the `OCID`__ of the compartment where - you want the service connector to reside. Notice that the service connector + you want the connector to reside. Notice that the connector doesn't have to be in the same compartment as the source or target services. For information about access control and compartments, see `Overview of the IAM Service`__. - After you send your request, the new service connector's state is temporarily + After you send your request, the new connector's state is temporarily CREATING. When the state changes to ACTIVE, data begins transferring from the source service to the target service. For instructions on deactivating and - activating service connectors, see - `To activate or deactivate a service connector`__. + activating connectors, see + `Activating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#create - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/create-service-connector.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/overview.htm __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/overview.htm - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/overview.htm + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/activate-service-connector.htm :param oci.sch.models.CreateServiceConnectorDetails create_service_connector_details: (required) - Configuration details for the new service connector. + Configuration details for the new connector. :param str opc_retry_token: (optional) A token that uniquely identifies a request so it can be retried in case of a timeout or @@ -406,7 +411,7 @@ def create_service_connector(self, create_service_connector_details, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -426,7 +431,7 @@ def create_service_connector(self, create_service_connector_details, **kwargs): resource_path = "/serviceConnectors" method = "POST" operation_name = "create_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/CreateServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -452,6 +457,8 @@ def create_service_connector(self, create_service_connector_details, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -481,18 +488,18 @@ def create_service_connector(self, create_service_connector_details, **kwargs): def deactivate_service_connector(self, service_connector_id, **kwargs): """ - Deactivates the specified service connector. + Deactivates the specified connector. - After you send your request, the service connector's state is temporarily + After you send your request, the connector's state is temporarily UPDATING and any data transfer stops. The state then changes to INACTIVE. - For instructions on deactivating service connectors, see - `To deactivate a service connector`__. + For more information, see + `Deactivating a Connector`__. - __ https://docs.cloud.oracle.com/iaas/Content/service-connector-hub/managingconnectors.htm#deactivate + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/deactivate-service-connector.htm :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -517,7 +524,7 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -537,7 +544,7 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): resource_path = "/serviceConnectors/{serviceConnectorId}/actions/deactivate" method = "POST" operation_name = "deactivate_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/DeactivateServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -575,6 +582,8 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -604,14 +613,18 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): def delete_service_connector(self, service_connector_id, **kwargs): """ - Deletes the specified service connector. + Deletes the specified connector. + For more information, see + `Deleting a Connector`__. - After you send your request, the service connector's state is temporarily + After you send your request, the connector's state is temporarily DELETING and any data transfer stops. The state then changes to DELETED. + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/delete-service-connector.htm + :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -629,7 +642,7 @@ def delete_service_connector(self, service_connector_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -649,7 +662,7 @@ def delete_service_connector(self, service_connector_id, **kwargs): resource_path = "/serviceConnectors/{serviceConnectorId}" method = "DELETE" operation_name = "delete_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/DeleteServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -685,6 +698,8 @@ def delete_service_connector(self, service_connector_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -713,11 +728,15 @@ def delete_service_connector(self, service_connector_id, **kwargs): def get_service_connector(self, service_connector_id, **kwargs): """ - Gets the specified service connector's configuration information. + Gets the specified connector's configuration information. + For more information, see + `Getting a Connector`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/get-service-connector.htm :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -728,7 +747,7 @@ def get_service_connector(self, service_connector_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -748,7 +767,7 @@ def get_service_connector(self, service_connector_id, **kwargs): resource_path = "/serviceConnectors/{serviceConnectorId}" method = "GET" operation_name = "get_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/GetServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -782,6 +801,8 @@ def get_service_connector(self, service_connector_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -813,6 +834,10 @@ def get_service_connector(self, service_connector_id, **kwargs): def get_work_request(self, work_request_id, **kwargs): """ Gets the details of the specified work request. + For more information, see + `Getting a Work Request's Details`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/get-work-request.htm :param str work_request_id: (required) @@ -827,7 +852,7 @@ def get_work_request(self, work_request_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -847,7 +872,7 @@ def get_work_request(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}" method = "GET" operation_name = "get_work_request" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/WorkRequest/GetWorkRequest" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -881,6 +906,8 @@ def get_work_request(self, work_request_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -911,7 +938,11 @@ def get_work_request(self, work_request_id, **kwargs): def list_service_connectors(self, compartment_id, **kwargs): """ - Lists service connectors in the specified compartment. + Lists connectors in the specified compartment. + For more information, see + `Listing Connectors`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/list-service-connector.htm :param str compartment_id: (required) @@ -963,7 +994,7 @@ def list_service_connectors(self, compartment_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -983,7 +1014,7 @@ def list_service_connectors(self, compartment_id, **kwargs): resource_path = "/serviceConnectors" method = "GET" operation_name = "list_service_connectors" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/ListServiceConnectors" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1045,6 +1076,8 @@ def list_service_connectors(self, compartment_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -1076,6 +1109,10 @@ def list_service_connectors(self, compartment_id, **kwargs): def list_work_request_errors(self, work_request_id, **kwargs): """ Lists work request errors for the specified work request. Results are paginated. + For more information, see + `Listing Work Request Errors`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/list-work-request-error.htm :param str work_request_id: (required) @@ -1104,7 +1141,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -1124,7 +1161,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}/errors" method = "GET" operation_name = "list_work_request_errors" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/WorkRequestError/ListWorkRequestErrors" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1166,6 +1203,8 @@ def list_work_request_errors(self, work_request_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -1199,6 +1238,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): def list_work_request_logs(self, work_request_id, **kwargs): """ Lists logs for the specified work request. Results are paginated. + For more information, see + `Listing Work Request Log Entries`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/list-work-request-log-entry.htm :param str work_request_id: (required) @@ -1227,7 +1270,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -1247,7 +1290,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}/logs" method = "GET" operation_name = "list_work_request_logs" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/WorkRequestLogEntry/ListWorkRequestLogs" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1289,6 +1332,8 @@ def list_work_request_logs(self, work_request_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -1322,6 +1367,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): def list_work_requests(self, compartment_id, **kwargs): """ Lists the work requests in the specified compartment. + For more information, see + `Listing Work Requests`__. + + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/list-work-request.htm :param str compartment_id: (required) @@ -1350,7 +1399,7 @@ def list_work_requests(self, compartment_id, **kwargs): :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -1370,7 +1419,7 @@ def list_work_requests(self, compartment_id, **kwargs): resource_path = "/workRequests" method = "GET" operation_name = "list_work_requests" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/WorkRequest/ListWorkRequests" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1403,6 +1452,8 @@ def list_work_requests(self, compartment_id, **kwargs): operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): @@ -1433,15 +1484,19 @@ def list_work_requests(self, compartment_id, **kwargs): def update_service_connector(self, service_connector_id, update_service_connector_details, **kwargs): """ - Updates the configuration information for the specified service connector. + Updates the configuration information for the specified connector. + For more information, see + `Updating a Connector`__. - After you send your request, the service connector's state is temporarily + After you send your request, the connector's state is temporarily UPDATING and any data transfer pauses. The state then changes back to its original value: if ACTIVE, then data transfer resumes. + __ https://docs.cloud.oracle.com/iaas/Content/connector-hub/update-service-connector.htm + :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -1462,7 +1517,7 @@ def update_service_connector(self, service_connector_id, update_service_connecto :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. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation uses :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` as default if no retry strategy is provided. 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`. @@ -1482,7 +1537,7 @@ def update_service_connector(self, service_connector_id, update_service_connecto resource_path = "/serviceConnectors/{serviceConnectorId}" method = "PUT" operation_name = "update_service_connector" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/serviceconnectors/20200909/ServiceConnector/UpdateServiceConnector" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1518,6 +1573,8 @@ def update_service_connector(self, service_connector_id, update_service_connecto operation_retry_strategy=kwargs.get('retry_strategy'), client_retry_strategy=self.retry_strategy ) + if retry_strategy is None: + retry_strategy = retry.DEFAULT_RETRY_STRATEGY if retry_strategy: if not isinstance(retry_strategy, retry.NoneRetryStrategy): diff --git a/src/oci/sch/service_connector_client_composite_operations.py b/src/oci/sch/service_connector_client_composite_operations.py index 7d2f5d0d6b..1f8a817a84 100644 --- a/src/oci/sch/service_connector_client_composite_operations.py +++ b/src/oci/sch/service_connector_client_composite_operations.py @@ -31,7 +31,7 @@ def activate_service_connector_and_wait_for_state(self, service_connector_id, wa to enter the given state(s). :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -72,12 +72,12 @@ def change_service_connector_compartment_and_wait_for_state(self, service_connec to enter the given state(s). :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.sch.models.ChangeServiceConnectorCompartmentDetails change_service_connector_compartment_details: (required) - The configuration details for moving a service connector to a different compartment. + The configuration details for moving a connector to a different compartment. :param list[str] wait_for_states: An array of states to wait on. These should be valid values for :py:attr:`~oci.sch.models.WorkRequest.status` @@ -116,7 +116,7 @@ def create_service_connector_and_wait_for_state(self, create_service_connector_d to enter the given state(s). :param oci.sch.models.CreateServiceConnectorDetails create_service_connector_details: (required) - Configuration details for the new service connector. + Configuration details for the new connector. :param list[str] wait_for_states: An array of states to wait on. These should be valid values for :py:attr:`~oci.sch.models.WorkRequest.status` @@ -155,7 +155,7 @@ def deactivate_service_connector_and_wait_for_state(self, service_connector_id, to enter the given state(s). :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -196,7 +196,7 @@ def delete_service_connector_and_wait_for_state(self, service_connector_id, wait to enter the given state(s). :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -245,7 +245,7 @@ def update_service_connector_and_wait_for_state(self, service_connector_id, upda to enter the given state(s). :param str service_connector_id: (required) - The `OCID`__ of the service connector. + The `OCID`__ of the connector. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/vault/models/__init__.py b/src/oci/vault/models/__init__.py index e8ae97639a..8c25985c97 100644 --- a/src/oci/vault/models/__init__.py +++ b/src/oci/vault/models/__init__.py @@ -8,20 +8,24 @@ from .adb_target_system_details import AdbTargetSystemDetails from .base64_secret_content_details import Base64SecretContentDetails +from .bytes_generation_context import BytesGenerationContext from .change_secret_compartment_details import ChangeSecretCompartmentDetails from .create_secret_details import CreateSecretDetails from .function_target_system_details import FunctionTargetSystemDetails +from .passphrase_generation_context import PassphraseGenerationContext from .rotation_config import RotationConfig from .schedule_secret_deletion_details import ScheduleSecretDeletionDetails from .schedule_secret_version_deletion_details import ScheduleSecretVersionDeletionDetails from .secret import Secret from .secret_content_details import SecretContentDetails from .secret_expiry_rule import SecretExpiryRule +from .secret_generation_context import SecretGenerationContext from .secret_reuse_rule import SecretReuseRule from .secret_rule import SecretRule from .secret_summary import SecretSummary from .secret_version import SecretVersion from .secret_version_summary import SecretVersionSummary +from .ssh_key_generation_context import SshKeyGenerationContext from .target_system_details import TargetSystemDetails from .update_secret_details import UpdateSecretDetails @@ -29,20 +33,24 @@ vault_type_mapping = { "AdbTargetSystemDetails": AdbTargetSystemDetails, "Base64SecretContentDetails": Base64SecretContentDetails, + "BytesGenerationContext": BytesGenerationContext, "ChangeSecretCompartmentDetails": ChangeSecretCompartmentDetails, "CreateSecretDetails": CreateSecretDetails, "FunctionTargetSystemDetails": FunctionTargetSystemDetails, + "PassphraseGenerationContext": PassphraseGenerationContext, "RotationConfig": RotationConfig, "ScheduleSecretDeletionDetails": ScheduleSecretDeletionDetails, "ScheduleSecretVersionDeletionDetails": ScheduleSecretVersionDeletionDetails, "Secret": Secret, "SecretContentDetails": SecretContentDetails, "SecretExpiryRule": SecretExpiryRule, + "SecretGenerationContext": SecretGenerationContext, "SecretReuseRule": SecretReuseRule, "SecretRule": SecretRule, "SecretSummary": SecretSummary, "SecretVersion": SecretVersion, "SecretVersionSummary": SecretVersionSummary, + "SshKeyGenerationContext": SshKeyGenerationContext, "TargetSystemDetails": TargetSystemDetails, "UpdateSecretDetails": UpdateSecretDetails } diff --git a/src/oci/vault/models/bytes_generation_context.py b/src/oci/vault/models/bytes_generation_context.py new file mode 100644 index 0000000000..14de5a5939 --- /dev/null +++ b/src/oci/vault/models/bytes_generation_context.py @@ -0,0 +1,107 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20180608 + +from .secret_generation_context import SecretGenerationContext +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 BytesGenerationContext(SecretGenerationContext): + """ + Generates random bytes. By default, secrets of type Bytes has no structure. The generated bytes are stored as a Base64 encoded string. + The SecretTemplate must have the %GENERATED_BYTES% keyword which is replaced with the generated bytes, if provided + """ + + #: A constant which can be used with the generation_template property of a BytesGenerationContext. + #: This constant has a value of "BYTES_512" + GENERATION_TEMPLATE_BYTES_512 = "BYTES_512" + + #: A constant which can be used with the generation_template property of a BytesGenerationContext. + #: This constant has a value of "BYTES_1024" + GENERATION_TEMPLATE_BYTES_1024 = "BYTES_1024" + + def __init__(self, **kwargs): + """ + Initializes a new BytesGenerationContext object with values from keyword arguments. The default value of the :py:attr:`~oci.vault.models.BytesGenerationContext.generation_type` attribute + of this class is ``BYTES`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param generation_type: + The value to assign to the generation_type property of this BytesGenerationContext. + Allowed values for this property are: "PASSPHRASE", "SSH_KEY", "BYTES", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_type: str + + :param secret_template: + The value to assign to the secret_template property of this BytesGenerationContext. + :type secret_template: str + + :param generation_template: + The value to assign to the generation_template property of this BytesGenerationContext. + Allowed values for this property are: "BYTES_512", "BYTES_1024", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_template: str + + """ + self.swagger_types = { + 'generation_type': 'str', + 'secret_template': 'str', + 'generation_template': 'str' + } + + self.attribute_map = { + 'generation_type': 'generationType', + 'secret_template': 'secretTemplate', + 'generation_template': 'generationTemplate' + } + + self._generation_type = None + self._secret_template = None + self._generation_template = None + self._generation_type = 'BYTES' + + @property + def generation_template(self): + """ + **[Required]** Gets the generation_template of this BytesGenerationContext. + Name of random bytes generation template for generating random byte type secret. + + Allowed values for this property are: "BYTES_512", "BYTES_1024", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The generation_template of this BytesGenerationContext. + :rtype: str + """ + return self._generation_template + + @generation_template.setter + def generation_template(self, generation_template): + """ + Sets the generation_template of this BytesGenerationContext. + Name of random bytes generation template for generating random byte type secret. + + + :param generation_template: The generation_template of this BytesGenerationContext. + :type: str + """ + allowed_values = ["BYTES_512", "BYTES_1024"] + if not value_allowed_none_or_none_sentinel(generation_template, allowed_values): + generation_template = 'UNKNOWN_ENUM_VALUE' + self._generation_template = generation_template + + 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/vault/models/create_secret_details.py b/src/oci/vault/models/create_secret_details.py index 5101188747..abee243269 100644 --- a/src/oci/vault/models/create_secret_details.py +++ b/src/oci/vault/models/create_secret_details.py @@ -64,6 +64,14 @@ def __init__(self, **kwargs): The value to assign to the vault_id property of this CreateSecretDetails. :type vault_id: str + :param secret_generation_context: + The value to assign to the secret_generation_context property of this CreateSecretDetails. + :type secret_generation_context: oci.vault.models.SecretGenerationContext + + :param enable_auto_generation: + The value to assign to the enable_auto_generation property of this CreateSecretDetails. + :type enable_auto_generation: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -76,7 +84,9 @@ def __init__(self, **kwargs): 'rotation_config': 'RotationConfig', 'secret_name': 'str', 'secret_rules': 'list[SecretRule]', - 'vault_id': 'str' + 'vault_id': 'str', + 'secret_generation_context': 'SecretGenerationContext', + 'enable_auto_generation': 'bool' } self.attribute_map = { @@ -90,7 +100,9 @@ def __init__(self, **kwargs): 'rotation_config': 'rotationConfig', 'secret_name': 'secretName', 'secret_rules': 'secretRules', - 'vault_id': 'vaultId' + 'vault_id': 'vaultId', + 'secret_generation_context': 'secretGenerationContext', + 'enable_auto_generation': 'enableAutoGeneration' } self._compartment_id = None @@ -104,6 +116,8 @@ def __init__(self, **kwargs): self._secret_name = None self._secret_rules = None self._vault_id = None + self._secret_generation_context = None + self._enable_auto_generation = None @property def compartment_id(self): @@ -220,7 +234,7 @@ def freeform_tags(self, freeform_tags): @property def key_id(self): """ - Gets the key_id of this CreateSecretDetails. + **[Required]** Gets the key_id of this CreateSecretDetails. The OCID of the master encryption key that is used to encrypt the secret. You must specify a symmetric key to encrypt the secret during import to the vault. You cannot encrypt secrets with asymmetric keys. Furthermore, the key must exist in the vault that you specify. @@ -381,6 +395,50 @@ def vault_id(self, vault_id): """ self._vault_id = vault_id + @property + def secret_generation_context(self): + """ + Gets the secret_generation_context of this CreateSecretDetails. + + :return: The secret_generation_context of this CreateSecretDetails. + :rtype: oci.vault.models.SecretGenerationContext + """ + return self._secret_generation_context + + @secret_generation_context.setter + def secret_generation_context(self, secret_generation_context): + """ + Sets the secret_generation_context of this CreateSecretDetails. + + :param secret_generation_context: The secret_generation_context of this CreateSecretDetails. + :type: oci.vault.models.SecretGenerationContext + """ + self._secret_generation_context = secret_generation_context + + @property + def enable_auto_generation(self): + """ + Gets the enable_auto_generation of this CreateSecretDetails. + The value of this flag determines whether or not secret content will be generated automatically. If not set, it defaults to false. + + + :return: The enable_auto_generation of this CreateSecretDetails. + :rtype: bool + """ + return self._enable_auto_generation + + @enable_auto_generation.setter + def enable_auto_generation(self, enable_auto_generation): + """ + Sets the enable_auto_generation of this CreateSecretDetails. + The value of this flag determines whether or not secret content will be generated automatically. If not set, it defaults to false. + + + :param enable_auto_generation: The enable_auto_generation of this CreateSecretDetails. + :type: bool + """ + self._enable_auto_generation = enable_auto_generation + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/vault/models/passphrase_generation_context.py b/src/oci/vault/models/passphrase_generation_context.py new file mode 100644 index 0000000000..0e5591118a --- /dev/null +++ b/src/oci/vault/models/passphrase_generation_context.py @@ -0,0 +1,138 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20180608 + +from .secret_generation_context import SecretGenerationContext +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 PassphraseGenerationContext(SecretGenerationContext): + """ + Generates Passphrase type secrets. By default, passphrase type secrets have no structure. The generated content is stored in Base64 format. + The SecretTemplate must have the %GENERATED_PASSPHRASE% keyword, which is later replaced with the generated content, if provided. + """ + + #: A constant which can be used with the generation_template property of a PassphraseGenerationContext. + #: This constant has a value of "SECRETS_DEFAULT_PASSWORD" + GENERATION_TEMPLATE_SECRETS_DEFAULT_PASSWORD = "SECRETS_DEFAULT_PASSWORD" + + #: A constant which can be used with the generation_template property of a PassphraseGenerationContext. + #: This constant has a value of "DBAAS_DEFAULT_PASSWORD" + GENERATION_TEMPLATE_DBAAS_DEFAULT_PASSWORD = "DBAAS_DEFAULT_PASSWORD" + + def __init__(self, **kwargs): + """ + Initializes a new PassphraseGenerationContext object with values from keyword arguments. The default value of the :py:attr:`~oci.vault.models.PassphraseGenerationContext.generation_type` attribute + of this class is ``PASSPHRASE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param generation_type: + The value to assign to the generation_type property of this PassphraseGenerationContext. + Allowed values for this property are: "PASSPHRASE", "SSH_KEY", "BYTES", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_type: str + + :param secret_template: + The value to assign to the secret_template property of this PassphraseGenerationContext. + :type secret_template: str + + :param generation_template: + The value to assign to the generation_template property of this PassphraseGenerationContext. + Allowed values for this property are: "SECRETS_DEFAULT_PASSWORD", "DBAAS_DEFAULT_PASSWORD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_template: str + + :param passphrase_length: + The value to assign to the passphrase_length property of this PassphraseGenerationContext. + :type passphrase_length: int + + """ + self.swagger_types = { + 'generation_type': 'str', + 'secret_template': 'str', + 'generation_template': 'str', + 'passphrase_length': 'int' + } + + self.attribute_map = { + 'generation_type': 'generationType', + 'secret_template': 'secretTemplate', + 'generation_template': 'generationTemplate', + 'passphrase_length': 'passphraseLength' + } + + self._generation_type = None + self._secret_template = None + self._generation_template = None + self._passphrase_length = None + self._generation_type = 'PASSPHRASE' + + @property + def generation_template(self): + """ + **[Required]** Gets the generation_template of this PassphraseGenerationContext. + Name of passphrase generation template to generate passphrase type secret. + + Allowed values for this property are: "SECRETS_DEFAULT_PASSWORD", "DBAAS_DEFAULT_PASSWORD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The generation_template of this PassphraseGenerationContext. + :rtype: str + """ + return self._generation_template + + @generation_template.setter + def generation_template(self, generation_template): + """ + Sets the generation_template of this PassphraseGenerationContext. + Name of passphrase generation template to generate passphrase type secret. + + + :param generation_template: The generation_template of this PassphraseGenerationContext. + :type: str + """ + allowed_values = ["SECRETS_DEFAULT_PASSWORD", "DBAAS_DEFAULT_PASSWORD"] + if not value_allowed_none_or_none_sentinel(generation_template, allowed_values): + generation_template = 'UNKNOWN_ENUM_VALUE' + self._generation_template = generation_template + + @property + def passphrase_length(self): + """ + Gets the passphrase_length of this PassphraseGenerationContext. + Length of the passphrase to be generated + + + :return: The passphrase_length of this PassphraseGenerationContext. + :rtype: int + """ + return self._passphrase_length + + @passphrase_length.setter + def passphrase_length(self, passphrase_length): + """ + Sets the passphrase_length of this PassphraseGenerationContext. + Length of the passphrase to be generated + + + :param passphrase_length: The passphrase_length of this PassphraseGenerationContext. + :type: int + """ + self._passphrase_length = passphrase_length + + 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/vault/models/secret.py b/src/oci/vault/models/secret.py index 6f63b24bde..a07fd4f2f3 100644 --- a/src/oci/vault/models/secret.py +++ b/src/oci/vault/models/secret.py @@ -156,6 +156,14 @@ def __init__(self, **kwargs): The value to assign to the vault_id property of this Secret. :type vault_id: str + :param secret_generation_context: + The value to assign to the secret_generation_context property of this Secret. + :type secret_generation_context: oci.vault.models.SecretGenerationContext + + :param is_auto_generation_enabled: + The value to assign to the is_auto_generation_enabled property of this Secret. + :type is_auto_generation_enabled: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -177,7 +185,9 @@ def __init__(self, **kwargs): 'time_created': 'datetime', 'time_of_current_version_expiry': 'datetime', 'time_of_deletion': 'datetime', - 'vault_id': 'str' + 'vault_id': 'str', + 'secret_generation_context': 'SecretGenerationContext', + 'is_auto_generation_enabled': 'bool' } self.attribute_map = { @@ -200,7 +210,9 @@ def __init__(self, **kwargs): 'time_created': 'timeCreated', 'time_of_current_version_expiry': 'timeOfCurrentVersionExpiry', 'time_of_deletion': 'timeOfDeletion', - 'vault_id': 'vaultId' + 'vault_id': 'vaultId', + 'secret_generation_context': 'secretGenerationContext', + 'is_auto_generation_enabled': 'isAutoGenerationEnabled' } self._compartment_id = None @@ -223,6 +235,8 @@ def __init__(self, **kwargs): self._time_of_current_version_expiry = None self._time_of_deletion = None self._vault_id = None + self._secret_generation_context = None + self._is_auto_generation_enabled = None @property def compartment_id(self): @@ -762,6 +776,50 @@ def vault_id(self, vault_id): """ self._vault_id = vault_id + @property + def secret_generation_context(self): + """ + Gets the secret_generation_context of this Secret. + + :return: The secret_generation_context of this Secret. + :rtype: oci.vault.models.SecretGenerationContext + """ + return self._secret_generation_context + + @secret_generation_context.setter + def secret_generation_context(self, secret_generation_context): + """ + Sets the secret_generation_context of this Secret. + + :param secret_generation_context: The secret_generation_context of this Secret. + :type: oci.vault.models.SecretGenerationContext + """ + self._secret_generation_context = secret_generation_context + + @property + def is_auto_generation_enabled(self): + """ + Gets the is_auto_generation_enabled of this Secret. + The value of this flag determines whether or not secret content will be generated automatically. + + + :return: The is_auto_generation_enabled of this Secret. + :rtype: bool + """ + return self._is_auto_generation_enabled + + @is_auto_generation_enabled.setter + def is_auto_generation_enabled(self, is_auto_generation_enabled): + """ + Sets the is_auto_generation_enabled of this Secret. + The value of this flag determines whether or not secret content will be generated automatically. + + + :param is_auto_generation_enabled: The is_auto_generation_enabled of this Secret. + :type: bool + """ + self._is_auto_generation_enabled = is_auto_generation_enabled + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/vault/models/secret_generation_context.py b/src/oci/vault/models/secret_generation_context.py new file mode 100644 index 0000000000..6a7ab1641c --- /dev/null +++ b/src/oci/vault/models/secret_generation_context.py @@ -0,0 +1,152 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20180608 + + +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 SecretGenerationContext(object): + """ + Captures a configurable set of secret generation rules such as length, base characters, additional characters, and so on. + """ + + #: A constant which can be used with the generation_type property of a SecretGenerationContext. + #: This constant has a value of "PASSPHRASE" + GENERATION_TYPE_PASSPHRASE = "PASSPHRASE" + + #: A constant which can be used with the generation_type property of a SecretGenerationContext. + #: This constant has a value of "SSH_KEY" + GENERATION_TYPE_SSH_KEY = "SSH_KEY" + + #: A constant which can be used with the generation_type property of a SecretGenerationContext. + #: This constant has a value of "BYTES" + GENERATION_TYPE_BYTES = "BYTES" + + def __init__(self, **kwargs): + """ + Initializes a new SecretGenerationContext object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.vault.models.PassphraseGenerationContext` + * :class:`~oci.vault.models.SshKeyGenerationContext` + * :class:`~oci.vault.models.BytesGenerationContext` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param generation_type: + The value to assign to the generation_type property of this SecretGenerationContext. + Allowed values for this property are: "PASSPHRASE", "SSH_KEY", "BYTES", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_type: str + + :param secret_template: + The value to assign to the secret_template property of this SecretGenerationContext. + :type secret_template: str + + """ + self.swagger_types = { + 'generation_type': 'str', + 'secret_template': 'str' + } + + self.attribute_map = { + 'generation_type': 'generationType', + 'secret_template': 'secretTemplate' + } + + self._generation_type = None + self._secret_template = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['generationType'] + + if type == 'PASSPHRASE': + return 'PassphraseGenerationContext' + + if type == 'SSH_KEY': + return 'SshKeyGenerationContext' + + if type == 'BYTES': + return 'BytesGenerationContext' + else: + return 'SecretGenerationContext' + + @property + def generation_type(self): + """ + **[Required]** Gets the generation_type of this SecretGenerationContext. + Name of the predefined secret generation type. + + Allowed values for this property are: "PASSPHRASE", "SSH_KEY", "BYTES", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The generation_type of this SecretGenerationContext. + :rtype: str + """ + return self._generation_type + + @generation_type.setter + def generation_type(self, generation_type): + """ + Sets the generation_type of this SecretGenerationContext. + Name of the predefined secret generation type. + + + :param generation_type: The generation_type of this SecretGenerationContext. + :type: str + """ + allowed_values = ["PASSPHRASE", "SSH_KEY", "BYTES"] + if not value_allowed_none_or_none_sentinel(generation_type, allowed_values): + generation_type = 'UNKNOWN_ENUM_VALUE' + self._generation_type = generation_type + + @property + def secret_template(self): + """ + Gets the secret_template of this SecretGenerationContext. + SecretTemplate captures structure in which customer wants to store secrets. This is optional and a default structure is available for each secret type. + The template can have any structure with static values that are not generated. Within the template, you can insert predefined placeholders to store secrets. + These placeholders are later replaced with the generated content and saved as a Base64 encoded content. + + + :return: The secret_template of this SecretGenerationContext. + :rtype: str + """ + return self._secret_template + + @secret_template.setter + def secret_template(self, secret_template): + """ + Sets the secret_template of this SecretGenerationContext. + SecretTemplate captures structure in which customer wants to store secrets. This is optional and a default structure is available for each secret type. + The template can have any structure with static values that are not generated. Within the template, you can insert predefined placeholders to store secrets. + These placeholders are later replaced with the generated content and saved as a Base64 encoded content. + + + :param secret_template: The secret_template of this SecretGenerationContext. + :type: str + """ + self._secret_template = secret_template + + 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/vault/models/secret_summary.py b/src/oci/vault/models/secret_summary.py index cba92e8aa4..5a9637b0a9 100644 --- a/src/oci/vault/models/secret_summary.py +++ b/src/oci/vault/models/secret_summary.py @@ -130,6 +130,14 @@ def __init__(self, **kwargs): The value to assign to the vault_id property of this SecretSummary. :type vault_id: str + :param secret_generation_context: + The value to assign to the secret_generation_context property of this SecretSummary. + :type secret_generation_context: oci.vault.models.SecretGenerationContext + + :param is_auto_generation_enabled: + The value to assign to the is_auto_generation_enabled property of this SecretSummary. + :type is_auto_generation_enabled: bool + """ self.swagger_types = { 'compartment_id': 'str', @@ -149,7 +157,9 @@ def __init__(self, **kwargs): 'time_created': 'datetime', 'time_of_current_version_expiry': 'datetime', 'time_of_deletion': 'datetime', - 'vault_id': 'str' + 'vault_id': 'str', + 'secret_generation_context': 'SecretGenerationContext', + 'is_auto_generation_enabled': 'bool' } self.attribute_map = { @@ -170,7 +180,9 @@ def __init__(self, **kwargs): 'time_created': 'timeCreated', 'time_of_current_version_expiry': 'timeOfCurrentVersionExpiry', 'time_of_deletion': 'timeOfDeletion', - 'vault_id': 'vaultId' + 'vault_id': 'vaultId', + 'secret_generation_context': 'secretGenerationContext', + 'is_auto_generation_enabled': 'isAutoGenerationEnabled' } self._compartment_id = None @@ -191,6 +203,8 @@ def __init__(self, **kwargs): self._time_of_current_version_expiry = None self._time_of_deletion = None self._vault_id = None + self._secret_generation_context = None + self._is_auto_generation_enabled = None @property def compartment_id(self): @@ -676,6 +690,50 @@ def vault_id(self, vault_id): """ self._vault_id = vault_id + @property + def secret_generation_context(self): + """ + Gets the secret_generation_context of this SecretSummary. + + :return: The secret_generation_context of this SecretSummary. + :rtype: oci.vault.models.SecretGenerationContext + """ + return self._secret_generation_context + + @secret_generation_context.setter + def secret_generation_context(self, secret_generation_context): + """ + Sets the secret_generation_context of this SecretSummary. + + :param secret_generation_context: The secret_generation_context of this SecretSummary. + :type: oci.vault.models.SecretGenerationContext + """ + self._secret_generation_context = secret_generation_context + + @property + def is_auto_generation_enabled(self): + """ + Gets the is_auto_generation_enabled of this SecretSummary. + The value of this flag determines whether or not secret content will be generated automatically. + + + :return: The is_auto_generation_enabled of this SecretSummary. + :rtype: bool + """ + return self._is_auto_generation_enabled + + @is_auto_generation_enabled.setter + def is_auto_generation_enabled(self, is_auto_generation_enabled): + """ + Sets the is_auto_generation_enabled of this SecretSummary. + The value of this flag determines whether or not secret content will be generated automatically. + + + :param is_auto_generation_enabled: The is_auto_generation_enabled of this SecretSummary. + :type: bool + """ + self._is_auto_generation_enabled = is_auto_generation_enabled + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/vault/models/secret_version.py b/src/oci/vault/models/secret_version.py index 4e667d2eb1..dff37039d9 100644 --- a/src/oci/vault/models/secret_version.py +++ b/src/oci/vault/models/secret_version.py @@ -80,6 +80,10 @@ def __init__(self, **kwargs): The value to assign to the version_number property of this SecretVersion. :type version_number: int + :param is_content_auto_generated: + The value to assign to the is_content_auto_generated property of this SecretVersion. + :type is_content_auto_generated: bool + """ self.swagger_types = { 'content_type': 'str', @@ -89,7 +93,8 @@ def __init__(self, **kwargs): 'time_created': 'datetime', 'time_of_deletion': 'datetime', 'time_of_current_version_expiry': 'datetime', - 'version_number': 'int' + 'version_number': 'int', + 'is_content_auto_generated': 'bool' } self.attribute_map = { @@ -100,7 +105,8 @@ def __init__(self, **kwargs): 'time_created': 'timeCreated', 'time_of_deletion': 'timeOfDeletion', 'time_of_current_version_expiry': 'timeOfCurrentVersionExpiry', - 'version_number': 'versionNumber' + 'version_number': 'versionNumber', + 'is_content_auto_generated': 'isContentAutoGenerated' } self._content_type = None @@ -111,6 +117,7 @@ def __init__(self, **kwargs): self._time_of_deletion = None self._time_of_current_version_expiry = None self._version_number = None + self._is_content_auto_generated = None @property def content_type(self): @@ -344,6 +351,30 @@ def version_number(self, version_number): """ self._version_number = version_number + @property + def is_content_auto_generated(self): + """ + Gets the is_content_auto_generated of this SecretVersion. + Boolean flag indicating whether secret content for this secret version was auto-generated or not. + + + :return: The is_content_auto_generated of this SecretVersion. + :rtype: bool + """ + return self._is_content_auto_generated + + @is_content_auto_generated.setter + def is_content_auto_generated(self, is_content_auto_generated): + """ + Sets the is_content_auto_generated of this SecretVersion. + Boolean flag indicating whether secret content for this secret version was auto-generated or not. + + + :param is_content_auto_generated: The is_content_auto_generated of this SecretVersion. + :type: bool + """ + self._is_content_auto_generated = is_content_auto_generated + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/vault/models/secret_version_summary.py b/src/oci/vault/models/secret_version_summary.py index 61a7767fff..49c3ec1926 100644 --- a/src/oci/vault/models/secret_version_summary.py +++ b/src/oci/vault/models/secret_version_summary.py @@ -84,6 +84,10 @@ def __init__(self, **kwargs): The value to assign to the system_tags property of this SecretVersionSummary. :type system_tags: dict(str, dict(str, object)) + :param is_content_auto_generated: + The value to assign to the is_content_auto_generated property of this SecretVersionSummary. + :type is_content_auto_generated: bool + """ self.swagger_types = { 'content_type': 'str', @@ -94,7 +98,8 @@ def __init__(self, **kwargs): 'time_of_deletion': 'datetime', 'time_of_expiry': 'datetime', 'version_number': 'int', - 'system_tags': 'dict(str, dict(str, object))' + 'system_tags': 'dict(str, dict(str, object))', + 'is_content_auto_generated': 'bool' } self.attribute_map = { @@ -106,7 +111,8 @@ def __init__(self, **kwargs): 'time_of_deletion': 'timeOfDeletion', 'time_of_expiry': 'timeOfExpiry', 'version_number': 'versionNumber', - 'system_tags': 'systemTags' + 'system_tags': 'systemTags', + 'is_content_auto_generated': 'isContentAutoGenerated' } self._content_type = None @@ -118,6 +124,7 @@ def __init__(self, **kwargs): self._time_of_expiry = None self._version_number = None self._system_tags = None + self._is_content_auto_generated = None @property def content_type(self): @@ -379,6 +386,30 @@ def system_tags(self, system_tags): """ self._system_tags = system_tags + @property + def is_content_auto_generated(self): + """ + Gets the is_content_auto_generated of this SecretVersionSummary. + Boolean flag indicating whether secret content for this secret version was auto-generated or not. + + + :return: The is_content_auto_generated of this SecretVersionSummary. + :rtype: bool + """ + return self._is_content_auto_generated + + @is_content_auto_generated.setter + def is_content_auto_generated(self, is_content_auto_generated): + """ + Sets the is_content_auto_generated of this SecretVersionSummary. + Boolean flag indicating whether secret content for this secret version was auto-generated or not. + + + :param is_content_auto_generated: The is_content_auto_generated of this SecretVersionSummary. + :type: bool + """ + self._is_content_auto_generated = is_content_auto_generated + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/vault/models/ssh_key_generation_context.py b/src/oci/vault/models/ssh_key_generation_context.py new file mode 100644 index 0000000000..c68295a1f5 --- /dev/null +++ b/src/oci/vault/models/ssh_key_generation_context.py @@ -0,0 +1,111 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20180608 + +from .secret_generation_context import SecretGenerationContext +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 SshKeyGenerationContext(SecretGenerationContext): + """ + Generates ssh keys. By default, the keys are stored as - {\"publicKey\": \"%GENERATED_PUBLIC_KEY%\", \"privateKey\": \"%GENERATED_PRIVATE_KEY%\"} in PEM format. + The SecretTemplate must have both %GENERATED_PUBLIC_KEY% and %GENERATED_PRIVATE_KEY% keywords which is later replaced with the respective keys, if provided. + """ + + #: A constant which can be used with the generation_template property of a SshKeyGenerationContext. + #: This constant has a value of "RSA_2048" + GENERATION_TEMPLATE_RSA_2048 = "RSA_2048" + + #: A constant which can be used with the generation_template property of a SshKeyGenerationContext. + #: This constant has a value of "RSA_3072" + GENERATION_TEMPLATE_RSA_3072 = "RSA_3072" + + #: A constant which can be used with the generation_template property of a SshKeyGenerationContext. + #: This constant has a value of "RSA_4096" + GENERATION_TEMPLATE_RSA_4096 = "RSA_4096" + + def __init__(self, **kwargs): + """ + Initializes a new SshKeyGenerationContext object with values from keyword arguments. The default value of the :py:attr:`~oci.vault.models.SshKeyGenerationContext.generation_type` attribute + of this class is ``SSH_KEY`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param generation_type: + The value to assign to the generation_type property of this SshKeyGenerationContext. + Allowed values for this property are: "PASSPHRASE", "SSH_KEY", "BYTES", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_type: str + + :param secret_template: + The value to assign to the secret_template property of this SshKeyGenerationContext. + :type secret_template: str + + :param generation_template: + The value to assign to the generation_template property of this SshKeyGenerationContext. + Allowed values for this property are: "RSA_2048", "RSA_3072", "RSA_4096", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type generation_template: str + + """ + self.swagger_types = { + 'generation_type': 'str', + 'secret_template': 'str', + 'generation_template': 'str' + } + + self.attribute_map = { + 'generation_type': 'generationType', + 'secret_template': 'secretTemplate', + 'generation_template': 'generationTemplate' + } + + self._generation_type = None + self._secret_template = None + self._generation_template = None + self._generation_type = 'SSH_KEY' + + @property + def generation_template(self): + """ + **[Required]** Gets the generation_template of this SshKeyGenerationContext. + Name of SSH key generation template to generate SSH key type secret. + + Allowed values for this property are: "RSA_2048", "RSA_3072", "RSA_4096", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The generation_template of this SshKeyGenerationContext. + :rtype: str + """ + return self._generation_template + + @generation_template.setter + def generation_template(self, generation_template): + """ + Sets the generation_template of this SshKeyGenerationContext. + Name of SSH key generation template to generate SSH key type secret. + + + :param generation_template: The generation_template of this SshKeyGenerationContext. + :type: str + """ + allowed_values = ["RSA_2048", "RSA_3072", "RSA_4096"] + if not value_allowed_none_or_none_sentinel(generation_template, allowed_values): + generation_template = 'UNKNOWN_ENUM_VALUE' + self._generation_template = generation_template + + 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/vault/models/update_secret_details.py b/src/oci/vault/models/update_secret_details.py index 1069c4c81e..24b9565bb6 100644 --- a/src/oci/vault/models/update_secret_details.py +++ b/src/oci/vault/models/update_secret_details.py @@ -52,6 +52,14 @@ def __init__(self, **kwargs): The value to assign to the secret_rules property of this UpdateSecretDetails. :type secret_rules: list[oci.vault.models.SecretRule] + :param secret_generation_context: + The value to assign to the secret_generation_context property of this UpdateSecretDetails. + :type secret_generation_context: oci.vault.models.SecretGenerationContext + + :param enable_auto_generation: + The value to assign to the enable_auto_generation property of this UpdateSecretDetails. + :type enable_auto_generation: bool + """ self.swagger_types = { 'current_version_number': 'int', @@ -61,7 +69,9 @@ def __init__(self, **kwargs): 'metadata': 'dict(str, object)', 'secret_content': 'SecretContentDetails', 'rotation_config': 'RotationConfig', - 'secret_rules': 'list[SecretRule]' + 'secret_rules': 'list[SecretRule]', + 'secret_generation_context': 'SecretGenerationContext', + 'enable_auto_generation': 'bool' } self.attribute_map = { @@ -72,7 +82,9 @@ def __init__(self, **kwargs): 'metadata': 'metadata', 'secret_content': 'secretContent', 'rotation_config': 'rotationConfig', - 'secret_rules': 'secretRules' + 'secret_rules': 'secretRules', + 'secret_generation_context': 'secretGenerationContext', + 'enable_auto_generation': 'enableAutoGeneration' } self._current_version_number = None @@ -83,6 +95,8 @@ def __init__(self, **kwargs): self._secret_content = None self._rotation_config = None self._secret_rules = None + self._secret_generation_context = None + self._enable_auto_generation = None @property def current_version_number(self): @@ -292,6 +306,50 @@ def secret_rules(self, secret_rules): """ self._secret_rules = secret_rules + @property + def secret_generation_context(self): + """ + Gets the secret_generation_context of this UpdateSecretDetails. + + :return: The secret_generation_context of this UpdateSecretDetails. + :rtype: oci.vault.models.SecretGenerationContext + """ + return self._secret_generation_context + + @secret_generation_context.setter + def secret_generation_context(self, secret_generation_context): + """ + Sets the secret_generation_context of this UpdateSecretDetails. + + :param secret_generation_context: The secret_generation_context of this UpdateSecretDetails. + :type: oci.vault.models.SecretGenerationContext + """ + self._secret_generation_context = secret_generation_context + + @property + def enable_auto_generation(self): + """ + Gets the enable_auto_generation of this UpdateSecretDetails. + The value of this flag determines whether or not secret content will be generated automatically. + + + :return: The enable_auto_generation of this UpdateSecretDetails. + :rtype: bool + """ + return self._enable_auto_generation + + @enable_auto_generation.setter + def enable_auto_generation(self, enable_auto_generation): + """ + Sets the enable_auto_generation of this UpdateSecretDetails. + The value of this flag determines whether or not secret content will be generated automatically. + + + :param enable_auto_generation: The enable_auto_generation of this UpdateSecretDetails. + :type: bool + """ + self._enable_auto_generation = enable_auto_generation + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/version.py b/src/oci/version.py index b9a80700ff..f361c0d5eb 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -2,4 +2,4 @@ # Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -__version__ = "2.122.0" +__version__ = "2.123.0"