oci 2.4.2 → 2.4.3

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

@@ -5,12 +5,7 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
-  # An Oracle database on a bare metal or virtual machine DB system. For more information, see [Bare Metal and Virtual Machine DB Systems](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/Concepts/overview.htm).
-  #
-  # 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.
-  #
+  # Database model.
   class Database::Models::Database # rubocop:disable Metrics/LineLength
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING'.freeze,
@@ -24,16 +19,21 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # The character set for the database.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database.
     # @return [String]
-    attr_accessor :character_set
+    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
 
-    # @return [OCI::Database::Models::DbBackupConfig]
-    attr_accessor :db_backup_config
+    # The character set for the database.
+    # @return [String]
+    attr_accessor :character_set
+
+    # The national character set for the database.
+    # @return [String]
+    attr_accessor :ncharacter_set
 
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
     # @return [String]
@@ -43,34 +43,18 @@ module OCI
     # @return [String]
     attr_accessor :db_name
 
-    # **[Required]** A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
-    #
+    # The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name.
     # @return [String]
-    attr_accessor :db_unique_name
+    attr_accessor :pdb_name
 
     # The database workload type.
     # @return [String]
     attr_accessor :db_workload
 
-    # 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
-
-    # 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).
-    #
-    # Example: `{\"Department\": \"Finance\"}`
+    # **[Required]** A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
     #
-    # @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 database.
     # @return [String]
-    attr_accessor :id
+    attr_accessor :db_unique_name
 
     # Additional information about the current lifecycleState.
     # @return [String]
@@ -80,37 +64,48 @@ module OCI
     # @return [String]
     attr_reader :lifecycle_state
 
-    # The national character set for the database.
-    # @return [String]
-    attr_accessor :ncharacter_set
-
-    # The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name.
-    # @return [String]
-    attr_accessor :pdb_name
-
     # The date and time the database was created.
     # @return [DateTime]
     attr_accessor :time_created
 
+    # @return [OCI::Database::Models::DbBackupConfig]
+    attr_accessor :db_backup_config
+
+    # 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).
+    #
+    # Example: `{\"Department\": \"Finance\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # 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
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'character_set': :'characterSet',
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'db_backup_config': :'dbBackupConfig',
+        'character_set': :'characterSet',
+        'ncharacter_set': :'ncharacterSet',
         'db_home_id': :'dbHomeId',
         'db_name': :'dbName',
-        'db_unique_name': :'dbUniqueName',
+        'pdb_name': :'pdbName',
         'db_workload': :'dbWorkload',
-        'defined_tags': :'definedTags',
-        'freeform_tags': :'freeformTags',
-        'id': :'id',
+        'db_unique_name': :'dbUniqueName',
         'lifecycle_details': :'lifecycleDetails',
         'lifecycle_state': :'lifecycleState',
-        'ncharacter_set': :'ncharacterSet',
-        'pdb_name': :'pdbName',
-        'time_created': :'timeCreated'
+        'time_created': :'timeCreated',
+        'db_backup_config': :'dbBackupConfig',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -119,21 +114,21 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'character_set': :'String',
+        'id': :'String',
         'compartment_id': :'String',
-        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
+        'character_set': :'String',
+        'ncharacter_set': :'String',
         'db_home_id': :'String',
         'db_name': :'String',
-        'db_unique_name': :'String',
+        'pdb_name': :'String',
         'db_workload': :'String',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
-        'freeform_tags': :'Hash<String, String>',
-        'id': :'String',
+        'db_unique_name': :'String',
         'lifecycle_details': :'String',
         'lifecycle_state': :'String',
-        'ncharacter_set': :'String',
-        'pdb_name': :'String',
-        'time_created': :'DateTime'
+        'time_created': :'DateTime',
+        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -144,32 +139,25 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :character_set The value to assign to the {#character_set} 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 [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} property
+    # @option attributes [String] :character_set The value to assign to the {#character_set} property
+    # @option attributes [String] :ncharacter_set The value to assign to the {#ncharacter_set} property
     # @option attributes [String] :db_home_id The value to assign to the {#db_home_id} property
     # @option attributes [String] :db_name The value to assign to the {#db_name} property
-    # @option attributes [String] :db_unique_name The value to assign to the {#db_unique_name} property
+    # @option attributes [String] :pdb_name The value to assign to the {#pdb_name} property
     # @option attributes [String] :db_workload The value to assign to the {#db_workload} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} 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] :db_unique_name The value to assign to the {#db_unique_name} 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] :ncharacter_set The value to assign to the {#ncharacter_set} property
-    # @option attributes [String] :pdb_name The value to assign to the {#pdb_name} property
     # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
+    # @option attributes [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} 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
     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.character_set = attributes[:'characterSet'] if attributes[:'characterSet']
-
-      raise 'You cannot provide both :characterSet and :character_set' if attributes.key?(:'characterSet') && attributes.key?(:'character_set')
-
-      self.character_set = attributes[:'character_set'] if attributes[:'character_set']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -177,11 +165,17 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
+      self.character_set = attributes[:'characterSet'] if attributes[:'characterSet']
 
-      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
+      raise 'You cannot provide both :characterSet and :character_set' if attributes.key?(:'characterSet') && attributes.key?(:'character_set')
 
-      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
+      self.character_set = attributes[:'character_set'] if attributes[:'character_set']
+
+      self.ncharacter_set = attributes[:'ncharacterSet'] if attributes[:'ncharacterSet']
+
+      raise 'You cannot provide both :ncharacterSet and :ncharacter_set' if attributes.key?(:'ncharacterSet') && attributes.key?(:'ncharacter_set')
+
+      self.ncharacter_set = attributes[:'ncharacter_set'] if attributes[:'ncharacter_set']
 
       self.db_home_id = attributes[:'dbHomeId'] if attributes[:'dbHomeId']
 
@@ -195,11 +189,11 @@ module OCI
 
       self.db_name = attributes[:'db_name'] if attributes[:'db_name']
 
-      self.db_unique_name = attributes[:'dbUniqueName'] if attributes[:'dbUniqueName']
+      self.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
 
-      raise 'You cannot provide both :dbUniqueName and :db_unique_name' if attributes.key?(:'dbUniqueName') && attributes.key?(:'db_unique_name')
+      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
 
-      self.db_unique_name = attributes[:'db_unique_name'] if attributes[:'db_unique_name']
+      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
 
       self.db_workload = attributes[:'dbWorkload'] if attributes[:'dbWorkload']
 
@@ -207,19 +201,11 @@ module OCI
 
       self.db_workload = attributes[:'db_workload'] if attributes[:'db_workload']
 
-      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
-
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
-
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
-
-      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
-
-      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+      self.db_unique_name = attributes[:'dbUniqueName'] if attributes[:'dbUniqueName']
 
-      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+      raise 'You cannot provide both :dbUniqueName and :db_unique_name' if attributes.key?(:'dbUniqueName') && attributes.key?(:'db_unique_name')
 
-      self.id = attributes[:'id'] if attributes[:'id']
+      self.db_unique_name = attributes[:'db_unique_name'] if attributes[:'db_unique_name']
 
       self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
@@ -233,23 +219,29 @@ module OCI
 
       self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
-      self.ncharacter_set = attributes[:'ncharacterSet'] if attributes[:'ncharacterSet']
+      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
 
-      raise 'You cannot provide both :ncharacterSet and :ncharacter_set' if attributes.key?(:'ncharacterSet') && attributes.key?(:'ncharacter_set')
+      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
 
-      self.ncharacter_set = attributes[:'ncharacter_set'] if attributes[:'ncharacter_set']
+      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
 
-      self.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
+      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
 
-      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
+      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
 
-      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
+      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
 
-      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
-      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
 
-      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -278,21 +270,21 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        character_set == other.character_set &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        db_backup_config == other.db_backup_config &&
+        character_set == other.character_set &&
+        ncharacter_set == other.ncharacter_set &&
         db_home_id == other.db_home_id &&
         db_name == other.db_name &&
-        db_unique_name == other.db_unique_name &&
+        pdb_name == other.pdb_name &&
         db_workload == other.db_workload &&
-        defined_tags == other.defined_tags &&
-        freeform_tags == other.freeform_tags &&
-        id == other.id &&
+        db_unique_name == other.db_unique_name &&
         lifecycle_details == other.lifecycle_details &&
         lifecycle_state == other.lifecycle_state &&
-        ncharacter_set == other.ncharacter_set &&
-        pdb_name == other.pdb_name &&
-        time_created == other.time_created
+        time_created == other.time_created &&
+        db_backup_config == other.db_backup_config &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -308,7 +300,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [character_set, compartment_id, db_backup_config, db_home_id, db_name, db_unique_name, db_workload, defined_tags, freeform_tags, id, lifecycle_details, lifecycle_state, ncharacter_set, pdb_name, time_created].hash
+      [id, compartment_id, character_set, ncharacter_set, db_home_id, db_name, pdb_name, db_workload, db_unique_name, lifecycle_details, lifecycle_state, time_created, db_backup_config, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -24,16 +24,21 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # The character set for the database.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database.
     # @return [String]
-    attr_accessor :character_set
+    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
 
-    # @return [OCI::Database::Models::DbBackupConfig]
-    attr_accessor :db_backup_config
+    # The character set for the database.
+    # @return [String]
+    attr_accessor :character_set
+
+    # The national character set for the database.
+    # @return [String]
+    attr_accessor :ncharacter_set
 
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
     # @return [String]
@@ -43,34 +48,18 @@ module OCI
     # @return [String]
     attr_accessor :db_name
 
-    # **[Required]** A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
-    #
+    # The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name.
     # @return [String]
-    attr_accessor :db_unique_name
+    attr_accessor :pdb_name
 
     # The database workload type.
     # @return [String]
     attr_accessor :db_workload
 
-    # 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
-
-    # 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).
-    #
-    # Example: `{\"Department\": \"Finance\"}`
+    # **[Required]** A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
     #
-    # @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 database.
     # @return [String]
-    attr_accessor :id
+    attr_accessor :db_unique_name
 
     # Additional information about the current lifecycleState.
     # @return [String]
@@ -80,37 +69,48 @@ module OCI
     # @return [String]
     attr_reader :lifecycle_state
 
-    # The national character set for the database.
-    # @return [String]
-    attr_accessor :ncharacter_set
-
-    # The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name.
-    # @return [String]
-    attr_accessor :pdb_name
-
     # The date and time the database was created.
     # @return [DateTime]
     attr_accessor :time_created
 
+    # @return [OCI::Database::Models::DbBackupConfig]
+    attr_accessor :db_backup_config
+
+    # 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).
+    #
+    # Example: `{\"Department\": \"Finance\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # 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
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'character_set': :'characterSet',
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'db_backup_config': :'dbBackupConfig',
+        'character_set': :'characterSet',
+        'ncharacter_set': :'ncharacterSet',
         'db_home_id': :'dbHomeId',
         'db_name': :'dbName',
-        'db_unique_name': :'dbUniqueName',
+        'pdb_name': :'pdbName',
         'db_workload': :'dbWorkload',
-        'defined_tags': :'definedTags',
-        'freeform_tags': :'freeformTags',
-        'id': :'id',
+        'db_unique_name': :'dbUniqueName',
         'lifecycle_details': :'lifecycleDetails',
         'lifecycle_state': :'lifecycleState',
-        'ncharacter_set': :'ncharacterSet',
-        'pdb_name': :'pdbName',
-        'time_created': :'timeCreated'
+        'time_created': :'timeCreated',
+        'db_backup_config': :'dbBackupConfig',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -119,21 +119,21 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'character_set': :'String',
+        'id': :'String',
         'compartment_id': :'String',
-        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
+        'character_set': :'String',
+        'ncharacter_set': :'String',
         'db_home_id': :'String',
         'db_name': :'String',
-        'db_unique_name': :'String',
+        'pdb_name': :'String',
         'db_workload': :'String',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
-        'freeform_tags': :'Hash<String, String>',
-        'id': :'String',
+        'db_unique_name': :'String',
         'lifecycle_details': :'String',
         'lifecycle_state': :'String',
-        'ncharacter_set': :'String',
-        'pdb_name': :'String',
-        'time_created': :'DateTime'
+        'time_created': :'DateTime',
+        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -144,32 +144,28 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :character_set The value to assign to the {#character_set} 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 [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} property
+    # @option attributes [String] :character_set The value to assign to the {#character_set} property
+    # @option attributes [String] :ncharacter_set The value to assign to the {#ncharacter_set} property
     # @option attributes [String] :db_home_id The value to assign to the {#db_home_id} property
     # @option attributes [String] :db_name The value to assign to the {#db_name} property
-    # @option attributes [String] :db_unique_name The value to assign to the {#db_unique_name} property
+    # @option attributes [String] :pdb_name The value to assign to the {#pdb_name} property
     # @option attributes [String] :db_workload The value to assign to the {#db_workload} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} 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] :db_unique_name The value to assign to the {#db_unique_name} 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] :ncharacter_set The value to assign to the {#ncharacter_set} property
-    # @option attributes [String] :pdb_name The value to assign to the {#pdb_name} property
     # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
+    # @option attributes [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} 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
     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.character_set = attributes[:'characterSet'] if attributes[:'characterSet']
-
-      raise 'You cannot provide both :characterSet and :character_set' if attributes.key?(:'characterSet') && attributes.key?(:'character_set')
-
-      self.character_set = attributes[:'character_set'] if attributes[:'character_set']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -177,11 +173,17 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
+      self.character_set = attributes[:'characterSet'] if attributes[:'characterSet']
 
-      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
+      raise 'You cannot provide both :characterSet and :character_set' if attributes.key?(:'characterSet') && attributes.key?(:'character_set')
 
-      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
+      self.character_set = attributes[:'character_set'] if attributes[:'character_set']
+
+      self.ncharacter_set = attributes[:'ncharacterSet'] if attributes[:'ncharacterSet']
+
+      raise 'You cannot provide both :ncharacterSet and :ncharacter_set' if attributes.key?(:'ncharacterSet') && attributes.key?(:'ncharacter_set')
+
+      self.ncharacter_set = attributes[:'ncharacter_set'] if attributes[:'ncharacter_set']
 
       self.db_home_id = attributes[:'dbHomeId'] if attributes[:'dbHomeId']
 
@@ -195,11 +197,11 @@ module OCI
 
       self.db_name = attributes[:'db_name'] if attributes[:'db_name']
 
-      self.db_unique_name = attributes[:'dbUniqueName'] if attributes[:'dbUniqueName']
+      self.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
 
-      raise 'You cannot provide both :dbUniqueName and :db_unique_name' if attributes.key?(:'dbUniqueName') && attributes.key?(:'db_unique_name')
+      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
 
-      self.db_unique_name = attributes[:'db_unique_name'] if attributes[:'db_unique_name']
+      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
 
       self.db_workload = attributes[:'dbWorkload'] if attributes[:'dbWorkload']
 
@@ -207,19 +209,11 @@ module OCI
 
       self.db_workload = attributes[:'db_workload'] if attributes[:'db_workload']
 
-      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
-
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
-
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
-
-      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
-
-      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+      self.db_unique_name = attributes[:'dbUniqueName'] if attributes[:'dbUniqueName']
 
-      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+      raise 'You cannot provide both :dbUniqueName and :db_unique_name' if attributes.key?(:'dbUniqueName') && attributes.key?(:'db_unique_name')
 
-      self.id = attributes[:'id'] if attributes[:'id']
+      self.db_unique_name = attributes[:'db_unique_name'] if attributes[:'db_unique_name']
 
       self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
@@ -233,23 +227,29 @@ module OCI
 
       self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
-      self.ncharacter_set = attributes[:'ncharacterSet'] if attributes[:'ncharacterSet']
+      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
 
-      raise 'You cannot provide both :ncharacterSet and :ncharacter_set' if attributes.key?(:'ncharacterSet') && attributes.key?(:'ncharacter_set')
+      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
 
-      self.ncharacter_set = attributes[:'ncharacter_set'] if attributes[:'ncharacter_set']
+      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
 
-      self.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
+      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
 
-      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
+      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
 
-      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
+      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
 
-      self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
-      raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
 
-      self.time_created = attributes[:'time_created'] if attributes[:'time_created']
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -278,21 +278,21 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        character_set == other.character_set &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        db_backup_config == other.db_backup_config &&
+        character_set == other.character_set &&
+        ncharacter_set == other.ncharacter_set &&
         db_home_id == other.db_home_id &&
         db_name == other.db_name &&
-        db_unique_name == other.db_unique_name &&
+        pdb_name == other.pdb_name &&
         db_workload == other.db_workload &&
-        defined_tags == other.defined_tags &&
-        freeform_tags == other.freeform_tags &&
-        id == other.id &&
+        db_unique_name == other.db_unique_name &&
         lifecycle_details == other.lifecycle_details &&
         lifecycle_state == other.lifecycle_state &&
-        ncharacter_set == other.ncharacter_set &&
-        pdb_name == other.pdb_name &&
-        time_created == other.time_created
+        time_created == other.time_created &&
+        db_backup_config == other.db_backup_config &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -308,7 +308,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [character_set, compartment_id, db_backup_config, db_home_id, db_name, db_unique_name, db_workload, defined_tags, freeform_tags, id, lifecycle_details, lifecycle_state, ncharacter_set, pdb_name, time_created].hash
+      [id, compartment_id, character_set, ncharacter_set, db_home_id, db_name, pdb_name, db_workload, db_unique_name, lifecycle_details, lifecycle_state, time_created, db_backup_config, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines