ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/min_max_default.rb

@@ -6,38 +6,44 @@
 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.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class MinMaxDefault
-    # min value
-    attr_accessor :min
+    # default value
+    attr_accessor :default
 
     # max value
     attr_accessor :max
 
-    # default value
-    attr_accessor :default
+    # min value
+    attr_accessor :min
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'min' => :'min',
+        :'default' => :'default',
         :'max' => :'max',
-        :'default' => :'default'
+        :'min' => :'min'
       }
     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
       {
-        :'min' => :'Float',
+        :'default' => :'Float',
         :'max' => :'Float',
-        :'default' => :'Float'
+        :'min' => :'Float'
       }
     end
 
@@ -62,16 +68,16 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'min')
-        self.min = attributes[:'min']
+      if attributes.key?(:'default')
+        self.default = attributes[:'default']
       end
 
       if attributes.key?(:'max')
         self.max = attributes[:'max']
       end
 
-      if attributes.key?(:'default')
-        self.default = attributes[:'default']
+      if attributes.key?(:'min')
+        self.min = attributes[:'min']
       end
     end
 
@@ -79,16 +85,16 @@ module IbmCloudPower
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @min.nil?
-        invalid_properties.push('invalid value for "min", min cannot be nil.')
+      if @default.nil?
+        invalid_properties.push('invalid value for "default", default cannot be nil.')
       end
 
       if @max.nil?
         invalid_properties.push('invalid value for "max", max cannot be nil.')
       end
 
-      if @default.nil?
-        invalid_properties.push('invalid value for "default", default cannot be nil.')
+      if @min.nil?
+        invalid_properties.push('invalid value for "min", min cannot be nil.')
       end
 
       invalid_properties
@@ -97,9 +103,9 @@ module IbmCloudPower
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @min.nil?
-      return false if @max.nil?
       return false if @default.nil?
+      return false if @max.nil?
+      return false if @min.nil?
       true
     end
 
@@ -108,9 +114,9 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          min == o.min &&
+          default == o.default &&
           max == o.max &&
-          default == o.default
+          min == o.min
     end
 
     # @see the `==` method
@@ -122,7 +128,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [min, max, default].hash
+      [default, max, min].hash
     end
 
     # Builds the object from hash
@@ -137,8 +143,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)
@@ -146,8 +155,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
 
@@ -160,8 +167,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
@@ -191,7 +198,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
 
@@ -217,7 +226,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
@@ -240,5 +249,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/multi_volumes_create.rb

@@ -6,37 +6,50 @@
 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.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class MultiVolumesCreate
-    # Base name of the volume(s)
-    attr_accessor :name
+    # PVM Instance (ID or Name)to base volume affinity policy against; required if requesting affinity and affinityVolume is not provided
+    attr_accessor :affinity_pvm_instance
 
-    # Volume Size (GB)
-    attr_accessor :size
+    # 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 requesting affinity and affinityPVMInstance is not provided
+    attr_accessor :affinity_volume
+
+    # 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
+
+    # List of volumes to base volume anti-affinity policy against; required if requesting anti-affinity and antiAffinityPVMInstances is not provided
+    attr_accessor :anti_affinity_volumes
 
     # Number of volumes to create
     attr_accessor :count
 
-    # Indicates if the volume is shareable between VMs
-    attr_accessor :shareable
-
-    # Type of Disk; required if affinityPolicy is not provided, otherwise ignored
+    # Type of Disk, required if affinityPolicy and volumePool not provided, otherwise ignored
     attr_accessor :disk_type
 
-    # Affinity policy for data volume being created; requires affinityPVMInstance or affinityVolume to be specified;
-    attr_accessor :affinity_policy
+    # Base name of the volume(s)
+    attr_accessor :name
 
-    # Volume (ID or Name) to base volume affinity policy against; required if affinityPolicy is provided and affinityPVMInstance is not provided
-    attr_accessor :affinity_volume
+    # Indicates if the volume should be replication enabled or not
+    attr_accessor :replication_enabled
 
-    # 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
+    # Indicates if the volume is shareable between VMs
+    attr_accessor :shareable
+
+    # Volume Size (GB)
+    attr_accessor :size
+
+    # Volume pool where the volume will be created; if provided then diskType and affinityPolicy values will be ignored
+    attr_accessor :volume_pool
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -63,28 +76,41 @@ module IbmCloudPower
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'name' => :'name',
-        :'size' => :'size',
-        :'count' => :'count',
-        :'shareable' => :'shareable',
-        :'disk_type' => :'diskType',
+        :'affinity_pvm_instance' => :'affinityPVMInstance',
         :'affinity_policy' => :'affinityPolicy',
         :'affinity_volume' => :'affinityVolume',
-        :'affinity_pvm_instance' => :'affinityPVMInstance'
+        :'anti_affinity_pvm_instances' => :'antiAffinityPVMInstances',
+        :'anti_affinity_volumes' => :'antiAffinityVolumes',
+        :'count' => :'count',
+        :'disk_type' => :'diskType',
+        :'name' => :'name',
+        :'replication_enabled' => :'replicationEnabled',
+        :'shareable' => :'shareable',
+        :'size' => :'size',
+        :'volume_pool' => :'volumePool'
       }
     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
       {
-        :'name' => :'String',
-        :'size' => :'Integer',
-        :'count' => :'Integer',
-        :'shareable' => :'Boolean',
-        :'disk_type' => :'String',
+        :'affinity_pvm_instance' => :'String',
         :'affinity_policy' => :'String',
         :'affinity_volume' => :'String',
-        :'affinity_pvm_instance' => :'String'
+        :'anti_affinity_pvm_instances' => :'Array<String>',
+        :'anti_affinity_volumes' => :'Array<String>',
+        :'count' => :'Integer',
+        :'disk_type' => :'String',
+        :'name' => :'String',
+        :'replication_enabled' => :'Boolean',
+        :'shareable' => :'Boolean',
+        :'size' => :'Integer',
+        :'volume_pool' => :'String'
       }
     end
 
@@ -109,36 +135,56 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'affinity_pvm_instance')
+        self.affinity_pvm_instance = attributes[:'affinity_pvm_instance']
       end
 
-      if attributes.key?(:'size')
-        self.size = attributes[:'size']
+      if attributes.key?(:'affinity_policy')
+        self.affinity_policy = attributes[:'affinity_policy']
       end
 
-      if attributes.key?(:'count')
-        self.count = attributes[:'count']
+      if attributes.key?(:'affinity_volume')
+        self.affinity_volume = attributes[:'affinity_volume']
       end
 
-      if attributes.key?(:'shareable')
-        self.shareable = attributes[:'shareable']
+      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
+
+      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?(:'count')
+        self.count = attributes[:'count']
       end
 
       if attributes.key?(:'disk_type')
         self.disk_type = attributes[:'disk_type']
       end
 
-      if attributes.key?(:'affinity_policy')
-        self.affinity_policy = attributes[:'affinity_policy']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'affinity_volume')
-        self.affinity_volume = attributes[:'affinity_volume']
+      if attributes.key?(:'replication_enabled')
+        self.replication_enabled = attributes[:'replication_enabled']
       end
 
-      if attributes.key?(:'affinity_pvm_instance')
-        self.affinity_pvm_instance = attributes[:'affinity_pvm_instance']
+      if attributes.key?(:'shareable')
+        self.shareable = attributes[:'shareable']
+      end
+
+      if attributes.key?(:'size')
+        self.size = attributes[:'size']
+      end
+
+      if attributes.key?(:'volume_pool')
+        self.volume_pool = attributes[:'volume_pool']
       end
     end
 
@@ -160,10 +206,10 @@ module IbmCloudPower
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @name.nil?
-      return false if @size.nil?
       affinity_policy_validator = EnumAttributeValidator.new('String', ["affinity", "anti-affinity"])
       return false unless affinity_policy_validator.valid?(@affinity_policy)
+      return false if @name.nil?
+      return false if @size.nil?
       true
     end
 
@@ -182,14 +228,18 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          name == o.name &&
-          size == o.size &&
-          count == o.count &&
-          shareable == o.shareable &&
-          disk_type == o.disk_type &&
+          affinity_pvm_instance == o.affinity_pvm_instance &&
           affinity_policy == o.affinity_policy &&
           affinity_volume == o.affinity_volume &&
-          affinity_pvm_instance == o.affinity_pvm_instance
+          anti_affinity_pvm_instances == o.anti_affinity_pvm_instances &&
+          anti_affinity_volumes == o.anti_affinity_volumes &&
+          count == o.count &&
+          disk_type == o.disk_type &&
+          name == o.name &&
+          replication_enabled == o.replication_enabled &&
+          shareable == o.shareable &&
+          size == o.size &&
+          volume_pool == o.volume_pool
     end
 
     # @see the `==` method
@@ -201,7 +251,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, size, count, shareable, disk_type, affinity_policy, affinity_volume, affinity_pvm_instance].hash
+      [affinity_pvm_instance, affinity_policy, affinity_volume, anti_affinity_pvm_instances, anti_affinity_volumes, count, disk_type, name, replication_enabled, shareable, size, volume_pool].hash
     end
 
     # Builds the object from hash
@@ -216,8 +266,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)
@@ -225,8 +278,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
 
@@ -239,8 +290,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
@@ -270,7 +321,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
 
@@ -296,7 +349,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
@@ -319,5 +372,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end