oci 2.14.0 → 2.15.0

data/lib/oci/database/models/cloud_exadata_infrastructure.rb

@@ -94,6 +94,13 @@ module OCI
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 
+    # The list of customer email addresses that receive information from Oracle about the specified OCI Database service resource.
+    # Oracle uses these email addresses to send notifications about planned and unplanned software maintenance updates, information about system hardware, and other information needed by administrators.
+    # Up to 10 email addresses can be added to the customer contacts for a cloud Exadata infrastructure instance.
+    #
+    # @return [Array<OCI::Database::Models::CustomerContact>]
+    attr_accessor :customer_contacts
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -114,7 +121,8 @@ module OCI
         'last_maintenance_run_id': :'lastMaintenanceRunId',
         'next_maintenance_run_id': :'nextMaintenanceRunId',
         'freeform_tags': :'freeformTags',
-        'defined_tags': :'definedTags'
+        'defined_tags': :'definedTags',
+        'customer_contacts': :'customerContacts'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -139,7 +147,8 @@ module OCI
         'last_maintenance_run_id': :'String',
         'next_maintenance_run_id': :'String',
         'freeform_tags': :'Hash<String, String>',
-        'defined_tags': :'Hash<String, Hash<String, Object>>'
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'customer_contacts': :'Array<OCI::Database::Models::CustomerContact>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -167,6 +176,7 @@ module OCI
     # @option attributes [String] :next_maintenance_run_id The value to assign to the {#next_maintenance_run_id} property
     # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
     # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    # @option attributes [Array<OCI::Database::Models::CustomerContact>] :customer_contacts The value to assign to the {#customer_contacts} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -263,6 +273,12 @@ module OCI
       raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
       self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+
+      self.customer_contacts = attributes[:'customerContacts'] if attributes[:'customerContacts']
+
+      raise 'You cannot provide both :customerContacts and :customer_contacts' if attributes.key?(:'customerContacts') && attributes.key?(:'customer_contacts')
+
+      self.customer_contacts = attributes[:'customer_contacts'] if attributes[:'customer_contacts']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -305,7 +321,8 @@ module OCI
         last_maintenance_run_id == other.last_maintenance_run_id &&
         next_maintenance_run_id == other.next_maintenance_run_id &&
         freeform_tags == other.freeform_tags &&
-        defined_tags == other.defined_tags
+        defined_tags == other.defined_tags &&
+        customer_contacts == other.customer_contacts
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -321,7 +338,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, lifecycle_state, display_name, shape, availability_domain, compute_count, storage_count, total_storage_size_in_gbs, available_storage_size_in_gbs, time_created, lifecycle_details, maintenance_window, last_maintenance_run_id, next_maintenance_run_id, freeform_tags, defined_tags].hash
+      [id, compartment_id, lifecycle_state, display_name, shape, availability_domain, compute_count, storage_count, total_storage_size_in_gbs, available_storage_size_in_gbs, time_created, lifecycle_details, maintenance_window, last_maintenance_run_id, next_maintenance_run_id, freeform_tags, defined_tags, customer_contacts].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/database/models/cloud_exadata_infrastructure_summary.rb

@@ -94,6 +94,13 @@ module OCI
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 
+    # The list of customer email addresses that receive information from Oracle about the specified OCI Database service resource.
+    # Oracle uses these email addresses to send notifications about planned and unplanned software maintenance updates, information about system hardware, and other information needed by administrators.
+    # Up to 10 email addresses can be added to the customer contacts for a cloud Exadata infrastructure instance.
+    #
+    # @return [Array<OCI::Database::Models::CustomerContact>]
+    attr_accessor :customer_contacts
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -114,7 +121,8 @@ module OCI
         'last_maintenance_run_id': :'lastMaintenanceRunId',
         'next_maintenance_run_id': :'nextMaintenanceRunId',
         'freeform_tags': :'freeformTags',
-        'defined_tags': :'definedTags'
+        'defined_tags': :'definedTags',
+        'customer_contacts': :'customerContacts'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -139,7 +147,8 @@ module OCI
         'last_maintenance_run_id': :'String',
         'next_maintenance_run_id': :'String',
         'freeform_tags': :'Hash<String, String>',
-        'defined_tags': :'Hash<String, Hash<String, Object>>'
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'customer_contacts': :'Array<OCI::Database::Models::CustomerContact>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -167,6 +176,7 @@ module OCI
     # @option attributes [String] :next_maintenance_run_id The value to assign to the {#next_maintenance_run_id} property
     # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
     # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    # @option attributes [Array<OCI::Database::Models::CustomerContact>] :customer_contacts The value to assign to the {#customer_contacts} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -266,6 +276,12 @@ module OCI
       raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
       self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+
+      self.customer_contacts = attributes[:'customerContacts'] if attributes[:'customerContacts']
+
+      raise 'You cannot provide both :customerContacts and :customer_contacts' if attributes.key?(:'customerContacts') && attributes.key?(:'customer_contacts')
+
+      self.customer_contacts = attributes[:'customer_contacts'] if attributes[:'customer_contacts']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -308,7 +324,8 @@ module OCI
         last_maintenance_run_id == other.last_maintenance_run_id &&
         next_maintenance_run_id == other.next_maintenance_run_id &&
         freeform_tags == other.freeform_tags &&
-        defined_tags == other.defined_tags
+        defined_tags == other.defined_tags &&
+        customer_contacts == other.customer_contacts
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -324,7 +341,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, lifecycle_state, display_name, shape, availability_domain, compute_count, storage_count, total_storage_size_in_gbs, available_storage_size_in_gbs, time_created, lifecycle_details, maintenance_window, last_maintenance_run_id, next_maintenance_run_id, freeform_tags, defined_tags].hash
+      [id, compartment_id, lifecycle_state, display_name, shape, availability_domain, compute_count, storage_count, total_storage_size_in_gbs, available_storage_size_in_gbs, time_created, lifecycle_details, maintenance_window, last_maintenance_run_id, next_maintenance_run_id, freeform_tags, defined_tags, customer_contacts].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/database/models/configure_autonomous_database_vault_key_details.rb

@@ -0,0 +1,182 @@
+# Copyright (c) 2016, 2021, 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.
+
+require 'date'
+
+# rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
+module OCI
+  # Configuration details for the Autonomous Database [vault](https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts) key.
+  class Database::Models::ConfigureAutonomousDatabaseVaultKeyDetails
+    # The OCID of the key container that is used as the master encryption key in database transparent data encryption (TDE) operations.
+    # @return [String]
+    attr_accessor :kms_key_id
+
+    # The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
+    # @return [String]
+    attr_accessor :vault_id
+
+    # True if disable Customer Managed Keys and use Oracle Managed Keys.
+    # @return [BOOLEAN]
+    attr_accessor :is_using_oracle_managed_keys
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'kms_key_id': :'kmsKeyId',
+        'vault_id': :'vaultId',
+        'is_using_oracle_managed_keys': :'isUsingOracleManagedKeys'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'kms_key_id': :'String',
+        'vault_id': :'String',
+        'is_using_oracle_managed_keys': :'BOOLEAN'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :kms_key_id The value to assign to the {#kms_key_id} property
+    # @option attributes [String] :vault_id The value to assign to the {#vault_id} property
+    # @option attributes [BOOLEAN] :is_using_oracle_managed_keys The value to assign to the {#is_using_oracle_managed_keys} property
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      self.kms_key_id = attributes[:'kmsKeyId'] if attributes[:'kmsKeyId']
+
+      raise 'You cannot provide both :kmsKeyId and :kms_key_id' if attributes.key?(:'kmsKeyId') && attributes.key?(:'kms_key_id')
+
+      self.kms_key_id = attributes[:'kms_key_id'] if attributes[:'kms_key_id']
+
+      self.vault_id = attributes[:'vaultId'] if attributes[:'vaultId']
+
+      raise 'You cannot provide both :vaultId and :vault_id' if attributes.key?(:'vaultId') && attributes.key?(:'vault_id')
+
+      self.vault_id = attributes[:'vault_id'] if attributes[:'vault_id']
+
+      self.is_using_oracle_managed_keys = attributes[:'isUsingOracleManagedKeys'] unless attributes[:'isUsingOracleManagedKeys'].nil?
+
+      raise 'You cannot provide both :isUsingOracleManagedKeys and :is_using_oracle_managed_keys' if attributes.key?(:'isUsingOracleManagedKeys') && attributes.key?(:'is_using_oracle_managed_keys')
+
+      self.is_using_oracle_managed_keys = attributes[:'is_using_oracle_managed_keys'] unless attributes[:'is_using_oracle_managed_keys'].nil?
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        kms_key_id == other.kms_key_id &&
+        vault_id == other.vault_id &&
+        is_using_oracle_managed_keys == other.is_using_oracle_managed_keys
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [kms_key_id, vault_id, is_using_oracle_managed_keys].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          public_method("#{key}=").call(
+            OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]])
+          )
+        end
+        # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective, Metrics/LineLength

data/lib/oci/database/models/create_autonomous_database_base.rb

@@ -7,6 +7,11 @@ require 'date'
 module OCI
   # 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 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.
   #
   # This class has direct subclasses. If you are using this class as input to a service operations then you should favor using a subclass over the base class
@@ -28,7 +33,13 @@ module OCI
       SOURCE_DATABASE = 'DATABASE'.freeze,
       SOURCE_BACKUP_FROM_ID = 'BACKUP_FROM_ID'.freeze,
       SOURCE_BACKUP_FROM_TIMESTAMP = 'BACKUP_FROM_TIMESTAMP'.freeze,
-      SOURCE_CLONE_TO_REFRESHABLE = 'CLONE_TO_REFRESHABLE'.freeze
+      SOURCE_CLONE_TO_REFRESHABLE = 'CLONE_TO_REFRESHABLE'.freeze,
+      SOURCE_CROSS_REGION_DATAGUARD = 'CROSS_REGION_DATAGUARD'.freeze
+    ].freeze
+
+    AUTONOMOUS_MAINTENANCE_SCHEDULE_TYPE_ENUM = [
+      AUTONOMOUS_MAINTENANCE_SCHEDULE_TYPE_EARLY = 'EARLY'.freeze,
+      AUTONOMOUS_MAINTENANCE_SCHEDULE_TYPE_REGULAR = 'REGULAR'.freeze
     ].freeze
 
     # **[Required]** The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment of the Autonomous Database.
@@ -39,10 +50,26 @@ module OCI
     # @return [String]
     attr_accessor :db_name
 
-    # **[Required]** The number of OCPU cores to be made available to the database.
+    # 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](https://www.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/autonomous-database&id=ATPFG-GUID-B0F033C1-CC5A-42F0-B2E7-3CECFEDA1FD1) for shape details.
+    #
+    # **Note:** This parameter cannot be used with the `ocpuCount` parameter.
+    #
     # @return [Integer]
     attr_accessor :cpu_core_count
 
+    # The number of OCPU cores to be made available to the database.
+    #
+    # 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 Databasese on shared Exadata infrastructure.)
+    # - 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.
+    #
+    # For Autonomous Databases on dedicated Exadata infrastructure, the maximum number of cores is determined by the infrastructure shape. See [Characteristics of Infrastructure Shapes](https://www.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/autonomous-database&id=ATPFG-GUID-B0F033C1-CC5A-42F0-B2E7-3CECFEDA1FD1) for shape details.
+    #
+    # **Note:** This parameter cannot be used with the `cpuCoreCount` parameter.
+    #
+    # @return [Float]
+    attr_accessor :ocpu_count
+
     # The Autonomous Database workload type. The following values are valid:
     #
     # - OLTP - indicates an Autonomous Transaction Processing database
@@ -53,16 +80,35 @@ module OCI
     # @return [String]
     attr_reader :db_workload
 
-    # The size, in terabytes, of the data volume that will be created and attached to the database. This storage can later be scaled up if needed.
+    # The size, in terabytes, of the data volume that will be created and attached to the database. This storage can later be scaled up if needed. For Autonomous Databases on dedicated Exadata infrastructure, the maximum storage value is determined by the infrastructure shape. See [Characteristics of Infrastructure Shapes](https://www.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/autonomous-database&id=ATPFG-GUID-B0F033C1-CC5A-42F0-B2E7-3CECFEDA1FD1) for shape details.
+    #
+    # **Note:** This parameter cannot be used with the `dataStorageSizeInGBs` parameter.
     #
     # @return [Integer]
     attr_accessor :data_storage_size_in_tbs
 
+    # The size, in gigabytes, of the data volume that will be created and attached to the database. This storage can later be scaled up if needed. The maximum storage value is determined by the infrastructure shape. See [Characteristics of Infrastructure Shapes](https://www.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/autonomous-database&id=ATPFG-GUID-B0F033C1-CC5A-42F0-B2E7-3CECFEDA1FD1) for shape details.
+    #
+    # **Notes**
+    # - This parameter is only supported for dedicated Exadata infrastructure.
+    # - This parameter cannot be used with the `dataStorageSizeInTBs` parameter.
+    #
+    # @return [Integer]
+    attr_accessor :data_storage_size_in_gbs
+
     # Indicates if this is an Always Free resource. The default value is false. Note that Always Free Autonomous Databases have 1 CPU and 20GB of memory. For Always Free databases, memory and CPU cannot be scaled.
     #
     # @return [BOOLEAN]
     attr_accessor :is_free_tier
 
+    # The OCID of the key container that is used as the master encryption key in database transparent data encryption (TDE) operations.
+    # @return [String]
+    attr_accessor :kms_key_id
+
+    # The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
+    # @return [String]
+    attr_accessor :vault_id
+
     # The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing.
     # @return [String]
     attr_accessor :admin_password
@@ -202,6 +248,12 @@ module OCI
     # @return [Array<OCI::Database::Models::CustomerContact>]
     attr_accessor :customer_contacts
 
+    # The maintenance schedule type of the Autonomous Database on shared Exadata infrastructure. The EARLY maintenance schedule of this Autonomous Database
+    # follows a schedule that applies patches prior to the REGULAR schedule.The REGULAR maintenance schedule of this Autonomous Database follows the normal cycle.
+    #
+    # @return [String]
+    attr_reader :autonomous_maintenance_schedule_type
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -209,9 +261,13 @@ module OCI
         'compartment_id': :'compartmentId',
         'db_name': :'dbName',
         'cpu_core_count': :'cpuCoreCount',
+        'ocpu_count': :'ocpuCount',
         'db_workload': :'dbWorkload',
         'data_storage_size_in_tbs': :'dataStorageSizeInTBs',
+        'data_storage_size_in_gbs': :'dataStorageSizeInGBs',
         'is_free_tier': :'isFreeTier',
+        'kms_key_id': :'kmsKeyId',
+        'vault_id': :'vaultId',
         'admin_password': :'adminPassword',
         'display_name': :'displayName',
         'license_model': :'licenseModel',
@@ -231,7 +287,8 @@ module OCI
         'defined_tags': :'definedTags',
         'db_version': :'dbVersion',
         'source': :'source',
-        'customer_contacts': :'customerContacts'
+        'customer_contacts': :'customerContacts',
+        'autonomous_maintenance_schedule_type': :'autonomousMaintenanceScheduleType'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -243,9 +300,13 @@ module OCI
         'compartment_id': :'String',
         'db_name': :'String',
         'cpu_core_count': :'Integer',
+        'ocpu_count': :'Float',
         'db_workload': :'String',
         'data_storage_size_in_tbs': :'Integer',
+        'data_storage_size_in_gbs': :'Integer',
         'is_free_tier': :'BOOLEAN',
+        'kms_key_id': :'String',
+        'vault_id': :'String',
         'admin_password': :'String',
         'display_name': :'String',
         'license_model': :'String',
@@ -265,7 +326,8 @@ module OCI
         'defined_tags': :'Hash<String, Hash<String, Object>>',
         'db_version': :'String',
         'source': :'String',
-        'customer_contacts': :'Array<OCI::Database::Models::CustomerContact>'
+        'customer_contacts': :'Array<OCI::Database::Models::CustomerContact>',
+        'autonomous_maintenance_schedule_type': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -282,6 +344,7 @@ module OCI
       return 'OCI::Database::Models::CreateRefreshableAutonomousDatabaseCloneDetails' if type == 'CLONE_TO_REFRESHABLE'
       return 'OCI::Database::Models::CreateAutonomousDatabaseFromBackupDetails' if type == 'BACKUP_FROM_ID'
       return 'OCI::Database::Models::CreateAutonomousDatabaseFromBackupTimestampDetails' if type == 'BACKUP_FROM_TIMESTAMP'
+      return 'OCI::Database::Models::CreateCrossRegionAutonomousDatabaseDataGuardDetails' if type == 'CROSS_REGION_DATAGUARD'
       return 'OCI::Database::Models::CreateAutonomousDatabaseDetails' if type == 'NONE'
 
       # TODO: Log a warning when the subtype is not found.
@@ -298,9 +361,13 @@ module OCI
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
     # @option attributes [String] :db_name The value to assign to the {#db_name} property
     # @option attributes [Integer] :cpu_core_count The value to assign to the {#cpu_core_count} property
+    # @option attributes [Float] :ocpu_count The value to assign to the {#ocpu_count} property
     # @option attributes [String] :db_workload The value to assign to the {#db_workload} property
     # @option attributes [Integer] :data_storage_size_in_tbs The value to assign to the {#data_storage_size_in_tbs} property
+    # @option attributes [Integer] :data_storage_size_in_gbs The value to assign to the {#data_storage_size_in_gbs} property
     # @option attributes [BOOLEAN] :is_free_tier The value to assign to the {#is_free_tier} property
+    # @option attributes [String] :kms_key_id The value to assign to the {#kms_key_id} property
+    # @option attributes [String] :vault_id The value to assign to the {#vault_id} property
     # @option attributes [String] :admin_password The value to assign to the {#admin_password} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
     # @option attributes [String] :license_model The value to assign to the {#license_model} property
@@ -321,6 +388,7 @@ module OCI
     # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [String] :source The value to assign to the {#source} property
     # @option attributes [Array<OCI::Database::Models::CustomerContact>] :customer_contacts The value to assign to the {#customer_contacts} property
+    # @option attributes [String] :autonomous_maintenance_schedule_type The value to assign to the {#autonomous_maintenance_schedule_type} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -345,6 +413,12 @@ module OCI
 
       self.cpu_core_count = attributes[:'cpu_core_count'] if attributes[:'cpu_core_count']
 
+      self.ocpu_count = attributes[:'ocpuCount'] if attributes[:'ocpuCount']
+
+      raise 'You cannot provide both :ocpuCount and :ocpu_count' if attributes.key?(:'ocpuCount') && attributes.key?(:'ocpu_count')
+
+      self.ocpu_count = attributes[:'ocpu_count'] if attributes[:'ocpu_count']
+
       self.db_workload = attributes[:'dbWorkload'] if attributes[:'dbWorkload']
 
       raise 'You cannot provide both :dbWorkload and :db_workload' if attributes.key?(:'dbWorkload') && attributes.key?(:'db_workload')
@@ -357,6 +431,12 @@ module OCI
 
       self.data_storage_size_in_tbs = attributes[:'data_storage_size_in_tbs'] if attributes[:'data_storage_size_in_tbs']
 
+      self.data_storage_size_in_gbs = attributes[:'dataStorageSizeInGBs'] if attributes[:'dataStorageSizeInGBs']
+
+      raise 'You cannot provide both :dataStorageSizeInGBs and :data_storage_size_in_gbs' if attributes.key?(:'dataStorageSizeInGBs') && attributes.key?(:'data_storage_size_in_gbs')
+
+      self.data_storage_size_in_gbs = attributes[:'data_storage_size_in_gbs'] if attributes[:'data_storage_size_in_gbs']
+
       self.is_free_tier = attributes[:'isFreeTier'] unless attributes[:'isFreeTier'].nil?
       self.is_free_tier = false if is_free_tier.nil? && !attributes.key?(:'isFreeTier') # rubocop:disable Style/StringLiterals
 
@@ -365,6 +445,18 @@ module OCI
       self.is_free_tier = attributes[:'is_free_tier'] unless attributes[:'is_free_tier'].nil?
       self.is_free_tier = false if is_free_tier.nil? && !attributes.key?(:'isFreeTier') && !attributes.key?(:'is_free_tier') # rubocop:disable Style/StringLiterals
 
+      self.kms_key_id = attributes[:'kmsKeyId'] if attributes[:'kmsKeyId']
+
+      raise 'You cannot provide both :kmsKeyId and :kms_key_id' if attributes.key?(:'kmsKeyId') && attributes.key?(:'kms_key_id')
+
+      self.kms_key_id = attributes[:'kms_key_id'] if attributes[:'kms_key_id']
+
+      self.vault_id = attributes[:'vaultId'] if attributes[:'vaultId']
+
+      raise 'You cannot provide both :vaultId and :vault_id' if attributes.key?(:'vaultId') && attributes.key?(:'vault_id')
+
+      self.vault_id = attributes[:'vault_id'] if attributes[:'vault_id']
+
       self.admin_password = attributes[:'adminPassword'] if attributes[:'adminPassword']
 
       raise 'You cannot provide both :adminPassword and :admin_password' if attributes.key?(:'adminPassword') && attributes.key?(:'admin_password')
@@ -485,6 +577,12 @@ module OCI
       raise 'You cannot provide both :customerContacts and :customer_contacts' if attributes.key?(:'customerContacts') && attributes.key?(:'customer_contacts')
 
       self.customer_contacts = attributes[:'customer_contacts'] if attributes[:'customer_contacts']
+
+      self.autonomous_maintenance_schedule_type = attributes[:'autonomousMaintenanceScheduleType'] if attributes[:'autonomousMaintenanceScheduleType']
+
+      raise 'You cannot provide both :autonomousMaintenanceScheduleType and :autonomous_maintenance_schedule_type' if attributes.key?(:'autonomousMaintenanceScheduleType') && attributes.key?(:'autonomous_maintenance_schedule_type')
+
+      self.autonomous_maintenance_schedule_type = attributes[:'autonomous_maintenance_schedule_type'] if attributes[:'autonomous_maintenance_schedule_type']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -513,6 +611,14 @@ module OCI
       @source = source
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] autonomous_maintenance_schedule_type Object to be assigned
+    def autonomous_maintenance_schedule_type=(autonomous_maintenance_schedule_type)
+      raise "Invalid value for 'autonomous_maintenance_schedule_type': this must be one of the values in AUTONOMOUS_MAINTENANCE_SCHEDULE_TYPE_ENUM." if autonomous_maintenance_schedule_type && !AUTONOMOUS_MAINTENANCE_SCHEDULE_TYPE_ENUM.include?(autonomous_maintenance_schedule_type)
+
+      @autonomous_maintenance_schedule_type = autonomous_maintenance_schedule_type
+    end
+
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
 
@@ -525,9 +631,13 @@ module OCI
         compartment_id == other.compartment_id &&
         db_name == other.db_name &&
         cpu_core_count == other.cpu_core_count &&
+        ocpu_count == other.ocpu_count &&
         db_workload == other.db_workload &&
         data_storage_size_in_tbs == other.data_storage_size_in_tbs &&
+        data_storage_size_in_gbs == other.data_storage_size_in_gbs &&
         is_free_tier == other.is_free_tier &&
+        kms_key_id == other.kms_key_id &&
+        vault_id == other.vault_id &&
         admin_password == other.admin_password &&
         display_name == other.display_name &&
         license_model == other.license_model &&
@@ -547,7 +657,8 @@ module OCI
         defined_tags == other.defined_tags &&
         db_version == other.db_version &&
         source == other.source &&
-        customer_contacts == other.customer_contacts
+        customer_contacts == other.customer_contacts &&
+        autonomous_maintenance_schedule_type == other.autonomous_maintenance_schedule_type
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -563,7 +674,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, db_name, cpu_core_count, db_workload, data_storage_size_in_tbs, is_free_tier, admin_password, display_name, license_model, is_preview_version_with_service_terms_accepted, is_auto_scaling_enabled, is_dedicated, autonomous_container_database_id, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_data_guard_enabled, subnet_id, nsg_ids, private_endpoint_label, freeform_tags, defined_tags, db_version, source, customer_contacts].hash
+      [compartment_id, db_name, cpu_core_count, ocpu_count, db_workload, data_storage_size_in_tbs, data_storage_size_in_gbs, is_free_tier, kms_key_id, vault_id, admin_password, display_name, license_model, is_preview_version_with_service_terms_accepted, is_auto_scaling_enabled, is_dedicated, autonomous_container_database_id, is_access_control_enabled, whitelisted_ips, are_primary_whitelisted_ips_used, standby_whitelisted_ips, is_data_guard_enabled, subnet_id, nsg_ids, private_endpoint_label, freeform_tags, defined_tags, db_version, source, customer_contacts, autonomous_maintenance_schedule_type].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines