ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/pvm_instance_network.rb

@@ -6,17 +6,30 @@
 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
   # A map containing information about a network address
   class PVMInstanceNetwork
-    # The version of the information provided
-    attr_accessor :version
+    # The external ip address (for pub-vlan networks)
+    attr_accessor :external_ip
+
+    # Link to PVM Instance Network
+    attr_accessor :href
+
+    # (deprecated - replaced by ipAddress)
+    attr_accessor :ip
+
+    # The ip address of this network interface
+    attr_accessor :ip_address
+
+    # The mac address of the network interface
+    attr_accessor :mac_address
 
     # ID of the network
     attr_accessor :network_id
@@ -24,51 +37,44 @@ module IbmCloudPower
     # The name of the network the address is on
     attr_accessor :network_name
 
-    # The mac address of the network interface
-    attr_accessor :mac_address
-
     # The address type (fixed or dynamic)
     attr_accessor :type
 
-    # (deprecated - replaced by ipAddress)
-    attr_accessor :ip
-
-    # The ip address of this network interface
-    attr_accessor :ip_address
-
-    # The external ip address (for pub-vlan networks)
-    attr_accessor :external_ip
-
-    # Link to PVM Instance Network
-    attr_accessor :href
+    # The version of the information provided
+    attr_accessor :version
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'version' => :'version',
+        :'external_ip' => :'externalIP',
+        :'href' => :'href',
+        :'ip' => :'ip',
+        :'ip_address' => :'ipAddress',
+        :'mac_address' => :'macAddress',
         :'network_id' => :'networkID',
         :'network_name' => :'networkName',
-        :'mac_address' => :'macAddress',
         :'type' => :'type',
-        :'ip' => :'ip',
-        :'ip_address' => :'ipAddress',
-        :'external_ip' => :'externalIP',
-        :'href' => :'href'
+        :'version' => :'version'
       }
     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
       {
-        :'version' => :'Float',
+        :'external_ip' => :'String',
+        :'href' => :'String',
+        :'ip' => :'String',
+        :'ip_address' => :'String',
+        :'mac_address' => :'String',
         :'network_id' => :'String',
         :'network_name' => :'String',
-        :'mac_address' => :'String',
         :'type' => :'String',
-        :'ip' => :'String',
-        :'ip_address' => :'String',
-        :'external_ip' => :'String',
-        :'href' => :'String'
+        :'version' => :'Float'
       }
     end
 
@@ -93,40 +99,40 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'version')
-        self.version = attributes[:'version']
+      if attributes.key?(:'external_ip')
+        self.external_ip = attributes[:'external_ip']
       end
 
-      if attributes.key?(:'network_id')
-        self.network_id = attributes[:'network_id']
+      if attributes.key?(:'href')
+        self.href = attributes[:'href']
       end
 
-      if attributes.key?(:'network_name')
-        self.network_name = attributes[:'network_name']
+      if attributes.key?(:'ip')
+        self.ip = attributes[:'ip']
       end
 
-      if attributes.key?(:'mac_address')
-        self.mac_address = attributes[:'mac_address']
+      if attributes.key?(:'ip_address')
+        self.ip_address = attributes[:'ip_address']
       end
 
-      if attributes.key?(:'type')
-        self.type = attributes[:'type']
+      if attributes.key?(:'mac_address')
+        self.mac_address = attributes[:'mac_address']
       end
 
-      if attributes.key?(:'ip')
-        self.ip = attributes[:'ip']
+      if attributes.key?(:'network_id')
+        self.network_id = attributes[:'network_id']
       end
 
-      if attributes.key?(:'ip_address')
-        self.ip_address = attributes[:'ip_address']
+      if attributes.key?(:'network_name')
+        self.network_name = attributes[:'network_name']
       end
 
-      if attributes.key?(:'external_ip')
-        self.external_ip = attributes[:'external_ip']
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
       end
 
-      if attributes.key?(:'href')
-        self.href = attributes[:'href']
+      if attributes.key?(:'version')
+        self.version = attributes[:'version']
       end
     end
 
@@ -148,15 +154,15 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          version == o.version &&
+          external_ip == o.external_ip &&
+          href == o.href &&
+          ip == o.ip &&
+          ip_address == o.ip_address &&
+          mac_address == o.mac_address &&
           network_id == o.network_id &&
           network_name == o.network_name &&
-          mac_address == o.mac_address &&
           type == o.type &&
-          ip == o.ip &&
-          ip_address == o.ip_address &&
-          external_ip == o.external_ip &&
-          href == o.href
+          version == o.version
     end
 
     # @see the `==` method
@@ -168,7 +174,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [version, network_id, network_name, mac_address, type, ip, ip_address, external_ip, href].hash
+      [external_ip, href, ip, ip_address, mac_address, network_id, network_name, type, version].hash
     end
 
     # Builds the object from hash
@@ -183,8 +189,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)
@@ -192,8 +201,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
 
@@ -206,8 +213,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
@@ -237,7 +244,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
 
@@ -263,7 +272,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
@@ -286,5 +295,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/pvm_instance_networks.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 PVMInstanceNetworks
@@ -24,6 +25,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
       {
@@ -109,8 +115,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)
@@ -118,8 +127,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
 
@@ -132,8 +139,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
@@ -163,7 +170,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
 
@@ -189,7 +198,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
@@ -212,5 +221,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/pvm_instance_operation.rb

@@ -6,19 +6,20 @@
 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 PVMInstanceOperation
+    attr_accessor :operation
+
     # Name of the operation to execute; can be job or boot
     attr_accessor :operation_type
 
-    attr_accessor :operation
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -44,16 +45,21 @@ module IbmCloudPower
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'operation_type' => :'operationType',
-        :'operation' => :'operation'
+        :'operation' => :'operation',
+        :'operation_type' => :'operationType'
       }
     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
       {
-        :'operation_type' => :'String',
-        :'operation' => :'Operations'
+        :'operation' => :'Operations',
+        :'operation_type' => :'String'
       }
     end
 
@@ -78,37 +84,37 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'operation_type')
-        self.operation_type = attributes[:'operation_type']
-      end
-
       if attributes.key?(:'operation')
         self.operation = attributes[:'operation']
       end
+
+      if attributes.key?(:'operation_type')
+        self.operation_type = attributes[:'operation_type']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @operation_type.nil?
-        invalid_properties.push('invalid value for "operation_type", operation_type cannot be nil.')
-      end
-
       if @operation.nil?
         invalid_properties.push('invalid value for "operation", operation cannot be nil.')
       end
 
+      if @operation_type.nil?
+        invalid_properties.push('invalid value for "operation_type", operation_type 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 @operation.nil?
       return false if @operation_type.nil?
       operation_type_validator = EnumAttributeValidator.new('String', ["job", "boot"])
       return false unless operation_type_validator.valid?(@operation_type)
-      return false if @operation.nil?
       true
     end
 
@@ -127,8 +133,8 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          operation_type == o.operation_type &&
-          operation == o.operation
+          operation == o.operation &&
+          operation_type == o.operation_type
     end
 
     # @see the `==` method
@@ -140,7 +146,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [operation_type, operation].hash
+      [operation, operation_type].hash
     end
 
     # Builds the object from hash
@@ -155,8 +161,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)
@@ -164,8 +173,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
 
@@ -178,8 +185,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
@@ -209,7 +216,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
 
@@ -235,7 +244,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
@@ -258,5 +267,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end