oci-cli 3.66.1__py3-none-any.whl → 3.66.2__py3-none-any.whl

services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py

@@ -10678,7 +10678,7 @@ def get_compatible_formats_for_sensitive_types(ctx, from_json, compartment_id, c
 
 
 @data_safe_configuration_group.command(name=cli_util.override('data_safe.get_data_safe_configuration.command_name', 'get'), help=u"""Gets the details of the Data Safe configuration. \n[Command Reference](getDataSafeConfiguration)""")
-@cli_util.option('--compartment-id', help=u"""A filter to return only resources that match the specified compartment OCID.""")
+@cli_util.option('--compartment-id', help=u"""A filter to return the Data Safe configuration for the specified tenancy OCID.""")
 @json_skeleton_utils.get_cli_json_input_option({})
 @cli_util.help_option
 @click.pass_context
@@ -13690,7 +13690,8 @@ def list_discovery_analytics(ctx, from_json, all_pages, page_size, compartment_i
 @cli_util.option('--object-name', multiple=True, help=u"""A filter to return only items related to a specific object name.""")
 @cli_util.option('--column-name', multiple=True, help=u"""A filter to return only a specific column based on column name.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either ascending (ASC) or descending (DESC).""")
-@cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["discoveryType", "timeFinished", "schemaName", "objectName", "columnName", "plannedAction"]), help=u"""The field to sort by. You can specify only one sorting parameter (sortOrder). The default order for timeFinished is descending. The default order for discoveryType, schemaName, objectName, columnName and plannedAction is ascending.""")
+@cli_util.option('--confidence-level', type=custom_types.CliCaseInsensitiveChoice(["NONE", "HIGH", "MEDIUM", "LOW"]), multiple=True, help=u"""A filter to return the discovery job results with the specified confidence level. Confidence level of discovery job result associated with a seeded sensitive type can either be HIGH or LOW. While the confidence level of discovery job result associated with a user defined sensitive will be NONE.""")
+@cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["discoveryType", "timeFinished", "schemaName", "objectName", "columnName", "plannedAction", "confidenceLevel"]), help=u"""The field to sort by. You can specify only one sorting parameter (sortOrder). The default order for timeFinished is descending. The default order for discoveryType, schemaName, objectName, columnName and plannedAction is ascending.""")
 @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of items to return per page in a paginated \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--page', help=u"""For list pagination. The page token representing the page at which to start retrieving results. It is usually retrieved from a previous \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""")
@@ -13700,7 +13701,7 @@ def list_discovery_analytics(ctx, from_json, all_pages, page_size, compartment_i
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schema-name': {'module': 'data_safe', 'class': 'list[string]'}, 'object-name': {'module': 'data_safe', 'class': 'list[string]'}, 'column-name': {'module': 'data_safe', 'class': 'list[string]'}}, output_type={'module': 'data_safe', 'class': 'DiscoveryJobResultCollection'})
 @cli_util.wrap_exceptions
-def list_discovery_job_results(ctx, from_json, all_pages, page_size, discovery_job_id, discovery_type, planned_action, is_result_applied, schema_name, object_name, column_name, sort_order, sort_by, limit, page):
+def list_discovery_job_results(ctx, from_json, all_pages, page_size, discovery_job_id, discovery_type, planned_action, is_result_applied, schema_name, object_name, column_name, sort_order, confidence_level, sort_by, limit, page):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -13723,6 +13724,8 @@ def list_discovery_job_results(ctx, from_json, all_pages, page_size, discovery_j
         kwargs['column_name'] = column_name
     if sort_order is not None:
         kwargs['sort_order'] = sort_order
+    if confidence_level is not None and len(confidence_level) > 0:
+        kwargs['confidence_level'] = confidence_level
     if sort_by is not None:
         kwargs['sort_by'] = sort_by
     if limit is not None:
@@ -13935,6 +13938,7 @@ def list_finding_analytics(ctx, from_json, all_pages, page_size, compartment_id,
 @cli_util.option('--contains-references', type=custom_types.CliCaseInsensitiveChoice(["STIG", "CIS", "GDPR"]), multiple=True, help=u"""An optional filter to return only findings that match the specified references. Use containsReferences param if need to filter by multiple references.""")
 @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of items to return per page in a paginated \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--page', help=u"""For list pagination. The page token representing the page at which to start retrieving results. It is usually retrieved from a previous \"List\" call. For details about how pagination works, see [List Pagination].""")
+@cli_util.option('--compartment-id', help=u"""A filter to return only resources that match the specified compartment OCID.""")
 @cli_util.option('--compartment-id-in-subtree', type=click.BOOL, help=u"""Default is false. When set to true, the hierarchy of compartments is traversed and all compartments and subcompartments in the tenancy are returned. Depends on the 'accessLevel' setting.""")
 @cli_util.option('--access-level', type=custom_types.CliCaseInsensitiveChoice(["RESTRICTED", "ACCESSIBLE"]), help=u"""Valid values are RESTRICTED and ACCESSIBLE. Default is RESTRICTED. Setting this to ACCESSIBLE returns only those compartments for which the user has INSPECT permissions directly or indirectly (permissions can be on a resource in a subcompartment). When set to RESTRICTED permissions are checked and no partial results are displayed.""")
 @cli_util.option('--target-id', help=u"""A filter to return only items related to a specific target OCID.""")
@@ -13955,7 +13959,7 @@ Supported fields: severity findingKey reference targetId isTopFinding title cate
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'target-ids': {'module': 'data_safe', 'class': 'list[string]'}}, output_type={'module': 'data_safe', 'class': 'list[FindingSummary]'})
 @cli_util.wrap_exceptions
-def list_findings(ctx, from_json, all_pages, page_size, security_assessment_id, is_top_finding, severity, contains_severity, category, lifecycle_state, references, contains_references, limit, page, compartment_id_in_subtree, access_level, target_id, target_ids, scim_query, field, sort_by, sort_order, finding_key):
+def list_findings(ctx, from_json, all_pages, page_size, security_assessment_id, is_top_finding, severity, contains_severity, category, lifecycle_state, references, contains_references, limit, page, compartment_id, compartment_id_in_subtree, access_level, target_id, target_ids, scim_query, field, sort_by, sort_order, finding_key):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -13982,6 +13986,8 @@ def list_findings(ctx, from_json, all_pages, page_size, security_assessment_id,
         kwargs['limit'] = limit
     if page is not None:
         kwargs['page'] = page
+    if compartment_id is not None:
+        kwargs['compartment_id'] = compartment_id
     if compartment_id_in_subtree is not None:
         kwargs['compartment_id_in_subtree'] = compartment_id_in_subtree
     if access_level is not None:
@@ -14588,7 +14594,7 @@ def list_masking_columns(ctx, from_json, all_pages, page_size, masking_policy_id
 
 @masking_error_summary_group.command(name=cli_util.override('data_safe.list_masking_errors.command_name', 'list-masking-errors'), help=u"""Gets a list of masking errors in a masking run based on the specified query parameters. \n[Command Reference](listMaskingErrors)""")
 @cli_util.option('--masking-report-id', required=True, help=u"""The OCID of the masking report.""")
-@cli_util.option('--step-name', type=custom_types.CliCaseInsensitiveChoice(["EXECUTE_MASKING", "PRE_MASKING", "POST_MASKING"]), help=u"""A filter to return only masking errors that match the specified step name.""")
+@cli_util.option('--step-name', type=custom_types.CliCaseInsensitiveChoice(["VALIDATE", "GENERATE_SCRIPT", "EXECUTE_MASKING", "PRE_MASKING", "POST_MASKING"]), help=u"""A filter to return only masking errors that match the specified step name.""")
 @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["stepName", "timeCreated"]), help=u"""The field to sort by. The default order will be ascending.""")
 @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of items to return per page in a paginated \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--page', help=u"""For list pagination. The page token representing the page at which to start retrieving results. It is usually retrieved from a previous \"List\" call. For details about how pagination works, see [List Pagination].""")
@@ -15007,6 +15013,7 @@ def list_masking_policy_referential_relations(ctx, from_json, all_pages, page_si
 @cli_util.option('--page', help=u"""For list pagination. The page token representing the page at which to start retrieving results. It is usually retrieved from a previous \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--masking-policy-id', help=u"""A filter to return only the resources that match the specified masking policy OCID.""")
 @cli_util.option('--target-id', help=u"""A filter to return only items related to a specific target OCID.""")
+@cli_util.option('--target-database-group-id', help=u"""A filter to return the target database group that matches the specified OCID.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either ascending (ASC) or descending (DESC).""")
 @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["timeMaskingFinished"]), help=u"""The field to sort by. You can specify only one sorting parameter (sortOrder). The default order for timeMaskingFinished is descending.""")
 @cli_util.option('--compartment-id-in-subtree', type=click.BOOL, help=u"""Default is false. When set to true, the hierarchy of compartments is traversed and all compartments and subcompartments in the tenancy are returned. Depends on the 'accessLevel' setting.""")
@@ -15018,7 +15025,7 @@ def list_masking_policy_referential_relations(ctx, from_json, all_pages, page_si
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'data_safe', 'class': 'MaskingReportCollection'})
 @cli_util.wrap_exceptions
-def list_masking_reports(ctx, from_json, all_pages, page_size, compartment_id, limit, page, masking_policy_id, target_id, sort_order, sort_by, compartment_id_in_subtree, access_level):
+def list_masking_reports(ctx, from_json, all_pages, page_size, compartment_id, limit, page, masking_policy_id, target_id, target_database_group_id, sort_order, sort_by, compartment_id_in_subtree, access_level):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -15032,6 +15039,8 @@ def list_masking_reports(ctx, from_json, all_pages, page_size, compartment_id, l
         kwargs['masking_policy_id'] = masking_policy_id
     if target_id is not None:
         kwargs['target_id'] = target_id
+    if target_database_group_id is not None:
+        kwargs['target_database_group_id'] = target_database_group_id
     if sort_order is not None:
         kwargs['sort_order'] = sort_order
     if sort_by is not None:
@@ -16711,6 +16720,8 @@ def list_sensitive_column_analytics(ctx, from_json, all_pages, page_size, compar
 @cli_util.option('--time-updated-greater-than-or-equal-to', type=custom_types.CLI_DATETIME, help=u"""Search for resources that were updated after a specific date. Specifying this parameter corresponding `timeUpdatedGreaterThanOrEqualTo` parameter will retrieve all resources updated after the specified created date, in \"YYYY-MM-ddThh:mmZ\" format with a Z offset, as defined by RFC 3339.""" + custom_types.CLI_DATETIME.VALID_DATETIME_CLI_HELP_MESSAGE)
 @cli_util.option('--time-updated-less-than', type=custom_types.CLI_DATETIME, help=u"""Search for resources that were updated before a specific date. Specifying this parameter corresponding `timeUpdatedLessThan` parameter will retrieve all resources updated before the specified created date, in \"YYYY-MM-ddThh:mmZ\" format with a Z offset, as defined by RFC 3339.""" + custom_types.CLI_DATETIME.VALID_DATETIME_CLI_HELP_MESSAGE)
 @cli_util.option('--sensitive-column-lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["CREATING", "ACTIVE", "UPDATING", "DELETING", "FAILED"]), help=u"""Filters the sensitive column resources with the given lifecycle state values.""")
+@cli_util.option('--column-data-count-filter', type=custom_types.CliCaseInsensitiveChoice(["SHOW_ALL_COLUMNS", "SHOW_COLUMNS_WITH_DATA", "SHOW_COLUMNS_WITHOUT_DATA"]), help=u"""Filters the sensitive columns with respect to the estimated row count.""")
+@cli_util.option('--confidence-level', type=custom_types.CliCaseInsensitiveChoice(["NONE", "HIGH", "MEDIUM", "LOW"]), multiple=True, help=u"""A filter to return the sensitive columns with the specified confidence level. Confidence level of sensitive column associated with a seeded sensitive type can either be HIGH or LOW. While the confidence level of sensitive column associated with a user defined sensitive will be NONE. For sensitive columns added manually the confidence level will also be NONE.""")
 @cli_util.option('--schema-name', multiple=True, help=u"""A filter to return only items related to specific schema name.""")
 @cli_util.option('--object-name', multiple=True, help=u"""A filter to return only items related to a specific object name.""")
 @cli_util.option('--column-name', multiple=True, help=u"""A filter to return only a specific column based on column name.""")
@@ -16724,7 +16735,7 @@ def list_sensitive_column_analytics(ctx, from_json, all_pages, page_size, compar
 @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of items to return per page in a paginated \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--page', help=u"""For list pagination. The page token representing the page at which to start retrieving results. It is usually retrieved from a previous \"List\" call. For details about how pagination works, see [List Pagination].""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either ascending (ASC) or descending (DESC).""")
-@cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["timeCreated", "schemaName", "objectName", "columnName", "dataType"]), help=u"""The field to sort by. You can specify only one sorting parameter (sortOrder). The default order for timeCreated is descending. The default order for schemaName, objectName, and columnName is ascending.""")
+@cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["timeCreated", "schemaName", "objectName", "columnName", "dataType", "confidenceLevel"]), help=u"""The field to sort by. You can specify only one sorting parameter (sortOrder). The default order for timeCreated is descending. The default order for schemaName, objectName, and columnName is ascending.""")
 @cli_util.option('--is-case-in-sensitive', type=click.BOOL, help=u"""A boolean flag indicating whether the search should be case-insensitive. The search is case-sensitive by default. Set this parameter to true to do case-insensitive search.""")
 @cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""")
 @cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""")
