ionoscloud 6.1.1 → 6.1.2

data/lib/ionoscloud/models/firewallrule_properties.rb

@@ -16,40 +16,44 @@ require 'time'
 module Ionoscloud
   class FirewallruleProperties
   
-    # The name of the  resource.
-    attr_accessor :name
+    # Defines the allowed code (from 0 to 254) if protocol ICMP or ICMPv6 is chosen. Value null allows all codes.
+    attr_accessor :icmp_code
 
 
-    # The protocol for the rule. Property cannot be modified after it is created (disallowed in update requests).
-    attr_accessor :protocol
+    # Defines the allowed type (from 0 to 254) if the protocol ICMP or ICMPv6 is chosen. Value null allows all types.
+    attr_accessor :icmp_type
 
 
-    # Only traffic originating from the respective MAC address is allowed. Valid format: aa:bb:cc:dd:ee:ff. Value null allows traffic from any MAC address.
-    attr_accessor :source_mac
+    # The IP version for this rule. If sourceIp or targetIp are specified, you can omit this value - the IP version will then be deduced from the IP address(es) used; if you specify it anyway, it must match the specified IP address(es). If neither sourceIp nor targetIp are specified, this rule allows traffic only for the specified IP version. If neither sourceIp, targetIp nor ipVersion are specified, this rule will only allow IPv4 traffic.
+    attr_accessor :ip_version
 
 
-    # Only traffic originating from the respective IPv4 address is allowed. Value null allows traffic from any IP address.
-    attr_accessor :source_ip
+    # The name of the  resource.
+    attr_accessor :name
 
 
-    # If the target NIC has multiple IP addresses, only the traffic directed to the respective IP address of the NIC is allowed. Value null Value null allows traffic to any target IP address.
-    attr_accessor :target_ip
+    # Defines the end range of the allowed port (from 1 to 65534) if the protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd null to allow all ports.
+    attr_accessor :port_range_end
 
 
-    # Defines the allowed code (from 0 to 254) if protocol ICMP is chosen. Value null allows all codes.
-    attr_accessor :icmp_code
+    # Defines the start range of the allowed port (from 1 to 65534) if protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd value null to allow all ports.
+    attr_accessor :port_range_start
 
 
-    # Defines the allowed type (from 0 to 254) if the protocol ICMP is chosen. Value null allows all types.
-    attr_accessor :icmp_type
+    # The protocol for the rule. Property cannot be modified after it is created (disallowed in update requests).
+    attr_accessor :protocol
 
 
-    # Defines the start range of the allowed port (from 1 to 65534) if protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd value null to allow all ports.
-    attr_accessor :port_range_start
+    # Only traffic originating from the respective IP address (or CIDR block) is allowed. Value null allows traffic from any IP address (according to the selected ipVersion).
+    attr_accessor :source_ip
 
 
-    # Defines the end range of the allowed port (from 1 to 65534) if the protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd null to allow all ports.
-    attr_accessor :port_range_end
+    # Only traffic originating from the respective MAC address is allowed. Valid format: aa:bb:cc:dd:ee:ff. Value null allows traffic from any MAC address.
+    attr_accessor :source_mac
+
+
+    # If the target NIC has multiple IP addresses, only the traffic directed to the respective IP address (or CIDR block) of the NIC is allowed. Value null allows traffic to any target IP address (according to the selected ipVersion).
+    attr_accessor :target_ip
 
 
     # The type of the firewall rule. If not specified, the default INGRESS value is used.
@@ -81,23 +85,25 @@ module Ionoscloud
     def self.attribute_map
       {
         
-        :'name' => :'name',
+        :'icmp_code' => :'icmpCode',
 
-        :'protocol' => :'protocol',
+        :'icmp_type' => :'icmpType',
 
-        :'source_mac' => :'sourceMac',
+        :'ip_version' => :'ipVersion',
 
-        :'source_ip' => :'sourceIp',
+        :'name' => :'name',
 
-        :'target_ip' => :'targetIp',
+        :'port_range_end' => :'portRangeEnd',
 
-        :'icmp_code' => :'icmpCode',
+        :'port_range_start' => :'portRangeStart',
 
-        :'icmp_type' => :'icmpType',
+        :'protocol' => :'protocol',
 
-        :'port_range_start' => :'portRangeStart',
+        :'source_ip' => :'sourceIp',
 
-        :'port_range_end' => :'portRangeEnd',
+        :'source_mac' => :'sourceMac',
+
+        :'target_ip' => :'targetIp',
 
         :'type' => :'type'
       }
@@ -112,23 +118,25 @@ module Ionoscloud
     def self.openapi_types
       {
         
-        :'name' => :'String',
+        :'icmp_code' => :'Integer',
 
-        :'protocol' => :'String',
+        :'icmp_type' => :'Integer',
 
-        :'source_mac' => :'String',
+        :'ip_version' => :'String',
 
-        :'source_ip' => :'String',
+        :'name' => :'String',
 
-        :'target_ip' => :'String',
+        :'port_range_end' => :'Integer',
 
-        :'icmp_code' => :'Integer',
+        :'port_range_start' => :'Integer',
 
-        :'icmp_type' => :'Integer',
+        :'protocol' => :'String',
 
-        :'port_range_start' => :'Integer',
+        :'source_ip' => :'String',
 
-        :'port_range_end' => :'Integer',
+        :'source_mac' => :'String',
+
+        :'target_ip' => :'String',
 
         :'type' => :'String'
       }
@@ -138,19 +146,21 @@ module Ionoscloud
     def self.openapi_nullable
       Set.new([
         
+        :'icmp_code',
 
+        :'icmp_type',
 
-        :'source_mac',
+        :'ip_version',
 
-        :'source_ip',
 
-        :'target_ip',
 
-        :'icmp_code',
 
-        :'icmp_type',
 
+        :'source_ip',
 
+        :'source_mac',
+
+        :'target_ip',
 
       ])
     end
@@ -171,48 +181,53 @@ module Ionoscloud
       }
       
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'icmp_code')
+        self.icmp_code = attributes[:'icmp_code']
       end
 
 
-      if attributes.key?(:'protocol')
-        self.protocol = attributes[:'protocol']
+      if attributes.key?(:'icmp_type')
+        self.icmp_type = attributes[:'icmp_type']
       end
 
 
-      if attributes.key?(:'source_mac')
-        self.source_mac = attributes[:'source_mac']
+      if attributes.key?(:'ip_version')
+        self.ip_version = attributes[:'ip_version']
       end
 
 
-      if attributes.key?(:'source_ip')
-        self.source_ip = attributes[:'source_ip']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
 
-      if attributes.key?(:'target_ip')
-        self.target_ip = attributes[:'target_ip']
+      if attributes.key?(:'port_range_end')
+        self.port_range_end = attributes[:'port_range_end']
       end
 
 
-      if attributes.key?(:'icmp_code')
-        self.icmp_code = attributes[:'icmp_code']
+      if attributes.key?(:'port_range_start')
+        self.port_range_start = attributes[:'port_range_start']
       end
 
 
-      if attributes.key?(:'icmp_type')
-        self.icmp_type = attributes[:'icmp_type']
+      if attributes.key?(:'protocol')
+        self.protocol = attributes[:'protocol']
       end
 
 
-      if attributes.key?(:'port_range_start')
-        self.port_range_start = attributes[:'port_range_start']
+      if attributes.key?(:'source_ip')
+        self.source_ip = attributes[:'source_ip']
       end
 
 
-      if attributes.key?(:'port_range_end')
-        self.port_range_end = attributes[:'port_range_end']
+      if attributes.key?(:'source_mac')
+        self.source_mac = attributes[:'source_mac']
+      end
+
+
+      if attributes.key?(:'target_ip')
+        self.target_ip = attributes[:'target_ip']
       end
 
 
@@ -226,30 +241,6 @@ module Ionoscloud
     def list_invalid_properties
       invalid_properties = Array.new
       
-
-      if @protocol.nil?
-        invalid_properties.push('invalid value for "protocol", protocol cannot be nil.')
-      end
-
-
-      pattern = Regexp.new(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/)
-      if !@source_mac.nil? && @source_mac !~ pattern
-        invalid_properties.push("invalid value for \"source_mac\", must conform to the pattern #{pattern}.")
-      end
-
-
-      pattern = Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-      if !@source_ip.nil? && @source_ip !~ pattern
-        invalid_properties.push("invalid value for \"source_ip\", must conform to the pattern #{pattern}.")
-      end
-
-
-      pattern = Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-      if !@target_ip.nil? && @target_ip !~ pattern
-        invalid_properties.push("invalid value for \"target_ip\", must conform to the pattern #{pattern}.")
-      end
-
-
       if !@icmp_code.nil? && @icmp_code > 254
         invalid_properties.push('invalid value for "icmp_code", must be smaller than or equal to 254.')
       end
@@ -268,6 +259,17 @@ module Ionoscloud
       end
 
 
+
+
+      if !@port_range_end.nil? && @port_range_end > 65534
+        invalid_properties.push('invalid value for "port_range_end", must be smaller than or equal to 65534.')
+      end
+
+      if !@port_range_end.nil? && @port_range_end < 1
+        invalid_properties.push('invalid value for "port_range_end", must be greater than or equal to 1.')
+      end
+
+
       if !@port_range_start.nil? && @port_range_start > 65534
         invalid_properties.push('invalid value for "port_range_start", must be smaller than or equal to 65534.')
       end
@@ -277,13 +279,12 @@ module Ionoscloud
       end
 
 
-      if !@port_range_end.nil? && @port_range_end > 65534
-        invalid_properties.push('invalid value for "port_range_end", must be smaller than or equal to 65534.')
+      if @protocol.nil?
+        invalid_properties.push('invalid value for "protocol", protocol cannot be nil.')
       end
 
-      if !@port_range_end.nil? && @port_range_end < 1
-        invalid_properties.push('invalid value for "port_range_end", must be greater than or equal to 1.')
-      end
+
+
 
 
       invalid_properties
@@ -293,83 +294,35 @@ module Ionoscloud
     # @return true if the model is valid
     def valid?
       
-
-      return false if @protocol.nil?
-      protocol_validator = EnumAttributeValidator.new('String', ["TCP", "UDP", "ICMP", "ANY"])
-      return false unless protocol_validator.valid?(@protocol)
-
-      return false if !@source_mac.nil? && @source_mac !~ Regexp.new(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/)
-
-      return false if !@source_ip.nil? && @source_ip !~ Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-
-      return false if !@target_ip.nil? && @target_ip !~ Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-
       return false if !@icmp_code.nil? && @icmp_code > 254
       return false if !@icmp_code.nil? && @icmp_code < 0
 
       return false if !@icmp_type.nil? && @icmp_type > 254
       return false if !@icmp_type.nil? && @icmp_type < 0
 
-      return false if !@port_range_start.nil? && @port_range_start > 65534
-      return false if !@port_range_start.nil? && @port_range_start < 1
+      ip_version_validator = EnumAttributeValidator.new('String', ["IPv4", "IPv6"])
+      return false unless ip_version_validator.valid?(@ip_version)
+
 
       return false if !@port_range_end.nil? && @port_range_end > 65534
       return false if !@port_range_end.nil? && @port_range_end < 1
 
-      type_validator = EnumAttributeValidator.new('String', ["INGRESS", "EGRESS"])
-      return false unless type_validator.valid?(@type)
-      true
-    end
-
-    
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] protocol Object to be assigned
-    def protocol=(protocol)
-      validator = EnumAttributeValidator.new('String', ["TCP", "UDP", "ICMP", "ANY"])
-      unless validator.valid?(protocol)
-        fail ArgumentError, "invalid value for \"protocol\", must be one of #{validator.allowable_values}."
-      end
-      @protocol = protocol
-    end
-
-
-    # Custom attribute writer method with validation
-    # @param [Object] source_mac Value to be assigned
-    def source_mac=(source_mac)
-      pattern = Regexp.new(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/)
-      if !source_mac.nil? && source_mac !~ pattern
-        fail ArgumentError, "invalid value for \"source_mac\", must conform to the pattern #{pattern}."
-      end
-
-      @source_mac = source_mac
-    end
-
+      return false if !@port_range_start.nil? && @port_range_start > 65534
+      return false if !@port_range_start.nil? && @port_range_start < 1
 
-    # Custom attribute writer method with validation
-    # @param [Object] source_ip Value to be assigned
-    def source_ip=(source_ip)
-      pattern = Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-      if !source_ip.nil? && source_ip !~ pattern
-        fail ArgumentError, "invalid value for \"source_ip\", must conform to the pattern #{pattern}."
-      end
+      return false if @protocol.nil?
+      protocol_validator = EnumAttributeValidator.new('String', ["TCP", "UDP", "ICMP", "ICMPv6", "ANY"])
+      return false unless protocol_validator.valid?(@protocol)
 
-      @source_ip = source_ip
-    end
 
 
-    # Custom attribute writer method with validation
-    # @param [Object] target_ip Value to be assigned
-    def target_ip=(target_ip)
-      pattern = Regexp.new(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/)
-      if !target_ip.nil? && target_ip !~ pattern
-        fail ArgumentError, "invalid value for \"target_ip\", must conform to the pattern #{pattern}."
-      end
 
-      @target_ip = target_ip
+      type_validator = EnumAttributeValidator.new('String', ["INGRESS", "EGRESS"])
+      return false unless type_validator.valid?(@type)
+      true
     end
 
-
+    
     # Custom attribute writer method with validation
     # @param [Object] icmp_code Value to be assigned
     def icmp_code=(icmp_code)
@@ -400,6 +353,33 @@ module Ionoscloud
     end
 
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] ip_version Object to be assigned
+    def ip_version=(ip_version)
+      validator = EnumAttributeValidator.new('String', ["IPv4", "IPv6"])
+      unless validator.valid?(ip_version)
+        fail ArgumentError, "invalid value for \"ip_version\", must be one of #{validator.allowable_values}."
+      end
+      @ip_version = ip_version
+    end
+
+
+
+    # Custom attribute writer method with validation
+    # @param [Object] port_range_end Value to be assigned
+    def port_range_end=(port_range_end)
+      if !port_range_end.nil? && port_range_end > 65534
+        fail ArgumentError, 'invalid value for "port_range_end", must be smaller than or equal to 65534.'
+      end
+
+      if !port_range_end.nil? && port_range_end < 1
+        fail ArgumentError, 'invalid value for "port_range_end", must be greater than or equal to 1.'
+      end
+
+      @port_range_end = port_range_end
+    end
+
+
     # Custom attribute writer method with validation
     # @param [Object] port_range_start Value to be assigned
     def port_range_start=(port_range_start)
@@ -415,19 +395,18 @@ module Ionoscloud
     end
 
 
-    # Custom attribute writer method with validation
-    # @param [Object] port_range_end Value to be assigned
-    def port_range_end=(port_range_end)
-      if !port_range_end.nil? && port_range_end > 65534
-        fail ArgumentError, 'invalid value for "port_range_end", must be smaller than or equal to 65534.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] protocol Object to be assigned
+    def protocol=(protocol)
+      validator = EnumAttributeValidator.new('String', ["TCP", "UDP", "ICMP", "ICMPv6", "ANY"])
+      unless validator.valid?(protocol)
+        fail ArgumentError, "invalid value for \"protocol\", must be one of #{validator.allowable_values}."
       end
+      @protocol = protocol
+    end
+
 
-      if !port_range_end.nil? && port_range_end < 1
-        fail ArgumentError, 'invalid value for "port_range_end", must be greater than or equal to 1.'
-      end
 
-      @port_range_end = port_range_end
-    end
 
 
     # Custom attribute writer method checking allowed values (enum).
@@ -445,15 +424,16 @@ module Ionoscloud
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+        icmp_code == o.icmp_code &&
+        icmp_type == o.icmp_type &&
+        ip_version == o.ip_version &&
         name == o.name &&
+        port_range_end == o.port_range_end &&
+        port_range_start == o.port_range_start &&
         protocol == o.protocol &&
-        source_mac == o.source_mac &&
         source_ip == o.source_ip &&
+        source_mac == o.source_mac &&
         target_ip == o.target_ip &&
-        icmp_code == o.icmp_code &&
-        icmp_type == o.icmp_type &&
-        port_range_start == o.port_range_start &&
-        port_range_end == o.port_range_end &&
         type == o.type
     end
 
@@ -466,7 +446,7 @@ module Ionoscloud
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, protocol, source_mac, source_ip, target_ip, icmp_code, icmp_type, port_range_start, port_range_end, type].hash
+      [icmp_code, icmp_type, ip_version, name, port_range_end, port_range_start, protocol, source_ip, source_mac, target_ip, type].hash
     end
 
     # Builds the object from hash

data/lib/ionoscloud/models/flow_log.rb

@@ -16,16 +16,12 @@ require 'time'
 module Ionoscloud
   class FlowLog
   
-    # The resource's unique identifier.
-    attr_accessor :id
-
-
-    # The type of object that has been created.
-    attr_accessor :type
+    # The URL to the object representation (absolute path).
+    attr_accessor :href
 
 
-    # URL to the object representation (absolute path).
-    attr_accessor :href
+    # The resource's unique identifier.
+    attr_accessor :id
 
 
     attr_accessor :metadata
@@ -33,19 +29,23 @@ module Ionoscloud
 
     attr_accessor :properties
 
+
+    # The type of object that has been created.
+    attr_accessor :type
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         
-        :'id' => :'id',
-
-        :'type' => :'type',
-
         :'href' => :'href',
 
+        :'id' => :'id',
+
         :'metadata' => :'metadata',
 
-        :'properties' => :'properties'
+        :'properties' => :'properties',
+
+        :'type' => :'type'
       }
     end
 
@@ -58,15 +58,15 @@ module Ionoscloud
     def self.openapi_types
       {
         
-        :'id' => :'String',
-
-        :'type' => :'Type',
-
         :'href' => :'String',
 
+        :'id' => :'String',
+
         :'metadata' => :'DatacenterElementMetadata',
 
-        :'properties' => :'FlowLogProperties'
+        :'properties' => :'FlowLogProperties',
+
+        :'type' => :'Type'
       }
     end
 
@@ -97,18 +97,13 @@ module Ionoscloud
       }
       
 
-      if attributes.key?(:'id')
-        self.id = attributes[:'id']
-      end
-
-
-      if attributes.key?(:'type')
-        self.type = attributes[:'type']
+      if attributes.key?(:'href')
+        self.href = attributes[:'href']
       end
 
 
-      if attributes.key?(:'href')
-        self.href = attributes[:'href']
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
       end
 
 
@@ -120,6 +115,11 @@ module Ionoscloud
       if attributes.key?(:'properties')
         self.properties = attributes[:'properties']
       end
+
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -130,11 +130,11 @@ module Ionoscloud
 
 
 
-
       if @properties.nil?
         invalid_properties.push('invalid value for "properties", properties cannot be nil.')
       end
 
+
       invalid_properties
     end
 
@@ -145,8 +145,8 @@ module Ionoscloud
 
 
 
-
       return false if @properties.nil?
+
       true
     end
 
@@ -160,11 +160,11 @@ module Ionoscloud
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-        id == o.id &&
-        type == o.type &&
         href == o.href &&
+        id == o.id &&
         metadata == o.metadata &&
-        properties == o.properties
+        properties == o.properties &&
+        type == o.type
     end
 
     # @see the `==` method
@@ -176,7 +176,7 @@ module Ionoscloud
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, type, href, metadata, properties].hash
+      [href, id, metadata, properties, type].hash
     end
 
     # Builds the object from hash