ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/pvm_instance_action.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.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class PVMInstanceAction
@@ -46,6 +47,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
       {
@@ -141,8 +147,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)
@@ -150,8 +159,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
 
@@ -164,8 +171,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
@@ -195,7 +202,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
 
@@ -221,7 +230,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
@@ -244,5 +253,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/pvm_instance_add_network.rb

@@ -6,33 +6,39 @@
 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 PVMInstanceAddNetwork
-    # ID of the network
-    attr_accessor :network_id
-
     # The requested ip address of this network interface
     attr_accessor :ip_address
 
+    # ID of the network
+    attr_accessor :network_id
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'network_id' => :'networkID',
-        :'ip_address' => :'ipAddress'
+        :'ip_address' => :'ipAddress',
+        :'network_id' => :'networkID'
       }
     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
       {
-        :'network_id' => :'String',
-        :'ip_address' => :'String'
+        :'ip_address' => :'String',
+        :'network_id' => :'String'
       }
     end
 
@@ -57,13 +63,13 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'network_id')
-        self.network_id = attributes[:'network_id']
-      end
-
       if attributes.key?(:'ip_address')
         self.ip_address = attributes[:'ip_address']
       end
+
+      if attributes.key?(:'network_id')
+        self.network_id = attributes[:'network_id']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -89,8 +95,8 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          network_id == o.network_id &&
-          ip_address == o.ip_address
+          ip_address == o.ip_address &&
+          network_id == o.network_id
     end
 
     # @see the `==` method
@@ -102,7 +108,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [network_id, ip_address].hash
+      [ip_address, network_id].hash
     end
 
     # Builds the object from hash
@@ -117,8 +123,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)
@@ -126,8 +135,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
 
@@ -140,8 +147,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
@@ -171,7 +178,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
 
@@ -197,7 +206,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
@@ -220,5 +229,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/pvm_instance_capture.rb

@@ -6,22 +6,26 @@
 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 PVMInstanceCapture
+    # Destination for the deployable image
+    attr_accessor :capture_destination
+
     # Name of the deployable image created for the captured PVMInstance
     attr_accessor :capture_name
 
     # List of Data volume IDs to include in the captured PVMInstance
-    attr_accessor :capture_volume_i_ds
+    attr_accessor :capture_volume_ids
 
-    # Destination for the deployable image
-    attr_accessor :capture_destination
+    # Cloud Storage Access key
+    attr_accessor :cloud_storage_access_key
 
     # Cloud Storage Image Path (bucket-name [/folder/../..])
     attr_accessor :cloud_storage_image_path
@@ -29,9 +33,6 @@ module IbmCloudPower
     # Cloud Storage Region
     attr_accessor :cloud_storage_region
 
-    # Cloud Storage Access key
-    attr_accessor :cloud_storage_access_key
-
     # Cloud Storage Secret key
     attr_accessor :cloud_storage_secret_key
 
@@ -60,25 +61,30 @@ module IbmCloudPower
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'capture_name' => :'captureName',
-        :'capture_volume_i_ds' => :'captureVolumeIDs',
         :'capture_destination' => :'captureDestination',
+        :'capture_name' => :'captureName',
+        :'capture_volume_ids' => :'captureVolumeIDs',
+        :'cloud_storage_access_key' => :'cloudStorageAccessKey',
         :'cloud_storage_image_path' => :'cloudStorageImagePath',
         :'cloud_storage_region' => :'cloudStorageRegion',
-        :'cloud_storage_access_key' => :'cloudStorageAccessKey',
         :'cloud_storage_secret_key' => :'cloudStorageSecretKey'
       }
     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
       {
-        :'capture_name' => :'String',
-        :'capture_volume_i_ds' => :'Array<String>',
         :'capture_destination' => :'String',
+        :'capture_name' => :'String',
+        :'capture_volume_ids' => :'Array<String>',
+        :'cloud_storage_access_key' => :'String',
         :'cloud_storage_image_path' => :'String',
         :'cloud_storage_region' => :'String',
-        :'cloud_storage_access_key' => :'String',
         :'cloud_storage_secret_key' => :'String'
       }
     end
@@ -104,20 +110,24 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'capture_destination')
+        self.capture_destination = attributes[:'capture_destination']
+      else
+        self.capture_destination = 'cloud-storage'
+      end
+
       if attributes.key?(:'capture_name')
         self.capture_name = attributes[:'capture_name']
       end
 
-      if attributes.key?(:'capture_volume_i_ds')
-        if (value = attributes[:'capture_volume_i_ds']).is_a?(Array)
-          self.capture_volume_i_ds = value
+      if attributes.key?(:'capture_volume_ids')
+        if (value = attributes[:'capture_volume_ids']).is_a?(Array)
+          self.capture_volume_ids = value
         end
       end
 
-      if attributes.key?(:'capture_destination')
-        self.capture_destination = attributes[:'capture_destination']
-      else
-        self.capture_destination = 'cloud-storage'
+      if attributes.key?(:'cloud_storage_access_key')
+        self.cloud_storage_access_key = attributes[:'cloud_storage_access_key']
       end
 
       if attributes.key?(:'cloud_storage_image_path')
@@ -128,10 +138,6 @@ module IbmCloudPower
         self.cloud_storage_region = attributes[:'cloud_storage_region']
       end
 
-      if attributes.key?(:'cloud_storage_access_key')
-        self.cloud_storage_access_key = attributes[:'cloud_storage_access_key']
-      end
-
       if attributes.key?(:'cloud_storage_secret_key')
         self.cloud_storage_secret_key = attributes[:'cloud_storage_secret_key']
       end
@@ -141,24 +147,24 @@ module IbmCloudPower
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @capture_name.nil?
-        invalid_properties.push('invalid value for "capture_name", capture_name cannot be nil.')
-      end
-
       if @capture_destination.nil?
         invalid_properties.push('invalid value for "capture_destination", capture_destination cannot be nil.')
       end
 
+      if @capture_name.nil?
+        invalid_properties.push('invalid value for "capture_name", capture_name cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # 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 @capture_name.nil?
       return false if @capture_destination.nil?
       capture_destination_validator = EnumAttributeValidator.new('String', ["image-catalog", "cloud-storage", "both"])
       return false unless capture_destination_validator.valid?(@capture_destination)
+      return false if @capture_name.nil?
       true
     end
 
@@ -177,12 +183,12 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          capture_name == o.capture_name &&
-          capture_volume_i_ds == o.capture_volume_i_ds &&
           capture_destination == o.capture_destination &&
+          capture_name == o.capture_name &&
+          capture_volume_ids == o.capture_volume_ids &&
+          cloud_storage_access_key == o.cloud_storage_access_key &&
           cloud_storage_image_path == o.cloud_storage_image_path &&
           cloud_storage_region == o.cloud_storage_region &&
-          cloud_storage_access_key == o.cloud_storage_access_key &&
           cloud_storage_secret_key == o.cloud_storage_secret_key
     end
 
@@ -195,7 +201,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [capture_name, capture_volume_i_ds, capture_destination, cloud_storage_image_path, cloud_storage_region, cloud_storage_access_key, cloud_storage_secret_key].hash
+      [capture_destination, capture_name, capture_volume_ids, cloud_storage_access_key, cloud_storage_image_path, cloud_storage_region, cloud_storage_secret_key].hash
     end
 
     # Builds the object from hash
@@ -210,8 +216,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)
@@ -219,8 +228,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
 
@@ -233,8 +240,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
@@ -264,7 +271,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
 
@@ -290,7 +299,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
@@ -313,5 +322,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end