oci 2.4.2 → 2.4.3

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

@@ -11,6 +11,12 @@ module OCI
   # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
   #
   class Database::Models::AutonomousDatabaseBackupSummary # rubocop:disable Metrics/LineLength
+    TYPE_ENUM = [
+      TYPE_INCREMENTAL = 'INCREMENTAL'.freeze,
+      TYPE_FULL = 'FULL'.freeze,
+      TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_CREATING = 'CREATING'.freeze,
       LIFECYCLE_STATE_ACTIVE = 'ACTIVE'.freeze,
@@ -20,66 +26,60 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    TYPE_ENUM = [
-      TYPE_INCREMENTAL = 'INCREMENTAL'.freeze,
-      TYPE_FULL = 'FULL'.freeze,
-      TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
-    ].freeze
-
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup.
     # @return [String]
-    attr_accessor :autonomous_database_id
+    attr_accessor :id
 
     # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
     attr_accessor :compartment_id
 
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+    # @return [String]
+    attr_accessor :autonomous_database_id
+
     # **[Required]** The user-friendly name for the backup. The name does not have to be unique.
     # @return [String]
     attr_accessor :display_name
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup.
+    # **[Required]** The type of backup.
     # @return [String]
-    attr_accessor :id
+    attr_reader :type
 
     # **[Required]** Indicates whether the backup is user-initiated or automatic.
     # @return [BOOLEAN]
     attr_accessor :is_automatic
 
-    # Additional information about the current lifecycle state.
-    # @return [String]
-    attr_accessor :lifecycle_details
-
-    # **[Required]** The current state of the backup.
-    # @return [String]
-    attr_reader :lifecycle_state
+    # The date and time the backup started.
+    # @return [DateTime]
+    attr_accessor :time_started
 
     # The date and time the backup completed.
     # @return [DateTime]
     attr_accessor :time_ended
 
-    # The date and time the backup started.
-    # @return [DateTime]
-    attr_accessor :time_started
+    # Additional information about the current lifecycle state.
+    # @return [String]
+    attr_accessor :lifecycle_details
 
-    # **[Required]** The type of backup.
+    # **[Required]** The current state of the backup.
     # @return [String]
-    attr_reader :type
+    attr_reader :lifecycle_state
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'autonomous_database_id': :'autonomousDatabaseId',
+        'id': :'id',
         'compartment_id': :'compartmentId',
+        'autonomous_database_id': :'autonomousDatabaseId',
         'display_name': :'displayName',
-        'id': :'id',
+        'type': :'type',
         'is_automatic': :'isAutomatic',
-        'lifecycle_details': :'lifecycleDetails',
-        'lifecycle_state': :'lifecycleState',
-        'time_ended': :'timeEnded',
         'time_started': :'timeStarted',
-        'type': :'type'
+        'time_ended': :'timeEnded',
+        'lifecycle_details': :'lifecycleDetails',
+        'lifecycle_state': :'lifecycleState'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -88,16 +88,16 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'autonomous_database_id': :'String',
+        'id': :'String',
         'compartment_id': :'String',
+        'autonomous_database_id': :'String',
         'display_name': :'String',
-        'id': :'String',
+        'type': :'String',
         'is_automatic': :'BOOLEAN',
-        'lifecycle_details': :'String',
-        'lifecycle_state': :'String',
-        'time_ended': :'DateTime',
         'time_started': :'DateTime',
-        'type': :'String'
+        'time_ended': :'DateTime',
+        'lifecycle_details': :'String',
+        'lifecycle_state': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -108,27 +108,23 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :autonomous_database_id The value to assign to the {#autonomous_database_id} property
+    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
+    # @option attributes [String] :autonomous_database_id The value to assign to the {#autonomous_database_id} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
-    # @option attributes [String] :id The value to assign to the {#id} property
+    # @option attributes [String] :type The value to assign to the {#type} property
     # @option attributes [BOOLEAN] :is_automatic The value to assign to the {#is_automatic} property
+    # @option attributes [DateTime] :time_started The value to assign to the {#time_started} property
+    # @option attributes [DateTime] :time_ended The value to assign to the {#time_ended} property
     # @option attributes [String] :lifecycle_details The value to assign to the {#lifecycle_details} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
-    # @option attributes [DateTime] :time_ended The value to assign to the {#time_ended} property
-    # @option attributes [DateTime] :time_started The value to assign to the {#time_started} property
-    # @option attributes [String] :type The value to assign to the {#type} 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.autonomous_database_id = attributes[:'autonomousDatabaseId'] if attributes[:'autonomousDatabaseId']
-
-      raise 'You cannot provide both :autonomousDatabaseId and :autonomous_database_id' if attributes.key?(:'autonomousDatabaseId') && attributes.key?(:'autonomous_database_id')
-
-      self.autonomous_database_id = attributes[:'autonomous_database_id'] if attributes[:'autonomous_database_id']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -136,13 +132,19 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
+      self.autonomous_database_id = attributes[:'autonomousDatabaseId'] if attributes[:'autonomousDatabaseId']
+
+      raise 'You cannot provide both :autonomousDatabaseId and :autonomous_database_id' if attributes.key?(:'autonomousDatabaseId') && attributes.key?(:'autonomous_database_id')
+
+      self.autonomous_database_id = attributes[:'autonomous_database_id'] if attributes[:'autonomous_database_id']
+
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
-      self.id = attributes[:'id'] if attributes[:'id']
+      self.type = attributes[:'type'] if attributes[:'type']
 
       self.is_automatic = attributes[:'isAutomatic'] unless attributes[:'isAutomatic'].nil?
 
@@ -150,17 +152,11 @@ module OCI
 
       self.is_automatic = attributes[:'is_automatic'] unless attributes[:'is_automatic'].nil?
 
-      self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
-
-      raise 'You cannot provide both :lifecycleDetails and :lifecycle_details' if attributes.key?(:'lifecycleDetails') && attributes.key?(:'lifecycle_details')
-
-      self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
-
-      self.lifecycle_state = attributes[:'lifecycleState'] if attributes[:'lifecycleState']
+      self.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
 
-      raise 'You cannot provide both :lifecycleState and :lifecycle_state' if attributes.key?(:'lifecycleState') && attributes.key?(:'lifecycle_state')
+      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
 
-      self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
+      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
 
       self.time_ended = attributes[:'timeEnded'] if attributes[:'timeEnded']
 
@@ -168,43 +164,47 @@ module OCI
 
       self.time_ended = attributes[:'time_ended'] if attributes[:'time_ended']
 
-      self.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+      self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
-      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+      raise 'You cannot provide both :lifecycleDetails and :lifecycle_details' if attributes.key?(:'lifecycleDetails') && attributes.key?(:'lifecycle_details')
 
-      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+      self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
 
-      self.type = attributes[:'type'] if attributes[:'type']
+      self.lifecycle_state = attributes[:'lifecycleState'] if attributes[:'lifecycleState']
+
+      raise 'You cannot provide both :lifecycleState and :lifecycle_state' if attributes.key?(:'lifecycleState') && attributes.key?(:'lifecycle_state')
+
+      self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] lifecycle_state Object to be assigned
-    def lifecycle_state=(lifecycle_state)
+    # @param [Object] type Object to be assigned
+    def type=(type)
       # rubocop:disable Style/ConditionalAssignment
-      if lifecycle_state && !LIFECYCLE_STATE_ENUM.include?(lifecycle_state)
+      if type && !TYPE_ENUM.include?(type)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'lifecycle_state' [" + lifecycle_state + "]. Mapping to 'LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        OCI.logger.debug("Unknown value for 'type' [" + type + "]. Mapping to 'TYPE_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @lifecycle_state = LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE
+        @type = TYPE_UNKNOWN_ENUM_VALUE
       else
-        @lifecycle_state = lifecycle_state
+        @type = type
       end
       # rubocop:enable Style/ConditionalAssignment
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
+    # @param [Object] lifecycle_state Object to be assigned
+    def lifecycle_state=(lifecycle_state)
       # rubocop:disable Style/ConditionalAssignment
-      if type && !TYPE_ENUM.include?(type)
+      if lifecycle_state && !LIFECYCLE_STATE_ENUM.include?(lifecycle_state)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'type' [" + type + "]. Mapping to 'TYPE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        OCI.logger.debug("Unknown value for 'lifecycle_state' [" + lifecycle_state + "]. Mapping to 'LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @type = TYPE_UNKNOWN_ENUM_VALUE
+        @lifecycle_state = LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE
       else
-        @type = type
+        @lifecycle_state = lifecycle_state
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -218,16 +218,16 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        autonomous_database_id == other.autonomous_database_id &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
+        autonomous_database_id == other.autonomous_database_id &&
         display_name == other.display_name &&
-        id == other.id &&
+        type == other.type &&
         is_automatic == other.is_automatic &&
-        lifecycle_details == other.lifecycle_details &&
-        lifecycle_state == other.lifecycle_state &&
-        time_ended == other.time_ended &&
         time_started == other.time_started &&
-        type == other.type
+        time_ended == other.time_ended &&
+        lifecycle_details == other.lifecycle_details &&
+        lifecycle_state == other.lifecycle_state
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -243,7 +243,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [autonomous_database_id, compartment_id, display_name, id, is_automatic, lifecycle_details, lifecycle_state, time_ended, time_started, type].hash
+      [id, compartment_id, autonomous_database_id, display_name, type, is_automatic, time_started, time_ended, lifecycle_details, lifecycle_state].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -7,30 +7,30 @@ module OCI
   # Connection strings to connect to an Oracle Autonomous Database.
   #
   class Database::Models::AutonomousDatabaseConnectionStrings # rubocop:disable Metrics/LineLength
-    # All connection strings to use to connect to the Autonomous Database.
-    # @return [Hash<String, String>]
-    attr_accessor :all_connection_strings
-
     # The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements.
     # @return [String]
     attr_accessor :high
 
+    # The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements.
+    # @return [String]
+    attr_accessor :medium
+
     # The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements.
     # @return [String]
     attr_accessor :low
 
-    # The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements.
-    # @return [String]
-    attr_accessor :medium
+    # All connection strings to use to connect to the Autonomous Database.
+    # @return [Hash<String, String>]
+    attr_accessor :all_connection_strings
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'all_connection_strings': :'allConnectionStrings',
         'high': :'high',
+        'medium': :'medium',
         'low': :'low',
-        'medium': :'medium'
+        'all_connection_strings': :'allConnectionStrings'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -39,10 +39,10 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'all_connection_strings': :'Hash<String, String>',
         'high': :'String',
+        'medium': :'String',
         'low': :'String',
-        'medium': :'String'
+        'all_connection_strings': :'Hash<String, String>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -53,27 +53,27 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Hash<String, String>] :all_connection_strings The value to assign to the {#all_connection_strings} property
     # @option attributes [String] :high The value to assign to the {#high} property
-    # @option attributes [String] :low The value to assign to the {#low} property
     # @option attributes [String] :medium The value to assign to the {#medium} property
+    # @option attributes [String] :low The value to assign to the {#low} property
+    # @option attributes [Hash<String, String>] :all_connection_strings The value to assign to the {#all_connection_strings} 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.all_connection_strings = attributes[:'allConnectionStrings'] if attributes[:'allConnectionStrings']
+      self.high = attributes[:'high'] if attributes[:'high']
 
-      raise 'You cannot provide both :allConnectionStrings and :all_connection_strings' if attributes.key?(:'allConnectionStrings') && attributes.key?(:'all_connection_strings')
+      self.medium = attributes[:'medium'] if attributes[:'medium']
 
-      self.all_connection_strings = attributes[:'all_connection_strings'] if attributes[:'all_connection_strings']
+      self.low = attributes[:'low'] if attributes[:'low']
 
-      self.high = attributes[:'high'] if attributes[:'high']
+      self.all_connection_strings = attributes[:'allConnectionStrings'] if attributes[:'allConnectionStrings']
 
-      self.low = attributes[:'low'] if attributes[:'low']
+      raise 'You cannot provide both :allConnectionStrings and :all_connection_strings' if attributes.key?(:'allConnectionStrings') && attributes.key?(:'all_connection_strings')
 
-      self.medium = attributes[:'medium'] if attributes[:'medium']
+      self.all_connection_strings = attributes[:'all_connection_strings'] if attributes[:'all_connection_strings']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -87,10 +87,10 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        all_connection_strings == other.all_connection_strings &&
         high == other.high &&
+        medium == other.medium &&
         low == other.low &&
-        medium == other.medium
+        all_connection_strings == other.all_connection_strings
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -106,7 +106,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [all_connection_strings, high, low, medium].hash
+      [high, medium, low, all_connection_strings].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -10,12 +10,6 @@ module OCI
   # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
   #
   class Database::Models::AutonomousDatabaseSummary # rubocop:disable Metrics/LineLength
-    LICENSE_MODEL_ENUM = [
-      LICENSE_MODEL_LICENSE_INCLUDED = 'LICENSE_INCLUDED'.freeze,
-      LICENSE_MODEL_BRING_YOUR_OWN_LICENSE = 'BRING_YOUR_OWN_LICENSE'.freeze,
-      LICENSE_MODEL_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
-    ].freeze
-
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING'.freeze,
       LIFECYCLE_STATE_AVAILABLE = 'AVAILABLE'.freeze,
@@ -33,13 +27,31 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
+    LICENSE_MODEL_ENUM = [
+      LICENSE_MODEL_LICENSE_INCLUDED = 'LICENSE_INCLUDED'.freeze,
+      LICENSE_MODEL_BRING_YOUR_OWN_LICENSE = 'BRING_YOUR_OWN_LICENSE'.freeze,
+      LICENSE_MODEL_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
+    # @return [String]
+    attr_accessor :id
+
     # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
     attr_accessor :compartment_id
 
-    # The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value.
-    # @return [OCI::Database::Models::AutonomousDatabaseConnectionStrings]
-    attr_accessor :connection_strings
+    # **[Required]** The current state of the database.
+    # @return [String]
+    attr_reader :lifecycle_state
+
+    # Information about the current lifecycle state.
+    # @return [String]
+    attr_accessor :lifecycle_details
+
+    # **[Required]** The database name.
+    # @return [String]
+    attr_accessor :db_name
 
     # **[Required]** The number of CPU cores to be made available to the database.
     # @return [Integer]
@@ -49,25 +61,26 @@ module OCI
     # @return [Integer]
     attr_accessor :data_storage_size_in_tbs
 
-    # **[Required]** The database name.
+    # The date and time the database was created.
+    # @return [DateTime]
+    attr_accessor :time_created
+
+    # The user-friendly name for the Autonomous Database. The name does not have to be unique.
     # @return [String]
-    attr_accessor :db_name
+    attr_accessor :display_name
 
-    # A valid Oracle Database version for Autonomous Database.
+    # The URL of the Service Console for the Autonomous Database.
     # @return [String]
-    attr_accessor :db_version
+    attr_accessor :service_console_url
 
-    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
-    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
-    #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
-    # @return [Hash<String, Hash<String, Object>>]
-    attr_accessor :defined_tags
+    # The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value.
+    # @return [OCI::Database::Models::AutonomousDatabaseConnectionStrings]
+    attr_accessor :connection_strings
 
-    # The user-friendly name for the Autonomous Database. The name does not have to be unique.
+    # The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE.
+    #
     # @return [String]
-    attr_accessor :display_name
+    attr_reader :license_model
 
     # 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
@@ -77,50 +90,37 @@ module OCI
     # @return [Hash<String, String>]
     attr_accessor :freeform_tags
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database.
-    # @return [String]
-    attr_accessor :id
-
-    # The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE.
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
     #
-    # @return [String]
-    attr_reader :license_model
-
-    # Information about the current lifecycle state.
-    # @return [String]
-    attr_accessor :lifecycle_details
-
-    # **[Required]** The current state of the database.
-    # @return [String]
-    attr_reader :lifecycle_state
+    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
 
-    # The URL of the Service Console for the Autonomous Database.
+    # A valid Oracle Database version for Autonomous Database.
     # @return [String]
-    attr_accessor :service_console_url
-
-    # The date and time the database was created.
-    # @return [DateTime]
-    attr_accessor :time_created
+    attr_accessor :db_version
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'connection_strings': :'connectionStrings',
+        'lifecycle_state': :'lifecycleState',
+        'lifecycle_details': :'lifecycleDetails',
+        'db_name': :'dbName',
         'cpu_core_count': :'cpuCoreCount',
         'data_storage_size_in_tbs': :'dataStorageSizeInTBs',
-        'db_name': :'dbName',
-        'db_version': :'dbVersion',
-        'defined_tags': :'definedTags',
+        'time_created': :'timeCreated',
         'display_name': :'displayName',
-        'freeform_tags': :'freeformTags',
-        'id': :'id',
-        'license_model': :'licenseModel',
-        'lifecycle_details': :'lifecycleDetails',
-        'lifecycle_state': :'lifecycleState',
         'service_console_url': :'serviceConsoleUrl',
-        'time_created': :'timeCreated'
+        'connection_strings': :'connectionStrings',
+        'license_model': :'licenseModel',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags',
+        'db_version': :'dbVersion'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -129,21 +129,21 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'String',
         'compartment_id': :'String',
-        'connection_strings': :'OCI::Database::Models::AutonomousDatabaseConnectionStrings',
+        'lifecycle_state': :'String',
+        'lifecycle_details': :'String',
+        'db_name': :'String',
         'cpu_core_count': :'Integer',
         'data_storage_size_in_tbs': :'Integer',
-        'db_name': :'String',
-        'db_version': :'String',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'time_created': :'DateTime',
         'display_name': :'String',
-        'freeform_tags': :'Hash<String, String>',
-        'id': :'String',
-        'license_model': :'String',
-        'lifecycle_details': :'String',
-        'lifecycle_state': :'String',
         'service_console_url': :'String',
-        'time_created': :'DateTime'
+        'connection_strings': :'OCI::Database::Models::AutonomousDatabaseConnectionStrings',
+        'license_model': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'db_version': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -154,50 +154,46 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
-    # @option attributes [OCI::Database::Models::AutonomousDatabaseConnectionStrings] :connection_strings The value to assign to the {#connection_strings} property
+    # @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 [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 [String] :db_name The value to assign to the {#db_name} property
-    # @option attributes [String] :db_version The value to assign to the {#db_version} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
-    # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
-    # @option attributes [String] :id The value to assign to the {#id} property
-    # @option attributes [String] :license_model The value to assign to the {#license_model} property
-    # @option attributes [String] :lifecycle_details The value to assign to the {#lifecycle_details} property
-    # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
     # @option attributes [String] :service_console_url The value to assign to the {#service_console_url} property
-    # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
+    # @option attributes [OCI::Database::Models::AutonomousDatabaseConnectionStrings] :connection_strings The value to assign to the {#connection_strings} property
+    # @option attributes [String] :license_model The value to assign to the {#license_model} 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] :db_version The value to assign to the {#db_version} 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.id = attributes[:'id'] if attributes[:'id']
+
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
       raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.connection_strings = attributes[:'connectionStrings'] if attributes[:'connectionStrings']
-
-      raise 'You cannot provide both :connectionStrings and :connection_strings' if attributes.key?(:'connectionStrings') && attributes.key?(:'connection_strings')
-
-      self.connection_strings = attributes[:'connection_strings'] if attributes[:'connection_strings']
-
-      self.cpu_core_count = attributes[:'cpuCoreCount'] if attributes[:'cpuCoreCount']
+      self.lifecycle_state = attributes[:'lifecycleState'] if attributes[:'lifecycleState']
 
-      raise 'You cannot provide both :cpuCoreCount and :cpu_core_count' if attributes.key?(:'cpuCoreCount') && attributes.key?(:'cpu_core_count')
+      raise 'You cannot provide both :lifecycleState and :lifecycle_state' if attributes.key?(:'lifecycleState') && attributes.key?(:'lifecycle_state')
 
-      self.cpu_core_count = attributes[:'cpu_core_count'] if attributes[:'cpu_core_count']
+      self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
-      self.data_storage_size_in_tbs = attributes[:'dataStorageSizeInTBs'] if attributes[:'dataStorageSizeInTBs']
+      self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
-      raise 'You cannot provide both :dataStorageSizeInTBs and :data_storage_size_in_tbs' if attributes.key?(:'dataStorageSizeInTBs') && attributes.key?(:'data_storage_size_in_tbs')
+      raise 'You cannot provide both :lifecycleDetails and :lifecycle_details' if attributes.key?(:'lifecycleDetails') && attributes.key?(:'lifecycle_details')
 
-      self.data_storage_size_in_tbs = attributes[:'data_storage_size_in_tbs'] if attributes[:'data_storage_size_in_tbs']
+      self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
 
       self.db_name = attributes[:'dbName'] if attributes[:'dbName']
 
@@ -205,17 +201,23 @@ module OCI
 
       self.db_name = attributes[:'db_name'] if attributes[:'db_name']
 
-      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
+      self.cpu_core_count = attributes[:'cpuCoreCount'] if attributes[:'cpuCoreCount']
 
-      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
+      raise 'You cannot provide both :cpuCoreCount and :cpu_core_count' if attributes.key?(:'cpuCoreCount') && attributes.key?(:'cpu_core_count')
 
-      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
+      self.cpu_core_count = attributes[:'cpu_core_count'] if attributes[:'cpu_core_count']
 
-      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+      self.data_storage_size_in_tbs = attributes[:'dataStorageSizeInTBs'] if attributes[:'dataStorageSizeInTBs']
 
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+      raise 'You cannot provide both :dataStorageSizeInTBs and :data_storage_size_in_tbs' if attributes.key?(:'dataStorageSizeInTBs') && attributes.key?(:'data_storage_size_in_tbs')
 
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+      self.data_storage_size_in_tbs = attributes[:'data_storage_size_in_tbs'] if attributes[:'data_storage_size_in_tbs']
+
+      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
+
+      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
+
+      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
 
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
@@ -223,13 +225,17 @@ module OCI
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
-      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+      self.service_console_url = attributes[:'serviceConsoleUrl'] if attributes[:'serviceConsoleUrl']
 
-      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+      raise 'You cannot provide both :serviceConsoleUrl and :service_console_url' if attributes.key?(:'serviceConsoleUrl') && attributes.key?(:'service_console_url')
 
-      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+      self.service_console_url = attributes[:'service_console_url'] if attributes[:'service_console_url']
 
-      self.id = attributes[:'id'] if attributes[:'id']
+      self.connection_strings = attributes[:'connectionStrings'] if attributes[:'connectionStrings']
+
+      raise 'You cannot provide both :connectionStrings and :connection_strings' if attributes.key?(:'connectionStrings') && attributes.key?(:'connection_strings')
+
+      self.connection_strings = attributes[:'connection_strings'] if attributes[:'connection_strings']
 
       self.license_model = attributes[:'licenseModel'] if attributes[:'licenseModel']
 
@@ -237,59 +243,53 @@ module OCI
 
       self.license_model = attributes[:'license_model'] if attributes[:'license_model']
 
-      self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
-
-      raise 'You cannot provide both :lifecycleDetails and :lifecycle_details' if attributes.key?(:'lifecycleDetails') && attributes.key?(:'lifecycle_details')
-
-      self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
-
-      self.lifecycle_state = attributes[:'lifecycleState'] if attributes[:'lifecycleState']
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
-      raise 'You cannot provide both :lifecycleState and :lifecycle_state' if attributes.key?(:'lifecycleState') && attributes.key?(:'lifecycle_state')
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
 
-      self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
 
-      self.service_console_url = attributes[:'serviceConsoleUrl'] if attributes[:'serviceConsoleUrl']
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
 
-      raise 'You cannot provide both :serviceConsoleUrl and :service_console_url' if attributes.key?(:'serviceConsoleUrl') && attributes.key?(:'service_console_url')
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
-      self.service_console_url = attributes[:'service_console_url'] if attributes[:'service_console_url']
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
 
-      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
+      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
 
-      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
+      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
 
-      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
+      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] license_model Object to be assigned
-    def license_model=(license_model)
+    # @param [Object] lifecycle_state Object to be assigned
+    def lifecycle_state=(lifecycle_state)
       # rubocop:disable Style/ConditionalAssignment
-      if license_model && !LICENSE_MODEL_ENUM.include?(license_model)
+      if lifecycle_state && !LIFECYCLE_STATE_ENUM.include?(lifecycle_state)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'license_model' [" + license_model + "]. Mapping to 'LICENSE_MODEL_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        OCI.logger.debug("Unknown value for 'lifecycle_state' [" + lifecycle_state + "]. Mapping to 'LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @license_model = LICENSE_MODEL_UNKNOWN_ENUM_VALUE
+        @lifecycle_state = LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE
       else
-        @license_model = license_model
+        @lifecycle_state = lifecycle_state
       end
       # rubocop:enable Style/ConditionalAssignment
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] lifecycle_state Object to be assigned
-    def lifecycle_state=(lifecycle_state)
+    # @param [Object] license_model Object to be assigned
+    def license_model=(license_model)
       # rubocop:disable Style/ConditionalAssignment
-      if lifecycle_state && !LIFECYCLE_STATE_ENUM.include?(lifecycle_state)
+      if license_model && !LICENSE_MODEL_ENUM.include?(license_model)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'lifecycle_state' [" + lifecycle_state + "]. Mapping to 'LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        OCI.logger.debug("Unknown value for 'license_model' [" + license_model + "]. Mapping to 'LICENSE_MODEL_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @lifecycle_state = LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE
+        @license_model = LICENSE_MODEL_UNKNOWN_ENUM_VALUE
       else
-        @lifecycle_state = lifecycle_state
+        @license_model = license_model
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -303,21 +303,21 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        connection_strings == other.connection_strings &&
+        lifecycle_state == other.lifecycle_state &&
+        lifecycle_details == other.lifecycle_details &&
+        db_name == other.db_name &&
         cpu_core_count == other.cpu_core_count &&
         data_storage_size_in_tbs == other.data_storage_size_in_tbs &&
-        db_name == other.db_name &&
-        db_version == other.db_version &&
-        defined_tags == other.defined_tags &&
+        time_created == other.time_created &&
         display_name == other.display_name &&
-        freeform_tags == other.freeform_tags &&
-        id == other.id &&
-        license_model == other.license_model &&
-        lifecycle_details == other.lifecycle_details &&
-        lifecycle_state == other.lifecycle_state &&
         service_console_url == other.service_console_url &&
-        time_created == other.time_created
+        connection_strings == other.connection_strings &&
+        license_model == other.license_model &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags &&
+        db_version == other.db_version
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -333,7 +333,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, connection_strings, cpu_core_count, data_storage_size_in_tbs, db_name, db_version, defined_tags, display_name, freeform_tags, id, license_model, lifecycle_details, lifecycle_state, service_console_url, time_created].hash
+      [id, compartment_id, lifecycle_state, lifecycle_details, db_name, cpu_core_count, data_storage_size_in_tbs, time_created, display_name, service_console_url, connection_strings, license_model, freeform_tags, defined_tags, db_version].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines