oci 2.4.2 → 2.4.3

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

@@ -5,16 +5,7 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
-  # A directory where Oracle Database software is installed. A bare metal DB system can have multiple database homes
-  # and each database home can run a different supported version of Oracle Database. A virtual machine DB system can have only one database home.
-  # 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.
-  #
+  # DbHome model.
   class Database::Models::DbHome # rubocop:disable Metrics/LineLength
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING'.freeze,
@@ -26,26 +17,18 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
-    # @return [String]
-    attr_accessor :compartment_id
-
-    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
     # @return [String]
-    attr_accessor :db_system_id
+    attr_accessor :id
 
-    # **[Required]** The Oracle Database version.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
-    attr_accessor :db_version
+    attr_accessor :compartment_id
 
     # **[Required]** The user-provided name for the database home. The name does not need to be unique.
     # @return [String]
     attr_accessor :display_name
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
-    # @return [String]
-    attr_accessor :id
-
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation is started.
     # @return [String]
     attr_accessor :last_patch_history_entry_id
@@ -54,6 +37,14 @@ module OCI
     # @return [String]
     attr_reader :lifecycle_state
 
+    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system.
+    # @return [String]
+    attr_accessor :db_system_id
+
+    # **[Required]** The Oracle Database version.
+    # @return [String]
+    attr_accessor :db_version
+
     # The date and time the database home was created.
     # @return [DateTime]
     attr_accessor :time_created
@@ -62,13 +53,13 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'db_system_id': :'dbSystemId',
-        'db_version': :'dbVersion',
         'display_name': :'displayName',
-        'id': :'id',
         'last_patch_history_entry_id': :'lastPatchHistoryEntryId',
         'lifecycle_state': :'lifecycleState',
+        'db_system_id': :'dbSystemId',
+        'db_version': :'dbVersion',
         'time_created': :'timeCreated'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -78,13 +69,13 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'String',
         'compartment_id': :'String',
-        'db_system_id': :'String',
-        'db_version': :'String',
         'display_name': :'String',
-        'id': :'String',
         'last_patch_history_entry_id': :'String',
         'lifecycle_state': :'String',
+        'db_system_id': :'String',
+        'db_version': :'String',
         'time_created': :'DateTime'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -96,19 +87,18 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
-    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
-    # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
-    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :last_patch_history_entry_id The value to assign to the {#last_patch_history_entry_id} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
+    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
+    # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
@@ -116,26 +106,12 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.db_system_id = attributes[:'dbSystemId'] if attributes[:'dbSystemId']
-
-      raise 'You cannot provide both :dbSystemId and :db_system_id' if attributes.key?(:'dbSystemId') && attributes.key?(:'db_system_id')
-
-      self.db_system_id = attributes[:'db_system_id'] if attributes[:'db_system_id']
-
-      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
-
-      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
-
-      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
-
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
-      self.id = attributes[:'id'] if attributes[:'id']
-
       self.last_patch_history_entry_id = attributes[:'lastPatchHistoryEntryId'] if attributes[:'lastPatchHistoryEntryId']
 
       raise 'You cannot provide both :lastPatchHistoryEntryId and :last_patch_history_entry_id' if attributes.key?(:'lastPatchHistoryEntryId') && attributes.key?(:'last_patch_history_entry_id')
@@ -148,6 +124,18 @@ module OCI
 
       self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
+      self.db_system_id = attributes[:'dbSystemId'] if attributes[:'dbSystemId']
+
+      raise 'You cannot provide both :dbSystemId and :db_system_id' if attributes.key?(:'dbSystemId') && attributes.key?(:'db_system_id')
+
+      self.db_system_id = attributes[:'db_system_id'] if attributes[:'db_system_id']
+
+      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
+
+      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
+
+      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
+
       self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
 
       raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
@@ -181,13 +169,13 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        db_system_id == other.db_system_id &&
-        db_version == other.db_version &&
         display_name == other.display_name &&
-        id == other.id &&
         last_patch_history_entry_id == other.last_patch_history_entry_id &&
         lifecycle_state == other.lifecycle_state &&
+        db_system_id == other.db_system_id &&
+        db_version == other.db_version &&
         time_created == other.time_created
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
@@ -204,7 +192,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, db_system_id, db_version, display_name, id, last_patch_history_entry_id, lifecycle_state, time_created].hash
+      [id, compartment_id, display_name, last_patch_history_entry_id, lifecycle_state, db_system_id, db_version, time_created].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -26,26 +26,18 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
-    # @return [String]
-    attr_accessor :compartment_id
-
-    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
     # @return [String]
-    attr_accessor :db_system_id
+    attr_accessor :id
 
-    # **[Required]** The Oracle Database version.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment.
     # @return [String]
-    attr_accessor :db_version
+    attr_accessor :compartment_id
 
     # **[Required]** The user-provided name for the database home. The name does not need to be unique.
     # @return [String]
     attr_accessor :display_name
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home.
-    # @return [String]
-    attr_accessor :id
-
     # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation is started.
     # @return [String]
     attr_accessor :last_patch_history_entry_id
@@ -54,6 +46,14 @@ module OCI
     # @return [String]
     attr_reader :lifecycle_state
 
+    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system.
+    # @return [String]
+    attr_accessor :db_system_id
+
+    # **[Required]** The Oracle Database version.
+    # @return [String]
+    attr_accessor :db_version
+
     # The date and time the database home was created.
     # @return [DateTime]
     attr_accessor :time_created
@@ -62,13 +62,13 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'id',
         'compartment_id': :'compartmentId',
-        'db_system_id': :'dbSystemId',
-        'db_version': :'dbVersion',
         'display_name': :'displayName',
-        'id': :'id',
         'last_patch_history_entry_id': :'lastPatchHistoryEntryId',
         'lifecycle_state': :'lifecycleState',
+        'db_system_id': :'dbSystemId',
+        'db_version': :'dbVersion',
         'time_created': :'timeCreated'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -78,13 +78,13 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'id': :'String',
         'compartment_id': :'String',
-        'db_system_id': :'String',
-        'db_version': :'String',
         'display_name': :'String',
-        'id': :'String',
         'last_patch_history_entry_id': :'String',
         'lifecycle_state': :'String',
+        'db_system_id': :'String',
+        'db_version': :'String',
         'time_created': :'DateTime'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -96,13 +96,13 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
-    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
-    # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
-    # @option attributes [String] :id The value to assign to the {#id} property
     # @option attributes [String] :last_patch_history_entry_id The value to assign to the {#last_patch_history_entry_id} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
+    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
+    # @option attributes [String] :db_version The value to assign to the {#db_version} property
     # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
@@ -110,32 +110,20 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      self.id = attributes[:'id'] if attributes[:'id']
+
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
       raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
-      self.db_system_id = attributes[:'dbSystemId'] if attributes[:'dbSystemId']
-
-      raise 'You cannot provide both :dbSystemId and :db_system_id' if attributes.key?(:'dbSystemId') && attributes.key?(:'db_system_id')
-
-      self.db_system_id = attributes[:'db_system_id'] if attributes[:'db_system_id']
-
-      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
-
-      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
-
-      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
-
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
-      self.id = attributes[:'id'] if attributes[:'id']
-
       self.last_patch_history_entry_id = attributes[:'lastPatchHistoryEntryId'] if attributes[:'lastPatchHistoryEntryId']
 
       raise 'You cannot provide both :lastPatchHistoryEntryId and :last_patch_history_entry_id' if attributes.key?(:'lastPatchHistoryEntryId') && attributes.key?(:'last_patch_history_entry_id')
@@ -148,6 +136,18 @@ module OCI
 
       self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
+      self.db_system_id = attributes[:'dbSystemId'] if attributes[:'dbSystemId']
+
+      raise 'You cannot provide both :dbSystemId and :db_system_id' if attributes.key?(:'dbSystemId') && attributes.key?(:'db_system_id')
+
+      self.db_system_id = attributes[:'db_system_id'] if attributes[:'db_system_id']
+
+      self.db_version = attributes[:'dbVersion'] if attributes[:'dbVersion']
+
+      raise 'You cannot provide both :dbVersion and :db_version' if attributes.key?(:'dbVersion') && attributes.key?(:'db_version')
+
+      self.db_version = attributes[:'db_version'] if attributes[:'db_version']
+
       self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
 
       raise 'You cannot provide both :timeCreated and :time_created' if attributes.key?(:'timeCreated') && attributes.key?(:'time_created')
@@ -181,13 +181,13 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        id == other.id &&
         compartment_id == other.compartment_id &&
-        db_system_id == other.db_system_id &&
-        db_version == other.db_version &&
         display_name == other.display_name &&
-        id == other.id &&
         last_patch_history_entry_id == other.last_patch_history_entry_id &&
         lifecycle_state == other.lifecycle_state &&
+        db_system_id == other.db_system_id &&
+        db_version == other.db_version &&
         time_created == other.time_created
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
@@ -204,7 +204,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, db_system_id, db_version, display_name, id, last_patch_history_entry_id, lifecycle_state, time_created].hash
+      [id, compartment_id, display_name, last_patch_history_entry_id, lifecycle_state, db_system_id, db_version, time_created].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -5,12 +5,7 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
-  # A server where Oracle Database software is running.
-  #
-  # 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.
-  #
+  # DbNode model.
   class Database::Models::DbNode # rubocop:disable Metrics/LineLength
     LIFECYCLE_STATE_ENUM = [
       LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING'.freeze,
@@ -25,51 +20,51 @@ module OCI
       LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
     ].freeze
 
-    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node.
     # @return [String]
-    attr_accessor :backup_vnic_id
+    attr_accessor :id
 
     # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system.
     # @return [String]
     attr_accessor :db_system_id
 
-    # The host name for the database node.
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC.
     # @return [String]
-    attr_accessor :hostname
+    attr_accessor :vnic_id
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node.
+    # The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC.
     # @return [String]
-    attr_accessor :id
+    attr_accessor :backup_vnic_id
 
     # **[Required]** The current state of the database node.
     # @return [String]
     attr_reader :lifecycle_state
 
-    # The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems.
-    #
-    # @return [Integer]
-    attr_accessor :software_storage_size_in_gb
+    # The host name for the database node.
+    # @return [String]
+    attr_accessor :hostname
 
     # **[Required]** The date and time that the database node was created.
     # @return [DateTime]
     attr_accessor :time_created
 
-    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC.
-    # @return [String]
-    attr_accessor :vnic_id
+    # The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems.
+    #
+    # @return [Integer]
+    attr_accessor :software_storage_size_in_gb
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'backup_vnic_id': :'backupVnicId',
-        'db_system_id': :'dbSystemId',
-        'hostname': :'hostname',
         'id': :'id',
+        'db_system_id': :'dbSystemId',
+        'vnic_id': :'vnicId',
+        'backup_vnic_id': :'backupVnicId',
         'lifecycle_state': :'lifecycleState',
-        'software_storage_size_in_gb': :'softwareStorageSizeInGB',
+        'hostname': :'hostname',
         'time_created': :'timeCreated',
-        'vnic_id': :'vnicId'
+        'software_storage_size_in_gb': :'softwareStorageSizeInGB'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -78,14 +73,14 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'backup_vnic_id': :'String',
-        'db_system_id': :'String',
-        'hostname': :'String',
         'id': :'String',
+        'db_system_id': :'String',
+        'vnic_id': :'String',
+        'backup_vnic_id': :'String',
         'lifecycle_state': :'String',
-        'software_storage_size_in_gb': :'Integer',
+        'hostname': :'String',
         'time_created': :'DateTime',
-        'vnic_id': :'String'
+        'software_storage_size_in_gb': :'Integer'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -96,25 +91,18 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :backup_vnic_id The value to assign to the {#backup_vnic_id} property
-    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
-    # @option attributes [String] :hostname The value to assign to the {#hostname} property
     # @option attributes [String] :id The value to assign to the {#id} property
+    # @option attributes [String] :db_system_id The value to assign to the {#db_system_id} property
+    # @option attributes [String] :vnic_id The value to assign to the {#vnic_id} property
+    # @option attributes [String] :backup_vnic_id The value to assign to the {#backup_vnic_id} property
     # @option attributes [String] :lifecycle_state The value to assign to the {#lifecycle_state} property
-    # @option attributes [Integer] :software_storage_size_in_gb The value to assign to the {#software_storage_size_in_gb} property
+    # @option attributes [String] :hostname The value to assign to the {#hostname} property
     # @option attributes [DateTime] :time_created The value to assign to the {#time_created} property
-    # @option attributes [String] :vnic_id The value to assign to the {#vnic_id} property
+    # @option attributes [Integer] :software_storage_size_in_gb The value to assign to the {#software_storage_size_in_gb} 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.backup_vnic_id = attributes[:'backupVnicId'] if attributes[:'backupVnicId']
-
-      raise 'You cannot provide both :backupVnicId and :backup_vnic_id' if attributes.key?(:'backupVnicId') && attributes.key?(:'backup_vnic_id')
-
-      self.backup_vnic_id = attributes[:'backup_vnic_id'] if attributes[:'backup_vnic_id']
+      self.id = attributes[:'id'] if attributes[:'id']
 
       self.db_system_id = attributes[:'dbSystemId'] if attributes[:'dbSystemId']
 
@@ -122,9 +110,17 @@ module OCI
 
       self.db_system_id = attributes[:'db_system_id'] if attributes[:'db_system_id']
 
-      self.hostname = attributes[:'hostname'] if attributes[:'hostname']
+      self.vnic_id = attributes[:'vnicId'] if attributes[:'vnicId']
 
-      self.id = attributes[:'id'] if attributes[:'id']
+      raise 'You cannot provide both :vnicId and :vnic_id' if attributes.key?(:'vnicId') && attributes.key?(:'vnic_id')
+
+      self.vnic_id = attributes[:'vnic_id'] if attributes[:'vnic_id']
+
+      self.backup_vnic_id = attributes[:'backupVnicId'] if attributes[:'backupVnicId']
+
+      raise 'You cannot provide both :backupVnicId and :backup_vnic_id' if attributes.key?(:'backupVnicId') && attributes.key?(:'backup_vnic_id')
+
+      self.backup_vnic_id = attributes[:'backup_vnic_id'] if attributes[:'backup_vnic_id']
 
       self.lifecycle_state = attributes[:'lifecycleState'] if attributes[:'lifecycleState']
 
@@ -132,11 +128,7 @@ module OCI
 
       self.lifecycle_state = attributes[:'lifecycle_state'] if attributes[:'lifecycle_state']
 
-      self.software_storage_size_in_gb = attributes[:'softwareStorageSizeInGB'] if attributes[:'softwareStorageSizeInGB']
-
-      raise 'You cannot provide both :softwareStorageSizeInGB and :software_storage_size_in_gb' if attributes.key?(:'softwareStorageSizeInGB') && attributes.key?(:'software_storage_size_in_gb')
-
-      self.software_storage_size_in_gb = attributes[:'software_storage_size_in_gb'] if attributes[:'software_storage_size_in_gb']
+      self.hostname = attributes[:'hostname'] if attributes[:'hostname']
 
       self.time_created = attributes[:'timeCreated'] if attributes[:'timeCreated']
 
@@ -144,11 +136,11 @@ module OCI
 
       self.time_created = attributes[:'time_created'] if attributes[:'time_created']
 
-      self.vnic_id = attributes[:'vnicId'] if attributes[:'vnicId']
+      self.software_storage_size_in_gb = attributes[:'softwareStorageSizeInGB'] if attributes[:'softwareStorageSizeInGB']
 
-      raise 'You cannot provide both :vnicId and :vnic_id' if attributes.key?(:'vnicId') && attributes.key?(:'vnic_id')
+      raise 'You cannot provide both :softwareStorageSizeInGB and :software_storage_size_in_gb' if attributes.key?(:'softwareStorageSizeInGB') && attributes.key?(:'software_storage_size_in_gb')
 
-      self.vnic_id = attributes[:'vnic_id'] if attributes[:'vnic_id']
+      self.software_storage_size_in_gb = attributes[:'software_storage_size_in_gb'] if attributes[:'software_storage_size_in_gb']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -177,14 +169,14 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        backup_vnic_id == other.backup_vnic_id &&
-        db_system_id == other.db_system_id &&
-        hostname == other.hostname &&
         id == other.id &&
+        db_system_id == other.db_system_id &&
+        vnic_id == other.vnic_id &&
+        backup_vnic_id == other.backup_vnic_id &&
         lifecycle_state == other.lifecycle_state &&
-        software_storage_size_in_gb == other.software_storage_size_in_gb &&
+        hostname == other.hostname &&
         time_created == other.time_created &&
-        vnic_id == other.vnic_id
+        software_storage_size_in_gb == other.software_storage_size_in_gb
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -200,7 +192,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [backup_vnic_id, db_system_id, hostname, id, lifecycle_state, software_storage_size_in_gb, time_created, vnic_id].hash
+      [id, db_system_id, vnic_id, backup_vnic_id, lifecycle_state, hostname, time_created, software_storage_size_in_gb].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines