oci 2.5.10 → 2.9.0

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'
@@ -63,11 +64,11 @@ module OCI
     # @return [String]
     attr_accessor :lifecycle_details
 
-    # The date and time the Autonomous was created.
+    # The date and time the Autonomous Container Database was created.
     # @return [DateTime]
     attr_accessor :time_created
 
-    # **[Required]** Database Patch model preference.
+    # **[Required]** Database patch model preference.
     # @return [String]
     attr_reader :patch_model
 
@@ -79,6 +80,9 @@ module OCI
     # @return [String]
     attr_accessor :next_maintenance_run_id
 
+    # @return [OCI::Database::Models::MaintenanceWindow]
+    attr_accessor :maintenance_window
+
     # 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](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
     #
@@ -90,8 +94,6 @@ module OCI
     # Defined tags for this resource. Each key is predefined and scoped to a namespace.
     # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
     #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 
@@ -99,6 +101,10 @@ module OCI
     # @return [String]
     attr_accessor :availability_domain
 
+    # Oracle Database version of the Autonomous Container Database
+    # @return [String]
+    attr_accessor :db_version
+
     # @return [OCI::Database::Models::AutonomousContainerDatabaseBackupConfig]
     attr_accessor :backup_config
 
@@ -117,9 +123,11 @@ module OCI
         'patch_model': :'patchModel',
         'last_maintenance_run_id': :'lastMaintenanceRunId',
         'next_maintenance_run_id': :'nextMaintenanceRunId',
+        'maintenance_window': :'maintenanceWindow',
         'freeform_tags': :'freeformTags',
         'defined_tags': :'definedTags',
         'availability_domain': :'availabilityDomain',
+        'db_version': :'dbVersion',
         'backup_config': :'backupConfig'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -140,9 +148,11 @@ module OCI
         'patch_model': :'String',
         'last_maintenance_run_id': :'String',
         'next_maintenance_run_id': :'String',
+        'maintenance_window': :'OCI::Database::Models::MaintenanceWindow',
         'freeform_tags': :'Hash<String, String>',
         'defined_tags': :'Hash<String, Hash<String, Object>>',
         'availability_domain': :'String',
+        'db_version': :'String',
         'backup_config': :'OCI::Database::Models::AutonomousContainerDatabaseBackupConfig'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -165,9 +175,11 @@ module OCI
     # @option attributes [String] :patch_model The value to assign to the {#patch_model} property
     # @option attributes [String] :last_maintenance_run_id The value to assign to the {#last_maintenance_run_id} property
     # @option attributes [String] :next_maintenance_run_id The value to assign to the {#next_maintenance_run_id} property
+    # @option attributes [OCI::Database::Models::MaintenanceWindow] :maintenance_window The value to assign to the {#maintenance_window} 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 [String] :availability_domain The value to assign to the {#availability_domain} property
+    # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [OCI::Database::Models::AutonomousContainerDatabaseBackupConfig] :backup_config The value to assign to the {#backup_config} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
@@ -237,6 +249,12 @@ module OCI
 
       self.next_maintenance_run_id = attributes[:'next_maintenance_run_id'] if attributes[:'next_maintenance_run_id']
 
+      self.maintenance_window = attributes[:'maintenanceWindow'] if attributes[:'maintenanceWindow']
+
+      raise 'You cannot provide both :maintenanceWindow and :maintenance_window' if attributes.key?(:'maintenanceWindow') && attributes.key?(:'maintenance_window')
+
+      self.maintenance_window = attributes[:'maintenance_window'] if attributes[:'maintenance_window']
+
       self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
       raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
@@ -255,6 +273,12 @@ module OCI
 
       self.availability_domain = attributes[:'availability_domain'] if attributes[:'availability_domain']
 
+      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
+
+      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
+
+      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
+
       self.backup_config = attributes[:'backupConfig'] if attributes[:'backupConfig']
 
       raise 'You cannot provide both :backupConfig and :backup_config' if attributes.key?(:'backupConfig') && attributes.key?(:'backup_config')
@@ -323,9 +347,11 @@ module OCI
         patch_model == other.patch_model &&
         last_maintenance_run_id == other.last_maintenance_run_id &&
         next_maintenance_run_id == other.next_maintenance_run_id &&
+        maintenance_window == other.maintenance_window &&
         freeform_tags == other.freeform_tags &&
         defined_tags == other.defined_tags &&
         availability_domain == other.availability_domain &&
+        db_version == other.db_version &&
         backup_config == other.backup_config
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
@@ -342,7 +368,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, display_name, service_level_agreement_type, autonomous_exadata_infrastructure_id, lifecycle_state, lifecycle_details, time_created, patch_model, last_maintenance_run_id, next_maintenance_run_id, freeform_tags, defined_tags, availability_domain, backup_config].hash
+      [id, compartment_id, display_name, service_level_agreement_type, autonomous_exadata_infrastructure_id, lifecycle_state, lifecycle_details, time_created, patch_model, last_maintenance_run_id, next_maintenance_run_id, maintenance_window, freeform_tags, defined_tags, availability_domain, db_version, backup_config].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'
@@ -21,6 +22,7 @@ module OCI
       LIFECYCLE_STATE_BACKUP_IN_PROGRESS = 'BACKUP_IN_PROGRESS'.freeze,
       LIFECYCLE_STATE_SCALE_IN_PROGRESS = 'SCALE_IN_PROGRESS'.freeze,
       LIFECYCLE_STATE_AVAILABLE_NEEDS_ATTENTION = 'AVAILABLE_NEEDS_ATTENTION'.freeze,
+      LIFECYCLE_STATE_UPDATING = 'UPDATING'.freeze,
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
@@ -90,8 +92,6 @@ module OCI
     # Defined tags for this resource. Each key is predefined and scoped to a namespace.
     # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
     #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 

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

@@ -0,0 +1,165 @@
+# Copyright (c) 2016, 2020, 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
+  # **Deprecated.** See {#autonomous_database_console_token_details autonomous_database_console_token_details} for reference information about the token that allows the OCI Console to access the Autonomous Data Warehouse Service Console.
+  #
+  class Database::Models::AutonomousDataWarehouseConsoleTokenDetails
+    # The token that allows the OCI Console to access the Autonomous Data Warehouse Service Console.
+    # @return [String]
+    attr_accessor :token
+
+    # The login URL that allows the OCI Console to access the Autonomous Data Warehouse Service Console.
+    # @return [String]
+    attr_accessor :login_url
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'token': :'token',
+        'login_url': :'loginUrl'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'token': :'String',
+        'login_url': :'String'
+        # 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] :token The value to assign to the {#token} property
+    # @option attributes [String] :login_url The value to assign to the {#login_url} 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.token = attributes[:'token'] if attributes[:'token']
+
+      self.login_url = attributes[:'loginUrl'] if attributes[:'loginUrl']
+
+      raise 'You cannot provide both :loginUrl and :login_url' if attributes.key?(:'loginUrl') && attributes.key?(:'login_url')
+
+      self.login_url = attributes[:'login_url'] if attributes[:'login_url']
+    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 &&
+        token == other.token &&
+        login_url == other.login_url
+    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
+      [token, login_url].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/autonomous_data_warehouse_summary.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'
@@ -23,6 +24,7 @@ module OCI
       LIFECYCLE_STATE_BACKUP_IN_PROGRESS = 'BACKUP_IN_PROGRESS'.freeze,
       LIFECYCLE_STATE_SCALE_IN_PROGRESS = 'SCALE_IN_PROGRESS'.freeze,
       LIFECYCLE_STATE_AVAILABLE_NEEDS_ATTENTION = 'AVAILABLE_NEEDS_ATTENTION'.freeze,
+      LIFECYCLE_STATE_UPDATING = 'UPDATING'.freeze,
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
@@ -92,8 +94,6 @@ module OCI
     # Defined tags for this resource. Each key is predefined and scoped to a namespace.
     # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
     #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 

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

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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'
 require 'logger'
@@ -24,6 +25,8 @@ module OCI
       LIFECYCLE_STATE_AVAILABLE_NEEDS_ATTENTION = 'AVAILABLE_NEEDS_ATTENTION'.freeze,
       LIFECYCLE_STATE_UPDATING = 'UPDATING'.freeze,
       LIFECYCLE_STATE_MAINTENANCE_IN_PROGRESS = 'MAINTENANCE_IN_PROGRESS'.freeze,
+      LIFECYCLE_STATE_RESTARTING = 'RESTARTING'.freeze,
+      LIFECYCLE_STATE_UPGRADING = 'UPGRADING'.freeze,
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
@@ -39,6 +42,15 @@ module OCI
       DB_WORKLOAD_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
+    DATA_SAFE_STATUS_ENUM = [
+      DATA_SAFE_STATUS_REGISTERING = 'REGISTERING'.freeze,
+      DATA_SAFE_STATUS_REGISTERED = 'REGISTERED'.freeze,
+      DATA_SAFE_STATUS_DEREGISTERING = 'DEREGISTERING'.freeze,
+      DATA_SAFE_STATUS_NOT_REGISTERED = 'NOT_REGISTERED'.freeze,
+      DATA_SAFE_STATUS_FAILED = 'FAILED'.freeze,
+      DATA_SAFE_STATUS_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
     # **[Required]** The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
     # @return [String]
     attr_accessor :id
@@ -47,7 +59,7 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
-    # **[Required]** The current state of the database.
+    # **[Required]** The current state of the Autonomous Database.
     # @return [String]
     attr_reader :lifecycle_state
 
@@ -59,7 +71,28 @@ module OCI
     # @return [String]
     attr_accessor :db_name
 
-    # **[Required]** The number of CPU cores to be made available to the database.
+    # 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
+
+    # System tags for this resource. Each key is predefined and scoped to a namespace.
+    # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :system_tags
+
+    # The date and time the Always Free database will be stopped because of inactivity. If this time is reached without any database activity, the database will automatically be put into the STOPPED state.
+    #
+    # @return [DateTime]
+    attr_accessor :time_reclamation_of_free_autonomous_database
+
+    # The date and time the Always Free database will be automatically deleted because of inactivity. If the database is in the STOPPED state and without activity until this time, it will be deleted.
+    #
+    # @return [DateTime]
+    attr_accessor :time_deletion_of_free_autonomous_database
+
+    # **[Required]** The number of OCPU cores to be made available to the database.
     # @return [Integer]
     attr_accessor :cpu_core_count
 
@@ -67,7 +100,7 @@ module OCI
     # @return [Integer]
     attr_accessor :data_storage_size_in_tbs
 
-    # True if it is dedicated database.
+    # True if the database uses [dedicated Exadata infrastructure](https://docs.cloud.oracle.com/Content/Database/Concepts/adbddoverview.htm).
     #
     # @return [BOOLEAN]
     attr_accessor :is_dedicated
@@ -76,7 +109,7 @@ module OCI
     # @return [String]
     attr_accessor :autonomous_container_database_id
 
-    # The date and time the database was created.
+    # The date and time the Autonomous Database was created.
     # @return [DateTime]
     attr_accessor :time_created
 
@@ -95,7 +128,8 @@ module OCI
     # @return [OCI::Database::Models::AutonomousDatabaseConnectionUrls]
     attr_accessor :connection_urls
 
-    # The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE.
+    # The Oracle license model that applies to the Oracle Autonomous Database. Note that when provisioning an Autonomous Database on [dedicated Exadata infrastructure](https://docs.cloud.oracle.com/Content/Database/Concepts/adbddoverview.htm), this attribute must be null because the attribute is already set at the
+    # Autonomous Exadata Infrastructure level. When using [shared Exadata infrastructure](https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI), if a value is not specified, the system will supply the value of `BRING_YOUR_OWN_LICENSE`.
     #
     # @return [String]
     attr_reader :license_model
@@ -115,11 +149,42 @@ module OCI
     # Defined tags for this resource. Each key is predefined and scoped to a namespace.
     # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
     #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 
+    # The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the subnet the resource is associated with.
+    #
+    # **Subnet Restrictions:**
+    # - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28.
+    # - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20.
+    # - For Autonomous Database, setting this will disable public secure access to the database.
+    #
+    # These subnets are used by the Oracle Clusterware private interconnect on the database instance.
+    # Specifying an overlapping subnet will cause the private interconnect to malfunction.
+    # This restriction applies to both the client subnet and the backup subnet.
+    #
+    # @return [String]
+    attr_accessor :subnet_id
+
+    # A list of the [OCIDs](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the network security groups (NSGs) that this resource belongs to. Setting this to an empty array after the list is created removes the resource from all NSGs. For more information about NSGs, see [Security Rules](https://docs.cloud.oracle.com/Content/Network/Concepts/securityrules.htm).
+    # **NsgIds restrictions:**
+    # - Autonomous Databases with private access require at least 1 Network Security Group (NSG). The nsgIds array cannot be empty.
+    #
+    # @return [Array<String>]
+    attr_accessor :nsg_ids
+
+    # The private endpoint for the resource.
+    # @return [String]
+    attr_accessor :private_endpoint
+
+    # The private endpoint label for the resource.
+    # @return [String]
+    attr_accessor :private_endpoint_label
+
+    # The private endpoint Ip address for the resource.
+    # @return [String]
+    attr_accessor :private_endpoint_ip
+
     # A valid Oracle Database version for Autonomous Database.
     # @return [String]
     attr_accessor :db_version
@@ -128,19 +193,44 @@ module OCI
     # @return [BOOLEAN]
     attr_accessor :is_preview
 
-    # The Autonomous Database workload type. OLTP indicates an Autonomous Transaction Processing database and DW indicates an Autonomous Data Warehouse database.
+    # The Autonomous Database workload type. The following values are valid:
+    #
+    # - OLTP - indicates an Autonomous Transaction Processing database
+    # - DW - indicates an Autonomous Data Warehouse database
+    #
     # @return [String]
     attr_reader :db_workload
 
-    # The client IP access control list (ACL). Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet.
+    # The client IP access control list (ACL). This feature is available for databases on [shared Exadata infrastructure](https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI) only.
+    # Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID.
+    #
+    # To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs.
+    # Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]`
+    #
     # @return [Array<String>]
     attr_accessor :whitelisted_ips
 
-    # Indicates if auto scaling is enabled for the Autonomous Database CPU core count.
+    # Indicates if auto scaling is enabled for the Autonomous Database CPU core count. Note that auto scaling is available for databases on [shared Exadata infrastructure](https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI) only.
     #
     # @return [BOOLEAN]
     attr_accessor :is_auto_scaling_enabled
 
+    # Status of the Data Safe registration for this Autonomous Database.
+    # @return [String]
+    attr_reader :data_safe_status
+
+    # The date and time when maintenance will begin.
+    # @return [DateTime]
+    attr_accessor :time_maintenance_begin
+
+    # The date and time when maintenance will end.
+    # @return [DateTime]
+    attr_accessor :time_maintenance_end
+
+    # List of Oracle Database versions available for a database upgrade. If there are no version upgrades available, this list is empty.
+    # @return [Array<String>]
+    attr_accessor :available_upgrade_versions
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -150,6 +240,10 @@ module OCI
         'lifecycle_state': :'lifecycleState',
         'lifecycle_details': :'lifecycleDetails',
         'db_name': :'dbName',
+        'is_free_tier': :'isFreeTier',
+        'system_tags': :'systemTags',
+        'time_reclamation_of_free_autonomous_database': :'timeReclamationOfFreeAutonomousDatabase',
+        'time_deletion_of_free_autonomous_database': :'timeDeletionOfFreeAutonomousDatabase',
         'cpu_core_count': :'cpuCoreCount',
         'data_storage_size_in_tbs': :'dataStorageSizeInTBs',
         'is_dedicated': :'isDedicated',
@@ -163,11 +257,20 @@ module OCI
         'used_data_storage_size_in_tbs': :'usedDataStorageSizeInTBs',
         'freeform_tags': :'freeformTags',
         'defined_tags': :'definedTags',
+        'subnet_id': :'subnetId',
+        'nsg_ids': :'nsgIds',
+        'private_endpoint': :'privateEndpoint',
+        'private_endpoint_label': :'privateEndpointLabel',
+        'private_endpoint_ip': :'privateEndpointIp',
         'db_version': :'dbVersion',
         'is_preview': :'isPreview',
         'db_workload': :'dbWorkload',
         'whitelisted_ips': :'whitelistedIps',
-        'is_auto_scaling_enabled': :'isAutoScalingEnabled'
+        'is_auto_scaling_enabled': :'isAutoScalingEnabled',
+        'data_safe_status': :'dataSafeStatus',
+        'time_maintenance_begin': :'timeMaintenanceBegin',
+        'time_maintenance_end': :'timeMaintenanceEnd',
+        'available_upgrade_versions': :'availableUpgradeVersions'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -181,6 +284,10 @@ module OCI
         'lifecycle_state': :'String',
         'lifecycle_details': :'String',
         'db_name': :'String',
+        'is_free_tier': :'BOOLEAN',
+        'system_tags': :'Hash<String, Hash<String, Object>>',
+        'time_reclamation_of_free_autonomous_database': :'DateTime',
+        'time_deletion_of_free_autonomous_database': :'DateTime',
         'cpu_core_count': :'Integer',
         'data_storage_size_in_tbs': :'Integer',
         'is_dedicated': :'BOOLEAN',
@@ -194,11 +301,20 @@ module OCI
         'used_data_storage_size_in_tbs': :'Integer',
         'freeform_tags': :'Hash<String, String>',
         'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'subnet_id': :'String',
+        'nsg_ids': :'Array<String>',
+        'private_endpoint': :'String',
+        'private_endpoint_label': :'String',
+        'private_endpoint_ip': :'String',
         'db_version': :'String',
         'is_preview': :'BOOLEAN',
         'db_workload': :'String',
         'whitelisted_ips': :'Array<String>',
-        'is_auto_scaling_enabled': :'BOOLEAN'
+        'is_auto_scaling_enabled': :'BOOLEAN',
+        'data_safe_status': :'String',
+        'time_maintenance_begin': :'DateTime',
+        'time_maintenance_end': :'DateTime',
+        'available_upgrade_versions': :'Array<String>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -214,6 +330,10 @@ module OCI
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
     # @option attributes [String] :lifecycle_details The value to assign to the {#lifecycle_details} property
     # @option attributes [String] :db_name The value to assign to the {#db_name} property
+    # @option attributes [BOOLEAN] :is_free_tier The value to assign to the {#is_free_tier} property
+    # @option attributes [Hash<String, Hash<String, Object>>] :system_tags The value to assign to the {#system_tags} property
+    # @option attributes [DateTime] :time_reclamation_of_free_autonomous_database The value to assign to the {#time_reclamation_of_free_autonomous_database} property
+    # @option attributes [DateTime] :time_deletion_of_free_autonomous_database The value to assign to the {#time_deletion_of_free_autonomous_database} property
     # @option attributes [Integer] :cpu_core_count The value to assign to the {#cpu_core_count} property
     # @option attributes [Integer] :data_storage_size_in_tbs The value to assign to the {#data_storage_size_in_tbs} property
     # @option attributes [BOOLEAN] :is_dedicated The value to assign to the {#is_dedicated} property
@@ -227,11 +347,20 @@ module OCI
     # @option attributes [Integer] :used_data_storage_size_in_tbs The value to assign to the {#used_data_storage_size_in_tbs} 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 [String] :subnet_id The value to assign to the {#subnet_id} property
+    # @option attributes [Array<String>] :nsg_ids The value to assign to the {#nsg_ids} property
+    # @option attributes [String] :private_endpoint The value to assign to the {#private_endpoint} property
+    # @option attributes [String] :private_endpoint_label The value to assign to the {#private_endpoint_label} property
+    # @option attributes [String] :private_endpoint_ip The value to assign to the {#private_endpoint_ip} property
     # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [BOOLEAN] :is_preview The value to assign to the {#is_preview} property
     # @option attributes [String] :db_workload The value to assign to the {#db_workload} property
     # @option attributes [Array<String>] :whitelisted_ips The value to assign to the {#whitelisted_ips} property
     # @option attributes [BOOLEAN] :is_auto_scaling_enabled The value to assign to the {#is_auto_scaling_enabled} property
+    # @option attributes [String] :data_safe_status The value to assign to the {#data_safe_status} property
+    # @option attributes [DateTime] :time_maintenance_begin The value to assign to the {#time_maintenance_begin} property
+    # @option attributes [DateTime] :time_maintenance_end The value to assign to the {#time_maintenance_end} property
+    # @option attributes [Array<String>] :available_upgrade_versions The value to assign to the {#available_upgrade_versions} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -261,6 +390,32 @@ module OCI
 
       self.db_name = attributes[:'db_name'] if attributes[:'db_name']
 
+      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
+
+      raise 'You cannot provide both :isFreeTier and :is_free_tier' if attributes.key?(:'isFreeTier') && attributes.key?(:'is_free_tier')
+
+      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.system_tags = attributes[:'systemTags'] if attributes[:'systemTags']
+
+      raise 'You cannot provide both :systemTags and :system_tags' if attributes.key?(:'systemTags') && attributes.key?(:'system_tags')
+
+      self.system_tags = attributes[:'system_tags'] if attributes[:'system_tags']
+
+      self.time_reclamation_of_free_autonomous_database = attributes[:'timeReclamationOfFreeAutonomousDatabase'] if attributes[:'timeReclamationOfFreeAutonomousDatabase']
+
+      raise 'You cannot provide both :timeReclamationOfFreeAutonomousDatabase and :time_reclamation_of_free_autonomous_database' if attributes.key?(:'timeReclamationOfFreeAutonomousDatabase') && attributes.key?(:'time_reclamation_of_free_autonomous_database')
+
+      self.time_reclamation_of_free_autonomous_database = attributes[:'time_reclamation_of_free_autonomous_database'] if attributes[:'time_reclamation_of_free_autonomous_database']
+
+      self.time_deletion_of_free_autonomous_database = attributes[:'timeDeletionOfFreeAutonomousDatabase'] if attributes[:'timeDeletionOfFreeAutonomousDatabase']
+
+      raise 'You cannot provide both :timeDeletionOfFreeAutonomousDatabase and :time_deletion_of_free_autonomous_database' if attributes.key?(:'timeDeletionOfFreeAutonomousDatabase') && attributes.key?(:'time_deletion_of_free_autonomous_database')
+
+      self.time_deletion_of_free_autonomous_database = attributes[:'time_deletion_of_free_autonomous_database'] if attributes[:'time_deletion_of_free_autonomous_database']
+
       self.cpu_core_count = attributes[:'cpuCoreCount'] if attributes[:'cpuCoreCount']
 
       raise 'You cannot provide both :cpuCoreCount and :cpu_core_count' if attributes.key?(:'cpuCoreCount') && attributes.key?(:'cpu_core_count')
@@ -339,6 +494,36 @@ module OCI
 
       self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
 
+      self.subnet_id = attributes[:'subnetId'] if attributes[:'subnetId']
+
+      raise 'You cannot provide both :subnetId and :subnet_id' if attributes.key?(:'subnetId') && attributes.key?(:'subnet_id')
+
+      self.subnet_id = attributes[:'subnet_id'] if attributes[:'subnet_id']
+
+      self.nsg_ids = attributes[:'nsgIds'] if attributes[:'nsgIds']
+
+      raise 'You cannot provide both :nsgIds and :nsg_ids' if attributes.key?(:'nsgIds') && attributes.key?(:'nsg_ids')
+
+      self.nsg_ids = attributes[:'nsg_ids'] if attributes[:'nsg_ids']
+
+      self.private_endpoint = attributes[:'privateEndpoint'] if attributes[:'privateEndpoint']
+
+      raise 'You cannot provide both :privateEndpoint and :private_endpoint' if attributes.key?(:'privateEndpoint') && attributes.key?(:'private_endpoint')
+
+      self.private_endpoint = attributes[:'private_endpoint'] if attributes[:'private_endpoint']
+
+      self.private_endpoint_label = attributes[:'privateEndpointLabel'] if attributes[:'privateEndpointLabel']
+
+      raise 'You cannot provide both :privateEndpointLabel and :private_endpoint_label' if attributes.key?(:'privateEndpointLabel') && attributes.key?(:'private_endpoint_label')
+
+      self.private_endpoint_label = attributes[:'private_endpoint_label'] if attributes[:'private_endpoint_label']
+
+      self.private_endpoint_ip = attributes[:'privateEndpointIp'] if attributes[:'privateEndpointIp']
+
+      raise 'You cannot provide both :privateEndpointIp and :private_endpoint_ip' if attributes.key?(:'privateEndpointIp') && attributes.key?(:'private_endpoint_ip')
+
+      self.private_endpoint_ip = attributes[:'private_endpoint_ip'] if attributes[:'private_endpoint_ip']
+
       self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
 
       raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
@@ -368,6 +553,30 @@ module OCI
       raise 'You cannot provide both :isAutoScalingEnabled and :is_auto_scaling_enabled' if attributes.key?(:'isAutoScalingEnabled') && attributes.key?(:'is_auto_scaling_enabled')
 
       self.is_auto_scaling_enabled = attributes[:'is_auto_scaling_enabled'] unless attributes[:'is_auto_scaling_enabled'].nil?
+
+      self.data_safe_status = attributes[:'dataSafeStatus'] if attributes[:'dataSafeStatus']
+
+      raise 'You cannot provide both :dataSafeStatus and :data_safe_status' if attributes.key?(:'dataSafeStatus') && attributes.key?(:'data_safe_status')
+
+      self.data_safe_status = attributes[:'data_safe_status'] if attributes[:'data_safe_status']
+
+      self.time_maintenance_begin = attributes[:'timeMaintenanceBegin'] if attributes[:'timeMaintenanceBegin']
+
+      raise 'You cannot provide both :timeMaintenanceBegin and :time_maintenance_begin' if attributes.key?(:'timeMaintenanceBegin') && attributes.key?(:'time_maintenance_begin')
+
+      self.time_maintenance_begin = attributes[:'time_maintenance_begin'] if attributes[:'time_maintenance_begin']
+
+      self.time_maintenance_end = attributes[:'timeMaintenanceEnd'] if attributes[:'timeMaintenanceEnd']
+
+      raise 'You cannot provide both :timeMaintenanceEnd and :time_maintenance_end' if attributes.key?(:'timeMaintenanceEnd') && attributes.key?(:'time_maintenance_end')
+
+      self.time_maintenance_end = attributes[:'time_maintenance_end'] if attributes[:'time_maintenance_end']
+
+      self.available_upgrade_versions = attributes[:'availableUpgradeVersions'] if attributes[:'availableUpgradeVersions']
+
+      raise 'You cannot provide both :availableUpgradeVersions and :available_upgrade_versions' if attributes.key?(:'availableUpgradeVersions') && attributes.key?(:'available_upgrade_versions')
+
+      self.available_upgrade_versions = attributes[:'available_upgrade_versions'] if attributes[:'available_upgrade_versions']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -411,6 +620,19 @@ module OCI
       # rubocop:enable Style/ConditionalAssignment
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] data_safe_status Object to be assigned
+    def data_safe_status=(data_safe_status)
+      # rubocop:disable Style/ConditionalAssignment
+      if data_safe_status && !DATA_SAFE_STATUS_ENUM.include?(data_safe_status)
+        OCI.logger.debug("Unknown value for 'data_safe_status' [" + data_safe_status + "]. Mapping to 'DATA_SAFE_STATUS_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        @data_safe_status = DATA_SAFE_STATUS_UNKNOWN_ENUM_VALUE
+      else
+        @data_safe_status = data_safe_status
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
 
@@ -425,6 +647,10 @@ module OCI
         lifecycle_state == other.lifecycle_state &&
         lifecycle_details == other.lifecycle_details &&
         db_name == other.db_name &&
+        is_free_tier == other.is_free_tier &&
+        system_tags == other.system_tags &&
+        time_reclamation_of_free_autonomous_database == other.time_reclamation_of_free_autonomous_database &&
+        time_deletion_of_free_autonomous_database == other.time_deletion_of_free_autonomous_database &&
         cpu_core_count == other.cpu_core_count &&
         data_storage_size_in_tbs == other.data_storage_size_in_tbs &&
         is_dedicated == other.is_dedicated &&
@@ -438,11 +664,20 @@ module OCI
         used_data_storage_size_in_tbs == other.used_data_storage_size_in_tbs &&
         freeform_tags == other.freeform_tags &&
         defined_tags == other.defined_tags &&
+        subnet_id == other.subnet_id &&
+        nsg_ids == other.nsg_ids &&
+        private_endpoint == other.private_endpoint &&
+        private_endpoint_label == other.private_endpoint_label &&
+        private_endpoint_ip == other.private_endpoint_ip &&
         db_version == other.db_version &&
         is_preview == other.is_preview &&
         db_workload == other.db_workload &&
         whitelisted_ips == other.whitelisted_ips &&
-        is_auto_scaling_enabled == other.is_auto_scaling_enabled
+        is_auto_scaling_enabled == other.is_auto_scaling_enabled &&
+        data_safe_status == other.data_safe_status &&
+        time_maintenance_begin == other.time_maintenance_begin &&
+        time_maintenance_end == other.time_maintenance_end &&
+        available_upgrade_versions == other.available_upgrade_versions
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -458,7 +693,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, compartment_id, lifecycle_state, lifecycle_details, db_name, cpu_core_count, data_storage_size_in_tbs, is_dedicated, autonomous_container_database_id, time_created, display_name, service_console_url, connection_strings, connection_urls, license_model, used_data_storage_size_in_tbs, freeform_tags, defined_tags, db_version, is_preview, db_workload, whitelisted_ips, is_auto_scaling_enabled].hash
+      [id, compartment_id, lifecycle_state, lifecycle_details, db_name, is_free_tier, system_tags, time_reclamation_of_free_autonomous_database, time_deletion_of_free_autonomous_database, cpu_core_count, data_storage_size_in_tbs, is_dedicated, autonomous_container_database_id, time_created, display_name, service_console_url, connection_strings, connection_urls, license_model, used_data_storage_size_in_tbs, freeform_tags, defined_tags, subnet_id, nsg_ids, private_endpoint, private_endpoint_label, private_endpoint_ip, db_version, is_preview, db_workload, whitelisted_ips, is_auto_scaling_enabled, data_safe_status, time_maintenance_begin, time_maintenance_end, available_upgrade_versions].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines