ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/cloud_instance_reference.rb

@@ -6,62 +6,68 @@
 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 CloudInstanceReference
+    # Cloud Instance Capabilities
+    attr_accessor :capabilities
+
     # Cloud Instance ID
     attr_accessor :cloud_instance_id
 
-    # Cloud Instance Name
-    attr_accessor :name
-
-    # The region the cloud instance lives
-    attr_accessor :region
-
     # Indicates if the cloud instance is enabled
     attr_accessor :enabled
 
+    # Link to Cloud Instance resource
+    attr_accessor :href
+
     # Indicates if the cloud instance is initialized and ready for use
     attr_accessor :initialized
 
     attr_accessor :limits
 
-    # Cloud Instance Capabilities
-    attr_accessor :capabilities
+    # Cloud Instance Name
+    attr_accessor :name
 
-    # Link to Cloud Instance resource
-    attr_accessor :href
+    # The region the cloud instance lives
+    attr_accessor :region
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'capabilities' => :'capabilities',
         :'cloud_instance_id' => :'cloudInstanceID',
-        :'name' => :'name',
-        :'region' => :'region',
         :'enabled' => :'enabled',
+        :'href' => :'href',
         :'initialized' => :'initialized',
         :'limits' => :'limits',
-        :'capabilities' => :'capabilities',
-        :'href' => :'href'
+        :'name' => :'name',
+        :'region' => :'region'
       }
     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
       {
+        :'capabilities' => :'Array<String>',
         :'cloud_instance_id' => :'String',
-        :'name' => :'String',
-        :'region' => :'String',
         :'enabled' => :'Boolean',
+        :'href' => :'String',
         :'initialized' => :'Boolean',
         :'limits' => :'CloudInstanceUsageLimits',
-        :'capabilities' => :'Array<String>',
-        :'href' => :'String'
+        :'name' => :'String',
+        :'region' => :'String'
       }
     end
 
@@ -86,22 +92,24 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'cloud_instance_id')
-        self.cloud_instance_id = attributes[:'cloud_instance_id']
-      end
-
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'capabilities')
+        if (value = attributes[:'capabilities']).is_a?(Array)
+          self.capabilities = value
+        end
       end
 
-      if attributes.key?(:'region')
-        self.region = attributes[:'region']
+      if attributes.key?(:'cloud_instance_id')
+        self.cloud_instance_id = attributes[:'cloud_instance_id']
       end
 
       if attributes.key?(:'enabled')
         self.enabled = attributes[:'enabled']
       end
 
+      if attributes.key?(:'href')
+        self.href = attributes[:'href']
+      end
+
       if attributes.key?(:'initialized')
         self.initialized = attributes[:'initialized']
       end
@@ -110,14 +118,12 @@ module IbmCloudPower
         self.limits = attributes[:'limits']
       end
 
-      if attributes.key?(:'capabilities')
-        if (value = attributes[:'capabilities']).is_a?(Array)
-          self.capabilities = value
-        end
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'href')
-        self.href = attributes[:'href']
+      if attributes.key?(:'region')
+        self.region = attributes[:'region']
       end
     end
 
@@ -129,18 +135,14 @@ module IbmCloudPower
         invalid_properties.push('invalid value for "cloud_instance_id", cloud_instance_id cannot be nil.')
       end
 
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
-      end
-
-      if @region.nil?
-        invalid_properties.push('invalid value for "region", region cannot be nil.')
-      end
-
       if @enabled.nil?
         invalid_properties.push('invalid value for "enabled", enabled cannot be nil.')
       end
 
+      if @href.nil?
+        invalid_properties.push('invalid value for "href", href cannot be nil.')
+      end
+
       if @initialized.nil?
         invalid_properties.push('invalid value for "initialized", initialized cannot be nil.')
       end
@@ -149,8 +151,12 @@ module IbmCloudPower
         invalid_properties.push('invalid value for "limits", limits cannot be nil.')
       end
 
-      if @href.nil?
-        invalid_properties.push('invalid value for "href", href cannot be nil.')
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
+      end
+
+      if @region.nil?
+        invalid_properties.push('invalid value for "region", region cannot be nil.')
       end
 
       invalid_properties
@@ -160,12 +166,12 @@ module IbmCloudPower
     # @return true if the model is valid
     def valid?
       return false if @cloud_instance_id.nil?
-      return false if @name.nil?
-      return false if @region.nil?
       return false if @enabled.nil?
+      return false if @href.nil?
       return false if @initialized.nil?
       return false if @limits.nil?
-      return false if @href.nil?
+      return false if @name.nil?
+      return false if @region.nil?
       true
     end
 
@@ -174,14 +180,14 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          capabilities == o.capabilities &&
           cloud_instance_id == o.cloud_instance_id &&
-          name == o.name &&
-          region == o.region &&
           enabled == o.enabled &&
+          href == o.href &&
           initialized == o.initialized &&
           limits == o.limits &&
-          capabilities == o.capabilities &&
-          href == o.href
+          name == o.name &&
+          region == o.region
     end
 
     # @see the `==` method
@@ -193,7 +199,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [cloud_instance_id, name, region, enabled, initialized, limits, capabilities, href].hash
+      [capabilities, cloud_instance_id, enabled, href, initialized, limits, name, region].hash
     end
 
     # Builds the object from hash
@@ -208,8 +214,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)
@@ -217,8 +226,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
 
@@ -231,8 +238,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
@@ -262,7 +269,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
 
@@ -288,7 +297,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
@@ -311,5 +320,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/cloud_instance_update.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 CloudInstanceUpdate
@@ -40,6 +41,11 @@ module IbmCloudPower
       }
     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
       {
@@ -142,8 +148,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)
@@ -151,8 +160,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
 
@@ -165,8 +172,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
@@ -196,7 +203,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
 
@@ -222,7 +231,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
@@ -245,5 +254,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/cloud_instance_usage_limits.rb

@@ -6,20 +6,33 @@
 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 CloudInstanceUsageLimits
+    # Maximum memory (in GB) per PVMInstance
+    attr_accessor :instance_memory
+
+    # Maximum proc units per PVMInstance
+    attr_accessor :instance_proc_units
+
     # Number of power instances allowed
     attr_accessor :instances
 
     # Amount of memory allowed
     attr_accessor :memory
 
+    # Maximum network bandwidth to GCP Mbps
+    attr_accessor :peering_bandwidth
+
+    # Amount of peering networks allowed
+    attr_accessor :peering_networks
+
     # Number of processor units allowed
     attr_accessor :proc_units
 
@@ -29,18 +42,6 @@ module IbmCloudPower
     # Amount of storage allowed (TB)
     attr_accessor :storage
 
-    # Maximum memory (in GB) per PVMInstance
-    attr_accessor :instance_memory
-
-    # Maximum proc units per PVMInstance
-    attr_accessor :instance_proc_units
-
-    # Amount of peering networks allowed
-    attr_accessor :peering_networks
-
-    # Maximum network bandwidth to GCP Mbps
-    attr_accessor :peering_bandwidth
-
     # Amount of SSD storage allowed (TB)
     attr_accessor :storage_ssd
 
@@ -50,32 +51,37 @@ module IbmCloudPower
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'instance_memory' => :'instanceMemory',
+        :'instance_proc_units' => :'instanceProcUnits',
         :'instances' => :'instances',
         :'memory' => :'memory',
+        :'peering_bandwidth' => :'peeringBandwidth',
+        :'peering_networks' => :'peeringNetworks',
         :'proc_units' => :'procUnits',
         :'processors' => :'processors',
         :'storage' => :'storage',
-        :'instance_memory' => :'instanceMemory',
-        :'instance_proc_units' => :'instanceProcUnits',
-        :'peering_networks' => :'peeringNetworks',
-        :'peering_bandwidth' => :'peeringBandwidth',
         :'storage_ssd' => :'storageSSD',
         :'storage_standard' => :'storageStandard'
       }
     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
       {
+        :'instance_memory' => :'Float',
+        :'instance_proc_units' => :'Float',
         :'instances' => :'Float',
         :'memory' => :'Float',
+        :'peering_bandwidth' => :'Integer',
+        :'peering_networks' => :'Integer',
         :'proc_units' => :'Float',
         :'processors' => :'Float',
         :'storage' => :'Float',
-        :'instance_memory' => :'Float',
-        :'instance_proc_units' => :'Float',
-        :'peering_networks' => :'Integer',
-        :'peering_bandwidth' => :'Integer',
         :'storage_ssd' => :'Float',
         :'storage_standard' => :'Float'
       }
@@ -102,6 +108,14 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'instance_memory')
+        self.instance_memory = attributes[:'instance_memory']
+      end
+
+      if attributes.key?(:'instance_proc_units')
+        self.instance_proc_units = attributes[:'instance_proc_units']
+      end
+
       if attributes.key?(:'instances')
         self.instances = attributes[:'instances']
       end
@@ -110,6 +124,14 @@ module IbmCloudPower
         self.memory = attributes[:'memory']
       end
 
+      if attributes.key?(:'peering_bandwidth')
+        self.peering_bandwidth = attributes[:'peering_bandwidth']
+      end
+
+      if attributes.key?(:'peering_networks')
+        self.peering_networks = attributes[:'peering_networks']
+      end
+
       if attributes.key?(:'proc_units')
         self.proc_units = attributes[:'proc_units']
       end
@@ -122,22 +144,6 @@ module IbmCloudPower
         self.storage = attributes[:'storage']
       end
 
-      if attributes.key?(:'instance_memory')
-        self.instance_memory = attributes[:'instance_memory']
-      end
-
-      if attributes.key?(:'instance_proc_units')
-        self.instance_proc_units = attributes[:'instance_proc_units']
-      end
-
-      if attributes.key?(:'peering_networks')
-        self.peering_networks = attributes[:'peering_networks']
-      end
-
-      if attributes.key?(:'peering_bandwidth')
-        self.peering_bandwidth = attributes[:'peering_bandwidth']
-      end
-
       if attributes.key?(:'storage_ssd')
         self.storage_ssd = attributes[:'storage_ssd']
       end
@@ -190,15 +196,15 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          instance_memory == o.instance_memory &&
+          instance_proc_units == o.instance_proc_units &&
           instances == o.instances &&
           memory == o.memory &&
+          peering_bandwidth == o.peering_bandwidth &&
+          peering_networks == o.peering_networks &&
           proc_units == o.proc_units &&
           processors == o.processors &&
           storage == o.storage &&
-          instance_memory == o.instance_memory &&
-          instance_proc_units == o.instance_proc_units &&
-          peering_networks == o.peering_networks &&
-          peering_bandwidth == o.peering_bandwidth &&
           storage_ssd == o.storage_ssd &&
           storage_standard == o.storage_standard
     end
@@ -212,7 +218,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [instances, memory, proc_units, processors, storage, instance_memory, instance_proc_units, peering_networks, peering_bandwidth, storage_ssd, storage_standard].hash
+      [instance_memory, instance_proc_units, instances, memory, peering_bandwidth, peering_networks, proc_units, processors, storage, storage_ssd, storage_standard].hash
     end
 
     # Builds the object from hash
@@ -227,8 +233,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)
@@ -236,8 +245,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
 
@@ -250,8 +257,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
@@ -281,7 +288,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
 
@@ -307,7 +316,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
@@ -330,5 +339,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end