aws-sdk 1.3.5 → 1.3.6

data/lib/aws/ec2/network_acl_collection.rb

@@ -0,0 +1,65 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class EC2
+
+    class NetworkACLCollection < Collection
+
+      include TaggedCollection
+      include Core::Collection::Simple
+
+      # Creates a network ACL.
+      #
+      # @param [Hash] options
+      #
+      # @option options [VPC,String] :vpc The vpc or vpc id of where you want
+      #   to create the subnet.  This option is required if this collection
+      #   does not have a populated vpc ({#vpc} returns nil).
+      #
+      # @return [NetworkACL]
+      #
+      def create options = {}
+
+        client_opts = {}
+        client_opts[:vpc_id] = vpc_id_option(options)
+        
+        resp = client.create_network_acl(client_opts)
+
+        NetworkACL.new_from(:create_network_acl, resp.network_acl,
+          resp.network_acl.network_acl_id, :config => config)
+
+      end
+
+      # @param [String] network_acl_id
+      # @return [NetworkACL]
+      def [] network_acl_id
+        NetworkACL.new(network_acl_id, :config => config)
+      end
+
+      protected
+      def _each_item options = {}, &block
+        response = filtered_request(:describe_network_acls, options, &block)
+        response.network_acl_set.each do |a|
+
+          network_acl = NetworkACL.new_from(:describe_network_acls, a, 
+            a.network_acl_id, :config => config)
+
+          yield(network_acl)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/network_interface.rb

@@ -0,0 +1,174 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'aws/ec2/network_interface/attachment'
+
+module AWS
+  class EC2
+
+    # Represents a network interface in EC2.
+    class NetworkInterface < Resource
+
+      include TaggedItem
+
+      def initialize network_interface_id, options = {}
+        @network_interface_id = network_interface_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :network_interface_id
+
+      alias_method :id, :network_interface_id
+
+      attribute :vpc_id, :static => true
+    
+      attribute :subnet_id, :static => true
+
+      mutable_attribute :description
+
+      attribute :owner_id, :static => true
+
+      attribute :status, :to_sym => true
+
+      attribute :private_ip_address, :static => true
+
+      attribute :private_dns_name, :static => true
+
+      mutable_attribute :source_dest_check?, 
+        :set_as => :source_dest_check
+
+      alias_method :source_dest_check, :source_dest_check?
+
+      attribute :attachment_details, :as => :attachment
+
+      protected :attachment_details
+
+      mutable_attribute :groups
+
+      protected :groups
+
+      populates_from(:create_network_interface) do |resp|
+        resp.network_interface if resp.network_interface.network_interface_id == id
+      end
+
+      populates_from(:describe_network_interfaces) do |resp|
+        resp.network_interface_set.find{|i| i.network_interface_id == id }
+      end
+
+      # @return [VPC] Returns the VPC this network interface belongs to.
+      def vpc
+        VPC.new(vpc_id, :config => config)
+      end
+
+      # @return [Subnet] Returns the Subnet this network interface
+      #   belongs to.
+      def subnet
+        Subnet.new(subnet_id, :vpc_id => vpc_id, :config => config)
+      end
+
+      # @return [Array<SecurityGroup>]
+      def security_groups
+        groups.collect do |g|
+          SecurityGroup.new(g.group_id, :name => g.group_name, :config => config)
+        end
+      end
+
+      # @param [Array<SecurityGroup>,Array<String>] groups A list of
+      #   security groups objects or security group ids.  This replaces
+      #   the security group set on this network interface.
+      #
+      # @return [nil]
+      #
+      def set_security_groups *groups
+        self.groups = [groups].flatten.collect do |g|
+          g.is_a?(SecurityGroup) ? g.security_group_id : g
+        end
+        nil
+      end
+      alias_method :security_groups=, :set_security_groups
+
+      # @return [Instance,nil] Returns the instance this network interface
+      #   is attached to.  If it has not been attached, then nil is
+      #   returned.
+      def instance
+        if attachment = self.attachment
+          attachment.instance
+        end
+      end
+
+      def attachment
+        if details = attachment_details
+          Attachment.new(self, details)
+        end
+      end
+
+      # @param [Instance,String] instance The instance to attach this network
+      #   interface to, may be an {Instance} object or an instance id string.
+      #
+      # @param [Hash] options
+      #
+      # @option options [Integer] :device_index (1) The index of the device 
+      #  for the network interface attachment on the instance.  Defaults to 1.
+      #
+      # @return [nil]
+      #
+      def attach instance, options = {}
+
+        instance_id = instance.is_a?(Instance) ? instance.instance_id : instance
+
+        client_opts = {}
+        client_opts[:network_interface_id] = network_interface_id
+        client_opts[:instance_id] = instance_id
+        client_opts[:device_index] = options[:device_index] || 1
+
+        client.attach_network_interface(client_opts)
+
+        nil
+
+      end
+
+      # Detaches this network interface.
+      # @param [Hash] options
+      # @option (see NetworkInterface::Attachment#detach)
+      # @return (see NetworkInterface::Attachment#detach)
+      def detach options = {}
+        if attachment = self.attachment
+          attachment.detach(options)
+        else
+          raise 'unable to detach network interface, no attachment present'
+        end
+      end
+
+      # Deletes this network interface.
+      # @return [nil]
+      def delete
+        client_opts = {}
+        client_opts[:network_interface_id] = network_interface_id
+        client.delete_network_interface(client_opts)
+        nil
+      end
+
+      # @return [Boolean] Returns true if this network interface exists.
+      def exists?
+        begin
+          get_resource
+          true
+        rescue Errors::InvalidNetworkInterfaceID::NotFound
+          false
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/network_interface/attachment.rb

@@ -0,0 +1,100 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'aws/ec2/network_interface/attachment'
+
+module AWS
+  class EC2
+    class NetworkInterface < Resource
+      class Attachment
+        
+        def initialize network_interface, details
+          @network_interface = network_interface
+          @attachment_id = details.attachment_id
+          @instance = Instance.new(details.instance_id, 
+            :owner_id => details.instance_owner_id,
+            :config => network_interface.config)
+          @instance_owner_id = details.instance_owner_id
+          @device_index = details.device_index
+          @status = details.status.to_sym
+          @attach_time = details.attach_time
+          @delete_on_termination = details.delete_on_termination?
+        end
+
+        # @return [String] Returns the attachment id.
+        attr_reader :attachment_id
+
+        alias_method :id, :attachment_id
+
+        # @return [NetworkInterface] Returns the network interface this
+        #   is an attachment for.
+        attr_reader :network_interface
+
+        # @return [Instance] Returns the instance the network interface
+        #   is attached to.
+        attr_reader :instance
+
+        # @return [String] Returns the instance owner id.
+        attr_reader :instance_owner_id
+
+        # @return [Integer] The index of the device for the network 
+        #   interface attachment on the instance.
+        attr_reader :device_index
+
+        # @return [Symbol] Returns the attachment status.
+        attr_reader :status
+
+        # @return [Time]
+        attr_reader :attach_time
+
+        # @return [Boolean]
+        attr_reader :delete_on_termination
+
+        alias_method :delete_on_termination?, :delete_on_termination
+
+        # Allows you to toggle the delete on termination state.
+        #
+        #   network_interface.attachment.delete_on_termination = false
+        #
+        # @param [Boolean] state
+        #
+        def delete_on_termination= state
+          opts = {}
+          opts[:network_interface_id] = network_interface.id
+          opts[:attachment] = {}
+          opts[:attachment][:attachment_id] = id
+          opts[:attachment][:delete_on_termination] = state
+          network_interface.client.modify_network_interface_attribute(opts)
+        end
+
+        # Detaches the network interface from the instance.
+        #
+        # @param [Hash] options
+        #
+        # @option options [Boolean] :force (false) Set true to force
+        #   a detachment.
+        #
+        # @return [nil]
+        #
+        def detach options = {}
+          client_opts = {}
+          client_opts[:attachment_id] = attachment_id
+          client_opts[:force] = options[:force] == true
+          network_interface.client.detach_network_interface(client_opts)
+        end
+        alias_method :delete, :detach
+
+      end
+    end
+  end
+end

data/lib/aws/ec2/network_interface_collection.rb

@@ -0,0 +1,103 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class EC2
+    class NetworkInterfaceCollection < Collection
+
+      include TaggedCollection
+      include Core::Collection::Simple
+
+      # Creates a network interface.
+      #
+      # @param [Hash] options
+      #
+      # @option options [Subnet,String] :subnet The subnet or subnet id
+      #   to associate with the network interface.
+      #
+      # @option options [String] :private_ip_address The private IP address
+      #   of the network interface.
+      #
+      # @option options [String] :description The description of the
+      #   network interface.
+      #
+      # @option options [Array<SecurityGroup>,Array<String>] :security_groups
+      #   A list of security groups (or security group id strings) that 
+      #   should be used by this network interface.
+      #
+      # @return [NetworkInterface]
+      #
+      def create options = {}
+
+        client_opts = {}
+
+        client_opts[:subnet_id] = subnet_id_option(options)
+
+        client_opts[:private_ip_address] = options[:private_ip_address] if
+          options.key?(:private_ip_address)
+
+        client_opts[:description] = options[:description] if
+          options.key?(:description)
+
+        groups = groups_options(options)
+        client_opts[:groups] = groups if groups
+        
+        resp = client.create_network_interface(client_opts)
+
+        NetworkInterface.new_from(:create_network_interface,
+          resp.network_interface, 
+          resp.network_interface.network_interface_id, 
+          :config => config)
+
+      end
+
+      # @param [String] network_interface_id
+      # @return [NetworkInterface]
+      def [] network_interface_id
+        NetworkInterface.new(network_interface_id, :config => config)
+      end
+
+      protected
+      def groups_options options
+
+        # accept this option a variety of different ways
+        groups = options[:security_groups]
+        groups ||= options[:security_group_ids]
+        groups ||= options[:security_group]
+        groups ||= options[:security_group_id]
+
+        if groups
+          [groups].flatten.map{|sg| sg.is_a?(SecurityGroup) ? sg.id : sg }
+        else
+          nil
+        end
+
+      end
+
+      protected
+      def _each_item options = {}, &block
+        resp = filtered_request(:describe_network_interfaces, options, &block)
+        resp.network_interface_set.each do |n|
+
+          network_interface = NetworkInterface.new_from(
+            :describe_network_interfaces, n, 
+            n.network_interface_id, :config => config)
+
+          yield(network_interface)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/region.rb

@@ -66,7 +66,17 @@ module AWS
         :volumes,
         :snapshots,
         :reserved_instances,
-        :reserved_instances_offerings
+        :reserved_instances_offerings,
+        :vpcs,
+        :subnets,
+        :network_acls,
+        :route_tables,
+        :network_interfaces,
+        :internet_gateways,
+        :customer_gateways,
+        :vpn_gateways,
+        :dhcp_options,
+        :vpn_connections,
       ]
 
       PROXIED_METHODS.each do |method|