oci 2.0.4 → 2.0.5

data/lib/oci/core/models/create_vcn_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -15,6 +15,14 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
+    # 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
+
     # A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
     # @return [String]
     attr_accessor :display_name
@@ -38,6 +46,15 @@ module OCI
     # @return [String]
     attr_accessor :dns_label
 
+    # 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).
+    # 
+    # Example: `{\"Department\": \"Finance\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
@@ -55,6 +72,10 @@ module OCI
         self.compartment_id = attributes[:'compartmentId']
       end
 
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
       if attributes[:'displayName']
         self.display_name = attributes[:'displayName']
       end
@@ -63,6 +84,10 @@ module OCI
         self.dns_label = attributes[:'dnsLabel']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
     end
 
     # Checks equality by comparing each attribute.
@@ -72,8 +97,10 @@ module OCI
       self.class == other_object.class &&
           cidr_block == other_object.cidr_block &&
           compartment_id == other_object.compartment_id &&
+          defined_tags == other_object.defined_tags &&
           display_name == other_object.display_name &&
-          dns_label == other_object.dns_label
+          dns_label == other_object.dns_label &&
+          freeform_tags == other_object.freeform_tags
     end
 
     # @see the `==` method
@@ -85,7 +112,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [cidr_block, compartment_id, display_name, dns_label].hash
+      [cidr_block, compartment_id, defined_tags, display_name, dns_label, freeform_tags].hash
     end
 
     # Builds the object from hash
@@ -98,10 +125,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -119,7 +146,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -153,8 +180,10 @@ module OCI
       { 
         :'cidr_block' => :'cidrBlock',
         :'compartment_id' => :'compartmentId',
+        :'defined_tags' => :'definedTags',
         :'display_name' => :'displayName',
-        :'dns_label' => :'dnsLabel'
+        :'dns_label' => :'dnsLabel',
+        :'freeform_tags' => :'freeformTags'
       }
     end
 
@@ -163,8 +192,10 @@ module OCI
       { 
         :'cidr_block' => :'String',
         :'compartment_id' => :'String',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'display_name' => :'String',
-        :'dns_label' => :'String'
+        :'dns_label' => :'String',
+        :'freeform_tags' => :'Hash<String, String>'
       }
     end
   end

data/lib/oci/core/models/create_virtual_circuit_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -197,10 +197,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -218,7 +218,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/core/models/create_virtual_circuit_public_prefix_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -55,10 +55,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -76,7 +76,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/core/models/create_vnic_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -154,10 +154,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -175,7 +175,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end

data/lib/oci/core/models/create_volume_backup_details.rb

@@ -1,15 +1,32 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
 module OCI
   class Core::Models::CreateVolumeBackupDetails
+    # 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
+
     # A user-friendly name for the volume backup. Does not have to be unique and it's changeable.
     # Avoid entering confidential information.
     # 
     # @return [String]
     attr_accessor :display_name
 
+    # 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).
+    # 
+    # Example: `{\"Department\": \"Finance\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
     # The OCID of the volume that needs to be backed up.
     # @return [String]
     attr_accessor :volume_id
@@ -23,10 +40,18 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
 
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
       if attributes[:'displayName']
         self.display_name = attributes[:'displayName']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
       if attributes[:'volumeId']
         self.volume_id = attributes[:'volumeId']
       end
@@ -38,7 +63,9 @@ module OCI
     def ==(other_object)
       return true if self.equal?(other_object)
       self.class == other_object.class &&
+          defined_tags == other_object.defined_tags &&
           display_name == other_object.display_name &&
+          freeform_tags == other_object.freeform_tags &&
           volume_id == other_object.volume_id
     end
 
@@ -51,7 +78,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [display_name, volume_id].hash
+      [defined_tags, display_name, freeform_tags, volume_id].hash
     end
 
     # Builds the object from hash
@@ -64,10 +91,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -85,7 +112,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -117,7 +144,9 @@ module OCI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       { 
+        :'defined_tags' => :'definedTags',
         :'display_name' => :'displayName',
+        :'freeform_tags' => :'freeformTags',
         :'volume_id' => :'volumeId'
       }
     end
@@ -125,7 +154,9 @@ module OCI
     # Attribute type mapping.
     def self.swagger_types
       { 
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'display_name' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
         :'volume_id' => :'String'
       }
     end

data/lib/oci/core/models/create_volume_details.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -15,12 +15,29 @@ module OCI
     # @return [String]
     attr_accessor :compartment_id
 
+    # 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
+
     # A user-friendly name. Does not have to be unique, and it's changeable.
     # Avoid entering confidential information.
     # 
     # @return [String]
     attr_accessor :display_name
 
+    # 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).
+    # 
+    # Example: `{\"Department\": \"Finance\"}`
+    # 
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
     # The size of the volume in GBs.
     # @return [Integer]
     attr_accessor :size_in_gbs
@@ -62,10 +79,18 @@ module OCI
         self.compartment_id = attributes[:'compartmentId']
       end
 
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
       if attributes[:'displayName']
         self.display_name = attributes[:'displayName']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
       if attributes[:'sizeInGBs']
         self.size_in_gbs = attributes[:'sizeInGBs']
       end
@@ -91,7 +116,9 @@ module OCI
       self.class == other_object.class &&
           availability_domain == other_object.availability_domain &&
           compartment_id == other_object.compartment_id &&
+          defined_tags == other_object.defined_tags &&
           display_name == other_object.display_name &&
+          freeform_tags == other_object.freeform_tags &&
           size_in_gbs == other_object.size_in_gbs &&
           size_in_mbs == other_object.size_in_mbs &&
           source_details == other_object.source_details &&
@@ -107,7 +134,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, compartment_id, display_name, size_in_gbs, size_in_mbs, source_details, volume_backup_id].hash
+      [availability_domain, compartment_id, defined_tags, display_name, freeform_tags, size_in_gbs, size_in_mbs, source_details, volume_backup_id].hash
     end
 
     # Builds the object from hash
@@ -120,10 +147,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -141,7 +168,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end
@@ -175,7 +202,9 @@ module OCI
       { 
         :'availability_domain' => :'availabilityDomain',
         :'compartment_id' => :'compartmentId',
+        :'defined_tags' => :'definedTags',
         :'display_name' => :'displayName',
+        :'freeform_tags' => :'freeformTags',
         :'size_in_gbs' => :'sizeInGBs',
         :'size_in_mbs' => :'sizeInMBs',
         :'source_details' => :'sourceDetails',
@@ -188,7 +217,9 @@ module OCI
       { 
         :'availability_domain' => :'String',
         :'compartment_id' => :'String',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'display_name' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
         :'size_in_gbs' => :'Integer',
         :'size_in_mbs' => :'Integer',
         :'source_details' => :'OCI::Core::Models::VolumeSourceDetails',

data/lib/oci/core/models/cross_connect.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
 
@@ -152,10 +152,10 @@ module OCI
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.public_send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
+            self.public_method("#{key}=").call(attributes[self.class.attribute_map[key]].map{ |v| OCI::Internal::Util.convert_to_type($1, v) } )
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
-          self.public_send("#{key}=", OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
+          self.public_method("#{key}=").call(OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -173,7 +173,7 @@ module OCI
     def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
-        value = public_send(attr)
+        value = public_method(attr).call
         next if value.nil? && !instance_variable_defined?("@#{attr}")
         hash[param] = _to_hash(value)
       end