oci 2.4.2 → 2.4.3

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

@@ -12,18 +12,18 @@ module OCI
   # see [Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm).
   #
   class Database::Models::PatchSummary # rubocop:disable Metrics/LineLength
-    AVAILABLE_ACTIONS_ENUM = [
-      AVAILABLE_ACTIONS_APPLY = 'APPLY'.freeze,
-      AVAILABLE_ACTIONS_PRECHECK = 'PRECHECK'.freeze,
-      AVAILABLE_ACTIONS_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
-    ].freeze
-
     LAST_ACTION_ENUM = [
       LAST_ACTION_APPLY = 'APPLY'.freeze,
       LAST_ACTION_PRECHECK = 'PRECHECK'.freeze,
       LAST_ACTION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
+    AVAILABLE_ACTIONS_ENUM = [
+      AVAILABLE_ACTIONS_APPLY = 'APPLY'.freeze,
+      AVAILABLE_ACTIONS_PRECHECK = 'PRECHECK'.freeze,
+      AVAILABLE_ACTIONS_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_AVAILABLE = 'AVAILABLE'.freeze,
       LIFECYCLE_STATE_SUCCESS = 'SUCCESS'.freeze,
@@ -32,22 +32,22 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # Actions that can possibly be performed using this patch.
-    # @return [Array<String>]
-    attr_reader :available_actions
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch.
+    # @return [String]
+    attr_accessor :id
 
     # **[Required]** The text describing this patch package.
     # @return [String]
     attr_accessor :description
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch.
-    # @return [String]
-    attr_accessor :id
-
     # Action that is currently being performed or was completed last.
     # @return [String]
     attr_reader :last_action
 
+    # Actions that can possibly be performed using this patch.
+    # @return [Array<String>]
+    attr_reader :available_actions
+
     # A descriptive text associated with the lifecycleState.
     # Typically can contain additional displayable text.
     #
@@ -70,10 +70,10 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'available_actions': :'availableActions',
-        'description': :'description',
         'id': :'id',
+        'description': :'description',
         'last_action': :'lastAction',
+        'available_actions': :'availableActions',
         'lifecycle_details': :'lifecycleDetails',
         'lifecycle_state': :'lifecycleState',
         'time_released': :'timeReleased',
@@ -86,10 +86,10 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'available_actions': :'Array<String>',
-        'description': :'String',
         'id': :'String',
+        'description': :'String',
         'last_action': :'String',
+        'available_actions': :'Array<String>',
         'lifecycle_details': :'String',
         'lifecycle_state': :'String',
         'time_released': :'DateTime',
@@ -104,10 +104,10 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Array<String>] :available_actions The value to assign to the {#available_actions} property
-    # @option attributes [String] :description The value to assign to the {#description} property
     # @option attributes [String] :id The value to assign to the {#id} property
+    # @option attributes [String] :description The value to assign to the {#description} property
     # @option attributes [String] :last_action The value to assign to the {#last_action} property
+    # @option attributes [Array<String>] :available_actions The value to assign to the {#available_actions} property
     # @option attributes [String] :lifecycle_details The value to assign to the {#lifecycle_details} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
     # @option attributes [DateTime] :time_released The value to assign to the {#time_released} property
@@ -118,22 +118,22 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      self.available_actions = attributes[:'availableActions'] if attributes[:'availableActions']
-
-      raise 'You cannot provide both :availableActions and :available_actions' if attributes.key?(:'availableActions') && attributes.key?(:'available_actions')
-
-      self.available_actions = attributes[:'available_actions'] if attributes[:'available_actions']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.description = attributes[:'description'] if attributes[:'description']
 
-      self.id = attributes[:'id'] if attributes[:'id']
-
       self.last_action = attributes[:'lastAction'] if attributes[:'lastAction']
 
       raise 'You cannot provide both :lastAction and :last_action' if attributes.key?(:'lastAction') && attributes.key?(:'last_action')
 
       self.last_action = attributes[:'last_action'] if attributes[:'last_action']
 
+      self.available_actions = attributes[:'availableActions'] if attributes[:'availableActions']
+
+      raise 'You cannot provide both :availableActions and :available_actions' if attributes.key?(:'availableActions') && attributes.key?(:'available_actions')
+
+      self.available_actions = attributes[:'available_actions'] if attributes[:'available_actions']
+
       self.lifecycle_details = attributes[:'lifecycleDetails'] if attributes[:'lifecycleDetails']
 
       raise 'You cannot provide both :lifecycleDetails and :lifecycle_details' if attributes.key?(:'lifecycleDetails') && attributes.key?(:'lifecycle_details')
@@ -157,6 +157,21 @@ module OCI
     # 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] last_action Object to be assigned
+    def last_action=(last_action)
+      # rubocop:disable Style/ConditionalAssignment
+      if last_action && !LAST_ACTION_ENUM.include?(last_action)
+        # rubocop: disable Metrics/LineLength
+        OCI.logger.debug("Unknown value for 'last_action' [" + last_action + "]. Mapping to 'LAST_ACTION_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        # rubocop: enable Metrics/LineLength
+        @last_action = LAST_ACTION_UNKNOWN_ENUM_VALUE
+      else
+        @last_action = last_action
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] available_actions Object to be assigned
     def available_actions=(available_actions)
@@ -179,21 +194,6 @@ module OCI
       # rubocop:enable Style/ConditionalAssignment
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] last_action Object to be assigned
-    def last_action=(last_action)
-      # rubocop:disable Style/ConditionalAssignment
-      if last_action && !LAST_ACTION_ENUM.include?(last_action)
-        # rubocop: disable Metrics/LineLength
-        OCI.logger.debug("Unknown value for 'last_action' [" + last_action + "]. Mapping to 'LAST_ACTION_UNKNOWN_ENUM_VALUE'") if OCI.logger
-        # rubocop: enable Metrics/LineLength
-        @last_action = LAST_ACTION_UNKNOWN_ENUM_VALUE
-      else
-        @last_action = last_action
-      end
-      # rubocop:enable Style/ConditionalAssignment
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] lifecycle_state Object to be assigned
     def lifecycle_state=(lifecycle_state)
@@ -218,10 +218,10 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        available_actions == other.available_actions &&
-        description == other.description &&
         id == other.id &&
+        description == other.description &&
         last_action == other.last_action &&
+        available_actions == other.available_actions &&
         lifecycle_details == other.lifecycle_details &&
         lifecycle_state == other.lifecycle_state &&
         time_released == other.time_released &&
@@ -241,7 +241,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [available_actions, description, id, last_action, lifecycle_details, lifecycle_state, time_released, version].hash
+      [id, description, last_action, available_actions, lifecycle_details, lifecycle_state, time_released, version].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -11,23 +11,23 @@ module OCI
     # @return [String]
     attr_accessor :database_scn
 
-    # Restores to the last known good state with the least possible data loss.
-    #
-    # @return [BOOLEAN]
-    attr_accessor :latest
-
     # Restores to the timestamp specified.
     #
     # @return [DateTime]
     attr_accessor :timestamp
 
+    # Restores to the last known good state with the least possible data loss.
+    #
+    # @return [BOOLEAN]
+    attr_accessor :latest
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
         'database_scn': :'databaseSCN',
-        'latest': :'latest',
-        'timestamp': :'timestamp'
+        'timestamp': :'timestamp',
+        'latest': :'latest'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -37,8 +37,8 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'database_scn': :'String',
-        'latest': :'BOOLEAN',
-        'timestamp': :'DateTime'
+        'timestamp': :'DateTime',
+        'latest': :'BOOLEAN'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -50,8 +50,8 @@ module OCI
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [String] :database_scn The value to assign to the {#database_scn} property
-    # @option attributes [BOOLEAN] :latest The value to assign to the {#latest} property
     # @option attributes [DateTime] :timestamp The value to assign to the {#timestamp} property
+    # @option attributes [BOOLEAN] :latest The value to assign to the {#latest} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -64,9 +64,9 @@ module OCI
 
       self.database_scn = attributes[:'database_scn'] if attributes[:'database_scn']
 
-      self.latest = attributes[:'latest'] unless attributes[:'latest'].nil?
-
       self.timestamp = attributes[:'timestamp'] if attributes[:'timestamp']
+
+      self.latest = attributes[:'latest'] unless attributes[:'latest'].nil?
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -81,8 +81,8 @@ module OCI
 
       self.class == other.class &&
         database_scn == other.database_scn &&
-        latest == other.latest &&
-        timestamp == other.timestamp
+        timestamp == other.timestamp &&
+        latest == other.latest
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -98,7 +98,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [database_scn, latest, timestamp].hash
+      [database_scn, timestamp, latest].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -9,10 +9,6 @@ module OCI
   # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
   #
   class Database::Models::UpdateAutonomousDataWarehouseDetails # rubocop:disable Metrics/LineLength
-    # A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords.
-    # @return [String]
-    attr_accessor :admin_password
-
     # The number of CPU cores to be made available to the database.
     # @return [Integer]
     attr_accessor :cpu_core_count
@@ -22,18 +18,14 @@ module OCI
     # @return [Integer]
     attr_accessor :data_storage_size_in_tbs
 
-    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
-    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
-    #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
-    # @return [Hash<String, Hash<String, Object>>]
-    attr_accessor :defined_tags
-
     # The user-friendly name for the Autonomous Data Warehouse. The name does not have to be unique.
     # @return [String]
     attr_accessor :display_name
 
+    # The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. It must be different from the last four passwords and it must not be a password used within the last 24 hours.
+    # @return [String]
+    attr_accessor :admin_password
+
     # 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).
     #
@@ -42,16 +34,24 @@ module OCI
     # @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
-        'admin_password': :'adminPassword',
         'cpu_core_count': :'cpuCoreCount',
         'data_storage_size_in_tbs': :'dataStorageSizeInTBs',
-        'defined_tags': :'definedTags',
         'display_name': :'displayName',
-        'freeform_tags': :'freeformTags'
+        'admin_password': :'adminPassword',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -60,12 +60,12 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'admin_password': :'String',
         'cpu_core_count': :'Integer',
         'data_storage_size_in_tbs': :'Integer',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'display_name': :'String',
-        'freeform_tags': :'Hash<String, String>'
+        'admin_password': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -76,24 +76,18 @@ 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 [Integer] :cpu_core_count The value to assign to the {#cpu_core_count} property
     # @option attributes [Integer] :data_storage_size_in_tbs The value to assign to the {#data_storage_size_in_tbs} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [String] :admin_password The value to assign to the {#admin_password} 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.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.cpu_core_count = attributes[:'cpuCoreCount'] if attributes[:'cpuCoreCount']
 
       raise 'You cannot provide both :cpuCoreCount and :cpu_core_count' if attributes.key?(:'cpuCoreCount') && attributes.key?(:'cpu_core_count')
@@ -106,23 +100,29 @@ module OCI
 
       self.data_storage_size_in_tbs = attributes[:'data_storage_size_in_tbs'] if attributes[:'data_storage_size_in_tbs']
 
-      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.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.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.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.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
@@ -136,12 +136,12 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        admin_password == other.admin_password &&
         cpu_core_count == other.cpu_core_count &&
         data_storage_size_in_tbs == other.data_storage_size_in_tbs &&
-        defined_tags == other.defined_tags &&
         display_name == other.display_name &&
-        freeform_tags == other.freeform_tags
+        admin_password == other.admin_password &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -157,7 +157,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [admin_password, cpu_core_count, data_storage_size_in_tbs, defined_tags, display_name, freeform_tags].hash
+      [cpu_core_count, data_storage_size_in_tbs, display_name, admin_password, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -9,10 +9,6 @@ module OCI
   # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
   #
   class Database::Models::UpdateAutonomousDatabaseDetails # rubocop:disable Metrics/LineLength
-    # A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords.
-    # @return [String]
-    attr_accessor :admin_password
-
     # The number of CPU cores to be made available to the database.
     # @return [Integer]
     attr_accessor :cpu_core_count
@@ -22,18 +18,14 @@ module OCI
     # @return [Integer]
     attr_accessor :data_storage_size_in_tbs
 
-    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
-    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
-    #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
-    # @return [Hash<String, Hash<String, Object>>]
-    attr_accessor :defined_tags
-
     # The user-friendly name for the Autonomous Database. The name does not have to be unique.
     # @return [String]
     attr_accessor :display_name
 
+    # The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. It must be different from the last four passwords and it must not be a password used within the last 24 hours.
+    # @return [String]
+    attr_accessor :admin_password
+
     # 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).
     #
@@ -42,16 +34,24 @@ module OCI
     # @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
-        'admin_password': :'adminPassword',
         'cpu_core_count': :'cpuCoreCount',
         'data_storage_size_in_tbs': :'dataStorageSizeInTBs',
-        'defined_tags': :'definedTags',
         'display_name': :'displayName',
-        'freeform_tags': :'freeformTags'
+        'admin_password': :'adminPassword',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -60,12 +60,12 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'admin_password': :'String',
         'cpu_core_count': :'Integer',
         'data_storage_size_in_tbs': :'Integer',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'display_name': :'String',
-        'freeform_tags': :'Hash<String, String>'
+        'admin_password': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -76,24 +76,18 @@ 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 [Integer] :cpu_core_count The value to assign to the {#cpu_core_count} property
     # @option attributes [Integer] :data_storage_size_in_tbs The value to assign to the {#data_storage_size_in_tbs} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [String] :admin_password The value to assign to the {#admin_password} 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.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.cpu_core_count = attributes[:'cpuCoreCount'] if attributes[:'cpuCoreCount']
 
       raise 'You cannot provide both :cpuCoreCount and :cpu_core_count' if attributes.key?(:'cpuCoreCount') && attributes.key?(:'cpu_core_count')
@@ -106,23 +100,29 @@ module OCI
 
       self.data_storage_size_in_tbs = attributes[:'data_storage_size_in_tbs'] if attributes[:'data_storage_size_in_tbs']
 
-      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.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.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.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.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
@@ -136,12 +136,12 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        admin_password == other.admin_password &&
         cpu_core_count == other.cpu_core_count &&
         data_storage_size_in_tbs == other.data_storage_size_in_tbs &&
-        defined_tags == other.defined_tags &&
         display_name == other.display_name &&
-        freeform_tags == other.freeform_tags
+        admin_password == other.admin_password &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -157,7 +157,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [admin_password, cpu_core_count, data_storage_size_in_tbs, defined_tags, display_name, freeform_tags].hash
+      [cpu_core_count, data_storage_size_in_tbs, display_name, admin_password, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines