oci 2.4.3 → 2.4.4

data/lib/oci/load_balancer/models/health_checker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -8,21 +8,6 @@ module OCI
   # For more information, see [Editing Health Check Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Tasks/editinghealthcheck.htm).
   #
   class LoadBalancer::Models::HealthChecker # rubocop:disable Metrics/LineLength
-    # The interval between health checks, in milliseconds. The default is 10000 (10 seconds).
-    #
-    # Example: `10000`
-    #
-    # @return [Integer]
-    attr_accessor :interval_in_millis
-
-    # **[Required]** The backend server port against which to run the health check. If the port is not specified, the load balancer uses the
-    # port information from the `Backend` object.
-    #
-    # Example: `8080`
-    #
-    # @return [Integer]
-    attr_accessor :port
-
     # **[Required]** The protocol the health check must use; either HTTP or TCP.
     #
     # Example: `HTTP`
@@ -30,19 +15,20 @@ module OCI
     # @return [String]
     attr_accessor :protocol
 
-    # **[Required]** A regular expression for parsing the response body from the backend server.
+    # The path against which to run the health check.
     #
-    # Example: `^((?!false).|\\s)*$`
+    # Example: `/healthcheck`
     #
     # @return [String]
-    attr_accessor :response_body_regex
+    attr_accessor :url_path
 
-    # The number of retries to attempt before a backend server is considered \"unhealthy\". Defaults to 3.
+    # **[Required]** The backend server port against which to run the health check. If the port is not specified, the load balancer uses the
+    # port information from the `Backend` object.
     #
-    # Example: `3`
+    # Example: `8080`
     #
     # @return [Integer]
-    attr_accessor :retries
+    attr_accessor :port
 
     # **[Required]** The status code a healthy backend server should return. If you configure the health check policy to use the HTTP protocol,
     # you can use common HTTP status codes such as \"200\".
@@ -52,6 +38,13 @@ module OCI
     # @return [Integer]
     attr_accessor :return_code
 
+    # The number of retries to attempt before a backend server is considered \"unhealthy\". Defaults to 3.
+    #
+    # Example: `3`
+    #
+    # @return [Integer]
+    attr_accessor :retries
+
     # The maximum time, in milliseconds, to wait for a reply to a health check. A health check is successful only if a reply
     # returns within this timeout period. Defaults to 3000 (3 seconds).
     #
@@ -60,25 +53,32 @@ module OCI
     # @return [Integer]
     attr_accessor :timeout_in_millis
 
-    # The path against which to run the health check.
+    # The interval between health checks, in milliseconds. The default is 10000 (10 seconds).
     #
-    # Example: `/healthcheck`
+    # Example: `10000`
+    #
+    # @return [Integer]
+    attr_accessor :interval_in_millis
+
+    # **[Required]** A regular expression for parsing the response body from the backend server.
+    #
+    # Example: `^((?!false).|\\s)*$`
     #
     # @return [String]
-    attr_accessor :url_path
+    attr_accessor :response_body_regex
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'interval_in_millis': :'intervalInMillis',
-        'port': :'port',
         'protocol': :'protocol',
-        'response_body_regex': :'responseBodyRegex',
-        'retries': :'retries',
+        'url_path': :'urlPath',
+        'port': :'port',
         'return_code': :'returnCode',
+        'retries': :'retries',
         'timeout_in_millis': :'timeoutInMillis',
-        'url_path': :'urlPath'
+        'interval_in_millis': :'intervalInMillis',
+        'response_body_regex': :'responseBodyRegex'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -87,14 +87,14 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'interval_in_millis': :'Integer',
-        'port': :'Integer',
         'protocol': :'String',
-        'response_body_regex': :'String',
-        'retries': :'Integer',
+        'url_path': :'String',
+        'port': :'Integer',
         'return_code': :'Integer',
+        'retries': :'Integer',
         'timeout_in_millis': :'Integer',
-        'url_path': :'String'
+        'interval_in_millis': :'Integer',
+        'response_body_regex': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -105,37 +105,29 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Integer] :interval_in_millis The value to assign to the {#interval_in_millis} property
-    # @option attributes [Integer] :port The value to assign to the {#port} property
     # @option attributes [String] :protocol The value to assign to the {#protocol} property
-    # @option attributes [String] :response_body_regex The value to assign to the {#response_body_regex} property
-    # @option attributes [Integer] :retries The value to assign to the {#retries} property
+    # @option attributes [String] :url_path The value to assign to the {#url_path} property
+    # @option attributes [Integer] :port The value to assign to the {#port} property
     # @option attributes [Integer] :return_code The value to assign to the {#return_code} property
+    # @option attributes [Integer] :retries The value to assign to the {#retries} property
     # @option attributes [Integer] :timeout_in_millis The value to assign to the {#timeout_in_millis} property
-    # @option attributes [String] :url_path The value to assign to the {#url_path} property
+    # @option attributes [Integer] :interval_in_millis The value to assign to the {#interval_in_millis} property
+    # @option attributes [String] :response_body_regex The value to assign to the {#response_body_regex} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      self.interval_in_millis = attributes[:'intervalInMillis'] if attributes[:'intervalInMillis']
-
-      raise 'You cannot provide both :intervalInMillis and :interval_in_millis' if attributes.key?(:'intervalInMillis') && attributes.key?(:'interval_in_millis')
-
-      self.interval_in_millis = attributes[:'interval_in_millis'] if attributes[:'interval_in_millis']
-
-      self.port = attributes[:'port'] if attributes[:'port']
-
       self.protocol = attributes[:'protocol'] if attributes[:'protocol']
 
-      self.response_body_regex = attributes[:'responseBodyRegex'] if attributes[:'responseBodyRegex']
+      self.url_path = attributes[:'urlPath'] if attributes[:'urlPath']
 
-      raise 'You cannot provide both :responseBodyRegex and :response_body_regex' if attributes.key?(:'responseBodyRegex') && attributes.key?(:'response_body_regex')
+      raise 'You cannot provide both :urlPath and :url_path' if attributes.key?(:'urlPath') && attributes.key?(:'url_path')
 
-      self.response_body_regex = attributes[:'response_body_regex'] if attributes[:'response_body_regex']
+      self.url_path = attributes[:'url_path'] if attributes[:'url_path']
 
-      self.retries = attributes[:'retries'] if attributes[:'retries']
+      self.port = attributes[:'port'] if attributes[:'port']
 
       self.return_code = attributes[:'returnCode'] if attributes[:'returnCode']
 
@@ -143,17 +135,25 @@ module OCI
 
       self.return_code = attributes[:'return_code'] if attributes[:'return_code']
 
+      self.retries = attributes[:'retries'] if attributes[:'retries']
+
       self.timeout_in_millis = attributes[:'timeoutInMillis'] if attributes[:'timeoutInMillis']
 
       raise 'You cannot provide both :timeoutInMillis and :timeout_in_millis' if attributes.key?(:'timeoutInMillis') && attributes.key?(:'timeout_in_millis')
 
       self.timeout_in_millis = attributes[:'timeout_in_millis'] if attributes[:'timeout_in_millis']
 
-      self.url_path = attributes[:'urlPath'] if attributes[:'urlPath']
+      self.interval_in_millis = attributes[:'intervalInMillis'] if attributes[:'intervalInMillis']
 
-      raise 'You cannot provide both :urlPath and :url_path' if attributes.key?(:'urlPath') && attributes.key?(:'url_path')
+      raise 'You cannot provide both :intervalInMillis and :interval_in_millis' if attributes.key?(:'intervalInMillis') && attributes.key?(:'interval_in_millis')
 
-      self.url_path = attributes[:'url_path'] if attributes[:'url_path']
+      self.interval_in_millis = attributes[:'interval_in_millis'] if attributes[:'interval_in_millis']
+
+      self.response_body_regex = attributes[:'responseBodyRegex'] if attributes[:'responseBodyRegex']
+
+      raise 'You cannot provide both :responseBodyRegex and :response_body_regex' if attributes.key?(:'responseBodyRegex') && attributes.key?(:'response_body_regex')
+
+      self.response_body_regex = attributes[:'response_body_regex'] if attributes[:'response_body_regex']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -167,14 +167,14 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        interval_in_millis == other.interval_in_millis &&
-        port == other.port &&
         protocol == other.protocol &&
-        response_body_regex == other.response_body_regex &&
-        retries == other.retries &&
+        url_path == other.url_path &&
+        port == other.port &&
         return_code == other.return_code &&
+        retries == other.retries &&
         timeout_in_millis == other.timeout_in_millis &&
-        url_path == other.url_path
+        interval_in_millis == other.interval_in_millis &&
+        response_body_regex == other.response_body_regex
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -190,7 +190,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [interval_in_millis, port, protocol, response_body_regex, retries, return_code, timeout_in_millis, url_path].hash
+      [protocol, url_path, port, return_code, retries, timeout_in_millis, interval_in_millis, response_body_regex].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/load_balancer/models/health_checker_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -6,21 +6,6 @@ require 'date'
 module OCI
   # The health check policy's configuration details.
   class LoadBalancer::Models::HealthCheckerDetails # rubocop:disable Metrics/LineLength
-    # The interval between health checks, in milliseconds.
-    #
-    # Example: `10000`
-    #
-    # @return [Integer]
-    attr_accessor :interval_in_millis
-
-    # The backend server port against which to run the health check. If the port is not specified, the load balancer uses the
-    # port information from the `Backend` object.
-    #
-    # Example: `8080`
-    #
-    # @return [Integer]
-    attr_accessor :port
-
     # **[Required]** The protocol the health check must use; either HTTP or TCP.
     #
     # Example: `HTTP`
@@ -28,19 +13,20 @@ module OCI
     # @return [String]
     attr_accessor :protocol
 
-    # A regular expression for parsing the response body from the backend server.
+    # The path against which to run the health check.
     #
-    # Example: `^((?!false).|\\s)*$`
+    # Example: `/healthcheck`
     #
     # @return [String]
-    attr_accessor :response_body_regex
+    attr_accessor :url_path
 
-    # The number of retries to attempt before a backend server is considered \"unhealthy\".
+    # The backend server port against which to run the health check. If the port is not specified, the load balancer uses the
+    # port information from the `Backend` object.
     #
-    # Example: `3`
+    # Example: `8080`
     #
     # @return [Integer]
-    attr_accessor :retries
+    attr_accessor :port
 
     # The status code a healthy backend server should return.
     #
@@ -49,6 +35,13 @@ module OCI
     # @return [Integer]
     attr_accessor :return_code
 
+    # The number of retries to attempt before a backend server is considered \"unhealthy\".
+    #
+    # Example: `3`
+    #
+    # @return [Integer]
+    attr_accessor :retries
+
     # The maximum time, in milliseconds, to wait for a reply to a health check. A health check is successful only if a reply
     # returns within this timeout period.
     #
@@ -57,25 +50,32 @@ module OCI
     # @return [Integer]
     attr_accessor :timeout_in_millis
 
-    # The path against which to run the health check.
+    # The interval between health checks, in milliseconds.
     #
-    # Example: `/healthcheck`
+    # Example: `10000`
+    #
+    # @return [Integer]
+    attr_accessor :interval_in_millis
+
+    # A regular expression for parsing the response body from the backend server.
+    #
+    # Example: `^((?!false).|\\s)*$`
     #
     # @return [String]
-    attr_accessor :url_path
+    attr_accessor :response_body_regex
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'interval_in_millis': :'intervalInMillis',
-        'port': :'port',
         'protocol': :'protocol',
-        'response_body_regex': :'responseBodyRegex',
-        'retries': :'retries',
+        'url_path': :'urlPath',
+        'port': :'port',
         'return_code': :'returnCode',
+        'retries': :'retries',
         'timeout_in_millis': :'timeoutInMillis',
-        'url_path': :'urlPath'
+        'interval_in_millis': :'intervalInMillis',
+        'response_body_regex': :'responseBodyRegex'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -84,14 +84,14 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'interval_in_millis': :'Integer',
-        'port': :'Integer',
         'protocol': :'String',
-        'response_body_regex': :'String',
-        'retries': :'Integer',
+        'url_path': :'String',
+        'port': :'Integer',
         'return_code': :'Integer',
+        'retries': :'Integer',
         'timeout_in_millis': :'Integer',
-        'url_path': :'String'
+        'interval_in_millis': :'Integer',
+        'response_body_regex': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -102,37 +102,29 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Integer] :interval_in_millis The value to assign to the {#interval_in_millis} property
-    # @option attributes [Integer] :port The value to assign to the {#port} property
     # @option attributes [String] :protocol The value to assign to the {#protocol} property
-    # @option attributes [String] :response_body_regex The value to assign to the {#response_body_regex} property
-    # @option attributes [Integer] :retries The value to assign to the {#retries} property
+    # @option attributes [String] :url_path The value to assign to the {#url_path} property
+    # @option attributes [Integer] :port The value to assign to the {#port} property
     # @option attributes [Integer] :return_code The value to assign to the {#return_code} property
+    # @option attributes [Integer] :retries The value to assign to the {#retries} property
     # @option attributes [Integer] :timeout_in_millis The value to assign to the {#timeout_in_millis} property
-    # @option attributes [String] :url_path The value to assign to the {#url_path} property
+    # @option attributes [Integer] :interval_in_millis The value to assign to the {#interval_in_millis} property
+    # @option attributes [String] :response_body_regex The value to assign to the {#response_body_regex} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      self.interval_in_millis = attributes[:'intervalInMillis'] if attributes[:'intervalInMillis']
-
-      raise 'You cannot provide both :intervalInMillis and :interval_in_millis' if attributes.key?(:'intervalInMillis') && attributes.key?(:'interval_in_millis')
-
-      self.interval_in_millis = attributes[:'interval_in_millis'] if attributes[:'interval_in_millis']
-
-      self.port = attributes[:'port'] if attributes[:'port']
-
       self.protocol = attributes[:'protocol'] if attributes[:'protocol']
 
-      self.response_body_regex = attributes[:'responseBodyRegex'] if attributes[:'responseBodyRegex']
+      self.url_path = attributes[:'urlPath'] if attributes[:'urlPath']
 
-      raise 'You cannot provide both :responseBodyRegex and :response_body_regex' if attributes.key?(:'responseBodyRegex') && attributes.key?(:'response_body_regex')
+      raise 'You cannot provide both :urlPath and :url_path' if attributes.key?(:'urlPath') && attributes.key?(:'url_path')
 
-      self.response_body_regex = attributes[:'response_body_regex'] if attributes[:'response_body_regex']
+      self.url_path = attributes[:'url_path'] if attributes[:'url_path']
 
-      self.retries = attributes[:'retries'] if attributes[:'retries']
+      self.port = attributes[:'port'] if attributes[:'port']
 
       self.return_code = attributes[:'returnCode'] if attributes[:'returnCode']
 
@@ -140,17 +132,25 @@ module OCI
 
       self.return_code = attributes[:'return_code'] if attributes[:'return_code']
 
+      self.retries = attributes[:'retries'] if attributes[:'retries']
+
       self.timeout_in_millis = attributes[:'timeoutInMillis'] if attributes[:'timeoutInMillis']
 
       raise 'You cannot provide both :timeoutInMillis and :timeout_in_millis' if attributes.key?(:'timeoutInMillis') && attributes.key?(:'timeout_in_millis')
 
       self.timeout_in_millis = attributes[:'timeout_in_millis'] if attributes[:'timeout_in_millis']
 
-      self.url_path = attributes[:'urlPath'] if attributes[:'urlPath']
+      self.interval_in_millis = attributes[:'intervalInMillis'] if attributes[:'intervalInMillis']
 
-      raise 'You cannot provide both :urlPath and :url_path' if attributes.key?(:'urlPath') && attributes.key?(:'url_path')
+      raise 'You cannot provide both :intervalInMillis and :interval_in_millis' if attributes.key?(:'intervalInMillis') && attributes.key?(:'interval_in_millis')
 
-      self.url_path = attributes[:'url_path'] if attributes[:'url_path']
+      self.interval_in_millis = attributes[:'interval_in_millis'] if attributes[:'interval_in_millis']
+
+      self.response_body_regex = attributes[:'responseBodyRegex'] if attributes[:'responseBodyRegex']
+
+      raise 'You cannot provide both :responseBodyRegex and :response_body_regex' if attributes.key?(:'responseBodyRegex') && attributes.key?(:'response_body_regex')
+
+      self.response_body_regex = attributes[:'response_body_regex'] if attributes[:'response_body_regex']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -164,14 +164,14 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        interval_in_millis == other.interval_in_millis &&
-        port == other.port &&
         protocol == other.protocol &&
-        response_body_regex == other.response_body_regex &&
-        retries == other.retries &&
+        url_path == other.url_path &&
+        port == other.port &&
         return_code == other.return_code &&
+        retries == other.retries &&
         timeout_in_millis == other.timeout_in_millis &&
-        url_path == other.url_path
+        interval_in_millis == other.interval_in_millis &&
+        response_body_regex == other.response_body_regex
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -187,7 +187,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [interval_in_millis, port, protocol, response_body_regex, retries, return_code, timeout_in_millis, url_path].hash
+      [protocol, url_path, port, return_code, retries, timeout_in_millis, interval_in_millis, response_body_regex].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines