ibm_cloud_power 1.1.0 → 2.0.0

data/lib/ibm_cloud_power/models/create_data_volume.rb

@@ -6,17 +6,21 @@
 The version of the OpenAPI document: 1.0.0
 Contact: kylej@us.ibm.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-beta2
+OpenAPI Generator version: 6.0.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class CreateDataVolume
-    # Type of disk, required if affinityPolicy is not provided, otherwise ignored
+    # Type of disk, required if affinityPolicy is not provided, otherwise ignored.
     attr_accessor :disk_type
 
+    # Volume pool where the volume will be created; if provided then diskType and affinityPolicy values are ignored.
+    attr_accessor :volume_pool
+
     # Volume Name
     attr_accessor :name
 
@@ -26,7 +30,7 @@ module IbmCloudPower
     # Indicates if the volume is shareable between VMs
     attr_accessor :shareable
 
-    # Affinity policy for data volume being created; requires affinityPVMInstance or affinityVolume to be specified;
+    # Affinity policy for data volume being created; ignored if volumePool provided. For policy 'affinity'; requires one of affinityPVMInstance or affinityVolume to be specified. For policy 'anti-affinity'; requires one of antiAffinityPVMInstances or antiAffinityVolumes to be specified.
     attr_accessor :affinity_policy
 
     # Volume (ID or Name) to base volume affinity policy against; required if affinityPolicy is provided and affinityPVMInstance is not provided
@@ -35,6 +39,12 @@ module IbmCloudPower
     # PVM Instance (ID or Name) to base volume affinity policy against; required if affinityPolicy is provided and affinityVolume is not provided
     attr_accessor :affinity_pvm_instance
 
+    # List of volumes to base volume anti-affinity policy against; required if requesting anti-affinity and storageAntiAffinityPVMInstances is not provided
+    attr_accessor :anti_affinity_volumes
+
+    # List of pvmInstances to base volume anti-affinity policy against; required if requesting anti-affinity and antiAffinityVolumes is not provided
+    attr_accessor :anti_affinity_pvm_instances
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -61,25 +71,36 @@ module IbmCloudPower
     def self.attribute_map
       {
         :'disk_type' => :'diskType',
+        :'volume_pool' => :'volumePool',
         :'name' => :'name',
         :'size' => :'size',
         :'shareable' => :'shareable',
         :'affinity_policy' => :'affinityPolicy',
         :'affinity_volume' => :'affinityVolume',
-        :'affinity_pvm_instance' => :'affinityPVMInstance'
+        :'affinity_pvm_instance' => :'affinityPVMInstance',
+        :'anti_affinity_volumes' => :'antiAffinityVolumes',
+        :'anti_affinity_pvm_instances' => :'antiAffinityPVMInstances'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
         :'disk_type' => :'String',
+        :'volume_pool' => :'String',
         :'name' => :'String',
         :'size' => :'Float',
         :'shareable' => :'Boolean',
         :'affinity_policy' => :'String',
         :'affinity_volume' => :'String',
-        :'affinity_pvm_instance' => :'String'
+        :'affinity_pvm_instance' => :'String',
+        :'anti_affinity_volumes' => :'Array<String>',
+        :'anti_affinity_pvm_instances' => :'Array<String>'
       }
     end
 
@@ -108,6 +129,10 @@ module IbmCloudPower
         self.disk_type = attributes[:'disk_type']
       end
 
+      if attributes.key?(:'volume_pool')
+        self.volume_pool = attributes[:'volume_pool']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
@@ -131,6 +156,18 @@ module IbmCloudPower
       if attributes.key?(:'affinity_pvm_instance')
         self.affinity_pvm_instance = attributes[:'affinity_pvm_instance']
       end
+
+      if attributes.key?(:'anti_affinity_volumes')
+        if (value = attributes[:'anti_affinity_volumes']).is_a?(Array)
+          self.anti_affinity_volumes = value
+        end
+      end
+
+      if attributes.key?(:'anti_affinity_pvm_instances')
+        if (value = attributes[:'anti_affinity_pvm_instances']).is_a?(Array)
+          self.anti_affinity_pvm_instances = value
+        end
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -174,12 +211,15 @@ module IbmCloudPower
       return true if self.equal?(o)
       self.class == o.class &&
           disk_type == o.disk_type &&
+          volume_pool == o.volume_pool &&
           name == o.name &&
           size == o.size &&
           shareable == o.shareable &&
           affinity_policy == o.affinity_policy &&
           affinity_volume == o.affinity_volume &&
-          affinity_pvm_instance == o.affinity_pvm_instance
+          affinity_pvm_instance == o.affinity_pvm_instance &&
+          anti_affinity_volumes == o.anti_affinity_volumes &&
+          anti_affinity_pvm_instances == o.anti_affinity_pvm_instances
     end
 
     # @see the `==` method
@@ -191,7 +231,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [disk_type, name, size, shareable, affinity_policy, affinity_volume, affinity_pvm_instance].hash
+      [disk_type, volume_pool, name, size, shareable, affinity_policy, affinity_volume, affinity_pvm_instance, anti_affinity_volumes, anti_affinity_pvm_instances].hash
     end
 
     # Builds the object from hash
@@ -206,8 +246,11 @@ module IbmCloudPower
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -215,8 +258,6 @@ module IbmCloudPower
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -229,8 +270,8 @@ module IbmCloudPower
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -260,7 +301,9 @@ module IbmCloudPower
           end
         end
       else # model
-        IbmCloudPower.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = IbmCloudPower.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -286,7 +329,7 @@ module IbmCloudPower
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -309,5 +352,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/create_image.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: 1.0.0
 Contact: kylej@us.ibm.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-beta2
+OpenAPI Generator version: 6.0.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class CreateImage
@@ -44,7 +45,12 @@ module IbmCloudPower
     # Image OS Type, required if importing a raw image; raw images can only be imported using the command line interface
     attr_accessor :os_type
 
-    # Type of Disk
+    attr_accessor :storage_affinity
+
+    # Storage pool where the image will be loaded; if provided then storageAffinity and diskType will be ignored; Used only when importing an image from cloud storage.
+    attr_accessor :storage_pool
+
+    # Type of Disk; will be ignored if storagePool or affinityPolicy is provided; Used only when importing an image from cloud storage.
     attr_accessor :disk_type
 
     class EnumAttributeValidator
@@ -82,10 +88,17 @@ module IbmCloudPower
         :'access_key' => :'accessKey',
         :'secret_key' => :'secretKey',
         :'os_type' => :'osType',
+        :'storage_affinity' => :'storageAffinity',
+        :'storage_pool' => :'storagePool',
         :'disk_type' => :'diskType'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -99,6 +112,8 @@ module IbmCloudPower
         :'access_key' => :'String',
         :'secret_key' => :'String',
         :'os_type' => :'String',
+        :'storage_affinity' => :'StorageAffinity',
+        :'storage_pool' => :'String',
         :'disk_type' => :'String'
       }
     end
@@ -164,6 +179,14 @@ module IbmCloudPower
         self.os_type = attributes[:'os_type']
       end
 
+      if attributes.key?(:'storage_affinity')
+        self.storage_affinity = attributes[:'storage_affinity']
+      end
+
+      if attributes.key?(:'storage_pool')
+        self.storage_pool = attributes[:'storage_pool']
+      end
+
       if attributes.key?(:'disk_type')
         self.disk_type = attributes[:'disk_type']
       end
@@ -186,8 +209,7 @@ module IbmCloudPower
       return false if @source.nil?
       source_validator = EnumAttributeValidator.new('String', ["root-project", "url"])
       return false unless source_validator.valid?(@source)
-      os_type_validator = EnumAttributeValidator.new('String', ["aix", "ibmi", "redhat", "sles"])
-      return false unless os_type_validator.valid?(@os_type)
+      return false if @os_type.nil?
       true
     end
 
@@ -201,16 +223,6 @@ module IbmCloudPower
       @source = source
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] os_type Object to be assigned
-    def os_type=(os_type)
-      validator = EnumAttributeValidator.new('String', ["aix", "ibmi", "redhat", "sles"])
-      unless validator.valid?(os_type)
-        fail ArgumentError, "invalid value for \"os_type\", must be one of #{validator.allowable_values}."
-      end
-      @os_type = os_type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -226,6 +238,8 @@ module IbmCloudPower
           access_key == o.access_key &&
           secret_key == o.secret_key &&
           os_type == o.os_type &&
+          storage_affinity == o.storage_affinity &&
+          storage_pool == o.storage_pool &&
           disk_type == o.disk_type
     end
 
@@ -238,7 +252,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [source, image_id, image_name, image_path, region, image_filename, bucket_name, access_key, secret_key, os_type, disk_type].hash
+      [source, image_id, image_name, image_path, region, image_filename, bucket_name, access_key, secret_key, os_type, storage_affinity, storage_pool, disk_type].hash
     end
 
     # Builds the object from hash
@@ -253,8 +267,11 @@ module IbmCloudPower
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -262,8 +279,6 @@ module IbmCloudPower
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -276,8 +291,8 @@ module IbmCloudPower
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -307,7 +322,9 @@ module IbmCloudPower
           end
         end
       else # model
-        IbmCloudPower.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = IbmCloudPower.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -333,7 +350,7 @@ module IbmCloudPower
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -356,5 +373,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end