fog 1.0.0 → 1.5.0

data/lib/fog/aws/models/compute/dhcp_option.rb

@@ -0,0 +1,68 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class DhcpOption < Fog::Model
+
+        identity  :id,                          :aliases => 'dhcpOptionsId'
+        attribute :dhcp_configuration_set,      :aliases => 'dhcpConfigurationSet'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+        def initialize(attributes={})
+          super
+        end
+
+        # Associates an existing dhcp configration set with a VPC
+        #
+        # dhcp_option.attach(dopt-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def associate(vpc_id)
+          requires :id
+          connection.attach_dhcp_option(id, vpc_id)
+          #reload
+        end
+
+        # Removes an existing dhcp configuration set
+        #
+        # dhcp_option.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :id
+          connection.delete_dhcp_options(id)
+          true
+        end
+
+        # Create a dhcp configuration set
+        #
+        #  >> g = AWS.dhcp_options.new()
+        #  >> g.save
+        #
+        # == Returns:
+        #
+        # requestId and a dhcpOptions object
+        #
+
+        def save
+          requires :dhcp_configuration_set
+          data = connection.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/dhcp_options.rb

@@ -0,0 +1,91 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/dhcp_option'
+
+module Fog
+  module Compute
+    class AWS
+
+      class DhcpOptions < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::DhcpOption
+
+        # Creates a new dhcp option
+        #
+        # AWS.dhcp_options.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new DHCP options
+        #
+        #>> AWS.dhcp_options.new
+        #=>   <Fog::Compute::AWS::DhcpOption
+        #id=nil,
+        #dhcp_configuration_set=nil,
+        #tag_set=nil
+        #>
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all DhcpOptions that have been created
+        #
+        # AWS.dhcp_options.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all DhcpOptions
+        #
+        #>> AWS.dhcp_options.all
+        #<Fog::Compute::AWS::DhcpOptions
+        #filters={}
+        #[
+        #<Fog::Compute::AWS::DhcpOption
+        #id="dopt-some-id",
+        #dhcp_configuration_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
+        #tag_set={}
+        #>
+        #]
+        #>
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('internet-gateway-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'dhcp-options-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_dhcp_options(filters).body
+          load(data['dhcpOptionsSet'])
+        end
+
+        # Used to retrieve an DhcpOption
+        #
+        # You can run the following command to get the details:
+        # AWS.dhcp_options.get("dopt-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.dhcp_options.get("dopt-12345678")
+        #=>   <Fog::Compute::AWS::DhcpOption
+        #id="dopt-12345678",
+        #dhcp_configuration_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
+        #tag_set={}
+        #>
+        #
+
+        def get(dhcp_options_id)
+          if dhcp_options_id
+            self.class.new(:connection => connection).all('dhcp-options-id' => dhcp_options_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/flavors.rb

@@ -20,6 +20,7 @@ module Fog
         { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
 
         { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
+        { :bits => 64, :cores =>   88, :disk => 3370, :id => 'cc2.8xlarge', :name => 'Cluster Compute Eight Extra Large',     :ram => 61952},
         { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
       ]
 
@@ -119,6 +120,14 @@ module Fog
         #        ram=23552
         #      >,
         #      <Fog::AWS::Compute::Flavor
+        #        id="cc2.8xlarge",
+        #        bits=64,
+        #        cores=88,
+        #        disk=3370,
+        #        name="Cluster Compute Eight Extra Large",
+        #        ram=61952
+        #      >,
+        #      <Fog::AWS::Compute::Flavor
         #        id="cg1.4xlarge",
         #        bits=64,
         #        cores=33.5,
@@ -135,10 +144,10 @@ module Fog
           self
         end
 
-        # Used to retreive a flavor
+        # Used to retrieve a flavor
         # flavor_id is required to get the associated flavor information.
         # flavors available currently:
-        # 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cg1.4xlarge'
+        # 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge'
         #
         # You can run the following command to get the details:
         # AWS.flavors.get("t1.micro")

data/lib/fog/aws/models/compute/internet_gateway.rb

@@ -0,0 +1,81 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class InternetGateway < Fog::Model
+
+        identity  :id,                          :aliases => 'internetGatewayId'
+        attribute :attachment_set,              :aliases => 'attachmentSet'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+        def initialize(attributes={})
+          super
+        end
+
+        # Attaches an existing internet gateway
+        #
+        # internet_gateway.attach(igw-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def attach(vpc_id)
+          requires :id
+          connection.attach_internet_gateway(id, vpc_id)
+          reload
+        end
+
+        # Detaches an existing internet gateway
+        #
+        # internet_gateway.detach(igw-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def detach(vpc_id)
+          requires :id
+          connection.detach_internet_gateway(id, vpc_id)
+          reload
+        end
+
+
+        # Removes an existing internet gateway
+        #
+        # internet_gateway.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def destroy
+          requires :id
+
+          connection.delete_internet_gateway(id)
+          true
+        end
+
+        # Create an internet gateway
+        #
+        #  >> g = AWS.internet_gateways.new()
+        #  >> g.save
+        #
+        # == Returns:
+        #
+        # requestId and a internetGateway object
+        #
+        def save
+          data = connection.create_internet_gateway.body['internetGatewaySet'].first
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/internet_gateways.rb

@@ -0,0 +1,91 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/internet_gateway'
+
+module Fog
+  module Compute
+    class AWS
+
+      class InternetGateways < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::InternetGateway
+
+        # Creates a new internet gateway
+        #
+        # AWS.internet_gateways.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new InternetGateway
+        #
+        #>> AWS.internet_gateways.new
+        #=>   <Fog::Compute::AWS::InternetGateway
+        #id=nil,
+        #attachment_set=nil,
+        #tag_set=nil
+        #>
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all InternetGateways that have been created
+        #
+        # AWS.internet_gateways.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all InternetGateways
+        #
+        #>> AWS.internet_gateways.all
+        #<Fog::Compute::AWS::InternetGateways
+        #filters={}
+        #[
+        #<Fog::Compute::AWS::InternetGateway
+        #id="igw-some-id",
+        #attachment_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
+        #tag_set={}
+        #>
+        #]
+        #>
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('internet-gateway-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'internet-gateway-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_internet_gateways(filters).body
+          load(data['internetGatewaySet'])
+        end
+
+        # Used to retrieve an InternetGateway
+        #
+        # You can run the following command to get the details:
+        # AWS.internet_gateways.get("igw-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.internet_gateways.get("igw-12345678")
+        #=>   <Fog::Compute::AWS::InternetGateway
+        #id="igw-12345678",
+        #attachment_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
+        #tag_set={}
+        #>
+        #
+
+        def get(internet_gateway_id)
+          if internet_gateway_id
+            self.class.new(:connection => connection).all('internet-gateway-id' => internet_gateway_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/key_pairs.rb

@@ -23,7 +23,7 @@ module Fog
         #  private_key="-----BEGIN RSA PRIVATE KEY-----\nf/VtfXJ/ekTSlRS2GSItBSzMrEGoZ+EXeMOuiA7HFkDcgKt6aBiOX9Bysiyfc1rIrgWdFKqXBRJA\nrtvBPa3/32koMPV4FxG7RZrPuKLITmFoEV86M0DSLo+ErlOPuDChfrR9dk6eI17/o1VmSvYsIpDc\njvbgx+tt7ZEPvduoUag7YdnUI0f20fttsdXjMlyDg9pPOVF3/hqucqOb3t5y9lvVJJxdTnEDFSjb\nvodpaDT9+ssw4IsQsZEIvfL0hK+Lt4phbclUWfG7JVnYfdd2u4zU6Nqe0+3qoR0ZOH4/zaUko7z8\n7JMbJqs5bmdWfnQTrvbJ13545FRI/W48ZRJxqPcj0t2MzasbT4gMgtNJrSadq78RkRJjNTu4lZmK\nvJejkBZPicHvo5IRSEbDc90Rhdh0aZNifXn0d0DSV2N6Ywo2o1lwRAi3/l6XSjukyRpTPcMr14MP\ntGwS1Tvez41Oa7Y96VfsJB2xtKc6LGRFiPUg2ZAEHU15Q9bIISVzHXgdAcef1bsh8UN/fDBrTusm\nvJisQ+dLaPH7cZ03od+XTwJc+IyeL4RqWuASE0NNfEVJMS+qcpt0WeNzfG0C27SwIcfEKL0sC0kn\nCfX2WpZDg7T5xN+88ftKJaN9tymxTgvoJVS1/WKvWBAXVozKp4f6K8wKmwf7VdUt/FWbUi54LW02\nf1ONkaYEOVwDgWlGxVSx43MWqvVdT2MPFNEBL7OA1LPwCO2nyQQ9UM9gCE65S9Najf939Bq8xwqx\nGNFlLmaH6biZUyL8ewRJ8Y7rMQ5cXy/gHZywjkuoyLQ8vVpmVpb7r1FaM/AYSr5l6gJEWdqbJleN\ntnhjPeE6qXISzIUBvwKzzgFTyW8ZHQtgbP3bHEiPG2/OjKHnLUoOId/eetcE+ovIxWsBrTDbf2SV\nYUD91u+W9K35eX89ZaIiohLNg4z9+QHCs4rcWyOXEfprBKcP2QU5+Y9ysnXLAmZt6QhInaAsUpQZ\nyhImA24UqvqrK0yyGhf/quouK7q0QkVQR+f7nGClIaphJkxO/xylrnK/pYObr4s3B8kmksuHiYOu\n1yz6SeRkj8F9dxkRmzbBK/G0tLkxIElDbM7icI9gsEO7vvgaR/K8hSDi0RkFPG43I20tU8PqwHe7\nR4jFW+6sB2+9FDeLn+qkoDSaxzmAuIRW082z/r7rJVIpFEo14hNhQYkNXpH40+P/hA9RFgvhZe8M\nvK4rz/eu246Kij6kObieTfpZhgGHqvtU8x5cnqEZOz5Hc5m4B+gMaTA53kFSPOA0pn6gqgiuYEdI\nZUhO8P1PkNqkmLz7NJRnz3qpAo6RisAxPBVr2WdSg4bP0YpGS/0TE4OOJwGLldx6dCsX60++mn0q\n1fhNw8oyZiguYMAeEEDWP8x/bsRaFz5L8uQVnnnj8ei1oTmZ+Uw9/48snWYcurL2jsbuWhhE0NTt\nfe/cqov7ZaZHs+Tr20ZBEDEqUEWr/MMskj/ZSVxnza1G/hztFJMAThF9ZJoGQkHWHfXCGOLLGY+z\nqi0SC8EIeu8PUxjO2SRj9S9o/Dwg3iHyM3pj57kD7fDNnl3Ed6LMoCXoaQV8BdMX4xh=\n-----END RSA PRIVATE KEY-----"
         #>
         #
-        # The key_pair can be retreived by running AWS.key_pairs.get("test").  See get method below.
+        # The key_pair can be retrieved by running AWS.key_pairs.get("test").  See get method below.
         #
 
         def initialize(attributes)
@@ -51,7 +51,7 @@ module Fog
 
         def all(filters = filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('key-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('key-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'key-name' => [*filters]}
           end
           self.filters = filters
@@ -59,7 +59,7 @@ module Fog
           load(data['keySet'])
         end
 
-        # Used to retreive a key pair that was created with the AWS.key_pairs.create method.
+        # Used to retrieve a key pair that was created with the AWS.key_pairs.create method.
         # The name is required to get the associated key_pair information.
         #
         # You can run the following command to get the details:

data/lib/fog/aws/models/compute/network_interface.rb

@@ -0,0 +1,70 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkInterface < Fog::Model
+
+        identity  :network_interface_id,        :aliases => 'networkInterfaceId'
+        attribute :state     
+        attribute :request_id,                  :aliases => 'requestId'
+        attribute :network_interface_id,        :aliases => 'networkInterfaceId'
+        attribute :subnet_id,                   :aliases => 'subnetId'
+        attribute :vpc_id,                      :aliases => 'vpcId'
+        attribute :availability_zone,           :aliases => 'availabilityZone'
+        attribute :description,                 :aliases => 'description'
+        attribute :owner_id,                    :aliases => 'ownerId'
+        attribute :requester_id,                :aliases => 'requesterId'
+        attribute :requester_managed,           :aliases => 'requesterManaged'
+        attribute :status,                      :aliases => 'status'
+        attribute :mac_address,                 :aliases => 'macAddress'
+        attribute :private_ip_address,          :aliases => 'privateIpAddress'
+        attribute :private_dns_name,            :aliases => 'privateDnsName'
+        attribute :source_dest_check,           :aliases => 'sourceDestCheck'
+        attribute :group_set,                   :aliases => 'groupSet'
+        attribute :attachment,                  :aliases => 'attachment'
+        attribute :association,                 :aliases => 'association'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+
+        # Removes an existing network interface
+        #
+        # network_interface.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :network_interface_id
+
+          connection.delete_network_interface(network_interface_id)
+          true
+        end
+
+        # Create a network_interface
+        #
+        #  >> g = AWS.network_interfaces.new(:subnet_id => "subnet-someId", options)
+        #  >> g.save
+        #
+        # options is an optional hash which may contain 'PrivateIpAddress', 'Description', 'groupSet'
+        #
+        # == Returns:
+        #
+        # requestId and a networkInterface object
+        #
+
+        def save
+          requires :subnet_id
+          data = connection.create_network_interface(subnet_id).body['networkInterface']
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/network_interfaces.rb

@@ -0,0 +1,136 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/network_interface'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkInterfaces < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::NetworkInterface
+
+        # Creates a new network interface
+        #
+        # AWS.network_interfaces.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new network interface
+        #
+        #>> AWS.network_interfaces.new
+        #  <Fog::AWS::Compute::NetworkInterface
+        #    network_interface_id=nil
+        #    state=nil
+        #    request_id=nil
+        #    network_interface_id=nil
+        #    subnet_id=nil
+        #    vpc_id=nil
+        #    availability_zone=nil
+        #    description=nil
+        #    owner_id=nil
+        #    requester_id=nil
+        #    requester_managed=nil
+        #    status=nil
+        #    mac_address=nil
+        #    private_ip_address=nil
+        #    private_dns_name=nil
+        #    source_dest_check=nil
+        #    group_set=nil
+        #    attachment=nil
+        #    association=nil
+        #    tag_set=nil
+        #  >
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all network interfaces that have been created
+        #
+        # AWS.network_interfaces.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all network interfaces
+        #
+        #>> AWS.network_interfaves.all
+        #  <Fog::AWS::Compute::NetworkInterfaces
+        #    filters={}
+        #    [
+        #      <Fog::Compute::AWS::NetworkInterface
+        #        network_interface_id="eni-da5dc7ca",
+        #        state=nil,
+        #        request_id=nil,
+        #        subnet_id="a9db1bcd-d215-a56f-b0ab-2398d7f37217",
+        #        vpc_id="mock-vpc-id",
+        #        availability_zone="mock-zone",
+        #        description=nil,
+        #        owner_id="",
+        #        requester_id=nil,
+        #        requester_managed="false",
+        #        status="available",
+        #        mac_address="00:11:22:33:44:55",
+        #        private_ip_address="10.0.0.2",
+        #        private_dns_name=nil,
+        #        source_dest_check=true,
+        #        group_set={},
+        #        attachment={},
+        #        association={},
+        #        tag_set={}
+        #      >
+        #    ]
+        #  >
+        #
+
+        def all(filters = filters)
+          self.filters = filters
+          data = connection.describe_network_interfaces(filters).body
+          load(data['networkInterfaceSet'])
+        end
+
+        # Used to retrieve a network interface
+        # network interface id is required to get any information
+        #
+        # You can run the following command to get the details:
+        # AWS.network_interfaces.get("eni-11223344")
+        #
+        # ==== Returns
+        #
+        #>> AWS.NetworkInterface.get("eni-11223344")
+        #  <Fog::AWS::Compute::NetworkInterface
+        #    network_interface_id="eni-da5dc7ca",
+        #    state=nil,
+        #    request_id=nil,
+        #    subnet_id="a9db1bcd-d215-a56f-b0ab-2398d7f37217",
+        #    vpc_id="mock-vpc-id",
+        #    availability_zone="mock-zone",
+        #    description=nil,
+        #    owner_id="",
+        #    requester_id=nil,
+        #    requester_managed="false",
+        #    status="available",
+        #    mac_address="00:11:22:33:44:55",
+        #    private_ip_address="10.0.0.2",
+        #    private_dns_name=nil,
+        #    source_dest_check=true,
+        #    group_set={},
+        #    attachment={},
+        #    association={},
+        #    tag_set={}
+        #  >
+        #
+
+        def get(nic_id)
+          if nic_id
+            self.class.new(:connection => connection).all('network-interface-id' => nic_id).first
+          end
+        end
+      end
+
+    end
+  end
+end