oci 2.0.1 → 2.0.2

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

@@ -8,8 +8,10 @@ module OCI
     LIFECYCLE_STATE_ENUM = [LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING',
                 LIFECYCLE_STATE_AVAILABLE = 'AVAILABLE',
                 LIFECYCLE_STATE_UPDATING = 'UPDATING',
+                LIFECYCLE_STATE_BACKUP_IN_PROGRESS = 'BACKUP_IN_PROGRESS',
                 LIFECYCLE_STATE_TERMINATING = 'TERMINATING',
                 LIFECYCLE_STATE_TERMINATED = 'TERMINATED',
+                LIFECYCLE_STATE_RESTORE_FAILED = 'RESTORE_FAILED',
                 LIFECYCLE_STATE_FAILED = 'FAILED',
                 LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE']
 
@@ -21,6 +23,9 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
+    # @return [OCI::Database::Models::DbBackupConfig]
+    attr_accessor :db_backup_config
+
     # The OCID of the database home.
     # @return [String]
     attr_accessor :db_home_id
@@ -79,6 +84,10 @@ module OCI
         self.compartment_id = attributes[:'compartmentId']
       end
 
+      if attributes[:'dbBackupConfig']
+        self.db_backup_config = attributes[:'dbBackupConfig']
+      end
+
       if attributes[:'dbHomeId']
         self.db_home_id = attributes[:'dbHomeId']
       end
@@ -138,6 +147,7 @@ module OCI
       self.class == other_object.class &&
           character_set == other_object.character_set &&
           compartment_id == other_object.compartment_id &&
+          db_backup_config == other_object.db_backup_config &&
           db_home_id == other_object.db_home_id &&
           db_name == other_object.db_name &&
           db_unique_name == other_object.db_unique_name &&
@@ -159,7 +169,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [character_set, compartment_id, db_home_id, db_name, db_unique_name, db_workload, id, lifecycle_details, lifecycle_state, ncharacter_set, pdb_name, time_created].hash
+      [character_set, compartment_id, db_backup_config, db_home_id, db_name, db_unique_name, db_workload, id, lifecycle_details, lifecycle_state, ncharacter_set, pdb_name, time_created].hash
     end
 
     # Builds the object from hash
@@ -193,8 +203,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash
@@ -227,6 +237,7 @@ module OCI
       { 
         :'character_set' => :'characterSet',
         :'compartment_id' => :'compartmentId',
+        :'db_backup_config' => :'dbBackupConfig',
         :'db_home_id' => :'dbHomeId',
         :'db_name' => :'dbName',
         :'db_unique_name' => :'dbUniqueName',
@@ -245,6 +256,7 @@ module OCI
       { 
         :'character_set' => :'String',
         :'compartment_id' => :'String',
+        :'db_backup_config' => :'OCI::Database::Models::DbBackupConfig',
         :'db_home_id' => :'String',
         :'db_name' => :'String',
         :'db_unique_name' => :'String',

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

@@ -0,0 +1,120 @@
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+
+module OCI
+  class Database::Models::DbBackupConfig
+    # If set to true, configures automatic backups. If you previously used RMAN or dbcli to configure backups and then you switch to using the Console or the API for backups, a new backup configuration is created and associated with your database. This means that you can no longer rely on your previously configured unmanaged backups to work.
+    # @return [BOOLEAN]
+    attr_accessor :auto_backup_enabled
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    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}
+
+      if attributes[:'autoBackupEnabled']
+        self.auto_backup_enabled = attributes[:'autoBackupEnabled']
+      end
+
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other_object to be compared
+    def ==(other_object)
+      return true if self.equal?(other_object)
+      self.class == other_object.class &&
+          auto_backup_enabled == other_object.auto_backup_enabled
+    end
+
+    # @see the `==` method
+    # @param [Object] other_object to be compared
+    def eql?(other_object)
+      self == other_object
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [auto_backup_enabled].hash
+    end
+
+    # 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)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", 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
+
+    # 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 = send(attr)
+        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
+
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      { 
+        :'auto_backup_enabled' => :'autoBackupEnabled'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      { 
+        :'auto_backup_enabled' => :'BOOLEAN'
+      }
+    end
+  end
+end

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

@@ -156,8 +156,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -156,8 +156,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -160,8 +160,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -160,8 +160,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -64,7 +64,7 @@ module OCI
     # Data storage size, in GBs, that is currently available to the DB system. This is applicable only for VM-based DBs.
     # 
     # @return [Integer]
-    attr_accessor :data_storage_size_in_gb
+    attr_accessor :data_storage_size_in_gbs
 
     # The Oracle Database Edition that applies to all the databases on the DB System.
     # 
@@ -210,8 +210,8 @@ module OCI
         self.data_storage_percentage = attributes[:'dataStoragePercentage']
       end
 
-      if attributes[:'dataStorageSizeInGB']
-        self.data_storage_size_in_gb = attributes[:'dataStorageSizeInGB']
+      if attributes[:'dataStorageSizeInGBs']
+        self.data_storage_size_in_gbs = attributes[:'dataStorageSizeInGBs']
       end
 
       if attributes[:'databaseEdition']
@@ -351,7 +351,7 @@ module OCI
           compartment_id == other_object.compartment_id &&
           cpu_core_count == other_object.cpu_core_count &&
           data_storage_percentage == other_object.data_storage_percentage &&
-          data_storage_size_in_gb == other_object.data_storage_size_in_gb &&
+          data_storage_size_in_gbs == other_object.data_storage_size_in_gbs &&
           database_edition == other_object.database_edition &&
           disk_redundancy == other_object.disk_redundancy &&
           display_name == other_object.display_name &&
@@ -384,7 +384,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, backup_subnet_id, cluster_name, compartment_id, cpu_core_count, data_storage_percentage, data_storage_size_in_gb, database_edition, disk_redundancy, display_name, domain, hostname, id, last_patch_history_entry_id, license_model, lifecycle_details, lifecycle_state, listener_port, node_count, reco_storage_size_in_gb, scan_dns_record_id, scan_ip_ids, shape, ssh_public_keys, subnet_id, time_created, version, vip_ids].hash
+      [availability_domain, backup_subnet_id, cluster_name, compartment_id, cpu_core_count, data_storage_percentage, data_storage_size_in_gbs, database_edition, disk_redundancy, display_name, domain, hostname, id, last_patch_history_entry_id, license_model, lifecycle_details, lifecycle_state, listener_port, node_count, reco_storage_size_in_gb, scan_dns_record_id, scan_ip_ids, shape, ssh_public_keys, subnet_id, time_created, version, vip_ids].hash
     end
 
     # Builds the object from hash
@@ -418,8 +418,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash
@@ -456,7 +456,7 @@ module OCI
         :'compartment_id' => :'compartmentId',
         :'cpu_core_count' => :'cpuCoreCount',
         :'data_storage_percentage' => :'dataStoragePercentage',
-        :'data_storage_size_in_gb' => :'dataStorageSizeInGB',
+        :'data_storage_size_in_gbs' => :'dataStorageSizeInGBs',
         :'database_edition' => :'databaseEdition',
         :'disk_redundancy' => :'diskRedundancy',
         :'display_name' => :'displayName',
@@ -490,7 +490,7 @@ module OCI
         :'compartment_id' => :'String',
         :'cpu_core_count' => :'Integer',
         :'data_storage_percentage' => :'Integer',
-        :'data_storage_size_in_gb' => :'Integer',
+        :'data_storage_size_in_gbs' => :'Integer',
         :'database_edition' => :'String',
         :'disk_redundancy' => :'String',
         :'display_name' => :'String',

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

@@ -92,8 +92,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -64,7 +64,7 @@ module OCI
     # Data storage size, in GBs, that is currently available to the DB system. This is applicable only for VM-based DBs.
     # 
     # @return [Integer]
-    attr_accessor :data_storage_size_in_gb
+    attr_accessor :data_storage_size_in_gbs
 
     # The Oracle Database Edition that applies to all the databases on the DB System.
     # 
@@ -210,8 +210,8 @@ module OCI
         self.data_storage_percentage = attributes[:'dataStoragePercentage']
       end
 
-      if attributes[:'dataStorageSizeInGB']
-        self.data_storage_size_in_gb = attributes[:'dataStorageSizeInGB']
+      if attributes[:'dataStorageSizeInGBs']
+        self.data_storage_size_in_gbs = attributes[:'dataStorageSizeInGBs']
       end
 
       if attributes[:'databaseEdition']
@@ -351,7 +351,7 @@ module OCI
           compartment_id == other_object.compartment_id &&
           cpu_core_count == other_object.cpu_core_count &&
           data_storage_percentage == other_object.data_storage_percentage &&
-          data_storage_size_in_gb == other_object.data_storage_size_in_gb &&
+          data_storage_size_in_gbs == other_object.data_storage_size_in_gbs &&
           database_edition == other_object.database_edition &&
           disk_redundancy == other_object.disk_redundancy &&
           display_name == other_object.display_name &&
@@ -384,7 +384,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, backup_subnet_id, cluster_name, compartment_id, cpu_core_count, data_storage_percentage, data_storage_size_in_gb, database_edition, disk_redundancy, display_name, domain, hostname, id, last_patch_history_entry_id, license_model, lifecycle_details, lifecycle_state, listener_port, node_count, reco_storage_size_in_gb, scan_dns_record_id, scan_ip_ids, shape, ssh_public_keys, subnet_id, time_created, version, vip_ids].hash
+      [availability_domain, backup_subnet_id, cluster_name, compartment_id, cpu_core_count, data_storage_percentage, data_storage_size_in_gbs, database_edition, disk_redundancy, display_name, domain, hostname, id, last_patch_history_entry_id, license_model, lifecycle_details, lifecycle_state, listener_port, node_count, reco_storage_size_in_gb, scan_dns_record_id, scan_ip_ids, shape, ssh_public_keys, subnet_id, time_created, version, vip_ids].hash
     end
 
     # Builds the object from hash
@@ -418,8 +418,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash
@@ -456,7 +456,7 @@ module OCI
         :'compartment_id' => :'compartmentId',
         :'cpu_core_count' => :'cpuCoreCount',
         :'data_storage_percentage' => :'dataStoragePercentage',
-        :'data_storage_size_in_gb' => :'dataStorageSizeInGB',
+        :'data_storage_size_in_gbs' => :'dataStorageSizeInGBs',
         :'database_edition' => :'databaseEdition',
         :'disk_redundancy' => :'diskRedundancy',
         :'display_name' => :'displayName',
@@ -490,7 +490,7 @@ module OCI
         :'compartment_id' => :'String',
         :'cpu_core_count' => :'Integer',
         :'data_storage_percentage' => :'Integer',
-        :'data_storage_size_in_gb' => :'Integer',
+        :'data_storage_size_in_gbs' => :'Integer',
         :'database_edition' => :'String',
         :'disk_redundancy' => :'String',
         :'display_name' => :'String',

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

@@ -83,8 +83,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -74,8 +74,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -314,8 +314,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -6,10 +6,12 @@ module OCI
   class Database::Models::Patch
 
     AVAILABLE_ACTIONS_ENUM = [AVAILABLE_ACTIONS_APPLY = 'APPLY',
+                AVAILABLE_ACTIONS_PRECHECK = 'PRECHECK',
                 AVAILABLE_ACTIONS_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE']
 
 
     LAST_ACTION_ENUM = [LAST_ACTION_APPLY = 'APPLY',
+                LAST_ACTION_PRECHECK = 'PRECHECK',
                 LAST_ACTION_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE']
 
 
@@ -187,8 +189,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash

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

@@ -5,7 +5,8 @@ require 'date'
 module OCI
   class Database::Models::PatchDetails
 
-    ACTION_ENUM = [ACTION_APPLY = 'APPLY']
+    ACTION_ENUM = [ACTION_APPLY = 'APPLY',
+                ACTION_PRECHECK = 'PRECHECK']
 
     # The action to perform on the patch.
     # @return [String]
@@ -96,8 +97,8 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        next if value.nil?
+        value = send(attr)
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
       hash