@@ -16733,7 +16744,7 @@ def list_sensitive_column_analytics(ctx, from_json, all_pages, page_size, compar
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schema-name': {'module': 'data_safe', 'class': 'list[string]'}, 'object-name': {'module': 'data_safe', 'class': 'list[string]'}, 'column-name': {'module': 'data_safe', 'class': 'list[string]'}, 'data-type': {'module': 'data_safe', 'class': 'list[string]'}, 'sensitive-type-id': {'module': 'data_safe', 'class': 'list[string]'}, 'parent-column-key': {'module': 'data_safe', 'class': 'list[string]'}}, output_type={'module': 'data_safe', 'class': 'SensitiveColumnCollection'})
 @cli_util.wrap_exceptions
-def list_sensitive_columns(ctx, from_json, all_pages, page_size, sensitive_data_model_id, time_created_greater_than_or_equal_to, time_created_less_than, time_updated_greater_than_or_equal_to, time_updated_less_than, sensitive_column_lifecycle_state, schema_name, object_name, column_name, object_type, data_type, status, sensitive_type_id, parent_column_key, relation_type, column_group, limit, page, sort_order, sort_by, is_case_in_sensitive):
+def list_sensitive_columns(ctx, from_json, all_pages, page_size, sensitive_data_model_id, time_created_greater_than_or_equal_to, time_created_less_than, time_updated_greater_than_or_equal_to, time_updated_less_than, sensitive_column_lifecycle_state, column_data_count_filter, confidence_level, schema_name, object_name, column_name, object_type, data_type, status, sensitive_type_id, parent_column_key, relation_type, column_group, limit, page, sort_order, sort_by, is_case_in_sensitive):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -16752,6 +16763,10 @@ def list_sensitive_columns(ctx, from_json, all_pages, page_size, sensitive_data_
         kwargs['time_updated_less_than'] = time_updated_less_than
     if sensitive_column_lifecycle_state is not None:
         kwargs['sensitive_column_lifecycle_state'] = sensitive_column_lifecycle_state
+    if column_data_count_filter is not None:
+        kwargs['column_data_count_filter'] = column_data_count_filter
+    if confidence_level is not None and len(confidence_level) > 0:
+        kwargs['confidence_level'] = confidence_level
     if schema_name is not None and len(schema_name) > 0:
         kwargs['schema_name'] = schema_name
     if object_name is not None and len(object_name) > 0:
@@ -19298,6 +19313,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, ope
 @cli_util.option('--tablespace', help=u"""The tablespace that should be used to create the mapping tables, DMASK objects, and other temporary tables for data masking. If no tablespace is provided, the DEFAULT tablespace is used.""")
 @cli_util.option('--is-ignore-errors-enabled', type=click.BOOL, help=u"""Indicates if the masking process should continue on hitting an error. It provides fault tolerance support and is enabled by default. In fault-tolerant mode, the masking process saves the failed step and continues. You can then submit another masking request (with isRerun attribute set to true) to execute only the failed steps.""")
 @cli_util.option('--seed', help=u"""The seed value to be used in case of Deterministic Encryption and Deterministic Substitution masking formats.""")
+@cli_util.option('--user-defined-function-seed', help=u"""The seed value to be used in case of User Defined Function masking format. This is an optional parameter and needs to be passed only if any User Defined Function uses seed.""")
 @cli_util.option('--is-move-interim-tables-enabled', type=click.BOOL, help=u"""Indicates if the interim DMASK tables should be moved to the user-specified tablespace. As interim tables can be large in size, set it to false if moving them causes performance overhead during masking.""")
 @cli_util.option('--is-execute-saved-script-enabled', type=click.BOOL, help=u"""Indicates if data masking should be performed using a saved masking script. Setting this attribute to true skips masking script generation and executes the masking script stored in the Data Safe repository. It helps save time if there are no changes in the database tables and their dependencies.""")
 @cli_util.option('--is-drop-temp-tables-enabled', type=click.BOOL, help=u"""Indicates if the temporary tables created during a masking operation should be dropped after masking. Set this attribute to false to preserve the temporary tables. Masking creates temporary tables that map the original sensitive data values to mask values. These temporary tables are dropped after masking if this attribute is set as true. But, in some cases, you may want to preserve this information to track how masking changed your data. Note that doing so compromises security. These tables must be dropped before the database is available for unprivileged users. If it's not provided, the value of the isDropTempTablesEnabled attribute in the MaskingPolicy resource is used.""")
@@ -19313,7 +19329,7 @@ def list_work_requests(ctx, from_json, all_pages, page_size, compartment_id, ope
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={})
 @cli_util.wrap_exceptions
-def mask_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, target_id, is_decrypt, is_rerun, re_run_from_step, tablespace, is_ignore_errors_enabled, seed, is_move_interim_tables_enabled, is_execute_saved_script_enabled, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile):
+def mask_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, masking_policy_id, target_id, is_decrypt, is_rerun, re_run_from_step, tablespace, is_ignore_errors_enabled, seed, user_defined_function_seed, is_move_interim_tables_enabled, is_execute_saved_script_enabled, is_drop_temp_tables_enabled, is_redo_logging_enabled, is_refresh_stats_enabled, parallel_degree, recompile):
 
     if isinstance(masking_policy_id, six.string_types) and len(masking_policy_id.strip()) == 0:
         raise click.UsageError('Parameter --masking-policy-id cannot be whitespace or empty string')
@@ -19344,6 +19360,9 @@ def mask_data(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se
     if seed is not None:
         _details['seed'] = seed
 
+    if user_defined_function_seed is not None:
+        _details['userDefinedFunctionSeed'] = user_defined_function_seed
+
     if is_move_interim_tables_enabled is not None:
         _details['isMoveInterimTablesEnabled'] = is_move_interim_tables_enabled
 

services/database/src/oci_cli_database/database_cli_extended.py

@@ -1783,12 +1783,14 @@ def add_storage_capacity_cloud_exadata_infrastructure(ctx, **kwargs):
     ctx.invoke(database_cli.add_storage_capacity_cloud_exadata_infrastructure, **kwargs)
 
 
-@cli_util.copy_params_from_generated_command(database_cli.create_cloud_vm_cluster, params_to_exclude=['cloud_exadata_infrastructure_id', 'is_sparse_diskgroup_enabled', 'is_local_backup_enabled', 'ssh_public_keys', 'data_collection_options'])
+# Renaming the parameter exascale-db-storage-vault-id to vault-id
+@cli_util.copy_params_from_generated_command(database_cli.create_cloud_vm_cluster, params_to_exclude=['cloud_exadata_infrastructure_id', 'is_sparse_diskgroup_enabled', 'is_local_backup_enabled', 'ssh_public_keys', 'data_collection_options', 'exascale_db_storage_vault_id'])
 @database_cli.cloud_vm_cluster_group.command('create', help=database_cli.create_cloud_vm_cluster.help)
 @cli_util.option('--cloud-exa-infra-id', required=True, help=u"""The [OCID] of the cloud Exadata infrastructure.""")
 @cli_util.option('--is-sparse-diskgroup', type=click.BOOL, help=u"""If true, the sparse disk group is configured for the cloud VM cluster. If false, the sparse disk group is not created.""")
 @cli_util.option('--is-local-backup', type=click.BOOL, help=u"""If true, database backup on local Exadata storage is configured for the cloud VM cluster. If false, database backup on local Exadata storage is not available in the cloud VM cluster.""")
 @cli_util.option('--ssh-authorized-keys-file', required=True, type=click.File('r'), help="""A file containing one or more public SSH keys to use for SSH access to the Cloud VM Cluster. Use a newline character to separate multiple keys. The length of the combined keys cannot exceed 10,000 characters.""")
+@cli_util.option('--vault-id', help=u"""The [OCID] of the Exadata Database Storage Vault.""")
 @cli_util.option('--data-collection-options', type=custom_types.CLI_COMPLEX_TYPE, help=DATA_COLLECTION_OPTIONS_HELP)
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'ssh-public-keys': {'module': 'database', 'class': 'list[string]'}, 'nsg-ids': {'module': 'database', 'class': 'list[string]'}, 'backup-network-nsg-ids': {'module': 'database', 'class': 'list[string]'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'data-collection-options': {'module': 'database', 'class': 'DataCollectionOptions'}}, output_type={'module': 'database', 'class': 'CloudVmCluster'})
@@ -1802,14 +1804,32 @@ def create_cloud_vm_cluster(ctx, **kwargs):
         content = [line.rstrip('\n') for line in kwargs['ssh_authorized_keys_file']]
         kwargs['ssh_public_keys'] = json.dumps(content)
 
+    if 'vault_id' in kwargs:
+        kwargs['exascale_db_storage_vault_id'] = kwargs['vault_id']
+
     kwargs.pop('cloud_exa_infra_id')
     kwargs.pop('is_sparse_diskgroup')
     kwargs.pop('is_local_backup')
     kwargs.pop('ssh_authorized_keys_file')
+    kwargs.pop('vault_id')
 
     ctx.invoke(database_cli.create_cloud_vm_cluster, **kwargs)
 
 
+# Renaming the parameter cloud-exadata-infrastructure-id to cloud-exa-infra-id
+@cli_util.copy_params_from_generated_command(database_cli.configure_exascale_cloud_exadata_infrastructure, params_to_exclude=['cloud_exadata_infrastructure_id'])
+@database_cli.cloud_exadata_infrastructure_group.command('configure-exascale', help=database_cli.configure_exascale_cloud_exadata_infrastructure.help)
+@cli_util.option('--cloud-exa-infra-id', required=True, help=u"""The [OCID] of the cloud Exadata infrastructure.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'database', 'class': 'CloudExadataInfrastructure'})
+@cli_util.wrap_exceptions
+def configure_exascale_cloud_exadata_infrastructure_extend(ctx, **kwargs):
+    kwargs['cloud_exadata_infrastructure_id'] = kwargs['cloud_exa_infra_id']
+    kwargs.pop('cloud_exa_infra_id')
+
+    ctx.invoke(database_cli.configure_exascale_cloud_exadata_infrastructure, **kwargs)
+
+
 @cli_util.copy_params_from_generated_command(database_cli.change_cloud_exadata_infrastructure_compartment, params_to_exclude=['cloud_exadata_infrastructure_id'])
 @database_cli.cloud_exadata_infrastructure_group.command('change-compartment', help=database_cli.change_cloud_exadata_infrastructure_compartment.help)
 @cli_util.option('--cloud-exa-infra-id', required=True, help=u"""The [OCID] of the cloud Exadata infrastructure.""")
@@ -3963,10 +3983,12 @@ def list_gi_version_minor_versions_extended(ctx, **kwargs):
 
 # Renaming the parameter high-capacity-database-storage to high-capacity-db-storage
 # Renaming the parameter additional-flash-cache-in-percent to flash-cache-in-percent
-@cli_util.copy_params_from_generated_command(database_cli.create_exascale_db_storage_vault, params_to_exclude=['high_capacity_database_storage', 'additional_flash_cache_in_percent'])
+# Renaming the parameter exadata-infrastructure-id to exa-infra-id
+@cli_util.copy_params_from_generated_command(database_cli.create_exascale_db_storage_vault, params_to_exclude=['high_capacity_database_storage', 'additional_flash_cache_in_percent', 'exadata_infrastructure_id'])
 @database_cli.exascale_db_storage_vault_group.command('create', help=database_cli.create_exascale_db_storage_vault.help)
 @cli_util.option('--high-capacity-storage-gb', required=True, type=click.INT, help=u"""The size of High Capacity database storage (GB).""")
 @cli_util.option('--flash-cache-in-percent', type=click.INT, help=u"""The size of additional Flash Cache in percentage of High Capacity database storage.""")
+@cli_util.option('--exa-infra-id', help=u"""The [OCID] of the Exadata infrastructure.""")
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'high-capacity-database-storage': {'module': 'database', 'class': 'ExascaleDbStorageInputDetails'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'database', 'class': 'ExascaleDbStorageVault'})
 @cli_util.wrap_exceptions
@@ -3982,11 +4004,30 @@ def create_exascale_db_storage_vault_extended(ctx, **kwargs):
     if 'flash_cache_in_percent' in kwargs:
         kwargs['additional_flash_cache_in_percent'] = kwargs['flash_cache_in_percent']
 
+    if 'exa_infra_id' in kwargs:
+        kwargs['exadata_infrastructure_id'] = kwargs['exa_infra_id']
+
     kwargs.pop('high_capacity_storage_gb')
     kwargs.pop('flash_cache_in_percent')
+    kwargs.pop('exa_infra_id')
     ctx.invoke(database_cli.create_exascale_db_storage_vault, **kwargs)
 
 
+# Renaming the parameter exadata-infrastructure-id to exa-infra-id
+@cli_util.copy_params_from_generated_command(database_cli.list_exascale_db_storage_vaults, params_to_exclude=['exadata_infrastructure_id'])
+@database_cli.exascale_db_storage_vault_group.command('list', help=database_cli.list_exascale_db_storage_vaults.help)
+@cli_util.option('--exa-infra-id', help=u"""A filter to return only list of Vaults that are linked to the exadata infrastructure Id.""")
+@click.pass_context
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.wrap_exceptions
+def list_exascale_db_storage_vaults_extended(ctx, **kwargs):
+    if 'exa_infra_id' in kwargs:
+        kwargs['exadata_infrastructure_id'] = kwargs['exa_infra_id']
+
+    kwargs.pop('exa_infra_id')
+    ctx.invoke(database_cli.list_exascale_db_storage_vaults, **kwargs)
+
+
 # Renaming the parameter exascale-db-storage-vault-id to vault-id
 # Renaming the parameter additional-flash-cache-in-percent to flash-cache-in-percent
 @cli_util.copy_params_from_generated_command(database_cli.update_exascale_db_storage_vault, params_to_exclude=['high_capacity_database_storage', 'additional_flash_cache_in_percent'])

services/database/src/oci_cli_database/generated/database_cli.py

@@ -3960,6 +3960,63 @@ def configure_autonomous_database_vault_key(ctx, from_json, wait_for_state, max_
     cli_util.render_response(result, ctx)
 
 
+@cloud_exadata_infrastructure_group.command(name=cli_util.override('db.configure_exascale_cloud_exadata_infrastructure.command_name', 'configure-exascale'), help=u"""Configures Exascale on Cloud exadata infrastructure resource. Applies to Exadata Cloud Service instances only. \n[Command Reference](configureExascaleCloudExadataInfrastructure)""")
+@cli_util.option('--cloud-exadata-infrastructure-id', required=True, help=u"""The cloud Exadata infrastructure [OCID].""")
+@cli_util.option('--total-storage-in-gbs', required=True, type=click.INT, help=u"""Storage size needed for Exascale in GBs.""")
+@cli_util.option('--if-match', help=u"""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.""")
+@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "MAINTENANCE_IN_PROGRESS"]), multiple=True, help="""This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
+@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the resource to reach the lifecycle state defined by --wait-for-state. Defaults to 1200 seconds.""")
+@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the resource has reached the lifecycle state defined by --wait-for-state. Defaults to 30 seconds.""")
+@json_skeleton_utils.get_cli_json_input_option({})
+@cli_util.help_option
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'database', 'class': 'CloudExadataInfrastructure'})
+@cli_util.wrap_exceptions
+def configure_exascale_cloud_exadata_infrastructure(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, cloud_exadata_infrastructure_id, total_storage_in_gbs, if_match):
+
+    if isinstance(cloud_exadata_infrastructure_id, six.string_types) and len(cloud_exadata_infrastructure_id.strip()) == 0:
+        raise click.UsageError('Parameter --cloud-exadata-infrastructure-id cannot be whitespace or empty string')
+
+    kwargs = {}
+    if if_match is not None:
+        kwargs['if_match'] = if_match
+    kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
+
+    _details = {}
+    _details['totalStorageInGBs'] = total_storage_in_gbs
+
+    client = cli_util.build_client('database', 'database', ctx)
+    result = client.configure_exascale_cloud_exadata_infrastructure(
+        cloud_exadata_infrastructure_id=cloud_exadata_infrastructure_id,
+        configure_exascale_cloud_exadata_infrastructure_details=_details,
+        **kwargs
+    )
+    if wait_for_state:
+
+        if hasattr(client, 'get_cloud_exadata_infrastructure') and callable(getattr(client, 'get_cloud_exadata_infrastructure')):
+            try:
+                wait_period_kwargs = {}
+                if max_wait_seconds is not None:
+                    wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
+                if wait_interval_seconds is not None:
+                    wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
+
+                click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
+                result = oci.wait_until(client, client.get_cloud_exadata_infrastructure(result.data.id), 'lifecycle_state', wait_for_state, **wait_period_kwargs)
+            except oci.exceptions.MaximumWaitTimeExceeded as e:
+                # If we fail, we should show an error, but we should still provide the information to the customer
+                click.echo('Failed to wait until the resource entered the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                sys.exit(2)
+            except Exception:
+                click.echo('Encountered error while waiting for resource to enter the specified state. Outputting last known resource state', file=sys.stderr)
+                cli_util.render_response(result, ctx)
+                raise
+        else:
+            click.echo('Unable to wait for the resource to enter the specified state', file=sys.stderr)
+    cli_util.render_response(result, ctx)
+
+
 @exadata_infrastructure_group.command(name=cli_util.override('db.configure_exascale_exadata_infrastructure.command_name', 'configure-exascale'), help=u"""Configures Exascale on Exadata infrastructure resource. Applies to Exadata Cloud@Customer instances only. \n[Command Reference](configureExascaleExadataInfrastructure)""")
 @cli_util.option('--exadata-infrastructure-id', required=True, help=u"""The Exadata infrastructure [OCID].""")
 @cli_util.option('--total-storage-in-gbs', required=True, type=click.INT, help=u"""Storage size needed for Exascale in GBs.""")
@@ -11029,6 +11086,7 @@ Example: `{\"Department\": \"Finance\"}`""" + custom_types.cli_complex_type.COMP
 
 This option is a JSON list with items of type FileSystemConfigurationDetail.  For documentation on FileSystemConfigurationDetail please see our API reference: https://docs.cloud.oracle.com/api/#/en/database/20160918/datatypes/FileSystemConfigurationDetail.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--cloud-automation-update-details', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
+@cli_util.option('--exascale-db-storage-vault-id', help=u"""The [OCID] of the Exadata Database Storage Vault.""")
 @cli_util.option('--vm-cluster-type', type=custom_types.CliCaseInsensitiveChoice(["REGULAR", "DEVELOPER"]), help=u"""The vmcluster type for the VM cluster/Cloud VM cluster.""")
 @cli_util.option('--opc-dry-run', type=click.BOOL, help=u"""Indicates that the request is a dry run, if set to \"true\". A dry run request does not actually creating or updating a resource and is used only to perform validation on the submitted data.""")
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["PROVISIONING", "AVAILABLE", "UPDATING", "TERMINATING", "TERMINATED", "FAILED", "MAINTENANCE_IN_PROGRESS"]), multiple=True, help="""This operation creates, modifies or deletes a resource that has a defined lifecycle state. Specify this option to perform the action and then wait until the resource reaches a given lifecycle state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
@@ -11039,7 +11097,7 @@ This option is a JSON list with items of type FileSystemConfigurationDetail.  Fo
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'db-servers': {'module': 'database', 'class': 'list[string]'}, 'ssh-public-keys': {'module': 'database', 'class': 'list[string]'}, 'nsg-ids': {'module': 'database', 'class': 'list[string]'}, 'backup-network-nsg-ids': {'module': 'database', 'class': 'list[string]'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'security-attributes': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'data-collection-options': {'module': 'database', 'class': 'DataCollectionOptions'}, 'file-system-configuration-details': {'module': 'database', 'class': 'list[FileSystemConfigurationDetail]'}, 'cloud-automation-update-details': {'module': 'database', 'class': 'CloudAutomationUpdateDetails'}}, output_type={'module': 'database', 'class': 'CloudVmCluster'})
 @cli_util.wrap_exceptions
-def create_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, subnet_id, backup_subnet_id, cpu_core_count, display_name, cloud_exadata_infrastructure_id, hostname, ssh_public_keys, gi_version, subscription_id, ocpu_count, memory_size_in_gbs, db_node_storage_size_in_gbs, data_storage_size_in_tbs, db_servers, cluster_name, data_storage_percentage, domain, license_model, is_sparse_diskgroup_enabled, is_local_backup_enabled, time_zone, scan_listener_port_tcp, scan_listener_port_tcp_ssl, private_zone_id, nsg_ids, backup_network_nsg_ids, freeform_tags, defined_tags, security_attributes, data_collection_options, system_version, file_system_configuration_details, cloud_automation_update_details, vm_cluster_type, opc_dry_run):
+def create_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, compartment_id, subnet_id, backup_subnet_id, cpu_core_count, display_name, cloud_exadata_infrastructure_id, hostname, ssh_public_keys, gi_version, subscription_id, ocpu_count, memory_size_in_gbs, db_node_storage_size_in_gbs, data_storage_size_in_tbs, db_servers, cluster_name, data_storage_percentage, domain, license_model, is_sparse_diskgroup_enabled, is_local_backup_enabled, time_zone, scan_listener_port_tcp, scan_listener_port_tcp_ssl, private_zone_id, nsg_ids, backup_network_nsg_ids, freeform_tags, defined_tags, security_attributes, data_collection_options, system_version, file_system_configuration_details, cloud_automation_update_details, exascale_db_storage_vault_id, vm_cluster_type, opc_dry_run):
 
     kwargs = {}
     if opc_dry_run is not None:
@@ -11132,6 +11190,9 @@ def create_cloud_vm_cluster(ctx, from_json, wait_for_state, max_wait_seconds, wa
     if cloud_automation_update_details is not None:
         _details['cloudAutomationUpdateDetails'] = cli_util.parse_json_parameter("cloud_automation_update_details", cloud_automation_update_details)
 
+    if exascale_db_storage_vault_id is not None:
+        _details['exascaleDbStorageVaultId'] = exascale_db_storage_vault_id
+
     if vm_cluster_type is not None:
         _details['vmClusterType'] = vm_cluster_type