fog 0.0.76 → 0.0.77

data/Rakefile

@@ -92,6 +92,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
+  sh "sudo gem install pkg/#{name}-#{version}.gem"
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.0.76'
-  s.date              = '2010-04-22'
+  s.version           = '0.0.77'
+  s.date              = '2010-04-23'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -30,7 +30,7 @@ require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.76'
+  VERSION = '0.0.77'
 
   module Mock
     @delay = 1

data/lib/fog/aws/ec2.rb

@@ -194,8 +194,8 @@ module Fog
         def request(params)
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
 
-          idempotent = params.delete(:idempotent)
-          parser = params.delete(:parser)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
 
           params.merge!({
             'AWSAccessKeyId' => @aws_access_key_id,

data/lib/fog/aws/models/ec2/snapshot.rb

@@ -20,6 +20,10 @@ module Fog
           true
         end
 
+        def ready?
+          @status == 'completed'
+        end
+
         def save
           requires :volume_id
 

data/lib/fog/aws/models/ec2/snapshots.rb

@@ -23,6 +23,8 @@ module Fog
 
       class Snapshots < Fog::Collection
 
+        attribute :owner,         'Owner'
+        attribute :restorable_by, 'RestorableBy'
         attribute :snapshot_id
         attribute :volume
 
@@ -33,8 +35,13 @@ module Fog
           super
         end
 
-        def all(snapshot_id = @snapshot_id)
-          @snapshot_id = snapshot_id
+        def all(snapshot_id = @snapshot_id, options = {})
+          options = {
+            'Owner' => @owner || 'self',
+            'RestorableBy' => @restorable_by
+          }
+          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
+          merge_attributes(options)
           data = connection.describe_snapshots(snapshot_id).body
           load(data['snapshotSet'])
           if volume

data/lib/fog/aws/requests/ec2/delete_snapshot.rb

@@ -7,7 +7,7 @@ module Fog
         #
         # ==== Parameters
         # * snapshot_id<~String> - ID of snapshot to delete
-        # ==== Returns
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -7,6 +7,9 @@ module Fog
         #
         # ==== Parameters
         # * snapshot_id<~Array> - List of snapshots to describe, defaults to all
+        # * options<~Array>:
+        #   * 'Owner'<~String> - Owner of snapshot in ['self', 'amazon', account_id]
+        #   * 'RestorableBy'<~String> - Account id of user who can create volumes from this snapshot
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -18,12 +21,13 @@ module Fog
         #       * 'startTime'<~Time>: Timestamp of when snapshot was initiated
         #       * 'status'<~String>: Snapshot state, in ['pending', 'completed']
         #       * 'volumeId'<~String>: Id of volume that snapshot contains
-        def describe_snapshots(snapshot_id = [])
-          params = AWS.indexed_param('SnapshotId', snapshot_id)
+        def describe_snapshots(snapshot_id = [], options = {})
+          options['Owner'] ||= 'self'
+          options.merge!(AWS.indexed_param('SnapshotId', snapshot_id))
           request({
             'Action'  => 'DescribeSnapshots',
             :parser   => Fog::Parsers::AWS::EC2::DescribeSnapshots.new
-          }.merge!(params))
+          }.merge!(options))
         end
 
       end

data/lib/fog/terremark/requests/instantiate_vapp_template.rb

@@ -5,68 +5,32 @@ module Fog
       # Instatiate a vapp template
       #
       # ==== Parameters
-      # * vdc_id<~Integer> - Id of vdc to instantiate template in
+      # * name<~String>: Name of the resulting vapp .. must start with letter, up to 15 chars alphanumeric.
       # * options<~Hash>:
       #   * cpus<~Integer>: Number of cpus in [1, 2, 4, 8], defaults to 1
       #   * memory<~Integer>: Amount of memory either 512 or a multiple of 1024, defaults to 512
+      #   * vapp_template<~String>: id of the vapp template to be instantiated
       # ==== Returns
       # * response<~Excon::Response>:
       #   * body<~Hash>:
-
-      # FIXME
-
-      #     * 'CatalogItems'<~Array>
-      #       * 'href'<~String> - linke to item
-      #       * 'name'<~String> - name of item
-      #       * 'type'<~String> - type of item
-      #     * 'description'<~String> - Description of catalog
-      #     * 'name'<~String> - Name of catalog
-      def instantiate_vapp_template(name, options = {})
-        options['cpus'] ||= 1
-        options['memory'] ||= 512
-
-        # FIXME: much cheating to commence
-        vdc_id        = default_vdc_id
-        network_id    = default_network_id
-        catalog_item  = 12 # Ubuntu JeOS 9.10 (64-bit)
-
-        #       case UNRESOLVED:
-        #          return "0";
-        #       case RESOLVED:
-        #          return "1";
-        #       case OFF:
-        #          return "2";
-        #       case SUSPENDED:
-        #          return "3";
-        #       case ON:
-        #          return "4";
-        #       default:
-        # 
-        # /**
-        #  * The vApp is unresolved (one or more file references are unavailable in the cloud)
-        #  */
-        # UNRESOLVED,
-        # /**
-        #  * The vApp is resolved (all file references are available in the cloud) but not deployed
-        #  */
-        # RESOLVED,
-        # /**
-        #  * The vApp is deployed and powered off
-        #  */
-        # OFF,
-        # /**
-        #  * The vApp is deployed and suspended
-        #  */
-        # SUSPENDED,
-        # /**
-        #  * The vApp is deployed and powered on
-        #  */
-        # ON;
+      #   *   'Links;<~Array> (e.g. up to vdc)
+      #   * 'href'<~String> Link to the resulting vapp
+      #   * 'name'<~String> - name of item
+      #   * 'type'<~String> - type of item
+      #   * 'status'<~String> - 0(pending) --> 2(off) -->4(on)
+      def instantiate_vapp_template(name, vapp_template, options = {})
+        unless name.length < 15
+          raise ArgumentError.new('Name must be fewer than 15 characters')
+        end
+        options['cpus']       ||= 1
+        options['memory']     ||= 512
+        options['network_id'] ||= default_network_id
+        options['vdc_id']     ||= default_vdc_id
 
         data = <<-DATA
 <?xml version="1.0" encoding="UTF-8"?>
   <InstantiateVAppTemplateParams name="#{name}" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://services.vcloudexpress.terremark.com/api/v0.8/ns/vcloud.xsd">
-    <VAppTemplate href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/#{catalog_item}" />
+    <VAppTemplate href="#{@scheme}://#{@host}/#{@path}/vAppTemplate/#{vapp_template}" />
     <InstantiationParams xmlns:vmw="http://www.vmware.com/schema/ovf">
       <ProductSection xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q1="http://www.vmware.com/vcloud/v0.8"/>
       <VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v0.8">
@@ -82,12 +46,8 @@ module Fog
         </Item>
       </VirtualHardwareSection>
       <NetworkConfigSection>
-        <NetworkConfig name="Network 1">
-          <Features>
-            <vmw:FenceMode>allowInOut</vmw:FenceMode>
-            <vmw:Dhcp>true</vmw:Dhcp>
-          </Features>
-          <NetworkAssociation href="https://services.vcloudexpress.terremark.com/api/v8/network/#{network_id}" />
+        <NetworkConfig>
+          <NetworkAssociation href="#{@scheme}://#{@host}/#{@path}/network/#{options['network_id']}"/>
         </NetworkConfig>
       </NetworkConfigSection>
     </InstantiationParams>
@@ -100,7 +60,7 @@ DATA
           :headers  => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::InstantiateVappTemplate.new,
-          :path     => "vdc/#{vdc_id}/action/instantiatevAppTemplate"
+          :path     => "vdc/#{options['vdc_id']}/action/instantiatevAppTemplate"
         )
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 76
-  version: 0.0.76
+  - 77
+  version: 0.0.77
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -07:00
+date: 2010-04-23 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency