oci 2.3.0 → 2.3.1

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

@@ -0,0 +1,228 @@
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+
+# rubocop:disable Lint/UnneededCopDisableDirective
+module OCI
+  # CreateServiceGatewayDetails model.
+  class Core::Models::CreateServiceGatewayDetails # rubocop:disable Metrics/LineLength
+    # **[Required]** The [OCID] (https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm)  of the compartment to contain the Service Gateway.
+    #
+    # @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
+
+    # **[Required]** List of the Service OCIDs. These are the Services which will be enabled on the Service Gateway. This list can be empty.
+    # @return [Array<OCI::Core::Models::ServiceIdRequestDetails>]
+    attr_accessor :services
+
+    # **[Required]** The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VCN.
+    # @return [String]
+    attr_accessor :vcn_id
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'compartmentId',
+        'defined_tags': :'definedTags',
+        'display_name': :'displayName',
+        'freeform_tags': :'freeformTags',
+        'services': :'services',
+        'vcn_id': :'vcnId'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'compartment_id': :'String',
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'display_name': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'services': :'Array<OCI::Core::Models::ServiceIdRequestDetails>',
+        'vcn_id': :'String'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
+    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
+    # @option attributes [Array<OCI::Core::Models::ServiceIdRequestDetails>] :services The value to assign to the {#services} property
+    # @option attributes [String] :vcn_id The value to assign to the {#vcn_id} 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.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
+
+      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+
+      self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
+
+      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.display_name = attributes[:'displayName'] if attributes[:'displayName']
+
+      raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
+
+      self.display_name = attributes[:'display_name'] if attributes[:'display_name']
+
+      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.services = attributes[:'services'] if attributes[:'services']
+
+      self.vcn_id = attributes[:'vcnId'] if attributes[:'vcnId']
+
+      raise 'You cannot provide both :vcnId and :vcn_id' if attributes.key?(:'vcnId') && attributes.key?(:'vcn_id')
+
+      self.vcn_id = attributes[:'vcn_id'] if attributes[:'vcn_id']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/LineLength, 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 &&
+        compartment_id == other.compartment_id &&
+        defined_tags == other.defined_tags &&
+        display_name == other.display_name &&
+        freeform_tags == other.freeform_tags &&
+        services == other.services &&
+        vcn_id == other.vcn_id
+    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, Metrics/LineLength, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [compartment_id, defined_tags, display_name, freeform_tags, services, vcn_id].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/LineLength, 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

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

@@ -1,17 +1,31 @@
 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
+require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
   # A rule for allowing outbound IP packets.
   class Core::Models::EgressSecurityRule # rubocop:disable Metrics/LineLength
-    # **[Required]** The destination CIDR block for the egress rule. This is the range of IP addresses that a
-    # packet originating from the instance can go to.
+    DESTINATION_TYPE_ENUM = [
+      DESTINATION_TYPE_CIDR_BLOCK = 'CIDR_BLOCK'.freeze,
+      DESTINATION_TYPE_SERVICE_CIDR_BLOCK = 'SERVICE_CIDR_BLOCK'.freeze,
+      DESTINATION_TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
+    # **[Required]** The destination service cidrBlock or destination IP address range in CIDR notation for the egress rule.
+    # This is the range of IP addresses that a packet originating from the instance can go to.
     #
     # @return [String]
     attr_accessor :destination
 
+    # Type of destination for EgressSecurityRule. SERVICE_CIDR_BLOCK should be used if destination is a service
+    # cidrBlock. CIDR_BLOCK should be used if destination is IP address range in CIDR notation.
+    # It defaults to CIDR_BLOCK, if not specified.
+    #
+    # @return [String]
+    attr_reader :destination_type
+
     # Optional and valid only for ICMP. Use to specify a particular ICMP type and code
     # as defined in
     # [ICMP Parameters](http://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml).
@@ -58,6 +72,7 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'destination': :'destination',
+        'destination_type': :'destinationType',
         'icmp_options': :'icmpOptions',
         'is_stateless': :'isStateless',
         'protocol': :'protocol',
@@ -72,6 +87,7 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'destination': :'String',
+        'destination_type': :'String',
         'icmp_options': :'OCI::Core::Models::IcmpOptions',
         'is_stateless': :'BOOLEAN',
         'protocol': :'String',
@@ -88,6 +104,7 @@ module OCI
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [String] :destination The value to assign to the {#destination} property
+    # @option attributes [String] :destination_type The value to assign to the {#destination_type} property
     # @option attributes [OCI::Core::Models::IcmpOptions] :icmp_options The value to assign to the {#icmp_options} property
     # @option attributes [BOOLEAN] :is_stateless The value to assign to the {#is_stateless} property
     # @option attributes [String] :protocol The value to assign to the {#protocol} property
@@ -101,6 +118,14 @@ module OCI
 
       self.destination = attributes[:'destination'] if attributes[:'destination']
 
+      self.destination_type = attributes[:'destinationType'] if attributes[:'destinationType']
+      self.destination_type = "CIDR_BLOCK" if destination_type.nil? && !attributes.key?(:'destinationType') # rubocop:disable Style/StringLiterals
+
+      raise 'You cannot provide both :destinationType and :destination_type' if attributes.key?(:'destinationType') && attributes.key?(:'destination_type')
+
+      self.destination_type = attributes[:'destination_type'] if attributes[:'destination_type']
+      self.destination_type = "CIDR_BLOCK" if destination_type.nil? && !attributes.key?(:'destinationType') && !attributes.key?(:'destination_type') # rubocop:disable Style/StringLiterals
+
       self.icmp_options = attributes[:'icmpOptions'] if attributes[:'icmpOptions']
 
       raise 'You cannot provide both :icmpOptions and :icmp_options' if attributes.key?(:'icmpOptions') && attributes.key?(:'icmp_options')
@@ -130,6 +155,21 @@ module OCI
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] destination_type Object to be assigned
+    def destination_type=(destination_type)
+      # rubocop:disable Style/ConditionalAssignment
+      if destination_type && !DESTINATION_TYPE_ENUM.include?(destination_type)
+        # rubocop: disable Metrics/LineLength
+        OCI.logger.debug("Unknown value for 'destination_type' [" + destination_type + "]. Mapping to 'DESTINATION_TYPE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        # rubocop: enable Metrics/LineLength
+        @destination_type = DESTINATION_TYPE_UNKNOWN_ENUM_VALUE
+      else
+        @destination_type = destination_type
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
 
@@ -139,6 +179,7 @@ module OCI
       return true if equal?(other)
       self.class == other.class &&
         destination == other.destination &&
+        destination_type == other.destination_type &&
         icmp_options == other.icmp_options &&
         is_stateless == other.is_stateless &&
         protocol == other.protocol &&
@@ -159,7 +200,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [destination, icmp_options, is_stateless, protocol, tcp_options, udp_options].hash
+      [destination, destination_type, icmp_options, is_stateless, protocol, tcp_options, udp_options].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
 

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

@@ -1,11 +1,18 @@
 # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 
 require 'date'
+require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective
 module OCI
   # A rule for allowing inbound IP packets.
   class Core::Models::IngressSecurityRule # rubocop:disable Metrics/LineLength
+    SOURCE_TYPE_ENUM = [
+      SOURCE_TYPE_CIDR_BLOCK = 'CIDR_BLOCK'.freeze,
+      SOURCE_TYPE_SERVICE_CIDR_BLOCK = 'SERVICE_CIDR_BLOCK'.freeze,
+      SOURCE_TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
     # Optional and valid only for ICMP. Use to specify a particular ICMP type and code
     # as defined in
     # [ICMP Parameters](http://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml).
@@ -35,12 +42,22 @@ module OCI
     # @return [String]
     attr_accessor :protocol
 
-    # **[Required]** The source CIDR block for the ingress rule. This is the range of IP addresses that a
-    # packet coming into the instance can come from.
+    # **[Required]** The source service cidrBlock or source IP address range in CIDR notation for the ingress rule. This is the
+    # range of IP addresses that a packet coming into the instance can come from.
+    #
+    # Examples: `10.12.0.0/16`
+    #           `oci-phx-objectstorage`
     #
     # @return [String]
     attr_accessor :source
 
+    # Type of source for IngressSecurityRule. SERVICE_CIDR_BLOCK should be used if source is a service cidrBlock.
+    # CIDR_BLOCK should be used if source is IP address range in CIDR notation. It defaults to CIDR_BLOCK, if
+    # not specified.
+    #
+    # @return [String]
+    attr_reader :source_type
+
     # Optional and valid only for TCP. Use to specify particular destination ports for TCP rules.
     # If you specify TCP as the protocol but omit this object, then all destination ports are allowed.
     #
@@ -61,6 +78,7 @@ module OCI
         'is_stateless': :'isStateless',
         'protocol': :'protocol',
         'source': :'source',
+        'source_type': :'sourceType',
         'tcp_options': :'tcpOptions',
         'udp_options': :'udpOptions'
         # rubocop:enable Style/SymbolLiteral
@@ -75,6 +93,7 @@ module OCI
         'is_stateless': :'BOOLEAN',
         'protocol': :'String',
         'source': :'String',
+        'source_type': :'String',
         'tcp_options': :'OCI::Core::Models::TcpOptions',
         'udp_options': :'OCI::Core::Models::UdpOptions'
         # rubocop:enable Style/SymbolLiteral
@@ -91,6 +110,7 @@ module OCI
     # @option attributes [BOOLEAN] :is_stateless The value to assign to the {#is_stateless} property
     # @option attributes [String] :protocol The value to assign to the {#protocol} property
     # @option attributes [String] :source The value to assign to the {#source} property
+    # @option attributes [String] :source_type The value to assign to the {#source_type} property
     # @option attributes [OCI::Core::Models::TcpOptions] :tcp_options The value to assign to the {#tcp_options} property
     # @option attributes [OCI::Core::Models::UdpOptions] :udp_options The value to assign to the {#udp_options} property
     def initialize(attributes = {})
@@ -115,6 +135,14 @@ module OCI
 
       self.source = attributes[:'source'] if attributes[:'source']
 
+      self.source_type = attributes[:'sourceType'] if attributes[:'sourceType']
+      self.source_type = "CIDR_BLOCK" if source_type.nil? && !attributes.key?(:'sourceType') # rubocop:disable Style/StringLiterals
+
+      raise 'You cannot provide both :sourceType and :source_type' if attributes.key?(:'sourceType') && attributes.key?(:'source_type')
+
+      self.source_type = attributes[:'source_type'] if attributes[:'source_type']
+      self.source_type = "CIDR_BLOCK" if source_type.nil? && !attributes.key?(:'sourceType') && !attributes.key?(:'source_type') # rubocop:disable Style/StringLiterals
+
       self.tcp_options = attributes[:'tcpOptions'] if attributes[:'tcpOptions']
 
       raise 'You cannot provide both :tcpOptions and :tcp_options' if attributes.key?(:'tcpOptions') && attributes.key?(:'tcp_options')
@@ -130,6 +158,21 @@ module OCI
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] source_type Object to be assigned
+    def source_type=(source_type)
+      # rubocop:disable Style/ConditionalAssignment
+      if source_type && !SOURCE_TYPE_ENUM.include?(source_type)
+        # rubocop: disable Metrics/LineLength
+        OCI.logger.debug("Unknown value for 'source_type' [" + source_type + "]. Mapping to 'SOURCE_TYPE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        # rubocop: enable Metrics/LineLength
+        @source_type = SOURCE_TYPE_UNKNOWN_ENUM_VALUE
+      else
+        @source_type = source_type
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
 
@@ -142,6 +185,7 @@ module OCI
         is_stateless == other.is_stateless &&
         protocol == other.protocol &&
         source == other.source &&
+        source_type == other.source_type &&
         tcp_options == other.tcp_options &&
         udp_options == other.udp_options
     end
@@ -159,7 +203,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [icmp_options, is_stateless, protocol, source, tcp_options, udp_options].hash
+      [icmp_options, is_stateless, protocol, source, source_type, tcp_options, udp_options].hash
     end
     # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines