oci 2.4.2 → 2.4.3

data/lib/oci/database/models/update_database_details.rb

@@ -12,14 +12,6 @@ module OCI
     # @return [OCI::Database::Models::DbBackupConfig]
     attr_accessor :db_backup_config
 
-    # 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
-
     # Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace.
     # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
     #
@@ -28,13 +20,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
         'db_backup_config': :'dbBackupConfig',
-        'defined_tags': :'definedTags',
-        'freeform_tags': :'freeformTags'
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -44,8 +44,8 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'db_backup_config': :'OCI::Database::Models::DbBackupConfig',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
-        'freeform_tags': :'Hash<String, String>'
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -57,8 +57,8 @@ module OCI
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [OCI::Database::Models::DbBackupConfig] :db_backup_config The value to assign to the {#db_backup_config} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} 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)
 
@@ -71,17 +71,17 @@ module OCI
 
       self.db_backup_config = attributes[:'db_backup_config'] if attributes[:'db_backup_config']
 
-      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.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
       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
@@ -96,8 +96,8 @@ module OCI
 
       self.class == other.class &&
         db_backup_config == other.db_backup_config &&
-        defined_tags == other.defined_tags &&
-        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
 
@@ -113,7 +113,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [db_backup_config, defined_tags, freeform_tags].hash
+      [db_backup_config, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/database/models/update_db_system_details.rb

@@ -13,19 +13,18 @@ module OCI
     # @return [Integer]
     attr_accessor :cpu_core_count
 
+    # @return [OCI::Database::Models::PatchDetails]
+    attr_accessor :version
+
+    # The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters.
+    # @return [Array<String>]
+    attr_accessor :ssh_public_keys
+
     # The size, in gigabytes, to scale the attached storage up to for this virtual machine DB system. This value must be greater than current storage size. Note that the resulting total storage size attached will be greater than the amount requested to allow for REDO/RECO space and software volume. Applies only to virtual machine DB systems.
     #
     # @return [Integer]
     attr_accessor :data_storage_size_in_gbs
 
-    # 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
-
     # Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace.
     # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
     #
@@ -34,23 +33,24 @@ module OCI
     # @return [Hash<String, String>]
     attr_accessor :freeform_tags
 
-    # The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters.
-    # @return [Array<String>]
-    attr_accessor :ssh_public_keys
-
-    # @return [OCI::Database::Models::PatchDetails]
-    attr_accessor :version
+    # 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
         'cpu_core_count': :'cpuCoreCount',
+        'version': :'version',
+        'ssh_public_keys': :'sshPublicKeys',
         'data_storage_size_in_gbs': :'dataStorageSizeInGBs',
-        'defined_tags': :'definedTags',
         'freeform_tags': :'freeformTags',
-        'ssh_public_keys': :'sshPublicKeys',
-        'version': :'version'
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -60,11 +60,11 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'cpu_core_count': :'Integer',
+        'version': :'OCI::Database::Models::PatchDetails',
+        'ssh_public_keys': :'Array<String>',
         'data_storage_size_in_gbs': :'Integer',
-        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'freeform_tags': :'Hash<String, String>',
-        'ssh_public_keys': :'Array<String>',
-        'version': :'OCI::Database::Models::PatchDetails'
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -76,11 +76,11 @@ module OCI
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [Integer] :cpu_core_count The value to assign to the {#cpu_core_count} property
+    # @option attributes [OCI::Database::Models::PatchDetails] :version The value to assign to the {#version} property
+    # @option attributes [Array<String>] :ssh_public_keys The value to assign to the {#ssh_public_keys} property
     # @option attributes [Integer] :data_storage_size_in_gbs The value to assign to the {#data_storage_size_in_gbs} property
-    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
     # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
-    # @option attributes [Array<String>] :ssh_public_keys The value to assign to the {#ssh_public_keys} property
-    # @option attributes [OCI::Database::Models::PatchDetails] :version The value to assign to the {#version} 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)
 
@@ -93,17 +93,19 @@ module OCI
 
       self.cpu_core_count = attributes[:'cpu_core_count'] if attributes[:'cpu_core_count']
 
-      self.data_storage_size_in_gbs = attributes[:'dataStorageSizeInGBs'] if attributes[:'dataStorageSizeInGBs']
+      self.version = attributes[:'version'] if attributes[:'version']
 
-      raise 'You cannot provide both :dataStorageSizeInGBs and :data_storage_size_in_gbs' if attributes.key?(:'dataStorageSizeInGBs') && attributes.key?(:'data_storage_size_in_gbs')
+      self.ssh_public_keys = attributes[:'sshPublicKeys'] if attributes[:'sshPublicKeys']
 
-      self.data_storage_size_in_gbs = attributes[:'data_storage_size_in_gbs'] if attributes[:'data_storage_size_in_gbs']
+      raise 'You cannot provide both :sshPublicKeys and :ssh_public_keys' if attributes.key?(:'sshPublicKeys') && attributes.key?(:'ssh_public_keys')
 
-      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+      self.ssh_public_keys = attributes[:'ssh_public_keys'] if attributes[:'ssh_public_keys']
 
-      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+      self.data_storage_size_in_gbs = attributes[:'dataStorageSizeInGBs'] if attributes[:'dataStorageSizeInGBs']
 
-      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+      raise 'You cannot provide both :dataStorageSizeInGBs and :data_storage_size_in_gbs' if attributes.key?(:'dataStorageSizeInGBs') && attributes.key?(:'data_storage_size_in_gbs')
+
+      self.data_storage_size_in_gbs = attributes[:'data_storage_size_in_gbs'] if attributes[:'data_storage_size_in_gbs']
 
       self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
 
@@ -111,13 +113,11 @@ module OCI
 
       self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
 
-      self.ssh_public_keys = attributes[:'sshPublicKeys'] if attributes[:'sshPublicKeys']
-
-      raise 'You cannot provide both :sshPublicKeys and :ssh_public_keys' if attributes.key?(:'sshPublicKeys') && attributes.key?(:'ssh_public_keys')
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
 
-      self.ssh_public_keys = attributes[:'ssh_public_keys'] if attributes[:'ssh_public_keys']
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
-      self.version = attributes[:'version'] if attributes[:'version']
+      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
@@ -132,11 +132,11 @@ module OCI
 
       self.class == other.class &&
         cpu_core_count == other.cpu_core_count &&
+        version == other.version &&
+        ssh_public_keys == other.ssh_public_keys &&
         data_storage_size_in_gbs == other.data_storage_size_in_gbs &&
-        defined_tags == other.defined_tags &&
         freeform_tags == other.freeform_tags &&
-        ssh_public_keys == other.ssh_public_keys &&
-        version == other.version
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
 
@@ -152,7 +152,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [cpu_core_count, data_storage_size_in_gbs, defined_tags, freeform_tags, ssh_public_keys, version].hash
+      [cpu_core_count, version, ssh_public_keys, data_storage_size_in_gbs, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

data/lib/oci/dns/dns.rb

@@ -12,6 +12,7 @@ end
 # Require models
 require 'oci/dns/models/create_zone_details'
 require 'oci/dns/models/external_master'
+require 'oci/dns/models/nameserver'
 require 'oci/dns/models/patch_domain_records_details'
 require 'oci/dns/models/patch_rr_set_details'
 require 'oci/dns/models/patch_zone_records_details'

data/lib/oci/dns/dns_client.rb

@@ -5,7 +5,8 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # API for managing DNS zones, records, and policies.
+  # API for the DNS service. Use this API to manage DNS zones, records, and other DNS resources.
+  # For more information, see [Overview of the DNS Service](/iaas/Content/DNS/Concepts/dnszonemanagement.htm).
   class Dns::DnsClient
     # Client used to make HTTP requests.
     # @return [OCI::ApiClient]
@@ -298,8 +299,8 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Deletes the specified zone. A `204` response indicates that zone has been
-    # successfully deleted.
+    # Deletes the specified zone. A `204` response indicates that zone has been successfully
+    # deleted.
     #
     # @param [String] zone_name_or_id The name or OCID of the target zone.
     # @param [Hash] opts the optional parameters
@@ -615,7 +616,7 @@ module OCI
 
     # Gets all records in the specified zone. The results are
     # sorted by `domain` in alphabetical order by default. For more
-    # information about records, please see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4).
+    # information about records, see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4).
     #
     # @param [String] zone_name_or_id The name or OCID of the target zone.
     # @param [Hash] opts the optional parameters
@@ -743,12 +744,12 @@ module OCI
     # @option opts [DateTime] :time_created_less_than An [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) timestamp that states
     #   all returned resources were created before the indicated time.
     #
+    # @option opts [String] :lifecycle_state The state of a resource.
+    #   Allowed values are: ACTIVE, CREATING, DELETED, DELETING, FAILED
     # @option opts [String] :sort_by The field by which to sort zones. (default to timeCreated)
     #   Allowed values are: name, zoneType, timeCreated
     # @option opts [String] :sort_order The order to sort the resources.
     #
-    # @option opts [String] :lifecycle_state The state of a resource.
-    #   Allowed values are: ACTIVE, CREATING, DELETED, DELETING, FAILED
     # @return [Response] A Response object with data of type Array<{OCI::Dns::Models::ZoneSummary ZoneSummary}>
     def list_zones(compartment_id, opts = {})
       logger.debug 'Calling operation DnsClient#list_zones.' if logger
@@ -759,6 +760,10 @@ module OCI
         raise 'Invalid value for "zone_type", must be one of PRIMARY, SECONDARY.'
       end
 
+      if opts[:lifecycle_state] && !%w[ACTIVE CREATING DELETED DELETING FAILED].include?(opts[:lifecycle_state])
+        raise 'Invalid value for "lifecycle_state", must be one of ACTIVE, CREATING, DELETED, DELETING, FAILED.'
+      end
+
       if opts[:sort_by] && !%w[name zoneType timeCreated].include?(opts[:sort_by])
         raise 'Invalid value for "sort_by", must be one of name, zoneType, timeCreated.'
       end
@@ -767,10 +772,6 @@ module OCI
         raise 'Invalid value for "sort_order", must be one of the values in OCI::Dns::Models::SORT_ORDER_ENUM.'
       end
 
-      if opts[:lifecycle_state] && !%w[ACTIVE CREATING DELETED DELETING FAILED].include?(opts[:lifecycle_state])
-        raise 'Invalid value for "lifecycle_state", must be one of ACTIVE, CREATING, DELETED, DELETING, FAILED.'
-      end
-
       path = '/zones'
       operation_signing_strategy = :standard
 
@@ -785,9 +786,9 @@ module OCI
       query_params[:zoneType] = opts[:zone_type] if opts[:zone_type]
       query_params[:timeCreatedGreaterThanOrEqualTo] = opts[:time_created_greater_than_or_equal_to] if opts[:time_created_greater_than_or_equal_to]
       query_params[:timeCreatedLessThan] = opts[:time_created_less_than] if opts[:time_created_less_than]
+      query_params[:lifecycleState] = opts[:lifecycle_state] if opts[:lifecycle_state]
       query_params[:sortBy] = opts[:sort_by] if opts[:sort_by]
       query_params[:sortOrder] = opts[:sort_order] if opts[:sort_order]
-      query_params[:lifecycleState] = opts[:lifecycle_state] if opts[:lifecycle_state]
 
       # Header Params
       header_params = {}
@@ -821,7 +822,7 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Replaces records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function.
+    # Updates records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function.
     # @param [String] zone_name_or_id The name or OCID of the target zone.
     # @param [String] domain The target fully-qualified domain name (FQDN) within the target zone.
     # @param [OCI::Dns::Models::PatchDomainRecordsDetails] patch_domain_records_details Operations describing how to modify the collection of records.
@@ -1197,7 +1198,7 @@ module OCI
 
     # Updates the specified secondary zone with your new external master
     # server information. For more information about secondary zone, see
-    # [Manage DNS Service Zone](https://docs.cloud.oracle.com/Content/DNS/Tasks/managingdnszones.htm).
+    # [Manage DNS Service Zone](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Tasks/managingdnszones.htm).
     #
     # @param [String] zone_name_or_id The name or OCID of the target zone.
     # @param [OCI::Dns::Models::UpdateZoneDetails] update_zone_details New data for the zone.

data/lib/oci/dns/models/create_zone_details.rb

@@ -6,6 +6,8 @@ require 'date'
 module OCI
   # The body for defining a new zone.
   #
+  # *Warning:* Oracle recommends that you avoid using any confidential information when you supply string values using the API.
+  #
   class Dns::Models::CreateZoneDetails # rubocop:disable Metrics/LineLength
     ZONE_TYPE_ENUM = [
       ZONE_TYPE_PRIMARY = 'PRIMARY'.freeze,
@@ -25,7 +27,22 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
-    # External master servers for the zone.
+    # Simple key-value pair that is applied without any predefined name, type, or scope.
+    # For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
+    # Example: `{\"bar-key\": \"value\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Usage of predefined tag keys. These predefined keys are scoped to a namespace.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
+    # External master servers for the zone. `externalMasters` becomes a
+    # required parameter when the `zoneType` value is `SECONDARY`.
+    #
     # @return [Array<OCI::Dns::Models::ExternalMaster>]
     attr_accessor :external_masters
 
@@ -36,6 +53,8 @@ module OCI
         'name': :'name',
         'zone_type': :'zoneType',
         'compartment_id': :'compartmentId',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags',
         'external_masters': :'externalMasters'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -48,6 +67,8 @@ module OCI
         'name': :'String',
         'zone_type': :'String',
         'compartment_id': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
         'external_masters': :'Array<OCI::Dns::Models::ExternalMaster>'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -62,6 +83,8 @@ module OCI
     # @option attributes [String] :name The value to assign to the {#name} property
     # @option attributes [String] :zone_type The value to assign to the {#zone_type} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} 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
     # @option attributes [Array<OCI::Dns::Models::ExternalMaster>] :external_masters The value to assign to the {#external_masters} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
@@ -83,6 +106,18 @@ module OCI
 
       self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
 
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+
+      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']
+
       self.external_masters = attributes[:'externalMasters'] if attributes[:'externalMasters']
 
       raise 'You cannot provide both :externalMasters and :external_masters' if attributes.key?(:'externalMasters') && attributes.key?(:'external_masters')
@@ -114,6 +149,8 @@ module OCI
         name == other.name &&
         zone_type == other.zone_type &&
         compartment_id == other.compartment_id &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags &&
         external_masters == other.external_masters
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
@@ -130,7 +167,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [name, zone_type, compartment_id, external_masters].hash
+      [name, zone_type, compartment_id, freeform_tags, defined_tags, external_masters].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines