oci 2.10.0 → 2.11.0

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

@@ -7,12 +7,24 @@ require 'date'
 module OCI
   # CreateVcnDetails model.
   class Core::Models::CreateVcnDetails
-    # **[Required]** The CIDR IP address block of the VCN.
+    # Deprecated. Instead use 'cidrBlocks'. It is an error to set both cidrBlock and
+    # cidrBlocks.
     # Example: `10.0.0.0/16`
     #
     # @return [String]
     attr_accessor :cidr_block
 
+    # List of IPv4 CIDR blocks associated with the VCN. The CIDRs must maintain the following
+    # rules -
+    #
+    # a. The list of CIDRs provided are valid
+    # b. There is no overlap between different CIDRs
+    # c. The number of CIDRs should not exceed the max limit of CIDRs per VCN
+    # d. It is an error to set both cidrBlock and cidrBlocks.
+    #
+    # @return [Array<String>]
+    attr_accessor :cidr_blocks
+
     # **[Required]** The OCID of the compartment to contain the VCN.
     # @return [String]
     attr_accessor :compartment_id
@@ -93,6 +105,7 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'cidr_block': :'cidrBlock',
+        'cidr_blocks': :'cidrBlocks',
         'compartment_id': :'compartmentId',
         'ipv6_cidr_block': :'ipv6CidrBlock',
         'defined_tags': :'definedTags',
@@ -109,6 +122,7 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'cidr_block': :'String',
+        'cidr_blocks': :'Array<String>',
         'compartment_id': :'String',
         'ipv6_cidr_block': :'String',
         'defined_tags': :'Hash<String, Hash<String, Object>>',
@@ -127,6 +141,7 @@ module OCI
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [String] :cidr_block The value to assign to the {#cidr_block} property
+    # @option attributes [Array<String>] :cidr_blocks The value to assign to the {#cidr_blocks} property
     # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
     # @option attributes [String] :ipv6_cidr_block The value to assign to the {#ipv6_cidr_block} property
     # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
@@ -146,6 +161,12 @@ module OCI
 
       self.cidr_block = attributes[:'cidr_block'] if attributes[:'cidr_block']
 
+      self.cidr_blocks = attributes[:'cidrBlocks'] if attributes[:'cidrBlocks']
+
+      raise 'You cannot provide both :cidrBlocks and :cidr_blocks' if attributes.key?(:'cidrBlocks') && attributes.key?(:'cidr_blocks')
+
+      self.cidr_blocks = attributes[:'cidr_blocks'] if attributes[:'cidr_blocks']
+
       self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
 
       raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
@@ -201,6 +222,7 @@ module OCI
 
       self.class == other.class &&
         cidr_block == other.cidr_block &&
+        cidr_blocks == other.cidr_blocks &&
         compartment_id == other.compartment_id &&
         ipv6_cidr_block == other.ipv6_cidr_block &&
         defined_tags == other.defined_tags &&
@@ -223,7 +245,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [cidr_block, compartment_id, ipv6_cidr_block, defined_tags, display_name, dns_label, freeform_tags, is_ipv6_enabled].hash
+      [cidr_block, cidr_blocks, compartment_id, ipv6_cidr_block, defined_tags, display_name, dns_label, freeform_tags, is_ipv6_enabled].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

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

@@ -18,6 +18,7 @@ module OCI
     # hosts outside the VLAN. The CIDR must maintain the following rules -
     #
     # a. The CIDR block is valid and correctly formatted.
+    # b. The new range is within one of the parent VCN ranges.
     #
     # Example: `192.0.2.0/24`
     #

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

@@ -9,18 +9,18 @@ module OCI
   class Core::Models::ImageMemoryConstraints
     # The minimum amount of memory, in gigabytes.
     # @return [Integer]
-    attr_accessor :min_in_g_bs
+    attr_accessor :min_in_gbs
 
     # The maximum amount of memory, in gigabytes.
     # @return [Integer]
-    attr_accessor :max_in_g_bs
+    attr_accessor :max_in_gbs
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'min_in_g_bs': :'minInGBs',
-        'max_in_g_bs': :'maxInGBs'
+        'min_in_gbs': :'minInGBs',
+        'max_in_gbs': :'maxInGBs'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -29,8 +29,8 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'min_in_g_bs': :'Integer',
-        'max_in_g_bs': :'Integer'
+        'min_in_gbs': :'Integer',
+        'max_in_gbs': :'Integer'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -41,25 +41,25 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Integer] :min_in_g_bs The value to assign to the {#min_in_g_bs} property
-    # @option attributes [Integer] :max_in_g_bs The value to assign to the {#max_in_g_bs} property
+    # @option attributes [Integer] :min_in_gbs The value to assign to the {#min_in_gbs} property
+    # @option attributes [Integer] :max_in_gbs The value to assign to the {#max_in_gbs} 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.min_in_g_bs = attributes[:'minInGBs'] if attributes[:'minInGBs']
+      self.min_in_gbs = attributes[:'minInGBs'] if attributes[:'minInGBs']
 
-      raise 'You cannot provide both :minInGBs and :min_in_g_bs' if attributes.key?(:'minInGBs') && attributes.key?(:'min_in_g_bs')
+      raise 'You cannot provide both :minInGBs and :min_in_gbs' if attributes.key?(:'minInGBs') && attributes.key?(:'min_in_gbs')
 
-      self.min_in_g_bs = attributes[:'min_in_g_bs'] if attributes[:'min_in_g_bs']
+      self.min_in_gbs = attributes[:'min_in_gbs'] if attributes[:'min_in_gbs']
 
-      self.max_in_g_bs = attributes[:'maxInGBs'] if attributes[:'maxInGBs']
+      self.max_in_gbs = attributes[:'maxInGBs'] if attributes[:'maxInGBs']
 
-      raise 'You cannot provide both :maxInGBs and :max_in_g_bs' if attributes.key?(:'maxInGBs') && attributes.key?(:'max_in_g_bs')
+      raise 'You cannot provide both :maxInGBs and :max_in_gbs' if attributes.key?(:'maxInGBs') && attributes.key?(:'max_in_gbs')
 
-      self.max_in_g_bs = attributes[:'max_in_g_bs'] if attributes[:'max_in_g_bs']
+      self.max_in_gbs = attributes[:'max_in_gbs'] if attributes[:'max_in_gbs']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -73,8 +73,8 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        min_in_g_bs == other.min_in_g_bs &&
-        max_in_g_bs == other.max_in_g_bs
+        min_in_gbs == other.min_in_gbs &&
+        max_in_gbs == other.max_in_gbs
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -90,7 +90,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [min_in_g_bs, max_in_g_bs].hash
+      [min_in_gbs, max_in_gbs].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

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

@@ -0,0 +1,172 @@
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+
+require 'date'
+
+# rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
+module OCI
+  # Contains the original CIDR that needs to be updated and the
+  # new CIDR which will replace the original CIDR.
+  #
+  class Core::Models::ModifyVcnCidrDetails
+    # **[Required]** The CIDR IP address that needs to be updated.
+    #
+    # @return [String]
+    attr_accessor :original_cidr_block
+
+    # **[Required]** The new CIDR IP address which will replace the orginal one.
+    #
+    # @return [String]
+    attr_accessor :new_cidr_block
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'original_cidr_block': :'originalCidrBlock',
+        'new_cidr_block': :'newCidrBlock'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'original_cidr_block': :'String',
+        'new_cidr_block': :'String'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :original_cidr_block The value to assign to the {#original_cidr_block} property
+    # @option attributes [String] :new_cidr_block The value to assign to the {#new_cidr_block} 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.original_cidr_block = attributes[:'originalCidrBlock'] if attributes[:'originalCidrBlock']
+
+      raise 'You cannot provide both :originalCidrBlock and :original_cidr_block' if attributes.key?(:'originalCidrBlock') && attributes.key?(:'original_cidr_block')
+
+      self.original_cidr_block = attributes[:'original_cidr_block'] if attributes[:'original_cidr_block']
+
+      self.new_cidr_block = attributes[:'newCidrBlock'] if attributes[:'newCidrBlock']
+
+      raise 'You cannot provide both :newCidrBlock and :new_cidr_block' if attributes.key?(:'newCidrBlock') && attributes.key?(:'new_cidr_block')
+
+      self.new_cidr_block = attributes[:'new_cidr_block'] if attributes[:'new_cidr_block']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        original_cidr_block == other.original_cidr_block &&
+        new_cidr_block == other.new_cidr_block
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [original_cidr_block, new_cidr_block].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # 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)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          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
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective, Metrics/LineLength

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

@@ -0,0 +1,155 @@
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+
+require 'date'
+
+# rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
+module OCI
+  # Contains the CIDR which will be removed from the VCN.
+  class Core::Models::RemoveVcnCidrDetails
+    # **[Required]** The CIDR IP address that needs to be removed.
+    #
+    # @return [String]
+    attr_accessor :cidr_block
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'cidr_block': :'cidrBlock'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'cidr_block': :'String'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :cidr_block The value to assign to the {#cidr_block} 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.cidr_block = attributes[:'cidrBlock'] if attributes[:'cidrBlock']
+
+      raise 'You cannot provide both :cidrBlock and :cidr_block' if attributes.key?(:'cidrBlock') && attributes.key?(:'cidr_block')
+
+      self.cidr_block = attributes[:'cidr_block'] if attributes[:'cidr_block']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        cidr_block == other.cidr_block
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [cidr_block].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # 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)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          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
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective, Metrics/LineLength