oci 2.4.3 → 2.4.4

data/lib/oci/load_balancer/models/certificate.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,22 +8,9 @@ module OCI
   # For more information on SSL certficate configuration, see
   # [Managing SSL Certificates](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Tasks/managingcertificates.htm).
   #
+  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
+  #
   class LoadBalancer::Models::Certificate # rubocop:disable Metrics/LineLength
-    # **[Required]** The Certificate Authority certificate, or any interim certificate, that you received from your SSL certificate provider.
-    #
-    # Example:
-    #
-    #     -----BEGIN CERTIFICATE-----
-    #     MIIEczCCA1ugAwIBAgIBADANBgkqhkiG9w0BAQQFAD..AkGA1UEBhMCR0Ix
-    #     EzARBgNVBAgTClNvbWUtU3RhdGUxFDASBgNVBAoTC0..0EgTHRkMTcwNQYD
-    #     VQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcn..XRpb24gQXV0aG9y
-    #     aXR5MRQwEgYDVQQDEwtCZXN0IENBIEx0ZDAeFw0wMD..TUwMTZaFw0wMTAy
-    #     ...
-    #     -----END CERTIFICATE-----
-    #
-    # @return [String]
-    attr_accessor :ca_certificate
-
     # **[Required]** A friendly name for the certificate bundle. It must be unique and it cannot be changed.
     # Valid certificate bundle names include only alphanumeric characters, dashes, and underscores.
     # Certificate bundle names cannot contain spaces. Avoid entering confidential information.
@@ -48,13 +35,28 @@ module OCI
     # @return [String]
     attr_accessor :public_certificate
 
+    # **[Required]** The Certificate Authority certificate, or any interim certificate, that you received from your SSL certificate provider.
+    #
+    # Example:
+    #
+    #     -----BEGIN CERTIFICATE-----
+    #     MIIEczCCA1ugAwIBAgIBADANBgkqhkiG9w0BAQQFAD..AkGA1UEBhMCR0Ix
+    #     EzARBgNVBAgTClNvbWUtU3RhdGUxFDASBgNVBAoTC0..0EgTHRkMTcwNQYD
+    #     VQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcn..XRpb24gQXV0aG9y
+    #     aXR5MRQwEgYDVQQDEwtCZXN0IENBIEx0ZDAeFw0wMD..TUwMTZaFw0wMTAy
+    #     ...
+    #     -----END CERTIFICATE-----
+    #
+    # @return [String]
+    attr_accessor :ca_certificate
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'ca_certificate': :'caCertificate',
         'certificate_name': :'certificateName',
-        'public_certificate': :'publicCertificate'
+        'public_certificate': :'publicCertificate',
+        'ca_certificate': :'caCertificate'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -63,9 +65,9 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'ca_certificate': :'String',
         'certificate_name': :'String',
-        'public_certificate': :'String'
+        'public_certificate': :'String',
+        'ca_certificate': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -76,21 +78,15 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :ca_certificate The value to assign to the {#ca_certificate} property
     # @option attributes [String] :certificate_name The value to assign to the {#certificate_name} property
     # @option attributes [String] :public_certificate The value to assign to the {#public_certificate} property
+    # @option attributes [String] :ca_certificate The value to assign to the {#ca_certificate} 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.ca_certificate = attributes[:'caCertificate'] if attributes[:'caCertificate']
-
-      raise 'You cannot provide both :caCertificate and :ca_certificate' if attributes.key?(:'caCertificate') && attributes.key?(:'ca_certificate')
-
-      self.ca_certificate = attributes[:'ca_certificate'] if attributes[:'ca_certificate']
-
       self.certificate_name = attributes[:'certificateName'] if attributes[:'certificateName']
 
       raise 'You cannot provide both :certificateName and :certificate_name' if attributes.key?(:'certificateName') && attributes.key?(:'certificate_name')
@@ -102,6 +98,12 @@ module OCI
       raise 'You cannot provide both :publicCertificate and :public_certificate' if attributes.key?(:'publicCertificate') && attributes.key?(:'public_certificate')
 
       self.public_certificate = attributes[:'public_certificate'] if attributes[:'public_certificate']
+
+      self.ca_certificate = attributes[:'caCertificate'] if attributes[:'caCertificate']
+
+      raise 'You cannot provide both :caCertificate and :ca_certificate' if attributes.key?(:'caCertificate') && attributes.key?(:'ca_certificate')
+
+      self.ca_certificate = attributes[:'ca_certificate'] if attributes[:'ca_certificate']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -115,9 +117,9 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        ca_certificate == other.ca_certificate &&
         certificate_name == other.certificate_name &&
-        public_certificate == other.public_certificate
+        public_certificate == other.public_certificate &&
+        ca_certificate == other.ca_certificate
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -133,7 +135,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [ca_certificate, certificate_name, public_certificate].hash
+      [certificate_name, public_certificate, ca_certificate].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/load_balancer/models/certificate_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'
 
@@ -8,31 +8,9 @@ module OCI
   # For more information on SSL certficate configuration, see
   # [Managing SSL Certificates](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Tasks/managingcertificates.htm).
   #
+  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
+  #
   class LoadBalancer::Models::CertificateDetails # rubocop:disable Metrics/LineLength
-    # The Certificate Authority certificate, or any interim certificate, that you received from your SSL certificate provider.
-    #
-    # Example:
-    #
-    #     -----BEGIN CERTIFICATE-----
-    #     MIIEczCCA1ugAwIBAgIBADANBgkqhkiG9w0BAQQFAD..AkGA1UEBhMCR0Ix
-    #     EzARBgNVBAgTClNvbWUtU3RhdGUxFDASBgNVBAoTC0..0EgTHRkMTcwNQYD
-    #     VQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcn..XRpb24gQXV0aG9y
-    #     aXR5MRQwEgYDVQQDEwtCZXN0IENBIEx0ZDAeFw0wMD..TUwMTZaFw0wMTAy
-    #     ...
-    #     -----END CERTIFICATE-----
-    #
-    # @return [String]
-    attr_accessor :ca_certificate
-
-    # **[Required]** A friendly name for the certificate bundle. It must be unique and it cannot be changed.
-    # Valid certificate bundle names include only alphanumeric characters, dashes, and underscores.
-    # Certificate bundle names cannot contain spaces. Avoid entering confidential information.
-    #
-    # Example: `example_certificate_bundle`
-    #
-    # @return [String]
-    attr_accessor :certificate_name
-
     # A passphrase for encrypted private keys. This is needed only if you created your certificate with a passphrase.
     #
     # @return [String]
@@ -68,15 +46,39 @@ module OCI
     # @return [String]
     attr_accessor :public_certificate
 
+    # The Certificate Authority certificate, or any interim certificate, that you received from your SSL certificate provider.
+    #
+    # Example:
+    #
+    #     -----BEGIN CERTIFICATE-----
+    #     MIIEczCCA1ugAwIBAgIBADANBgkqhkiG9w0BAQQFAD..AkGA1UEBhMCR0Ix
+    #     EzARBgNVBAgTClNvbWUtU3RhdGUxFDASBgNVBAoTC0..0EgTHRkMTcwNQYD
+    #     VQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcn..XRpb24gQXV0aG9y
+    #     aXR5MRQwEgYDVQQDEwtCZXN0IENBIEx0ZDAeFw0wMD..TUwMTZaFw0wMTAy
+    #     ...
+    #     -----END CERTIFICATE-----
+    #
+    # @return [String]
+    attr_accessor :ca_certificate
+
+    # **[Required]** A friendly name for the certificate bundle. It must be unique and it cannot be changed.
+    # Valid certificate bundle names include only alphanumeric characters, dashes, and underscores.
+    # Certificate bundle names cannot contain spaces. Avoid entering confidential information.
+    #
+    # Example: `example_certificate_bundle`
+    #
+    # @return [String]
+    attr_accessor :certificate_name
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'ca_certificate': :'caCertificate',
-        'certificate_name': :'certificateName',
         'passphrase': :'passphrase',
         'private_key': :'privateKey',
-        'public_certificate': :'publicCertificate'
+        'public_certificate': :'publicCertificate',
+        'ca_certificate': :'caCertificate',
+        'certificate_name': :'certificateName'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -85,11 +87,11 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'ca_certificate': :'String',
-        'certificate_name': :'String',
         'passphrase': :'String',
         'private_key': :'String',
-        'public_certificate': :'String'
+        'public_certificate': :'String',
+        'ca_certificate': :'String',
+        'certificate_name': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -100,29 +102,17 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :ca_certificate The value to assign to the {#ca_certificate} property
-    # @option attributes [String] :certificate_name The value to assign to the {#certificate_name} property
     # @option attributes [String] :passphrase The value to assign to the {#passphrase} property
     # @option attributes [String] :private_key The value to assign to the {#private_key} property
     # @option attributes [String] :public_certificate The value to assign to the {#public_certificate} property
+    # @option attributes [String] :ca_certificate The value to assign to the {#ca_certificate} property
+    # @option attributes [String] :certificate_name The value to assign to the {#certificate_name} 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.ca_certificate = attributes[:'caCertificate'] if attributes[:'caCertificate']
-
-      raise 'You cannot provide both :caCertificate and :ca_certificate' if attributes.key?(:'caCertificate') && attributes.key?(:'ca_certificate')
-
-      self.ca_certificate = attributes[:'ca_certificate'] if attributes[:'ca_certificate']
-
-      self.certificate_name = attributes[:'certificateName'] if attributes[:'certificateName']
-
-      raise 'You cannot provide both :certificateName and :certificate_name' if attributes.key?(:'certificateName') && attributes.key?(:'certificate_name')
-
-      self.certificate_name = attributes[:'certificate_name'] if attributes[:'certificate_name']
-
       self.passphrase = attributes[:'passphrase'] if attributes[:'passphrase']
 
       self.private_key = attributes[:'privateKey'] if attributes[:'privateKey']
@@ -136,6 +126,18 @@ module OCI
       raise 'You cannot provide both :publicCertificate and :public_certificate' if attributes.key?(:'publicCertificate') && attributes.key?(:'public_certificate')
 
       self.public_certificate = attributes[:'public_certificate'] if attributes[:'public_certificate']
+
+      self.ca_certificate = attributes[:'caCertificate'] if attributes[:'caCertificate']
+
+      raise 'You cannot provide both :caCertificate and :ca_certificate' if attributes.key?(:'caCertificate') && attributes.key?(:'ca_certificate')
+
+      self.ca_certificate = attributes[:'ca_certificate'] if attributes[:'ca_certificate']
+
+      self.certificate_name = attributes[:'certificateName'] if attributes[:'certificateName']
+
+      raise 'You cannot provide both :certificateName and :certificate_name' if attributes.key?(:'certificateName') && attributes.key?(:'certificate_name')
+
+      self.certificate_name = attributes[:'certificate_name'] if attributes[:'certificate_name']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -149,11 +151,11 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        ca_certificate == other.ca_certificate &&
-        certificate_name == other.certificate_name &&
         passphrase == other.passphrase &&
         private_key == other.private_key &&
-        public_certificate == other.public_certificate
+        public_certificate == other.public_certificate &&
+        ca_certificate == other.ca_certificate &&
+        certificate_name == other.certificate_name
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -169,7 +171,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [ca_certificate, certificate_name, passphrase, private_key, public_certificate].hash
+      [passphrase, private_key, public_certificate, ca_certificate, certificate_name].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/load_balancer/models/connection_configuration.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/create_backend_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,25 +6,9 @@ require 'date'
 module OCI
   # The configuration details for creating a backend server in a backend set.
   # For more information on backend server configuration, see
-  # [Managing Backend Servers](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/tasks/managingbackendservers.htm).
+  # [Managing Backend Servers](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Tasks/managingbackendservers.htm).
   #
   class LoadBalancer::Models::CreateBackendDetails # rubocop:disable Metrics/LineLength
-    # Whether the load balancer should treat this server as a backup unit. If `true`, the load balancer forwards no ingress
-    # traffic to this backend server unless all other backend servers not marked as \"backup\" fail the health check policy.
-    #
-    # Example: `false`
-    #
-    # @return [BOOLEAN]
-    attr_accessor :backup
-
-    # Whether the load balancer should drain this server. Servers marked \"drain\" receive no new
-    # incoming traffic.
-    #
-    # Example: `false`
-    #
-    # @return [BOOLEAN]
-    attr_accessor :drain
-
     # **[Required]** The IP address of the backend server.
     #
     # Example: `10.0.0.3`
@@ -32,14 +16,6 @@ module OCI
     # @return [String]
     attr_accessor :ip_address
 
-    # Whether the load balancer should treat this server as offline. Offline servers receive no incoming
-    # traffic.
-    #
-    # Example: `false`
-    #
-    # @return [BOOLEAN]
-    attr_accessor :offline
-
     # **[Required]** The communication port for the backend server.
     #
     # Example: `8080`
@@ -58,16 +34,40 @@ module OCI
     # @return [Integer]
     attr_accessor :weight
 
+    # Whether the load balancer should treat this server as a backup unit. If `true`, the load balancer forwards no ingress
+    # traffic to this backend server unless all other backend servers not marked as \"backup\" fail the health check policy.
+    #
+    # Example: `false`
+    #
+    # @return [BOOLEAN]
+    attr_accessor :backup
+
+    # Whether the load balancer should drain this server. Servers marked \"drain\" receive no new
+    # incoming traffic.
+    #
+    # Example: `false`
+    #
+    # @return [BOOLEAN]
+    attr_accessor :drain
+
+    # Whether the load balancer should treat this server as offline. Offline servers receive no incoming
+    # traffic.
+    #
+    # Example: `false`
+    #
+    # @return [BOOLEAN]
+    attr_accessor :offline
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'backup': :'backup',
-        'drain': :'drain',
         'ip_address': :'ipAddress',
-        'offline': :'offline',
         'port': :'port',
-        'weight': :'weight'
+        'weight': :'weight',
+        'backup': :'backup',
+        'drain': :'drain',
+        'offline': :'offline'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -76,12 +76,12 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'backup': :'BOOLEAN',
-        'drain': :'BOOLEAN',
         'ip_address': :'String',
-        'offline': :'BOOLEAN',
         'port': :'Integer',
-        'weight': :'Integer'
+        'weight': :'Integer',
+        'backup': :'BOOLEAN',
+        'drain': :'BOOLEAN',
+        'offline': :'BOOLEAN'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -92,36 +92,36 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [BOOLEAN] :backup The value to assign to the {#backup} property
-    # @option attributes [BOOLEAN] :drain The value to assign to the {#drain} property
     # @option attributes [String] :ip_address The value to assign to the {#ip_address} property
-    # @option attributes [BOOLEAN] :offline The value to assign to the {#offline} property
     # @option attributes [Integer] :port The value to assign to the {#port} property
     # @option attributes [Integer] :weight The value to assign to the {#weight} property
+    # @option attributes [BOOLEAN] :backup The value to assign to the {#backup} property
+    # @option attributes [BOOLEAN] :drain The value to assign to the {#drain} property
+    # @option attributes [BOOLEAN] :offline The value to assign to the {#offline} 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.backup = attributes[:'backup'] unless attributes[:'backup'].nil?
-      self.backup = false if backup.nil? && !attributes.key?(:'backup') # rubocop:disable Style/StringLiterals
-
-      self.drain = attributes[:'drain'] unless attributes[:'drain'].nil?
-      self.drain = false if drain.nil? && !attributes.key?(:'drain') # rubocop:disable Style/StringLiterals
-
       self.ip_address = attributes[:'ipAddress'] if attributes[:'ipAddress']
 
       raise 'You cannot provide both :ipAddress and :ip_address' if attributes.key?(:'ipAddress') && attributes.key?(:'ip_address')
 
       self.ip_address = attributes[:'ip_address'] if attributes[:'ip_address']
 
-      self.offline = attributes[:'offline'] unless attributes[:'offline'].nil?
-      self.offline = false if offline.nil? && !attributes.key?(:'offline') # rubocop:disable Style/StringLiterals
-
       self.port = attributes[:'port'] if attributes[:'port']
 
       self.weight = attributes[:'weight'] if attributes[:'weight']
+
+      self.backup = attributes[:'backup'] unless attributes[:'backup'].nil?
+      self.backup = false if backup.nil? && !attributes.key?(:'backup') # rubocop:disable Style/StringLiterals
+
+      self.drain = attributes[:'drain'] unless attributes[:'drain'].nil?
+      self.drain = false if drain.nil? && !attributes.key?(:'drain') # rubocop:disable Style/StringLiterals
+
+      self.offline = attributes[:'offline'] unless attributes[:'offline'].nil?
+      self.offline = false if offline.nil? && !attributes.key?(:'offline') # rubocop:disable Style/StringLiterals
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -135,12 +135,12 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        backup == other.backup &&
-        drain == other.drain &&
         ip_address == other.ip_address &&
-        offline == other.offline &&
         port == other.port &&
-        weight == other.weight
+        weight == other.weight &&
+        backup == other.backup &&
+        drain == other.drain &&
+        offline == other.offline
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -156,7 +156,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [backup, drain, ip_address, offline, port, weight].hash
+      [ip_address, port, weight, backup, drain, offline].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines