ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/cloud_instance.rb

@@ -6,29 +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.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class CloudInstance
+    # Cloud Instance Capabilities
+    attr_accessor :capabilities
+
     # Cloud Instance ID
     attr_accessor :cloud_instance_id
 
-    # Cloud Instance Name
-    attr_accessor :name
-
-    # The tenant ID that owns this cloud instance
-    attr_accessor :tenant_id
-
-    # The open stack ID that controls this cloud instance
-    attr_accessor :openstack_id
-
-    # The region the cloud instance lives
-    attr_accessor :region
-
     # Indicates if the cloud instance is enabled
     attr_accessor :enabled
 
@@ -37,45 +29,59 @@ module IbmCloudPower
 
     attr_accessor :limits
 
-    attr_accessor :usage
+    # Cloud Instance Name
+    attr_accessor :name
 
-    # Cloud Instance Capabilities
-    attr_accessor :capabilities
+    # The open stack ID that controls this cloud instance
+    attr_accessor :openstack_id
 
     # PVM instances owned by the Cloud Instance
     attr_accessor :pvm_instances
 
+    # The region the cloud instance lives
+    attr_accessor :region
+
+    # The tenant ID that owns this cloud instance
+    attr_accessor :tenant_id
+
+    attr_accessor :usage
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'capabilities' => :'capabilities',
         :'cloud_instance_id' => :'cloudInstanceID',
-        :'name' => :'name',
-        :'tenant_id' => :'tenantID',
-        :'openstack_id' => :'openstackID',
-        :'region' => :'region',
         :'enabled' => :'enabled',
         :'initialized' => :'initialized',
         :'limits' => :'limits',
-        :'usage' => :'usage',
-        :'capabilities' => :'capabilities',
-        :'pvm_instances' => :'pvmInstances'
+        :'name' => :'name',
+        :'openstack_id' => :'openstackID',
+        :'pvm_instances' => :'pvmInstances',
+        :'region' => :'region',
+        :'tenant_id' => :'tenantID',
+        :'usage' => :'usage'
       }
     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',
-        :'tenant_id' => :'String',
-        :'openstack_id' => :'String',
-        :'region' => :'String',
         :'enabled' => :'Boolean',
         :'initialized' => :'Boolean',
         :'limits' => :'CloudInstanceUsageLimits',
-        :'usage' => :'CloudInstanceUsageLimits',
-        :'capabilities' => :'Array<String>',
-        :'pvm_instances' => :'Array<PVMInstanceReference>'
+        :'name' => :'String',
+        :'openstack_id' => :'String',
+        :'pvm_instances' => :'Array<PVMInstanceReference>',
+        :'region' => :'String',
+        :'tenant_id' => :'String',
+        :'usage' => :'CloudInstanceUsageLimits'
       }
     end
 
@@ -100,24 +106,14 @@ 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']
-      end
-
-      if attributes.key?(:'tenant_id')
-        self.tenant_id = attributes[:'tenant_id']
-      end
-
-      if attributes.key?(:'openstack_id')
-        self.openstack_id = attributes[:'openstack_id']
+      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')
@@ -132,14 +128,12 @@ module IbmCloudPower
         self.limits = attributes[:'limits']
       end
 
-      if attributes.key?(:'usage')
-        self.usage = attributes[:'usage']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'capabilities')
-        if (value = attributes[:'capabilities']).is_a?(Array)
-          self.capabilities = value
-        end
+      if attributes.key?(:'openstack_id')
+        self.openstack_id = attributes[:'openstack_id']
       end
 
       if attributes.key?(:'pvm_instances')
@@ -147,6 +141,18 @@ module IbmCloudPower
           self.pvm_instances = value
         end
       end
+
+      if attributes.key?(:'region')
+        self.region = attributes[:'region']
+      end
+
+      if attributes.key?(:'tenant_id')
+        self.tenant_id = attributes[:'tenant_id']
+      end
+
+      if attributes.key?(:'usage')
+        self.usage = attributes[:'usage']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -157,22 +163,6 @@ 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 @tenant_id.nil?
-        invalid_properties.push('invalid value for "tenant_id", tenant_id cannot be nil.')
-      end
-
-      if @openstack_id.nil?
-        invalid_properties.push('invalid value for "openstack_id", openstack_id 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
@@ -185,14 +175,30 @@ module IbmCloudPower
         invalid_properties.push('invalid value for "limits", limits cannot be nil.')
       end
 
-      if @usage.nil?
-        invalid_properties.push('invalid value for "usage", usage cannot be nil.')
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
+      end
+
+      if @openstack_id.nil?
+        invalid_properties.push('invalid value for "openstack_id", openstack_id cannot be nil.')
       end
 
       if @pvm_instances.nil?
         invalid_properties.push('invalid value for "pvm_instances", pvm_instances cannot be nil.')
       end
 
+      if @region.nil?
+        invalid_properties.push('invalid value for "region", region cannot be nil.')
+      end
+
+      if @tenant_id.nil?
+        invalid_properties.push('invalid value for "tenant_id", tenant_id cannot be nil.')
+      end
+
+      if @usage.nil?
+        invalid_properties.push('invalid value for "usage", usage cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -200,15 +206,15 @@ 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 @tenant_id.nil?
-      return false if @openstack_id.nil?
-      return false if @region.nil?
       return false if @enabled.nil?
       return false if @initialized.nil?
       return false if @limits.nil?
-      return false if @usage.nil?
+      return false if @name.nil?
+      return false if @openstack_id.nil?
       return false if @pvm_instances.nil?
+      return false if @region.nil?
+      return false if @tenant_id.nil?
+      return false if @usage.nil?
       true
     end
 
@@ -217,17 +223,17 @@ 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 &&
-          tenant_id == o.tenant_id &&
-          openstack_id == o.openstack_id &&
-          region == o.region &&
           enabled == o.enabled &&
           initialized == o.initialized &&
           limits == o.limits &&
-          usage == o.usage &&
-          capabilities == o.capabilities &&
-          pvm_instances == o.pvm_instances
+          name == o.name &&
+          openstack_id == o.openstack_id &&
+          pvm_instances == o.pvm_instances &&
+          region == o.region &&
+          tenant_id == o.tenant_id &&
+          usage == o.usage
     end
 
     # @see the `==` method
@@ -239,7 +245,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [cloud_instance_id, name, tenant_id, openstack_id, region, enabled, initialized, limits, usage, capabilities, pvm_instances].hash
+      [capabilities, cloud_instance_id, enabled, initialized, limits, name, openstack_id, pvm_instances, region, tenant_id, usage].hash
     end
 
     # Builds the object from hash
@@ -254,8 +260,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)
@@ -263,8 +272,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
 
@@ -277,8 +284,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
@@ -308,7 +315,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
 
@@ -334,7 +343,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
@@ -357,5 +366,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/cloud_instance_create.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 CloudInstanceCreate
@@ -48,6 +49,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
       {
@@ -187,8 +193,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)
@@ -196,8 +205,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
 
@@ -210,8 +217,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
@@ -241,7 +248,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
 
@@ -267,7 +276,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
@@ -290,5 +299,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end