oci 2.4.2 → 2.4.3

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

@@ -0,0 +1,218 @@
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+require_relative 'create_data_guard_association_details'
+
+# rubocop:disable Lint/UnneededCopDisableDirective
+module OCI
+  # The configuration details for creating a Data Guard association to an existing database. A new DbSystem will be launched for standby database.
+  class Database::Models::CreateDataGuardAssociationWithNewDbSystemDetails < Database::Models::CreateDataGuardAssociationDetails # rubocop:disable Metrics/LineLength
+    # The user-friendly name of the DB system that will contain the the standby database. The display name does not have to be unique.
+    # @return [String]
+    attr_accessor :display_name
+
+    # The name of the availability domain that the standby database DB system will be located in. For example- \"Uocm:PHX-AD-1\".
+    # @return [String]
+    attr_accessor :availability_domain
+
+    # The OCID of the subnet the DB system is associated with.
+    # **Subnet Restrictions:**
+    # - For 1- and 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.16.16/28
+    #
+    # These subnets are used by the Oracle Clusterware private interconnect on the database instance.
+    # Specifying an overlapping subnet will cause the private interconnect to malfunction.
+    # This restriction applies to both the client subnet and backup subnet.
+    #
+    # @return [String]
+    attr_accessor :subnet_id
+
+    # The host name for the DB Node.
+    # @return [String]
+    attr_accessor :hostname
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'database_admin_password': :'databaseAdminPassword',
+        'protection_mode': :'protectionMode',
+        'transport_type': :'transportType',
+        'creation_type': :'creationType',
+        'display_name': :'displayName',
+        'availability_domain': :'availabilityDomain',
+        'subnet_id': :'subnetId',
+        'hostname': :'hostname'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'database_admin_password': :'String',
+        'protection_mode': :'String',
+        'transport_type': :'String',
+        'creation_type': :'String',
+        'display_name': :'String',
+        'availability_domain': :'String',
+        'subnet_id': :'String',
+        'hostname': :'String'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :database_admin_password The value to assign to the {OCI::Database::Models::CreateDataGuardAssociationDetails#database_admin_password #database_admin_password} proprety
+    # @option attributes [String] :protection_mode The value to assign to the {OCI::Database::Models::CreateDataGuardAssociationDetails#protection_mode #protection_mode} proprety
+    # @option attributes [String] :transport_type The value to assign to the {OCI::Database::Models::CreateDataGuardAssociationDetails#transport_type #transport_type} proprety
+    # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [String] :availability_domain The value to assign to the {#availability_domain} property
+    # @option attributes [String] :subnet_id The value to assign to the {#subnet_id} property
+    # @option attributes [String] :hostname The value to assign to the {#hostname} property
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      attributes['creationType'] = 'NewDbSystem'
+
+      super(attributes)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      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.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.subnet_id = attributes[:'subnetId'] if attributes[:'subnetId']
+
+      raise 'You cannot provide both :subnetId and :subnet_id' if attributes.key?(:'subnetId') && attributes.key?(:'subnet_id')
+
+      self.subnet_id = attributes[:'subnet_id'] if attributes[:'subnet_id']
+
+      self.hostname = attributes[:'hostname'] if attributes[:'hostname']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        database_admin_password == other.database_admin_password &&
+        protection_mode == other.protection_mode &&
+        transport_type == other.transport_type &&
+        creation_type == other.creation_type &&
+        display_name == other.display_name &&
+        availability_domain == other.availability_domain &&
+        subnet_id == other.subnet_id &&
+        hostname == other.hostname
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [database_admin_password, protection_mode, transport_type, creation_type, display_name, availability_domain, subnet_id, hostname].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          public_method("#{key}=").call(
+            OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]])
+          )
+        end
+        # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective

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

@@ -14,6 +14,14 @@ module OCI
       DB_WORKLOAD_DSS = 'DSS'.freeze
     ].freeze
 
+    # **[Required]** The database name. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.
+    # @return [String]
+    attr_accessor :db_name
+
+    # 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
+
     # **[Required]** A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, \\#, or -.
     # @return [String]
     attr_accessor :admin_password
@@ -25,24 +33,18 @@ module OCI
     # @return [String]
     attr_accessor :character_set
 
-    # @return [OCI::Database::Models::DbBackupConfig]
-    attr_accessor :db_backup_config
-
-    # **[Required]** The database name. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted.
+    # The national character set for the database.  The default is AL16UTF16. Allowed values are:
+    # AL16UTF16 or UTF8.
+    #
     # @return [String]
-    attr_accessor :db_name
+    attr_accessor :ncharacter_set
 
     # The database workload type.
     # @return [String]
     attr_reader :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
+    # @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).
@@ -52,29 +54,27 @@ module OCI
     # @return [Hash<String, String>]
     attr_accessor :freeform_tags
 
-    # The national character set for the database.  The default is AL16UTF16. Allowed values are:
-    # AL16UTF16 or UTF8.
+    # 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_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
+    # 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
+        'db_name': :'dbName',
+        'pdb_name': :'pdbName',
         'admin_password': :'adminPassword',
         'character_set': :'characterSet',
-        'db_backup_config': :'dbBackupConfig',
-        'db_name': :'dbName',
+        'ncharacter_set': :'ncharacterSet',
         'db_workload': :'dbWorkload',
-        'defined_tags': :'definedTags',
+        'db_backup_config': :'dbBackupConfig',
         'freeform_tags': :'freeformTags',
-        'ncharacter_set': :'ncharacterSet',
-        'pdb_name': :'pdbName'
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -83,15 +83,15 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'db_name': :'String',
+        'pdb_name': :'String',
         'admin_password': :'String',
         'character_set': :'String',
-        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
-        'db_name': :'String',
+        'ncharacter_set': :'String',
         'db_workload': :'String',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
         'freeform_tags': :'Hash<String, String>',
-        'ncharacter_set': :'String',
-        'pdb_name': :'String'
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -102,21 +102,33 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :db_name The value to assign to the {#db_name} property
+    # @option attributes [String] :pdb_name The value to assign to the {#pdb_name} property
     # @option attributes [String] :admin_password The value to assign to the {#admin_password} property
     # @option attributes [String] :character_set The value to assign to the {#character_set} property
-    # @option attributes [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} property
-    # @option attributes [String] :db_name The value to assign to the {#db_name} property
+    # @option attributes [String] :ncharacter_set The value to assign to the {#ncharacter_set} 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 [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 [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 [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.db_name = attributes[:'dbName'] if attributes[:'dbName']
+
+      raise 'You cannot provide both :dbName and :db_name' if attributes.key?(:'dbName') && attributes.key?(:'db_name')
+
+      self.db_name = attributes[:'db_name'] if attributes[:'db_name']
+
+      self.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
+
+      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
+
+      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
+
       self.admin_password = attributes[:'adminPassword'] if attributes[:'adminPassword']
 
       raise 'You cannot provide both :adminPassword and :admin_password' if attributes.key?(:'adminPassword') && attributes.key?(:'admin_password')
@@ -129,17 +141,11 @@ module OCI
 
       self.character_set = attributes[:'character_set'] if attributes[:'character_set']
 
-      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
-
-      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
-
-      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
-
-      self.db_name = attributes[:'dbName'] if attributes[:'dbName']
+      self.ncharacter_set = attributes[:'ncharacterSet'] if attributes[:'ncharacterSet']
 
-      raise 'You cannot provide both :dbName and :db_name' if attributes.key?(:'dbName') && attributes.key?(:'db_name')
+      raise 'You cannot provide both :ncharacterSet and :ncharacter_set' if attributes.key?(:'ncharacterSet') && attributes.key?(:'ncharacter_set')
 
-      self.db_name = attributes[:'db_name'] if attributes[:'db_name']
+      self.ncharacter_set = attributes[:'ncharacter_set'] if attributes[:'ncharacter_set']
 
       self.db_workload = attributes[:'dbWorkload'] if attributes[:'dbWorkload']
 
@@ -147,11 +153,11 @@ module OCI
 
       self.db_workload = attributes[:'db_workload'] if attributes[:'db_workload']
 
-      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+      self.db_backup_config = attributes[:'dbBackupConfig'] if attributes[:'dbBackupConfig']
 
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+      raise 'You cannot provide both :dbBackupConfig and :db_backup_config' if attributes.key?(:'dbBackupConfig') && attributes.key?(:'db_backup_config')
 
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+      self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
 
       self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
@@ -159,17 +165,11 @@ module OCI
 
       self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
 
-      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.pdb_name = attributes[:'pdbName'] if attributes[:'pdbName']
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
 
-      raise 'You cannot provide both :pdbName and :pdb_name' if attributes.key?(:'pdbName') && attributes.key?(:'pdb_name')
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
-      self.pdb_name = attributes[:'pdb_name'] if attributes[:'pdb_name']
+      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
@@ -193,15 +193,15 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        db_name == other.db_name &&
+        pdb_name == other.pdb_name &&
         admin_password == other.admin_password &&
         character_set == other.character_set &&
-        db_backup_config == other.db_backup_config &&
-        db_name == other.db_name &&
+        ncharacter_set == other.ncharacter_set &&
         db_workload == other.db_workload &&
-        defined_tags == other.defined_tags &&
+        db_backup_config == other.db_backup_config &&
         freeform_tags == other.freeform_tags &&
-        ncharacter_set == other.ncharacter_set &&
-        pdb_name == other.pdb_name
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -217,7 +217,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [admin_password, character_set, db_backup_config, db_name, db_workload, defined_tags, freeform_tags, ncharacter_set, pdb_name].hash
+      [db_name, pdb_name, admin_password, character_set, ncharacter_set, db_workload, db_backup_config, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -6,10 +6,6 @@ require 'date'
 module OCI
   # CreateDatabaseFromBackupDetails model.
   class Database::Models::CreateDatabaseFromBackupDetails # rubocop:disable Metrics/LineLength
-    # **[Required]** A strong password for SYS, SYSTEM, PDB Admin and TDE Wallet. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, \\#, or -.
-    # @return [String]
-    attr_accessor :admin_password
-
     # **[Required]** The backup [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm).
     # @return [String]
     attr_accessor :backup_id
@@ -18,13 +14,17 @@ module OCI
     # @return [String]
     attr_accessor :backup_tde_password
 
+    # **[Required]** A strong password for SYS, SYSTEM, PDB Admin and TDE Wallet. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, \\#, or -.
+    # @return [String]
+    attr_accessor :admin_password
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'admin_password': :'adminPassword',
         'backup_id': :'backupId',
-        'backup_tde_password': :'backupTDEPassword'
+        'backup_tde_password': :'backupTDEPassword',
+        'admin_password': :'adminPassword'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -33,9 +33,9 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'admin_password': :'String',
         'backup_id': :'String',
-        'backup_tde_password': :'String'
+        'backup_tde_password': :'String',
+        'admin_password': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -46,21 +46,15 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :admin_password The value to assign to the {#admin_password} property
     # @option attributes [String] :backup_id The value to assign to the {#backup_id} property
     # @option attributes [String] :backup_tde_password The value to assign to the {#backup_tde_password} property
+    # @option attributes [String] :admin_password The value to assign to the {#admin_password} 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.admin_password = attributes[:'adminPassword'] if attributes[:'adminPassword']
-
-      raise 'You cannot provide both :adminPassword and :admin_password' if attributes.key?(:'adminPassword') && attributes.key?(:'admin_password')
-
-      self.admin_password = attributes[:'admin_password'] if attributes[:'admin_password']
-
       self.backup_id = attributes[:'backupId'] if attributes[:'backupId']
 
       raise 'You cannot provide both :backupId and :backup_id' if attributes.key?(:'backupId') && attributes.key?(:'backup_id')
@@ -72,6 +66,12 @@ module OCI
       raise 'You cannot provide both :backupTDEPassword and :backup_tde_password' if attributes.key?(:'backupTDEPassword') && attributes.key?(:'backup_tde_password')
 
       self.backup_tde_password = attributes[:'backup_tde_password'] if attributes[:'backup_tde_password']
+
+      self.admin_password = attributes[:'adminPassword'] if attributes[:'adminPassword']
+
+      raise 'You cannot provide both :adminPassword and :admin_password' if attributes.key?(:'adminPassword') && attributes.key?(:'admin_password')
+
+      self.admin_password = attributes[:'admin_password'] if attributes[:'admin_password']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -85,9 +85,9 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        admin_password == other.admin_password &&
         backup_id == other.backup_id &&
-        backup_tde_password == other.backup_tde_password
+        backup_tde_password == other.backup_tde_password &&
+        admin_password == other.admin_password
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -103,7 +103,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [admin_password, backup_id, backup_tde_password].hash
+      [backup_id, backup_tde_password, admin_password].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines