oci 2.4.2 → 2.4.3

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

@@ -5,18 +5,12 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
-  # A database backup.
-  # To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized, talk to an administrator. If you're an administrator who needs to write policies to give users access, see [Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm).
-  #
-  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
-  #
+  # Backup model.
   class Database::Models::Backup # rubocop:disable Metrics/LineLength
-    DATABASE_EDITION_ENUM = [
-      DATABASE_EDITION_STANDARD_EDITION = 'STANDARD_EDITION'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION = 'ENTERPRISE_EDITION'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION_HIGH_PERFORMANCE = 'ENTERPRISE_EDITION_HIGH_PERFORMANCE'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION_EXTREME_PERFORMANCE = 'ENTERPRISE_EDITION_EXTREME_PERFORMANCE'.freeze,
-      DATABASE_EDITION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    TYPE_ENUM = [
+      TYPE_INCREMENTAL = 'INCREMENTAL'.freeze,
+      TYPE_FULL = 'FULL'.freeze,
+      TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
     LIFECYCLE_STATE_ENUM = [
@@ -29,78 +23,80 @@ 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
+    DATABASE_EDITION_ENUM = [
+      DATABASE_EDITION_STANDARD_EDITION = 'STANDARD_EDITION'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION = 'ENTERPRISE_EDITION'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION_HIGH_PERFORMANCE = 'ENTERPRISE_EDITION_HIGH_PERFORMANCE'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION_EXTREME_PERFORMANCE = 'ENTERPRISE_EDITION_EXTREME_PERFORMANCE'.freeze,
+      DATABASE_EDITION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # The name of the availability domain where the database backup is stored.
+    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup.
     # @return [String]
-    attr_accessor :availability_domain
+    attr_accessor :id
 
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
     attr_accessor :compartment_id
 
-    # The Oracle Database edition of the DB system from which the database backup was taken.
-    #
-    # @return [String]
-    attr_reader :database_edition
-
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database.
     # @return [String]
     attr_accessor :database_id
 
-    # The size of the database in gigabytes at the time the backup was taken.
-    #
-    # @return [Float]
-    attr_accessor :database_size_in_gbs
-
     # The user-friendly name for the backup. The name does not have to be unique.
     # @return [String]
     attr_accessor :display_name
 
-    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup.
+    # The type of backup.
     # @return [String]
-    attr_accessor :id
+    attr_reader :type
+
+    # The date and time the backup started.
+    # @return [DateTime]
+    attr_accessor :time_started
+
+    # The date and time the backup was completed.
+    # @return [DateTime]
+    attr_accessor :time_ended
 
     # Additional information about the current lifecycleState.
     # @return [String]
     attr_accessor :lifecycle_details
 
+    # The name of the availability domain where the database backup is stored.
+    # @return [String]
+    attr_accessor :availability_domain
+
     # The current state of the backup.
     # @return [String]
     attr_reader :lifecycle_state
 
-    # The date and time the backup was completed.
-    # @return [DateTime]
-    attr_accessor :time_ended
-
-    # The date and time the backup started.
-    # @return [DateTime]
-    attr_accessor :time_started
-
-    # The type of backup.
+    # The Oracle Database edition of the DB system from which the database backup was taken.
+    #
     # @return [String]
-    attr_reader :type
+    attr_reader :database_edition
+
+    # The size of the database in gigabytes at the time the backup was taken.
+    #
+    # @return [Float]
+    attr_accessor :database_size_in_gbs
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'availability_domain': :'availabilityDomain',
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'database_edition': :'databaseEdition',
         'database_id': :'databaseId',
-        'database_size_in_gbs': :'databaseSizeInGBs',
         'display_name': :'displayName',
-        'id': :'id',
+        'type': :'type',
+        'time_started': :'timeStarted',
+        'time_ended': :'timeEnded',
         'lifecycle_details': :'lifecycleDetails',
+        'availability_domain': :'availabilityDomain',
         'lifecycle_state': :'lifecycleState',
-        'time_ended': :'timeEnded',
-        'time_started': :'timeStarted',
-        'type': :'type'
+        'database_edition': :'databaseEdition',
+        'database_size_in_gbs': :'databaseSizeInGBs'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -109,18 +105,18 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'availability_domain': :'String',
+        'id': :'String',
         'compartment_id': :'String',
-        'database_edition': :'String',
         'database_id': :'String',
-        'database_size_in_gbs': :'Float',
         'display_name': :'String',
-        'id': :'String',
+        'type': :'String',
+        'time_started': :'DateTime',
+        'time_ended': :'DateTime',
         'lifecycle_details': :'String',
+        'availability_domain': :'String',
         'lifecycle_state': :'String',
-        'time_ended': :'DateTime',
-        'time_started': :'DateTime',
-        'type': :'String'
+        'database_edition': :'String',
+        'database_size_in_gbs': :'Float'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -131,29 +127,22 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :availability_domain The value to assign to the {#availability_domain} 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] :database_edition The value to assign to the {#database_edition} property
     # @option attributes [String] :database_id The value to assign to the {#database_id} property
-    # @option attributes [Float] :database_size_in_gbs The value to assign to the {#database_size_in_gbs} 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 [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] :availability_domain The value to assign to the {#availability_domain} 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
+    # @option attributes [String] :database_edition The value to assign to the {#database_edition} property
+    # @option attributes [Float] :database_size_in_gbs The value to assign to the {#database_size_in_gbs} 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.availability_domain = attributes[:'availabilityDomain'] if attributes[:'availabilityDomain']
-
-      raise 'You cannot provide both :availabilityDomain and :availability_domain' if attributes.key?(:'availabilityDomain') && attributes.key?(:'availability_domain')
-
-      self.availability_domain = attributes[:'availability_domain'] if attributes[:'availability_domain']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -161,31 +150,31 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.database_edition = attributes[:'databaseEdition'] if attributes[:'databaseEdition']
-
-      raise 'You cannot provide both :databaseEdition and :database_edition' if attributes.key?(:'databaseEdition') && attributes.key?(:'database_edition')
-
-      self.database_edition = attributes[:'database_edition'] if attributes[:'database_edition']
-
       self.database_id = attributes[:'databaseId'] if attributes[:'databaseId']
 
       raise 'You cannot provide both :databaseId and :database_id' if attributes.key?(:'databaseId') && attributes.key?(:'database_id')
 
       self.database_id = attributes[:'database_id'] if attributes[:'database_id']
 
-      self.database_size_in_gbs = attributes[:'databaseSizeInGBs'] if attributes[:'databaseSizeInGBs']
-
-      raise 'You cannot provide both :databaseSizeInGBs and :database_size_in_gbs' if attributes.key?(:'databaseSizeInGBs') && attributes.key?(:'database_size_in_gbs')
-
-      self.database_size_in_gbs = attributes[:'database_size_in_gbs'] if attributes[:'database_size_in_gbs']
-
       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.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+
+      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+
+      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+
+      self.time_ended = attributes[:'timeEnded'] if attributes[:'timeEnded']
+
+      raise 'You cannot provide both :timeEnded and :time_ended' if attributes.key?(:'timeEnded') && attributes.key?(:'time_ended')
+
+      self.time_ended = attributes[:'time_ended'] if attributes[:'time_ended']
 
       self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
@@ -193,40 +182,44 @@ module OCI
 
       self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
 
+      self.availability_domain = attributes[:'availabilityDomain'] if attributes[:'availabilityDomain']
+
+      raise 'You cannot provide both :availabilityDomain and :availability_domain' if attributes.key?(:'availabilityDomain') && attributes.key?(:'availability_domain')
+
+      self.availability_domain = attributes[:'availability_domain'] if attributes[:'availability_domain']
+
       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']
 
-      self.time_ended = attributes[:'timeEnded'] if attributes[:'timeEnded']
-
-      raise 'You cannot provide both :timeEnded and :time_ended' if attributes.key?(:'timeEnded') && attributes.key?(:'time_ended')
+      self.database_edition = attributes[:'databaseEdition'] if attributes[:'databaseEdition']
 
-      self.time_ended = attributes[:'time_ended'] if attributes[:'time_ended']
+      raise 'You cannot provide both :databaseEdition and :database_edition' if attributes.key?(:'databaseEdition') && attributes.key?(:'database_edition')
 
-      self.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+      self.database_edition = attributes[:'database_edition'] if attributes[:'database_edition']
 
-      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+      self.database_size_in_gbs = attributes[:'databaseSizeInGBs'] if attributes[:'databaseSizeInGBs']
 
-      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+      raise 'You cannot provide both :databaseSizeInGBs and :database_size_in_gbs' if attributes.key?(:'databaseSizeInGBs') && attributes.key?(:'database_size_in_gbs')
 
-      self.type = attributes[:'type'] if attributes[:'type']
+      self.database_size_in_gbs = attributes[:'database_size_in_gbs'] if attributes[:'database_size_in_gbs']
     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] database_edition Object to be assigned
-    def database_edition=(database_edition)
+    # @param [Object] type Object to be assigned
+    def type=(type)
       # rubocop:disable Style/ConditionalAssignment
-      if database_edition && !DATABASE_EDITION_ENUM.include?(database_edition)
+      if type && !TYPE_ENUM.include?(type)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'database_edition' [" + database_edition + "]. Mapping to 'DATABASE_EDITION_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
-        @database_edition = DATABASE_EDITION_UNKNOWN_ENUM_VALUE
+        @type = TYPE_UNKNOWN_ENUM_VALUE
       else
-        @database_edition = database_edition
+        @type = type
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -247,16 +240,16 @@ module OCI
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
+    # @param [Object] database_edition Object to be assigned
+    def database_edition=(database_edition)
       # rubocop:disable Style/ConditionalAssignment
-      if type && !TYPE_ENUM.include?(type)
+      if database_edition && !DATABASE_EDITION_ENUM.include?(database_edition)
         # 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 'database_edition' [" + database_edition + "]. Mapping to 'DATABASE_EDITION_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @type = TYPE_UNKNOWN_ENUM_VALUE
+        @database_edition = DATABASE_EDITION_UNKNOWN_ENUM_VALUE
       else
-        @type = type
+        @database_edition = database_edition
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -270,18 +263,18 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        availability_domain == other.availability_domain &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        database_edition == other.database_edition &&
         database_id == other.database_id &&
-        database_size_in_gbs == other.database_size_in_gbs &&
         display_name == other.display_name &&
-        id == other.id &&
+        type == other.type &&
+        time_started == other.time_started &&
+        time_ended == other.time_ended &&
         lifecycle_details == other.lifecycle_details &&
+        availability_domain == other.availability_domain &&
         lifecycle_state == other.lifecycle_state &&
-        time_ended == other.time_ended &&
-        time_started == other.time_started &&
-        type == other.type
+        database_edition == other.database_edition &&
+        database_size_in_gbs == other.database_size_in_gbs
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -297,7 +290,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, compartment_id, database_edition, database_id, database_size_in_gbs, display_name, id, lifecycle_details, lifecycle_state, time_ended, time_started, type].hash
+      [id, compartment_id, database_id, display_name, type, time_started, time_ended, lifecycle_details, availability_domain, lifecycle_state, database_edition, database_size_in_gbs].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -11,12 +11,10 @@ module OCI
   # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
   #
   class Database::Models::BackupSummary # rubocop:disable Metrics/LineLength
-    DATABASE_EDITION_ENUM = [
-      DATABASE_EDITION_STANDARD_EDITION = 'STANDARD_EDITION'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION = 'ENTERPRISE_EDITION'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION_HIGH_PERFORMANCE = 'ENTERPRISE_EDITION_HIGH_PERFORMANCE'.freeze,
-      DATABASE_EDITION_ENTERPRISE_EDITION_EXTREME_PERFORMANCE = 'ENTERPRISE_EDITION_EXTREME_PERFORMANCE'.freeze,
-      DATABASE_EDITION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    TYPE_ENUM = [
+      TYPE_INCREMENTAL = 'INCREMENTAL'.freeze,
+      TYPE_FULL = 'FULL'.freeze,
+      TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
     LIFECYCLE_STATE_ENUM = [
@@ -29,78 +27,80 @@ 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
+    DATABASE_EDITION_ENUM = [
+      DATABASE_EDITION_STANDARD_EDITION = 'STANDARD_EDITION'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION = 'ENTERPRISE_EDITION'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION_HIGH_PERFORMANCE = 'ENTERPRISE_EDITION_HIGH_PERFORMANCE'.freeze,
+      DATABASE_EDITION_ENTERPRISE_EDITION_EXTREME_PERFORMANCE = 'ENTERPRISE_EDITION_EXTREME_PERFORMANCE'.freeze,
+      DATABASE_EDITION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # The name of the availability domain where the database backup is stored.
+    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup.
     # @return [String]
-    attr_accessor :availability_domain
+    attr_accessor :id
 
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
     attr_accessor :compartment_id
 
-    # The Oracle Database edition of the DB system from which the database backup was taken.
-    #
-    # @return [String]
-    attr_reader :database_edition
-
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database.
     # @return [String]
     attr_accessor :database_id
 
-    # The size of the database in gigabytes at the time the backup was taken.
-    #
-    # @return [Float]
-    attr_accessor :database_size_in_gbs
-
     # The user-friendly name for the backup. The name does not have to be unique.
     # @return [String]
     attr_accessor :display_name
 
-    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup.
+    # The type of backup.
     # @return [String]
-    attr_accessor :id
+    attr_reader :type
+
+    # The date and time the backup started.
+    # @return [DateTime]
+    attr_accessor :time_started
+
+    # The date and time the backup was completed.
+    # @return [DateTime]
+    attr_accessor :time_ended
 
     # Additional information about the current lifecycleState.
     # @return [String]
     attr_accessor :lifecycle_details
 
+    # The name of the availability domain where the database backup is stored.
+    # @return [String]
+    attr_accessor :availability_domain
+
     # The current state of the backup.
     # @return [String]
     attr_reader :lifecycle_state
 
-    # The date and time the backup was completed.
-    # @return [DateTime]
-    attr_accessor :time_ended
-
-    # The date and time the backup started.
-    # @return [DateTime]
-    attr_accessor :time_started
-
-    # The type of backup.
+    # The Oracle Database edition of the DB system from which the database backup was taken.
+    #
     # @return [String]
-    attr_reader :type
+    attr_reader :database_edition
+
+    # The size of the database in gigabytes at the time the backup was taken.
+    #
+    # @return [Float]
+    attr_accessor :database_size_in_gbs
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'availability_domain': :'availabilityDomain',
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'database_edition': :'databaseEdition',
         'database_id': :'databaseId',
-        'database_size_in_gbs': :'databaseSizeInGBs',
         'display_name': :'displayName',
-        'id': :'id',
+        'type': :'type',
+        'time_started': :'timeStarted',
+        'time_ended': :'timeEnded',
         'lifecycle_details': :'lifecycleDetails',
+        'availability_domain': :'availabilityDomain',
         'lifecycle_state': :'lifecycleState',
-        'time_ended': :'timeEnded',
-        'time_started': :'timeStarted',
-        'type': :'type'
+        'database_edition': :'databaseEdition',
+        'database_size_in_gbs': :'databaseSizeInGBs'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -109,18 +109,18 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'availability_domain': :'String',
+        'id': :'String',
         'compartment_id': :'String',
-        'database_edition': :'String',
         'database_id': :'String',
-        'database_size_in_gbs': :'Float',
         'display_name': :'String',
-        'id': :'String',
+        'type': :'String',
+        'time_started': :'DateTime',
+        'time_ended': :'DateTime',
         'lifecycle_details': :'String',
+        'availability_domain': :'String',
         'lifecycle_state': :'String',
-        'time_ended': :'DateTime',
-        'time_started': :'DateTime',
-        'type': :'String'
+        'database_edition': :'String',
+        'database_size_in_gbs': :'Float'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -131,29 +131,25 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :availability_domain The value to assign to the {#availability_domain} 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] :database_edition The value to assign to the {#database_edition} property
     # @option attributes [String] :database_id The value to assign to the {#database_id} property
-    # @option attributes [Float] :database_size_in_gbs The value to assign to the {#database_size_in_gbs} 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 [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] :availability_domain The value to assign to the {#availability_domain} 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
+    # @option attributes [String] :database_edition The value to assign to the {#database_edition} property
+    # @option attributes [Float] :database_size_in_gbs The value to assign to the {#database_size_in_gbs} 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.availability_domain = attributes[:'availabilityDomain'] if attributes[:'availabilityDomain']
-
-      raise 'You cannot provide both :availabilityDomain and :availability_domain' if attributes.key?(:'availabilityDomain') && attributes.key?(:'availability_domain')
-
-      self.availability_domain = attributes[:'availability_domain'] if attributes[:'availability_domain']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -161,31 +157,31 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.database_edition = attributes[:'databaseEdition'] if attributes[:'databaseEdition']
-
-      raise 'You cannot provide both :databaseEdition and :database_edition' if attributes.key?(:'databaseEdition') && attributes.key?(:'database_edition')
-
-      self.database_edition = attributes[:'database_edition'] if attributes[:'database_edition']
-
       self.database_id = attributes[:'databaseId'] if attributes[:'databaseId']
 
       raise 'You cannot provide both :databaseId and :database_id' if attributes.key?(:'databaseId') && attributes.key?(:'database_id')
 
       self.database_id = attributes[:'database_id'] if attributes[:'database_id']
 
-      self.database_size_in_gbs = attributes[:'databaseSizeInGBs'] if attributes[:'databaseSizeInGBs']
-
-      raise 'You cannot provide both :databaseSizeInGBs and :database_size_in_gbs' if attributes.key?(:'databaseSizeInGBs') && attributes.key?(:'database_size_in_gbs')
-
-      self.database_size_in_gbs = attributes[:'database_size_in_gbs'] if attributes[:'database_size_in_gbs']
-
       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.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+
+      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+
+      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+
+      self.time_ended = attributes[:'timeEnded'] if attributes[:'timeEnded']
+
+      raise 'You cannot provide both :timeEnded and :time_ended' if attributes.key?(:'timeEnded') && attributes.key?(:'time_ended')
+
+      self.time_ended = attributes[:'time_ended'] if attributes[:'time_ended']
 
       self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
@@ -193,40 +189,44 @@ module OCI
 
       self.lifecycle_details = attributes[:'lifecycle_details'] if attributes[:'lifecycle_details']
 
+      self.availability_domain = attributes[:'availabilityDomain'] if attributes[:'availabilityDomain']
+
+      raise 'You cannot provide both :availabilityDomain and :availability_domain' if attributes.key?(:'availabilityDomain') && attributes.key?(:'availability_domain')
+
+      self.availability_domain = attributes[:'availability_domain'] if attributes[:'availability_domain']
+
       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']
 
-      self.time_ended = attributes[:'timeEnded'] if attributes[:'timeEnded']
-
-      raise 'You cannot provide both :timeEnded and :time_ended' if attributes.key?(:'timeEnded') && attributes.key?(:'time_ended')
+      self.database_edition = attributes[:'databaseEdition'] if attributes[:'databaseEdition']
 
-      self.time_ended = attributes[:'time_ended'] if attributes[:'time_ended']
+      raise 'You cannot provide both :databaseEdition and :database_edition' if attributes.key?(:'databaseEdition') && attributes.key?(:'database_edition')
 
-      self.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+      self.database_edition = attributes[:'database_edition'] if attributes[:'database_edition']
 
-      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+      self.database_size_in_gbs = attributes[:'databaseSizeInGBs'] if attributes[:'databaseSizeInGBs']
 
-      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+      raise 'You cannot provide both :databaseSizeInGBs and :database_size_in_gbs' if attributes.key?(:'databaseSizeInGBs') && attributes.key?(:'database_size_in_gbs')
 
-      self.type = attributes[:'type'] if attributes[:'type']
+      self.database_size_in_gbs = attributes[:'database_size_in_gbs'] if attributes[:'database_size_in_gbs']
     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] database_edition Object to be assigned
-    def database_edition=(database_edition)
+    # @param [Object] type Object to be assigned
+    def type=(type)
       # rubocop:disable Style/ConditionalAssignment
-      if database_edition && !DATABASE_EDITION_ENUM.include?(database_edition)
+      if type && !TYPE_ENUM.include?(type)
         # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'database_edition' [" + database_edition + "]. Mapping to 'DATABASE_EDITION_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
-        @database_edition = DATABASE_EDITION_UNKNOWN_ENUM_VALUE
+        @type = TYPE_UNKNOWN_ENUM_VALUE
       else
-        @database_edition = database_edition
+        @type = type
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -247,16 +247,16 @@ module OCI
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
+    # @param [Object] database_edition Object to be assigned
+    def database_edition=(database_edition)
       # rubocop:disable Style/ConditionalAssignment
-      if type && !TYPE_ENUM.include?(type)
+      if database_edition && !DATABASE_EDITION_ENUM.include?(database_edition)
         # 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 'database_edition' [" + database_edition + "]. Mapping to 'DATABASE_EDITION_UNKNOWN_ENUM_VALUE'") if OCI.logger
         # rubocop: enable Metrics/LineLength
-        @type = TYPE_UNKNOWN_ENUM_VALUE
+        @database_edition = DATABASE_EDITION_UNKNOWN_ENUM_VALUE
       else
-        @type = type
+        @database_edition = database_edition
       end
       # rubocop:enable Style/ConditionalAssignment
     end
@@ -270,18 +270,18 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        availability_domain == other.availability_domain &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        database_edition == other.database_edition &&
         database_id == other.database_id &&
-        database_size_in_gbs == other.database_size_in_gbs &&
         display_name == other.display_name &&
-        id == other.id &&
+        type == other.type &&
+        time_started == other.time_started &&
+        time_ended == other.time_ended &&
         lifecycle_details == other.lifecycle_details &&
+        availability_domain == other.availability_domain &&
         lifecycle_state == other.lifecycle_state &&
-        time_ended == other.time_ended &&
-        time_started == other.time_started &&
-        type == other.type
+        database_edition == other.database_edition &&
+        database_size_in_gbs == other.database_size_in_gbs
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -297,7 +297,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, compartment_id, database_edition, database_id, database_size_in_gbs, display_name, id, lifecycle_details, lifecycle_state, time_ended, time_started, type].hash
+      [id, compartment_id, database_id, display_name, type, time_started, time_ended, lifecycle_details, availability_domain, lifecycle_state, database_edition, database_size_in_gbs].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines