oci-cli 3.65.0__py3-none-any.whl → 3.65.1__py3-none-any.whl

services/dbmulticloud/src/oci_cli_oracle_db_azure_vault_association/generated/oracledbazurevaultassociation_cli.py

@@ -16,22 +16,41 @@ from oci_cli.aliasing import CommandGroupWithAlias
 from services.dbmulticloud.src.oci_cli_dbmulticloud.generated import dbmulticloud_service_cli
 
 
-@click.command(cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.command_name', 'oracle-db-azure-vault-association'), cls=CommandGroupWithAlias, help=cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.help', """1. Oracle Azure Connector Resource: This is for installing Azure Arc Server in ExaCS VM Cluster.
-  There are two way to install Azure Arc Server (Azure Identity) in ExaCS VMCluster.
-    a. Using Bearer Access Token or
-    b. By providing Authentication token
+@click.command(cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.command_name', 'oracle-db-azure-vault-association'), cls=CommandGroupWithAlias, help=cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.help', """<b>Microsoft Azure:</b> <br>
+<b>Oracle Azure Connector Resource:</b>:&nbsp;&nbsp;The Oracle Azure Connector Resource is used to install the Azure Arc Server on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+ The supported method to install the Azure Arc Server (Azure Identity) on the Exadata VM cluster:
+<ul>
+ <li>Using a Bearer Access Token</li>
+</ul>
 
-2. Oracle Azure Blob Container Resource: This is for to capture Azure Container details
-   and same will be used in multiple ExaCS VMCluster to mount the Azure Container.
+<b>Oracle Azure Blob Container Resource:</b>&nbsp;&nbsp;The Oracle Azure Blob Container Resource is used to capture the details of an Azure Blob Container.
+This resource can then be reused across multiple Exadata VM clusters in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D) to mount the Azure container.
 
-3. Oracle Azure Blob Mount Resource: This is for to mount Azure Container in ExaCS VMCluster
-   using Oracle Azure Connector and Oracle Azure Blob Container Resource."""), short_help=cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.short_help', """Oracle Database MultiCloud Data plane Integration"""))
+<b>Oracle Azure Blob Mount Resource:</b>&nbsp;&nbsp;The Oracle Azure Blob Mount Resource is used to mount an Azure Blob Container on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+It relies on both the Oracle Azure Connector and the Oracle Azure Blob Container Resource to perform the mount operation.
+
+<b>Discover Azure Vaults and Keys Resource:</b>&nbsp;&nbsp;The Discover Oracle Azure Vaults and Azure Keys Resource is used to discover Azure Vaults and the associated encryption keys available in your Azure project.
+
+<b>Oracle Azure Vault:</b>&nbsp;&nbsp;The Oracle Azure Vault Resource is used to manage Azure Vaults within Oracle Cloud Infrastructure (OCI) for use with services such as Oracle Exadata Database Service on Dedicated Infrastructure.
+
+<b>Oracle Azure Key:</b>&nbsp;&nbsp;Oracle Azure Key Resource is used to register and manage a Oracle Azure Key Key within Oracle Cloud Infrastructure (OCI) under an associated Azure Vault.
+
+<br>
+
+<b>Google Cloud:</b><br>
+<b>Oracle Google Cloud Connector Resource:</b>&nbsp;&nbsp;The Oracle Google Cloud Connector Resource is used to install the Google Cloud Identity Connector on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+
+<b>Discover Google Key Rings and Keys Resource:</b>&nbsp;&nbsp;The Discover Google Key Rings and Keys Resource is used to discover Google Cloud Key Rings and the associated encryption keys available in your Google Cloud project.
+
+<b>Google Key Rings Resource:</b>&nbsp;&nbsp;The Google Key Rings Resource is used to register and manage Google Cloud Key Rings within Oracle Cloud Infrastructure (OCI) for use with services such as Oracle Exadata Database Service on Dedicated Infrastructure.
+
+<b>Google Key Resource:</b>&nbsp;&nbsp;The Google Key Resource is used to register and manage a Google Cloud Key within Oracle Cloud Infrastructure (OCI) under an associated Google Key Ring."""), short_help=cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_root_group.short_help', """Oracle Database MultiCloud Data Plane Integration"""))
 @cli_util.help_option_group
 def oracle_db_azure_vault_association_root_group():
     pass
 
 
-@click.command(cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_group.command_name', 'oracle-db-azure-vault-association'), cls=CommandGroupWithAlias, help="""Oracle DB Azure Vault Association Resource Object.""")
+@click.command(cli_util.override('oracle_db_azure_vault_association.oracle_db_azure_vault_association_group.command_name', 'oracle-db-azure-vault-association'), cls=CommandGroupWithAlias, help="""Oracle DB Azure Vault Association resource object.""")
 @cli_util.help_option_group
 def oracle_db_azure_vault_association_group():
     pass
@@ -41,8 +60,8 @@ dbmulticloud_service_cli.dbmulticloud_service_group.add_command(oracle_db_azure_
 oracle_db_azure_vault_association_root_group.add_command(oracle_db_azure_vault_association_group)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.cascading_delete_oracle_db_azure_vault_association.command_name', 'cascading-delete'), help=u"""Delete Oracle DB Azure Vault Association details. \n[Command Reference](cascadingDeleteOracleDbAzureVaultAssociation)""")
-@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The ID of the Oracle DB Azure Vault Association Resource.""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.cascading_delete_oracle_db_azure_vault_association.command_name', 'cascading-delete'), help=u"""Deletes the Oracle DB Azure Vault Association resource. \n[Command Reference](cascadingDeleteOracleDbAzureVaultAssociation)""")
+@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault Association resource.""")
 @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(["ACCEPTED", "IN_PROGRESS", "WAITING", "NEEDS_ATTENTION", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain 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 work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
@@ -97,8 +116,8 @@ def cascading_delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_
 
 
 @oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.change_oracle_db_azure_vault_association_compartment.command_name', 'change-compartment'), help=u"""Moves the Oracle DB Azure Vault Association resource into a different compartment. When provided, 'If-Match' is checked against 'ETag' values of the resource. \n[Command Reference](changeOracleDbAzureVaultAssociationCompartment)""")
-@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The ID of the Oracle DB Azure Vault Association Resource.""")
-@cli_util.option('--compartment-id', help=u"""The [OCID] of the new compartment to contain the Oracle DB Azure Vault Association Resource.""")
+@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--compartment-id', help=u"""The [OCID] of the new compartment to contain the Oracle DB Azure Vault Association resource.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""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\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
@@ -177,11 +196,11 @@ def change_oracle_db_azure_vault_association_compartment(ctx, from_json, wait_fo
     cli_util.render_response(result, ctx)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.create_oracle_db_azure_vault_association.command_name', 'create'), help=u"""Create Oracle DB Azure Vault Association based on the provided information. \n[Command Reference](createOracleDbAzureVaultAssociation)""")
-@cli_util.option('--compartment-id', required=True, help=u"""The [OCID] of the compartment that contains Oracle DB Azure Vault Association Resource.""")
-@cli_util.option('--display-name', required=True, help=u"""Display name of Oracle DB Azure Vault Association.""")
-@cli_util.option('--oracle-db-azure-vault-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault.""")
-@cli_util.option('--oracle-db-azure-connector-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Connector.""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.create_oracle_db_azure_vault_association.command_name', 'create'), help=u"""Creates Oracle DB Azure Vault Association resource. \n[Command Reference](createOracleDbAzureVaultAssociation)""")
+@cli_util.option('--compartment-id', required=True, help=u"""The [OCID] of the compartment that contains Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--display-name', required=True, help=u"""Oracle DB Azure Vault Association resource name.""")
+@cli_util.option('--oracle-db-azure-vault-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault that contains Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--oracle-db-azure-connector-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Connector that contains Oracle DB Azure Vault Association resource.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""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\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
@@ -251,8 +270,8 @@ def create_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max
     cli_util.render_response(result, ctx)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.delete_oracle_db_azure_vault_association.command_name', 'delete'), help=u"""Delete Oracle DB Azure Vault Association details. \n[Command Reference](deleteOracleDbAzureVaultAssociation)""")
-@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The ID of the Oracle DB Azure Vault Association Resource.""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.delete_oracle_db_azure_vault_association.command_name', 'delete'), help=u"""Deletes the Oracle DB Azure Vault Association resource. \n[Command Reference](deleteOracleDbAzureVaultAssociation)""")
+@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault Association resource.""")
 @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.confirm_delete_option
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "WAITING", "NEEDS_ATTENTION", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain 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.""")
@@ -307,8 +326,8 @@ def delete_oracle_db_azure_vault_association(ctx, from_json, wait_for_state, max
     cli_util.render_response(result, ctx)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.get_oracle_db_azure_vault_association.command_name', 'get'), help=u"""Get Oracle DB Azure Vault Details Association form a particular Container Resource ID. \n[Command Reference](getOracleDbAzureVaultAssociation)""")
-@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The ID of the Oracle DB Azure Vault Association Resource.""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.get_oracle_db_azure_vault_association.command_name', 'get'), help=u"""Retrieves the details of an Oracle DB Azure Vault Association using the specified association resource [OCID]. \n[Command Reference](getOracleDbAzureVaultAssociation)""")
+@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault Association resource.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")
 @cli_util.option('--page', help=u"""The page token representing the page at which to start retrieving results. This is usually retrieved from a previous list call.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either 'asc' or 'desc'.""")
@@ -338,13 +357,13 @@ def get_oracle_db_azure_vault_association(ctx, from_json, oracle_db_azure_vault_
     cli_util.render_response(result, ctx)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.list_oracle_db_azure_vault_associations.command_name', 'list'), help=u"""Lists the all Oracle DB Azure Associations based on filters. \n[Command Reference](listOracleDbAzureVaultAssociations)""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.list_oracle_db_azure_vault_associations.command_name', 'list'), help=u"""Lists all Oracle DB Azure Associations based on the specified filters. \n[Command Reference](listOracleDbAzureVaultAssociations)""")
 @cli_util.option('--compartment-id', required=True, help=u"""The [ID] of the compartment.""")
-@cli_util.option('--oracle-db-azure-vault-id', help=u"""A filter to return Oracle DB Azure Vault Resources.""")
-@cli_util.option('--display-name', help=u"""A filter to return Azure Vault Association.""")
-@cli_util.option('--oracle-db-azure-vault-association-id', help=u"""A filter to return Oracle DB Azure Vault Association Resources.""")
+@cli_util.option('--oracle-db-azure-vault-id', help=u"""A filter to return Oracle DB Azure Vault resources that match the specified [OCID] of the Oracle DB Azure Vault resource.""")
+@cli_util.option('--display-name', help=u"""A filter to return Oracle DB Azure Vault Association resources that match the specified display name.""")
+@cli_util.option('--oracle-db-azure-vault-association-id', help=u"""A filter to return Oracle DB Azure Vault resources that match the specified OCID](/Content/General/Concepts/identifiers.htm) of the Oracle DB Azure Vault Association resource.""")
 @cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["CREATING", "ACTIVE", "UPDATING", "DELETING", "DELETED", "FAILED"]), help=u"""A filter to return only resources that match the given lifecycle state. The state value is case-insensitive.""")
-@cli_util.option('--oracle-db-azure-connector-id', help=u"""A filter to return Oracle DB Azure Blob Mount Resources.""")
+@cli_util.option('--oracle-db-azure-connector-id', help=u"""A filter to return Oracle DB Azure Azure Identity Connector resources.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return.""")
 @cli_util.option('--page', help=u"""The page token representing the page at which to start retrieving results. This is usually retrieved from a previous list call.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either 'asc' or 'desc'.""")
@@ -407,12 +426,12 @@ def list_oracle_db_azure_vault_associations(ctx, from_json, all_pages, page_size
     cli_util.render_response(result, ctx)
 
 
-@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.update_oracle_db_azure_vault_association.command_name', 'update'), help=u"""Modifies the existing Oracle DB Azure Vault Association Details for a given ID. \n[Command Reference](updateOracleDbAzureVaultAssociation)""")
-@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The ID of the Oracle DB Azure Vault Association Resource.""")
-@cli_util.option('--compartment-id', help=u"""The [OCID] of the compartment that contains Oracle DB Azure Vault Association Resource.""")
-@cli_util.option('--display-name', help=u"""Display name of Oracle DB Azure Vault Association Resource.""")
-@cli_util.option('--oracle-db-azure-vault-id', help=u"""The [OCID] of the Oracle DB Azure Vault.""")
-@cli_util.option('--oracle-db-azure-connector-id', help=u"""The [OCID] of the Oracle DB Azure Connector.""")
+@oracle_db_azure_vault_association_group.command(name=cli_util.override('oracle_db_azure_vault_association.update_oracle_db_azure_vault_association.command_name', 'update'), help=u"""Modifies the properties of an Oracle DB Azure Vault Association resource identified by the specified resource [OCID]. \n[Command Reference](updateOracleDbAzureVaultAssociation)""")
+@cli_util.option('--oracle-db-azure-vault-association-id', required=True, help=u"""The [OCID] of the Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--compartment-id', help=u"""The [OCID] of the compartment that contains Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--display-name', help=u"""Oracle DB Azure Vault Association resource name.""")
+@cli_util.option('--oracle-db-azure-vault-id', help=u"""The [OCID] of the Oracle DB Azure Vault that contains Oracle DB Azure Vault Association resource.""")
+@cli_util.option('--oracle-db-azure-connector-id', help=u"""The [OCID] of the Oracle DB Azure Connector that contains Oracle DB Azure Vault Association resource.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""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\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)

services/dbmulticloud/src/oci_cli_work_request/generated/workrequest_cli.py

@@ -16,16 +16,35 @@ from oci_cli.aliasing import CommandGroupWithAlias
 from services.dbmulticloud.src.oci_cli_dbmulticloud.generated import dbmulticloud_service_cli
 
 
-@click.command(cli_util.override('work_request.work_request_root_group.command_name', 'work-request'), cls=CommandGroupWithAlias, help=cli_util.override('work_request.work_request_root_group.help', """1. Oracle Azure Connector Resource: This is for installing Azure Arc Server in ExaCS VM Cluster.
-  There are two way to install Azure Arc Server (Azure Identity) in ExaCS VMCluster.
-    a. Using Bearer Access Token or
-    b. By providing Authentication token
+@click.command(cli_util.override('work_request.work_request_root_group.command_name', 'work-request'), cls=CommandGroupWithAlias, help=cli_util.override('work_request.work_request_root_group.help', """<b>Microsoft Azure:</b> <br>
+<b>Oracle Azure Connector Resource:</b>:&nbsp;&nbsp;The Oracle Azure Connector Resource is used to install the Azure Arc Server on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+ The supported method to install the Azure Arc Server (Azure Identity) on the Exadata VM cluster:
+<ul>
+ <li>Using a Bearer Access Token</li>
+</ul>
 
-2. Oracle Azure Blob Container Resource: This is for to capture Azure Container details
-   and same will be used in multiple ExaCS VMCluster to mount the Azure Container.
+<b>Oracle Azure Blob Container Resource:</b>&nbsp;&nbsp;The Oracle Azure Blob Container Resource is used to capture the details of an Azure Blob Container.
+This resource can then be reused across multiple Exadata VM clusters in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D) to mount the Azure container.
 
-3. Oracle Azure Blob Mount Resource: This is for to mount Azure Container in ExaCS VMCluster
-   using Oracle Azure Connector and Oracle Azure Blob Container Resource."""), short_help=cli_util.override('work_request.work_request_root_group.short_help', """Oracle Database MultiCloud Data plane Integration"""))
+<b>Oracle Azure Blob Mount Resource:</b>&nbsp;&nbsp;The Oracle Azure Blob Mount Resource is used to mount an Azure Blob Container on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+It relies on both the Oracle Azure Connector and the Oracle Azure Blob Container Resource to perform the mount operation.
+
+<b>Discover Azure Vaults and Keys Resource:</b>&nbsp;&nbsp;The Discover Oracle Azure Vaults and Azure Keys Resource is used to discover Azure Vaults and the associated encryption keys available in your Azure project.
+
+<b>Oracle Azure Vault:</b>&nbsp;&nbsp;The Oracle Azure Vault Resource is used to manage Azure Vaults within Oracle Cloud Infrastructure (OCI) for use with services such as Oracle Exadata Database Service on Dedicated Infrastructure.
+
+<b>Oracle Azure Key:</b>&nbsp;&nbsp;Oracle Azure Key Resource is used to register and manage a Oracle Azure Key Key within Oracle Cloud Infrastructure (OCI) under an associated Azure Vault.
+
+<br>
+
+<b>Google Cloud:</b><br>
+<b>Oracle Google Cloud Connector Resource:</b>&nbsp;&nbsp;The Oracle Google Cloud Connector Resource is used to install the Google Cloud Identity Connector on an Exadata VM cluster in Oracle Exadata Database Service on Dedicated Infrastructure (ExaDB-D).
+
+<b>Discover Google Key Rings and Keys Resource:</b>&nbsp;&nbsp;The Discover Google Key Rings and Keys Resource is used to discover Google Cloud Key Rings and the associated encryption keys available in your Google Cloud project.
+
+<b>Google Key Rings Resource:</b>&nbsp;&nbsp;The Google Key Rings Resource is used to register and manage Google Cloud Key Rings within Oracle Cloud Infrastructure (OCI) for use with services such as Oracle Exadata Database Service on Dedicated Infrastructure.
+
+<b>Google Key Resource:</b>&nbsp;&nbsp;The Google Key Resource is used to register and manage a Google Cloud Key within Oracle Cloud Infrastructure (OCI) under an associated Google Key Ring."""), short_help=cli_util.override('work_request.work_request_root_group.short_help', """Oracle Database MultiCloud Data Plane Integration"""))
 @cli_util.help_option_group
 def work_request_root_group():
     pass

services/generative_ai/src/oci_cli_generative_ai/generated/generativeai_cli.py

@@ -202,7 +202,7 @@ Allowed values are: - HOSTING - FINE_TUNING""")
 @cli_util.option('--unit-count', required=True, type=click.INT, help=u"""The number of dedicated units in this AI cluster.""")
 @cli_util.option('--unit-shape', required=True, help=u"""The shape of dedicated unit in this AI cluster. The underlying hardware configuration is hidden from customers.
 
-Allowed values are: - LARGE_COHERE - LARGE_COHERE_V2 - SMALL_COHERE - SMALL_COHERE_V2 - SMALL_COHERE_4 - EMBED_COHERE - LLAMA2_70 - LARGE_GENERIC - LARGE_COHERE_V2_2 - LARGE_GENERIC_4 - SMALL_GENERIC_V2 - LARGE_GENERIC_2 - LARGE_COHERE_V3 - RERANK_COHERE""")
+Allowed values are: - LARGE_COHERE - LARGE_COHERE_V2 - SMALL_COHERE - SMALL_COHERE_V2 - SMALL_COHERE_4 - EMBED_COHERE - LLAMA2_70 - LARGE_GENERIC - LARGE_COHERE_V2_2 - LARGE_GENERIC_4 - SMALL_GENERIC_V2 - LARGE_GENERIC_2 - LARGE_COHERE_V3 - RERANK_COHERE - SMALL_GENERIC_V1 - MEDIUM_GENERIC_V1 - LARGE_GENERIC_V1""")
 @cli_util.option('--display-name', help=u"""A user-friendly name. Does not have to be unique, and it's changeable.""")
 @cli_util.option('--description', help=u"""An optional description of the dedicated AI cluster.""")
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""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].
@@ -773,6 +773,7 @@ def list_dedicated_ai_clusters(ctx, from_json, all_pages, page_size, compartment
 @cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "CREATING", "UPDATING", "DELETING", "DELETED", "FAILED"]), help=u"""A filter to return only resources that their lifecycle state matches the given lifecycle state.""")
 @cli_util.option('--display-name', help=u"""A filter to return only resources that match the given display name exactly.""")
 @cli_util.option('--id', help=u"""The [OCID] of the endpoint.""")
+@cli_util.option('--generative-ai-private-endpoint-id', help=u"""The [OCID] of the private endpoint.""")
 @cli_util.option('--limit', type=click.INT, help=u"""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].""")
 @cli_util.option('--page', help=u"""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].""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either 'ASC' or 'DESC'.""")
@@ -784,7 +785,7 @@ def list_dedicated_ai_clusters(ctx, from_json, all_pages, page_size, compartment
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'generative_ai', 'class': 'EndpointCollection'})
 @cli_util.wrap_exceptions
-def list_endpoints(ctx, from_json, all_pages, page_size, compartment_id, lifecycle_state, display_name, id, limit, page, sort_order, sort_by):
+def list_endpoints(ctx, from_json, all_pages, page_size, compartment_id, lifecycle_state, display_name, id, generative_ai_private_endpoint_id, limit, page, sort_order, sort_by):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -796,6 +797,8 @@ def list_endpoints(ctx, from_json, all_pages, page_size, compartment_id, lifecyc
         kwargs['display_name'] = display_name
     if id is not None:
         kwargs['id'] = id
+    if generative_ai_private_endpoint_id is not None:
+        kwargs['generative_ai_private_endpoint_id'] = generative_ai_private_endpoint_id
     if limit is not None:
         kwargs['limit'] = limit
     if page is not None:

services/generative_ai_inference/src/oci_cli_generative_ai_inference/generated/generativeaiinference_cli.py

@@ -267,12 +267,13 @@ Example: '{\"6395\": 2, \"8134\": 1, \"21943\": 0.5, \"5923\": -100}'""" + custo
 @cli_util.option('--chat-request-tools', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tools the model may call. Use this to provide a list of functions the model may generate JSON inputs for. A max of 128 functions are supported.
 
 This option is a JSON list with items of type ToolDefinition.  For documentation on ToolDefinition please see our API reference: https://docs.cloud.oracle.com/api/#/en/generativeaiinference/20231130/datatypes/ToolDefinition.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
-@json_skeleton_utils.get_cli_json_input_option({'serving-mode': {'module': 'generative_ai_inference', 'class': 'ServingMode'}, 'chat-request-messages': {'module': 'generative_ai_inference', 'class': 'list[Message]'}, 'chat-request-metadata': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-stream-options': {'module': 'generative_ai_inference', 'class': 'StreamOptions'}, 'chat-request-stop': {'module': 'generative_ai_inference', 'class': 'list[string]'}, 'chat-request-logit-bias': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-prediction': {'module': 'generative_ai_inference', 'class': 'Prediction'}, 'chat-request-response-format': {'module': 'generative_ai_inference', 'class': 'ResponseFormat'}, 'chat-request-tool-choice': {'module': 'generative_ai_inference', 'class': 'ToolChoice'}, 'chat-request-tools': {'module': 'generative_ai_inference', 'class': 'list[ToolDefinition]'}})
+@cli_util.option('--chat-request-web-search-options', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
+@json_skeleton_utils.get_cli_json_input_option({'serving-mode': {'module': 'generative_ai_inference', 'class': 'ServingMode'}, 'chat-request-messages': {'module': 'generative_ai_inference', 'class': 'list[Message]'}, 'chat-request-metadata': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-stream-options': {'module': 'generative_ai_inference', 'class': 'StreamOptions'}, 'chat-request-stop': {'module': 'generative_ai_inference', 'class': 'list[string]'}, 'chat-request-logit-bias': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-prediction': {'module': 'generative_ai_inference', 'class': 'Prediction'}, 'chat-request-response-format': {'module': 'generative_ai_inference', 'class': 'ResponseFormat'}, 'chat-request-tool-choice': {'module': 'generative_ai_inference', 'class': 'ToolChoice'}, 'chat-request-tools': {'module': 'generative_ai_inference', 'class': 'list[ToolDefinition]'}, 'chat-request-web-search-options': {'module': 'generative_ai_inference', 'class': 'WebSearchOptions'}})
 @cli_util.help_option
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'serving-mode': {'module': 'generative_ai_inference', 'class': 'ServingMode'}, 'chat-request-messages': {'module': 'generative_ai_inference', 'class': 'list[Message]'}, 'chat-request-metadata': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-stream-options': {'module': 'generative_ai_inference', 'class': 'StreamOptions'}, 'chat-request-stop': {'module': 'generative_ai_inference', 'class': 'list[string]'}, 'chat-request-logit-bias': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-prediction': {'module': 'generative_ai_inference', 'class': 'Prediction'}, 'chat-request-response-format': {'module': 'generative_ai_inference', 'class': 'ResponseFormat'}, 'chat-request-tool-choice': {'module': 'generative_ai_inference', 'class': 'ToolChoice'}, 'chat-request-tools': {'module': 'generative_ai_inference', 'class': 'list[ToolDefinition]'}}, output_type={'module': 'generative_ai_inference', 'class': 'ChatResult'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'serving-mode': {'module': 'generative_ai_inference', 'class': 'ServingMode'}, 'chat-request-messages': {'module': 'generative_ai_inference', 'class': 'list[Message]'}, 'chat-request-metadata': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-stream-options': {'module': 'generative_ai_inference', 'class': 'StreamOptions'}, 'chat-request-stop': {'module': 'generative_ai_inference', 'class': 'list[string]'}, 'chat-request-logit-bias': {'module': 'generative_ai_inference', 'class': 'object'}, 'chat-request-prediction': {'module': 'generative_ai_inference', 'class': 'Prediction'}, 'chat-request-response-format': {'module': 'generative_ai_inference', 'class': 'ResponseFormat'}, 'chat-request-tool-choice': {'module': 'generative_ai_inference', 'class': 'ToolChoice'}, 'chat-request-tools': {'module': 'generative_ai_inference', 'class': 'list[ToolDefinition]'}, 'chat-request-web-search-options': {'module': 'generative_ai_inference', 'class': 'WebSearchOptions'}}, output_type={'module': 'generative_ai_inference', 'class': 'ChatResult'})
 @cli_util.wrap_exceptions
-def chat_generic_chat_request(ctx, from_json, compartment_id, serving_mode, chat_request_messages, chat_request_reasoning_effort, chat_request_verbosity, chat_request_metadata, chat_request_is_stream, chat_request_stream_options, chat_request_num_generations, chat_request_seed, chat_request_is_echo, chat_request_top_k, chat_request_top_p, chat_request_temperature, chat_request_frequency_penalty, chat_request_presence_penalty, chat_request_stop, chat_request_log_probs, chat_request_max_tokens, chat_request_max_completion_tokens, chat_request_logit_bias, chat_request_prediction, chat_request_response_format, chat_request_tool_choice, chat_request_is_parallel_tool_calls, chat_request_tools):
+def chat_generic_chat_request(ctx, from_json, compartment_id, serving_mode, chat_request_messages, chat_request_reasoning_effort, chat_request_verbosity, chat_request_metadata, chat_request_is_stream, chat_request_stream_options, chat_request_num_generations, chat_request_seed, chat_request_is_echo, chat_request_top_k, chat_request_top_p, chat_request_temperature, chat_request_frequency_penalty, chat_request_presence_penalty, chat_request_stop, chat_request_log_probs, chat_request_max_tokens, chat_request_max_completion_tokens, chat_request_logit_bias, chat_request_prediction, chat_request_response_format, chat_request_tool_choice, chat_request_is_parallel_tool_calls, chat_request_tools, chat_request_web_search_options):
 
     kwargs = {}
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
@@ -354,6 +355,9 @@ def chat_generic_chat_request(ctx, from_json, compartment_id, serving_mode, chat
     if chat_request_tools is not None:
         _details['chatRequest']['tools'] = cli_util.parse_json_parameter("chat_request_tools", chat_request_tools)
 
+    if chat_request_web_search_options is not None:
+        _details['chatRequest']['webSearchOptions'] = cli_util.parse_json_parameter("chat_request_web_search_options", chat_request_web_search_options)
+
     _details['chatRequest']['apiFormat'] = 'GENERIC'
 
     client = cli_util.build_client('generative_ai_inference', 'generative_ai_inference', ctx)

services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py

@@ -409,6 +409,8 @@ def get_backup(ctx, from_json, backup_id, if_none_match):
 @cli_util.option('--db-system-id', help=u"""The DB System [OCID].""")
 @cli_util.option('--display-name', help=u"""A filter to return only the resource matching the given display name exactly.""")
 @cli_util.option('--soft-delete', type=custom_types.CliCaseInsensitiveChoice(["ENABLED", "DISABLED"]), help=u"""Backup Soft Delete""")
+@cli_util.option('--backup-preparation-status', type=custom_types.CliCaseInsensitiveChoice(["PREPARED", "NOT_PREPARED"]), help=u"""Indicates whether the backup has been prepared successfully.""")
+@cli_util.option('--validation-status', type=custom_types.CliCaseInsensitiveChoice(["NOT_VALIDATED", "VALIDATED", "NEEDS_ATTENTION", "FAILED"]), help=u"""Backup validation status""")
 @cli_util.option('--creation-type', type=custom_types.CliCaseInsensitiveChoice(["MANUAL", "AUTOMATIC", "OPERATOR"]), help=u"""Backup creationType""")
 @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["timeCreated", "timeUpdated", "displayName"]), help=u"""The field to sort by. Only one sort order may be provided. Time fields are default ordered as descending.""")
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use (ASC or DESC).""")
@@ -421,7 +423,7 @@ def get_backup(ctx, from_json, backup_id, if_none_match):
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'mysql', 'class': 'list[BackupSummary]'})
 @cli_util.wrap_exceptions
-def list_backups(ctx, from_json, all_pages, page_size, compartment_id, backup_id, lifecycle_state, db_system_id, display_name, soft_delete, creation_type, sort_by, sort_order, limit, page):
+def list_backups(ctx, from_json, all_pages, page_size, compartment_id, backup_id, lifecycle_state, db_system_id, display_name, soft_delete, backup_preparation_status, validation_status, creation_type, sort_by, sort_order, limit, page):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -437,6 +439,10 @@ def list_backups(ctx, from_json, all_pages, page_size, compartment_id, backup_id
         kwargs['display_name'] = display_name
     if soft_delete is not None:
         kwargs['soft_delete'] = soft_delete
+    if backup_preparation_status is not None:
+        kwargs['backup_preparation_status'] = backup_preparation_status
+    if validation_status is not None:
+        kwargs['validation_status'] = validation_status
     if creation_type is not None:
         kwargs['creation_type'] = creation_type
     if sort_by is not None:
@@ -556,3 +562,66 @@ def update_backup(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_
         else:
             click.echo('Unable to wait for the resource to enter the specified state', file=sys.stderr)
     cli_util.render_response(result, ctx)
+
+
+@backup_group.command(name=cli_util.override('db_backups.validate_backup.command_name', 'validate'), help=u"""Request to validate the backup by checking the data consistency. \n[Command Reference](validateBackup)""")
+@cli_util.option('--backup-id', required=True, help=u"""The OCID of the Backup""")
+@cli_util.option('--is-prepared-backup-required', required=True, type=click.BOOL, help=u"""Specifies whether the backup needs to be prepared for fast restore or not. Set to true to prepare the backup, set to false (default) if not required. Note: The prepared backup will replace the original backup and will not generate a new backup copy. The cost associated with the backup may vary, as the prepared backup will consistently be a full backup, it may also change the storage size of the original backup.""")
+@cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `If-Match` header 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(["ACCEPTED", "IN_PROGRESS", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain 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 work request to reach the 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 work request has reached the 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': 'mysql', 'class': 'Backup'})
+@cli_util.wrap_exceptions
+def validate_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, backup_id, is_prepared_backup_required, if_match):
+
+    if isinstance(backup_id, six.string_types) and len(backup_id.strip()) == 0:
+        raise click.UsageError('Parameter --backup-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['isPreparedBackupRequired'] = is_prepared_backup_required
+
+    client = cli_util.build_client('mysql', 'db_backups', ctx)
+    result = client.validate_backup(
+        backup_id=backup_id,
+        validate_backup_details=_details,
+        **kwargs
+    )
+    if wait_for_state:
+
+        client = cli_util.build_client('mysql', 'work_requests', ctx)
+
+        if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')):
+            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
+                if 'opc-work-request-id' not in result.headers:
+                    click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state')
+                    cli_util.render_response(result, ctx)
+                    return
+
+                click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr)
+                result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', 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 work request 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 work request 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 work request to enter the specified state', file=sys.stderr)
+    cli_util.render_response(result, ctx)