oci 2.4.3 → 2.4.4

data/lib/oci/load_balancer/models/update_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,20 +6,6 @@ require 'date'
 module OCI
   # The health checker's configuration details.
   class LoadBalancer::Models::UpdateHealthCheckerDetails # rubocop:disable Metrics/LineLength
-    # **[Required]** The interval between health checks, in milliseconds.
-    #
-    # Example: `10000`
-    #
-    # @return [Integer]
-    attr_accessor :interval_in_millis
-
-    # **[Required]** The backend server port against which to run the health check.
-    #
-    # Example: `8080`
-    #
-    # @return [Integer]
-    attr_accessor :port
-
     # **[Required]** The protocol the health check must use; either HTTP or TCP.
     #
     # Example: `HTTP`
@@ -27,19 +13,19 @@ 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
 
-    # **[Required]** The number of retries to attempt before a backend server is considered \"unhealthy\".
+    # **[Required]** The backend server port against which to run the health check.
     #
-    # Example: `3`
+    # Example: `8080`
     #
     # @return [Integer]
-    attr_accessor :retries
+    attr_accessor :port
 
     # **[Required]** The status code a healthy backend server should return.
     #
@@ -48,6 +34,13 @@ module OCI
     # @return [Integer]
     attr_accessor :return_code
 
+    # **[Required]** The number of retries to attempt before a backend server is considered \"unhealthy\".
+    #
+    # Example: `3`
+    #
+    # @return [Integer]
+    attr_accessor :retries
+
     # **[Required]** 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.
     #
@@ -56,25 +49,32 @@ module OCI
     # @return [Integer]
     attr_accessor :timeout_in_millis
 
-    # The path against which to run the health check.
+    # **[Required]** The interval between health checks, in milliseconds.
     #
-    # 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
@@ -83,14 +83,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
@@ -101,37 +101,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']
 
@@ -139,17 +131,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
@@ -163,14 +163,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
 
@@ -186,7 +186,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/update_hostname_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'
 

data/lib/oci/load_balancer/models/update_listener_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,9 +6,6 @@ require 'date'
 module OCI
   # The configuration details for updating a listener.
   class LoadBalancer::Models::UpdateListenerDetails # rubocop:disable Metrics/LineLength
-    # @return [OCI::LoadBalancer::Models::ConnectionConfiguration]
-    attr_accessor :connection_configuration
-
     # **[Required]** The name of the associated backend set.
     #
     # Example: `example_backend_set`
@@ -16,18 +13,6 @@ module OCI
     # @return [String]
     attr_accessor :default_backend_set_name
 
-    # An array of hostname resource names.
-    # @return [Array<String>]
-    attr_accessor :hostname_names
-
-    # The name of the set of path-based routing rules, {PathRouteSet},
-    # applied to this listener's traffic.
-    #
-    # Example: `example_path_route_set`
-    #
-    # @return [String]
-    attr_accessor :path_route_set_name
-
     # **[Required]** The communication port for the listener.
     #
     # Example: `80`
@@ -44,20 +29,43 @@ module OCI
     # @return [String]
     attr_accessor :protocol
 
+    # An array of hostname resource names.
+    # @return [Array<String>]
+    attr_accessor :hostname_names
+
+    # The name of the set of path-based routing rules, {PathRouteSet},
+    # applied to this listener's traffic.
+    #
+    # Example: `example_path_route_set`
+    #
+    # @return [String]
+    attr_accessor :path_route_set_name
+
     # @return [OCI::LoadBalancer::Models::SSLConfigurationDetails]
     attr_accessor :ssl_configuration
 
+    # @return [OCI::LoadBalancer::Models::ConnectionConfiguration]
+    attr_accessor :connection_configuration
+
+    # The names of the {RuleSet} to apply to the listener.
+    #
+    # Example: [\"example_rule_set\"]
+    #
+    # @return [Array<String>]
+    attr_accessor :rule_set_names
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'connection_configuration': :'connectionConfiguration',
         'default_backend_set_name': :'defaultBackendSetName',
-        'hostname_names': :'hostnameNames',
-        'path_route_set_name': :'pathRouteSetName',
         'port': :'port',
         'protocol': :'protocol',
-        'ssl_configuration': :'sslConfiguration'
+        'hostname_names': :'hostnameNames',
+        'path_route_set_name': :'pathRouteSetName',
+        'ssl_configuration': :'sslConfiguration',
+        'connection_configuration': :'connectionConfiguration',
+        'rule_set_names': :'ruleSetNames'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -66,13 +74,14 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'connection_configuration': :'OCI::LoadBalancer::Models::ConnectionConfiguration',
         'default_backend_set_name': :'String',
-        'hostname_names': :'Array<String>',
-        'path_route_set_name': :'String',
         'port': :'Integer',
         'protocol': :'String',
-        'ssl_configuration': :'OCI::LoadBalancer::Models::SSLConfigurationDetails'
+        'hostname_names': :'Array<String>',
+        'path_route_set_name': :'String',
+        'ssl_configuration': :'OCI::LoadBalancer::Models::SSLConfigurationDetails',
+        'connection_configuration': :'OCI::LoadBalancer::Models::ConnectionConfiguration',
+        'rule_set_names': :'Array<String>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -83,31 +92,30 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [OCI::LoadBalancer::Models::ConnectionConfiguration] :connection_configuration The value to assign to the {#connection_configuration} property
     # @option attributes [String] :default_backend_set_name The value to assign to the {#default_backend_set_name} property
-    # @option attributes [Array<String>] :hostname_names The value to assign to the {#hostname_names} property
-    # @option attributes [String] :path_route_set_name The value to assign to the {#path_route_set_name} 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 [Array<String>] :hostname_names The value to assign to the {#hostname_names} property
+    # @option attributes [String] :path_route_set_name The value to assign to the {#path_route_set_name} property
     # @option attributes [OCI::LoadBalancer::Models::SSLConfigurationDetails] :ssl_configuration The value to assign to the {#ssl_configuration} property
+    # @option attributes [OCI::LoadBalancer::Models::ConnectionConfiguration] :connection_configuration The value to assign to the {#connection_configuration} property
+    # @option attributes [Array<String>] :rule_set_names The value to assign to the {#rule_set_names} 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.connection_configuration = attributes[:'connectionConfiguration'] if attributes[:'connectionConfiguration']
-
-      raise 'You cannot provide both :connectionConfiguration and :connection_configuration' if attributes.key?(:'connectionConfiguration') && attributes.key?(:'connection_configuration')
-
-      self.connection_configuration = attributes[:'connection_configuration'] if attributes[:'connection_configuration']
-
       self.default_backend_set_name = attributes[:'defaultBackendSetName'] if attributes[:'defaultBackendSetName']
 
       raise 'You cannot provide both :defaultBackendSetName and :default_backend_set_name' if attributes.key?(:'defaultBackendSetName') && attributes.key?(:'default_backend_set_name')
 
       self.default_backend_set_name = attributes[:'default_backend_set_name'] if attributes[:'default_backend_set_name']
 
+      self.port = attributes[:'port'] if attributes[:'port']
+
+      self.protocol = attributes[:'protocol'] if attributes[:'protocol']
+
       self.hostname_names = attributes[:'hostnameNames'] if attributes[:'hostnameNames']
 
       raise 'You cannot provide both :hostnameNames and :hostname_names' if attributes.key?(:'hostnameNames') && attributes.key?(:'hostname_names')
@@ -120,15 +128,23 @@ module OCI
 
       self.path_route_set_name = attributes[:'path_route_set_name'] if attributes[:'path_route_set_name']
 
-      self.port = attributes[:'port'] if attributes[:'port']
-
-      self.protocol = attributes[:'protocol'] if attributes[:'protocol']
-
       self.ssl_configuration = attributes[:'sslConfiguration'] if attributes[:'sslConfiguration']
 
       raise 'You cannot provide both :sslConfiguration and :ssl_configuration' if attributes.key?(:'sslConfiguration') && attributes.key?(:'ssl_configuration')
 
       self.ssl_configuration = attributes[:'ssl_configuration'] if attributes[:'ssl_configuration']
+
+      self.connection_configuration = attributes[:'connectionConfiguration'] if attributes[:'connectionConfiguration']
+
+      raise 'You cannot provide both :connectionConfiguration and :connection_configuration' if attributes.key?(:'connectionConfiguration') && attributes.key?(:'connection_configuration')
+
+      self.connection_configuration = attributes[:'connection_configuration'] if attributes[:'connection_configuration']
+
+      self.rule_set_names = attributes[:'ruleSetNames'] if attributes[:'ruleSetNames']
+
+      raise 'You cannot provide both :ruleSetNames and :rule_set_names' if attributes.key?(:'ruleSetNames') && attributes.key?(:'rule_set_names')
+
+      self.rule_set_names = attributes[:'rule_set_names'] if attributes[:'rule_set_names']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -142,13 +158,14 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        connection_configuration == other.connection_configuration &&
         default_backend_set_name == other.default_backend_set_name &&
-        hostname_names == other.hostname_names &&
-        path_route_set_name == other.path_route_set_name &&
         port == other.port &&
         protocol == other.protocol &&
-        ssl_configuration == other.ssl_configuration
+        hostname_names == other.hostname_names &&
+        path_route_set_name == other.path_route_set_name &&
+        ssl_configuration == other.ssl_configuration &&
+        connection_configuration == other.connection_configuration &&
+        rule_set_names == other.rule_set_names
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -164,7 +181,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [connection_configuration, default_backend_set_name, hostname_names, path_route_set_name, port, protocol, ssl_configuration].hash
+      [default_backend_set_name, port, protocol, hostname_names, path_route_set_name, ssl_configuration, connection_configuration, rule_set_names].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -1,19 +1,14 @@
-# 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'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
   # Configuration details to update a load balancer.
+  #
+  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
+  #
   class LoadBalancer::Models::UpdateLoadBalancerDetails # rubocop:disable Metrics/LineLength
-    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
-    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
-    #
-    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
-    #
-    # @return [Hash<String, Hash<String, Object>>]
-    attr_accessor :defined_tags
-
     # The user-friendly display name for the load balancer. It does not have to be unique, and it is changeable.
     # Avoid entering confidential information.
     #
@@ -30,13 +25,21 @@ module OCI
     # @return [Hash<String, String>]
     attr_accessor :freeform_tags
 
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    #
+    # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'defined_tags': :'definedTags',
         'display_name': :'displayName',
-        'freeform_tags': :'freeformTags'
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -45,9 +48,9 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'display_name': :'String',
-        'freeform_tags': :'Hash<String, String>'
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -58,21 +61,15 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
     # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
+    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} 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.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
-
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
-
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
-
       self.display_name = attributes[:'displayName'] if attributes[:'displayName']
 
       raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
@@ -84,6 +81,12 @@ module OCI
       raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
 
       self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -97,9 +100,9 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        defined_tags == other.defined_tags &&
         display_name == other.display_name &&
-        freeform_tags == other.freeform_tags
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -115,7 +118,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [defined_tags, display_name, freeform_tags].hash
+      [display_name, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines