oci 2.0.4 → 2.0.5

data/lib/oci/core/models/image_source_via_object_storage_uri_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'
 require_relative 'image_source_details'
@@ -33,6 +33,7 @@ module OCI
     def ==(other_object)
       return true if self.equal?(other_object)
       self.class == other_object.class &&
+          source_image_type == other_object.source_image_type &&
           source_type == other_object.source_type &&
           source_uri == other_object.source_uri
     end
@@ -46,7 +47,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [source_type, source_uri].hash
+      [source_image_type, source_type, source_uri].hash
     end
 
     # Builds the object from hash
@@ -59,10 +60,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
 
@@ -80,7 +81,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
@@ -112,6 +113,7 @@ module OCI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       { 
+        :'source_image_type' => :'sourceImageType',
         :'source_type' => :'sourceType',
         :'source_uri' => :'sourceUri'
       }
@@ -120,6 +122,7 @@ module OCI
     # Attribute type mapping.
     def self.swagger_types
       { 
+        :'source_image_type' => :'String',
         :'source_type' => :'String',
         :'source_uri' => :'String'
       }

data/lib/oci/core/models/ingress_security_rule.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'
 
@@ -121,10 +121,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
 
@@ -142,7 +142,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/instance.rb

@@ -1,10 +1,16 @@
-# 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::Instance
 
+    LAUNCH_MODE_ENUM = [LAUNCH_MODE_NATIVE = 'NATIVE',
+                LAUNCH_MODE_EMULATED = 'EMULATED',
+                LAUNCH_MODE_CUSTOM = 'CUSTOM',
+                LAUNCH_MODE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE']
+
+
     LIFECYCLE_STATE_ENUM = [LIFECYCLE_STATE_PROVISIONING = 'PROVISIONING',
                 LIFECYCLE_STATE_RUNNING = 'RUNNING',
                 LIFECYCLE_STATE_STARTING = 'STARTING',
@@ -26,6 +32,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.
     # 
@@ -43,6 +57,15 @@ module OCI
     # @return [Hash<String, Object>]
     attr_accessor :extended_metadata
 
+    # 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 instance.
     # @return [String]
     attr_accessor :id
@@ -78,6 +101,17 @@ module OCI
     # @return [String]
     attr_accessor :ipxe_script
 
+    # Specifies the configuration mode for launching virtual machine (VM) instances. The configuration modes are:
+    # * `NATIVE` - VM instances launch with iSCSI boot and VFIO devices. The default value for Oracle-provided images.
+    # * `EMULATED` - VM instances launch with emulated devices, such as the E1000 network driver and emulated SCSI disk controller.
+    # * `CUSTOM` - VM instances launch with custom configuration settings specified in the `LaunchOptions` parameter.
+    # 
+    # @return [String]
+    attr_accessor :launch_mode
+
+    # @return [OCI::Core::Models::LaunchOptions]
+    attr_accessor :launch_options
+
     # The current state of the instance.
     # @return [String]
     attr_accessor :lifecycle_state
@@ -128,6 +162,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
@@ -136,6 +174,10 @@ module OCI
         self.extended_metadata = attributes[:'extendedMetadata']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
       if attributes[:'id']
         self.id = attributes[:'id']
       end
@@ -148,6 +190,14 @@ module OCI
         self.ipxe_script = attributes[:'ipxeScript']
       end
 
+      if attributes[:'launchMode']
+        self.launch_mode = attributes[:'launchMode']
+      end
+
+      if attributes[:'launchOptions']
+        self.launch_options = attributes[:'launchOptions']
+      end
+
       if attributes[:'lifecycleState']
         self.lifecycle_state = attributes[:'lifecycleState']
       end
@@ -174,6 +224,16 @@ module OCI
 
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] launch_mode Object to be assigned
+    def launch_mode=(launch_mode)
+      if launch_mode && !LAUNCH_MODE_ENUM.include?(launch_mode)
+        @launch_mode = LAUNCH_MODE_UNKNOWN_ENUM_VALUE
+      else
+        @launch_mode = launch_mode
+      end
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] lifecycle_state Object to be assigned
     def lifecycle_state=(lifecycle_state)
@@ -191,11 +251,15 @@ 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 &&
           extended_metadata == other_object.extended_metadata &&
+          freeform_tags == other_object.freeform_tags &&
           id == other_object.id &&
           image_id == other_object.image_id &&
           ipxe_script == other_object.ipxe_script &&
+          launch_mode == other_object.launch_mode &&
+          launch_options == other_object.launch_options &&
           lifecycle_state == other_object.lifecycle_state &&
           metadata == other_object.metadata &&
           region == other_object.region &&
@@ -213,7 +277,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, compartment_id, display_name, extended_metadata, id, image_id, ipxe_script, lifecycle_state, metadata, region, shape, source_details, time_created].hash
+      [availability_domain, compartment_id, defined_tags, display_name, extended_metadata, freeform_tags, id, image_id, ipxe_script, launch_mode, launch_options, lifecycle_state, metadata, region, shape, source_details, time_created].hash
     end
 
     # Builds the object from hash
@@ -226,10 +290,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
 
@@ -247,7 +311,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
@@ -281,11 +345,15 @@ module OCI
       { 
         :'availability_domain' => :'availabilityDomain',
         :'compartment_id' => :'compartmentId',
+        :'defined_tags' => :'definedTags',
         :'display_name' => :'displayName',
         :'extended_metadata' => :'extendedMetadata',
+        :'freeform_tags' => :'freeformTags',
         :'id' => :'id',
         :'image_id' => :'imageId',
         :'ipxe_script' => :'ipxeScript',
+        :'launch_mode' => :'launchMode',
+        :'launch_options' => :'launchOptions',
         :'lifecycle_state' => :'lifecycleState',
         :'metadata' => :'metadata',
         :'region' => :'region',
@@ -300,11 +368,15 @@ module OCI
       { 
         :'availability_domain' => :'String',
         :'compartment_id' => :'String',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'display_name' => :'String',
         :'extended_metadata' => :'Hash<String, Object>',
+        :'freeform_tags' => :'Hash<String, String>',
         :'id' => :'String',
         :'image_id' => :'String',
         :'ipxe_script' => :'String',
+        :'launch_mode' => :'String',
+        :'launch_options' => :'OCI::Core::Models::LaunchOptions',
         :'lifecycle_state' => :'String',
         :'metadata' => :'Hash<String, String>',
         :'region' => :'String',

data/lib/oci/core/models/instance_console_connection.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'
 
@@ -20,10 +20,27 @@ module OCI
     # @return [String]
     attr_accessor :connection_string
 
+    # 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 SSH public key fingerprint for the console connection.
     # @return [String]
     attr_accessor :fingerprint
 
+    # 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 console connection.
     # @return [String]
     attr_accessor :id
@@ -36,6 +53,12 @@ module OCI
     # @return [String]
     attr_accessor :lifecycle_state
 
+    # The SSH connection string for the SSH tunnel used to
+    # connect to the console connection over VNC.
+    # 
+    # @return [String]
+    attr_accessor :vnc_connection_string
+
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
@@ -53,10 +76,18 @@ module OCI
         self.connection_string = attributes[:'connectionString']
       end
 
+      if attributes[:'definedTags']
+        self.defined_tags = attributes[:'definedTags']
+      end
+
       if attributes[:'fingerprint']
         self.fingerprint = attributes[:'fingerprint']
       end
 
+      if attributes[:'freeformTags']
+        self.freeform_tags = attributes[:'freeformTags']
+      end
+
       if attributes[:'id']
         self.id = attributes[:'id']
       end
@@ -69,6 +100,10 @@ module OCI
         self.lifecycle_state = attributes[:'lifecycleState']
       end
 
+      if attributes[:'vncConnectionString']
+        self.vnc_connection_string = attributes[:'vncConnectionString']
+      end
+
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -88,10 +123,13 @@ module OCI
       self.class == other_object.class &&
           compartment_id == other_object.compartment_id &&
           connection_string == other_object.connection_string &&
+          defined_tags == other_object.defined_tags &&
           fingerprint == other_object.fingerprint &&
+          freeform_tags == other_object.freeform_tags &&
           id == other_object.id &&
           instance_id == other_object.instance_id &&
-          lifecycle_state == other_object.lifecycle_state
+          lifecycle_state == other_object.lifecycle_state &&
+          vnc_connection_string == other_object.vnc_connection_string
     end
 
     # @see the `==` method
@@ -103,7 +141,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [compartment_id, connection_string, fingerprint, id, instance_id, lifecycle_state].hash
+      [compartment_id, connection_string, defined_tags, fingerprint, freeform_tags, id, instance_id, lifecycle_state, vnc_connection_string].hash
     end
 
     # Builds the object from hash
@@ -116,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
 
@@ -137,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
@@ -171,10 +209,13 @@ module OCI
       { 
         :'compartment_id' => :'compartmentId',
         :'connection_string' => :'connectionString',
+        :'defined_tags' => :'definedTags',
         :'fingerprint' => :'fingerprint',
+        :'freeform_tags' => :'freeformTags',
         :'id' => :'id',
         :'instance_id' => :'instanceId',
-        :'lifecycle_state' => :'lifecycleState'
+        :'lifecycle_state' => :'lifecycleState',
+        :'vnc_connection_string' => :'vncConnectionString'
       }
     end
 
@@ -183,10 +224,13 @@ module OCI
       { 
         :'compartment_id' => :'String',
         :'connection_string' => :'String',
+        :'defined_tags' => :'Hash<String, Hash<String, Object>>',
         :'fingerprint' => :'String',
+        :'freeform_tags' => :'Hash<String, String>',
         :'id' => :'String',
         :'instance_id' => :'String',
-        :'lifecycle_state' => :'String'
+        :'lifecycle_state' => :'String',
+        :'vnc_connection_string' => :'String'
       }
     end
   end

data/lib/oci/core/models/instance_credentials.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'
 
@@ -62,10 +62,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
 
@@ -83,7 +83,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