fog 1.1.0 → 1.2.0

data/lib/fog/aws/models/beanstalk/templates.rb

@@ -0,0 +1,70 @@
+require 'fog/core/collection'
+require 'fog/aws/models/beanstalk/template'
+
+module Fog
+  module AWS
+    class ElasticBeanstalk
+
+      class Templates < Fog::Collection
+        model Fog::AWS::ElasticBeanstalk::Template
+
+        # Describes all configuration templates, may optionally pass an ApplicationName filter
+        #
+        # Note: This is currently an expensive operation requiring multiple API calls due to a lack of
+        # a describe configuration templates call in the AWS API.
+        def all(options={})
+          application_filter = []
+          if options.has_key?('ApplicationName')
+            application_filter << options['ApplicationName']
+          end
+
+          # Initialize with empty array
+          data = []
+
+          applications = connection.describe_applications(application_filter).body['DescribeApplicationsResult']['Applications']
+          applications.each { |application|
+            application['ConfigurationTemplates'].each { |template_name|
+              begin
+                options = {
+                    'ApplicationName' => application['ApplicationName'],
+                    'TemplateName' => template_name
+                }
+                settings = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+                if settings.length == 1
+                  # Add to data
+                  data << settings.first
+                end
+              rescue Fog::AWS::ElasticBeanstalk::InvalidParameterError
+                # Ignore
+              end
+
+            }
+          }
+
+          load(data) # data is an array of attribute hashes
+        end
+
+        def get(application_name, template_name)
+          options = {
+              'ApplicationName' => application_name,
+              'TemplateName' => template_name
+          }
+
+          result = nil
+          # There is no describe call for templates, so we must use describe_configuration_settings.  Unfortunately,
+          # it throws an exception if template name doesn't exist, which is inconsistent, catch and return nil
+          begin
+            data = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+            if data.length == 1
+              result = new(data.first)
+            end
+          rescue Fog::AWS::ElasticBeanstalk::InvalidParameterError
+
+          end
+            result
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/beanstalk/version.rb

@@ -0,0 +1,79 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class ElasticBeanstalk
+
+      class Version < Fog::Model
+        attribute :label, :aliases => 'VersionLabel'
+        attribute :application_name, :aliases => 'ApplicationName'
+        attribute :created_at, :aliases => 'DateCreated'
+        attribute :updated_at, :aliases => 'DateUpdated'
+        attribute :description, :aliases => 'Description'
+        attribute :source_bundle, :aliases => 'SourceBundle'
+        attribute :auto_create_application # FIXME - should be write only
+
+        def initialize(attributes={})
+          super
+        end
+
+        # Return events related to this version
+        def events
+          requires :label, :application_name
+          connection.events.all({
+                                    'ApplicationName' => application_name,
+                                    'VersionLabel' => label
+                                })
+        end
+
+        # Returns environments running this version
+        def environments
+          requires :label, :application_name
+          connection.environments.all({
+                                    'ApplicationName' => application_name,
+                                    'VersionLabel' => label
+                                })
+        end
+
+        def destroy(delete_source_bundle = nil)
+          requires :label, :application_name
+          connection.delete_application_version(application_name, label, delete_source_bundle)
+          true
+        end
+
+        def save
+          requires :label, :application_name
+
+          options = {
+              'ApplicationName' => application_name,
+              'AutoCreateApplication' => auto_create_application,
+              'Description' => description,
+              'SourceBundle' => source_bundle,
+              'VersionLabel' => label
+          }
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.create_application_version(options).body['CreateApplicationVersionResult']['ApplicationVersion']
+          merge_attributes(data)
+          true
+        end
+
+        # Updates the version label with the current property values.  Currently only updates description
+        def update
+          requires :label, :application_name
+
+          options = {
+              'ApplicationName' => application_name,
+              'Description' => description,
+              'VersionLabel' => label
+          }
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.update_application_version(options).body['UpdateApplicationVersionResult']['ApplicationVersion']
+          merge_attributes(data)
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/beanstalk/versions.rb

@@ -0,0 +1,31 @@
+require 'fog/core/collection'
+require 'fog/aws/models/beanstalk/version'
+
+module Fog
+  module AWS
+    class ElasticBeanstalk
+
+      class Versions < Fog::Collection
+        model Fog::AWS::ElasticBeanstalk::Version
+
+        def all(options={})
+          data = connection.describe_application_versions(options).body['DescribeApplicationVersionsResult']['ApplicationVersions']
+          load(data) # data is an array of attribute hashes
+        end
+
+        def get(application_name, version_label)
+          if data = connection.describe_application_versions({
+                                                                 'ApplicationName' => application_name,
+                                                                 'VersionLabels' => [version_label]
+                                                             }).body['DescribeApplicationVersionsResult']['ApplicationVersions']
+            if data.length == 1
+              new(data.first)
+            end
+
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/cloud_watch/metric_statistic.rb

@@ -25,7 +25,6 @@ module Fog
 
           put_opts = {'MetricName' => metric_name, 'Unit' => unit}
           put_opts.merge!('Dimensions' => dimensions) if dimensions
-          put_opts.merge!('Timestamp' => dimensions) if timestamp
           if value
             put_opts.merge!('Value' => value)
           else
@@ -43,4 +42,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -6,9 +6,12 @@ module Fog
 
       class Address < Fog::Model
 
-        identity  :public_ip, :aliases => 'publicIp'
+        identity  :public_ip,            :aliases => 'publicIp'
 
-        attribute :server_id, :aliases => 'instanceId'
+        attribute :allocation_id,        :aliases => 'allocationId'
+        attribute :server_id,            :aliases => 'instanceId'
+        attribute :network_interface_id, :aliases => 'networkInterfaceId'
+        attribute :domain
 
         def initialize(attributes = {})
           # assign server first to prevent race condition with new_record?
@@ -33,7 +36,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          data = connection.allocate_address.body
+          data = connection.allocate_address(domain).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           if @server
@@ -50,7 +53,7 @@ module Fog
           else
             @server = nil
             self.server_id = new_server.id
-            connection.associate_address(server_id, public_ip)
+            connection.associate_address(server_id, public_ip, network_interface_id, allocation_id)
           end
         end
 

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

@@ -22,7 +22,7 @@ module Fog
         #    server_id=nil
         #  >
         #
-        # The IP address can be retreived by running AWS.addresses.get("test").  See get method below.
+        # The IP address can be retrieved by running AWS.addresses.get("test").  See get method below.
         #
 
         def initialize(attributes)
@@ -72,7 +72,7 @@ module Fog
           self
         end
 
-        # Used to retreive an IP address
+        # Used to retrieve an IP address
         #
         # public_ip is required to get the associated IP information.
         #

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

@@ -135,7 +135,7 @@ 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'

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)
@@ -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/security_group.rb

@@ -7,10 +7,11 @@ module Fog
       class SecurityGroup < Fog::Model
 
         identity  :name,            :aliases => 'groupName'
-
         attribute :description,     :aliases => 'groupDescription'
+        attribute :group_id,        :aliases => 'groupId'
         attribute :ip_permissions,  :aliases => 'ipPermissions'
         attribute :owner_id,        :aliases => 'ownerId'
+        attribute :vpc_id,          :aliases => 'vpcId'
 
         # Authorize access by another security group
         #
@@ -193,8 +194,7 @@ module Fog
 
         def save
           requires :description, :name
-
-          data = connection.create_security_group(name, description).body
+          data = connection.create_security_group(name, description, vpc_id).body
           true
         end
 

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

@@ -25,14 +25,15 @@ module Fog
         #    description=nil,
         #    ip_permissions=nil,
         #    owner_id=nil
+        #    vpc_id=nil
         #  >
         #
-        
+
         def initialize(attributes)
           self.filters ||= {}
           super
         end
-        
+
         # Returns an array of all security groups that have been created
         #
         # AWS.security_groups.all
@@ -50,6 +51,7 @@ module Fog
         #        description="default group",
         #        ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
         #        owner_id="312571045469"
+        #        vpc_id=nill
         #      >
         #    ]
         #  >
@@ -65,7 +67,7 @@ module Fog
           load(data['securityGroupInfo'])
         end
 
-        # Used to retreive a security group
+        # Used to retrieve a security group
         # group name is required to get the associated flavor information.
         #
         # You can run the following command to get the details:
@@ -79,15 +81,38 @@ module Fog
         #    description="default group",
         #    ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
         #    owner_id="312571045469"
-        #  > 
+        #    vpc_id=nil
+        #  >
         #
-        
+
         def get(group_name)
           if group_name
             self.class.new(:connection => connection).all('group-name' => group_name).first
           end
         end
 
+        # Used to retrieve a security group
+        # group id is required to get the associated flavor information.
+        #
+        # You can run the following command to get the details:
+        # AWS.security_groups.get_by_id("default")
+        #
+        # ==== Returns
+        #
+        #>> AWS.security_groups.get_by_id("sg-123456")
+        #  <Fog::AWS::Compute::SecurityGroup
+        #    name="default",
+        #    description="default group",
+        #    ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
+        #    owner_id="312571045469"
+        #  >
+        #
+
+        def get_by_id(group_id)
+          if group_id
+            self.class.new(:connection => connection).all('group-id' => group_id).first
+          end
+        end
       end
 
     end

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

@@ -34,18 +34,20 @@ module Fog
         attribute :reason
         attribute :root_device_name,      :aliases => 'rootDeviceName'
         attribute :root_device_type,      :aliases => 'rootDeviceType'
+        attribute :security_group_ids,    :aliases => 'securityGroupIds'
         attribute :state,                 :aliases => 'instanceState', :squash => 'name'
         attribute :state_reason,          :aliases => 'stateReason'
         attribute :subnet_id,             :aliases => 'subnetId'
         attribute :tenancy
         attribute :tags,                  :aliases => 'tagSet'
         attribute :user_data
+        attribute :vpc_id,                :aliases => 'vpcId'
 
         attr_accessor :password
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.groups     ||= ["default"] unless attributes[:subnet_id]
+          self.groups     ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids])
           self.flavor_id  ||= 't1.micro'
           self.image_id   ||= begin
             self.username = 'ubuntu'
@@ -150,8 +152,10 @@ module Fog
             'Placement.AvailabilityZone'  => availability_zone,
             'Placement.GroupName'         => placement_group,
             'Placement.Tenancy'           => tenancy,
+            'PrivateIpAddress'            => private_ip_address,
             'RamdiskId'                   => ramdisk_id,
             'SecurityGroup'               => groups,
+            'SecurityGroupId'             => security_group_ids,
             'SubnetId'                    => subnet_id,
             'UserData'                    => user_data
           }

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

@@ -103,7 +103,7 @@ module Fog
           server
         end
 
-        # Used to retreive a server
+        # Used to retrieve a server
         #
         # server_id is required to get the associated server information.
         #
@@ -142,7 +142,7 @@ module Fog
         #    user_data=nil
         #  >
         #
-        
+
         def get(server_id)
           if server_id
             self.class.new(:connection => connection).all('instance-id' => server_id).first

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

@@ -0,0 +1,58 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class Subnet < Fog::Model
+
+        identity  :subnet_id,                   :aliases => 'subnetId'
+        attribute :state     
+        attribute :vpc_id,                      :aliases => 'vpcId'
+        attribute :cidr_block,                  :aliases => 'cidrBlock'
+        attribute :available_ip_address_count,  :aliases => 'availableIpAddressCount'
+        attribute :availability_zone,           :aliases => 'availabilityZone'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+
+        # Removes an existing subnet
+        #
+        # subnet.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :subnet_id
+
+          connection.delete_subnet(subnet_id)
+          true
+        end
+
+        # Create a subnet
+        #
+        #  >> g = AWS.subnets.new(:vpc_id => "vpc-someId", :cidr_block => "10.0.0.0/24")
+        #  >> g.save
+        #
+        # == Returns:
+        #
+        # requestId and a subnetSet object
+        #
+
+        def save
+          requires :vpc_id, :cidr_block
+          data = connection.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
+		puts data
+          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/subnets.rb

@@ -0,0 +1,99 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/subnet'
+
+module Fog
+  module Compute
+    class AWS
+
+      class Subnets < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::Subnet
+
+        # Creates a new subnet
+        #
+        # AWS.subnets.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new Subnet
+        #
+        #>> AWS.subnets.new
+        # <Fog::AWS::Compute::Subnet
+        # subnet_id=subnet-someId,
+        # state=[pending|available],
+        # vpc_id=vpc-someId
+        # cidr_block=someIpRange
+        # available_ip_address_count=someInt
+        # tagset=nil
+        # >
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all Subnets that have been created
+        #
+        # AWS.subnets.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all VPCs
+        #
+        #>> AWS.subnets.all
+        # <Fog::AWS::Compute::Subnet
+        # filters={}
+        # [
+        # subnet_id=subnet-someId,
+        # state=[pending|available],
+        # vpc_id=vpc-someId
+        # cidr_block=someIpRange
+        # available_ip_address_count=someInt
+        # tagset=nil
+        # ]
+        # >
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('subnet-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'subnet-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_subnets(filters).body
+          load(data['subnetSet'])
+        end
+
+        # Used to retrieve a Subnet
+        # subnet-id is required to get the associated VPC information.
+        #
+        # You can run the following command to get the details:
+        # AWS.subnets.get("subnet-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.subnets.get("subnet-12345678")
+        # <Fog::AWS::Compute::Subnet
+        # subnet_id=subnet-someId,
+        # state=[pending|available],
+        # vpc_id=vpc-someId
+        # cidr_block=someIpRange
+        # available_ip_address_count=someInt
+        # tagset=nil
+        # >
+        #
+
+        def get(subnet_id)
+          if subnet_id
+            self.class.new(:connection => connection).all('subnet-id' => subnet_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -31,7 +31,7 @@ module Fog
         #  tags=nil
         #>
         #
-        # The volume can be retreived by running AWS.volumes.get("vol-1e2028b9").  See get method below.
+        # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9").  See get method below.
         #
 
         def initialize(attributes)
@@ -59,7 +59,7 @@ module Fog
         #  tags=nil
         #>
         #
-        # The volume can be retreived by running AWS.volumes.get("vol-1e2028b9").  See get method below.
+        # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9").  See get method below.
         #
 
         def all(filters = filters)
@@ -76,7 +76,7 @@ module Fog
           self
         end
 
-        # Used to retreive a volume
+        # Used to retrieve a volume
         # volume_id is required to get the associated volume information.
         #
         # You can run the following command to get the details:

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

@@ -0,0 +1,63 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class VPC < Fog::Model
+
+        identity :id,                :aliases => 'vpcId'
+
+        attribute :state
+        attribute :cidr_block,       :aliases => 'cidrBlock'
+        attribute :dhcp_options_id,  :aliases => 'dhcpOptionsId'
+        attribute :tags,             :aliases => 'tagSet'
+        attribute :tenancy,          :aliases => 'instanceTenancy'
+
+        def initialize(attributes={})
+          self.dhcp_options_id ||= "default"
+          self.tenancy ||= "default"
+          super
+        end
+
+        # Removes an existing vpc
+        #
+        # vpc.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :id
+
+          connection.delete_vpc(id)
+          true
+        end
+
+        # Create a vpc
+        #
+        # >> g = AWS.vpcs.new(:cidr_block => "10.1.2.0/24")
+        # >> g.save
+        #
+        # == Returns:
+        #
+        # True or an exception depending on the result. Keep in mind that this *creates* a new vpc.
+        # As such, it yields an InvalidGroup.Duplicate exception if you attempt to save an existing vpc.
+        #
+
+        def save
+          requires :cidr_block
+
+          data = connection.create_vpc(cidr_block).body['vpcSet'].first
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+        end
+
+      end
+
+    end
+  end
+end