fog 0.3.7 → 0.3.8

data/spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+
+if Fog.mocking?
+  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
+
+    it { should respond_to :get_customization_options }
+
+    describe "#get_customization_options" do
+      context "with a valid catalog_item customizations uri" do
+        let(:catalog_item) { @vcloud.get_catalog_item(@vcloud.vdcs.first.catalog.first.href) }
+
+        before { @customization_options = @vcloud.get_customization_options(catalog_item.body[:Link][:href]) }
+        subject { @customization_options }
+
+        it_should_behave_like "all responses"
+        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml" }
+
+        describe "#body" do
+          subject { @customization_options.body }
+
+          it { should have(5).items }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+
+          specify { subject[:CustomizeNetwork].should == "true" }
+          specify { subject[:CustomizePassword].should == "false" }
+        end
+      end
+
+      context "with a catalog uri that doesn't exist" do
+        subject { lambda { @vcloud.get_catalog(URI.parse('https://www.fakey.com/api/v0.8/vdc/999/catalog')) } }
+
+        it_should_behave_like "a request for a resource that doesn't exist"
+      end
+    end
+  end
+else
+end

data/spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb

@@ -0,0 +1,73 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+
+if Fog.mocking?
+  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
+
+    it { should respond_to :instantiate_vapp_template }
+
+    describe "#instantiate_vapp_template" do
+      let(:vdc) { @vcloud.vdcs.first }
+      let(:catalog_item) { vdc.catalog.first }
+      let(:new_vapp_data) do
+        {
+          :name => "foobar",
+          :network_uri => @mock_network[:href],
+          :row => "test row",
+          :group => "test group",
+          :memory => 1024,
+          :cpus => 2,
+          :vdc_uri => vdc.href
+        }
+      end
+
+      context "with a valid data" do
+        let(:template_instantiation) { @vcloud.instantiate_vapp_template(catalog_item.href, new_vapp_data) }
+        subject { template_instantiation }
+
+        it_should_behave_like "all responses"
+        it { should have_headers_denoting_a_content_type_of "application/xml" }
+
+        it "updates the mock data properly" do
+          expect { template_instantiation }.to change { @vcloud.vdc_from_uri(vdc.href)[:vms].count }.by(1)
+        end
+
+        describe "added mock data" do
+          subject { template_instantiation; @vcloud.vdc_from_uri(vdc.href)[:vms].last }
+
+          it { should include :id }
+          it { should include :href }
+
+          specify { subject.values_at(*new_vapp_data.keys).should == new_vapp_data.values }
+        end
+
+        describe "#body" do
+          subject { template_instantiation.body }
+
+          it { should have(9).items }
+
+          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+
+          its(:href) { should =~ %r{/vapp/\d+$} }
+          its(:type) { should == "application/vnd.vmware.vcloud.vApp+xml" }
+          its(:name) { should == new_vapp_data[:name] }
+          its(:status) { should == "0" }
+          its(:size) { should == "4" }
+
+          it { should include :Link }
+
+          describe "Link" do
+            subject { template_instantiation.body[:Link] }
+
+            it { should have(3).keys }
+
+            its(:rel)  { should == "up" }
+            its(:type) { should == "application/vnd.vmware.vcloud.vdc+xml" }
+            its(:href) { should == vdc.href }
+          end
+        end
+      end
+    end
+  end
+else
+end

data/tests/aws/requests/compute/address_tests.rb

@@ -26,8 +26,8 @@ Shindo.tests('AWS::Compute | address requests', ['aws']) do
       AWS[:compute].describe_addresses.body
     end
 
-    tests("#describe_addresses('#{@public_Ip}')").formats(@addresses_format) do
-      AWS[:compute].describe_addresses(@public_ip).body
+    tests("#describe_addresses('public-ip' => #{@public_Ip}')").formats(@addresses_format) do
+      AWS[:compute].describe_addresses('public-ip' => @public_ip).body
     end
 
     tests("#associate_addresses('#{@server.identity}', '#{@public_Ip}')").formats(AWS::Compute::Formats::BASIC) do
@@ -47,10 +47,6 @@ Shindo.tests('AWS::Compute | address requests', ['aws']) do
 
     @address = AWS[:compute].addresses.create
 
-    tests("#describe_addresses('127.0.0.1')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_addresses('127.0.0.1')
-    end
-
     tests("#associate_addresses('i-00000000', '#{@address.identity}')").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].associate_address('i-00000000', @address.identity)
     end

data/tests/aws/requests/compute/availability_zone_tests.rb

@@ -2,6 +2,7 @@ Shindo.tests('AWS::Compute | availability zone requests', ['aws']) do
 
   @availability_zones_format = {
     'availabilityZoneInfo'  => [{
+      'messageSet'  => [],
       'regionName'  => String,
       'zoneName'    => String,
       'zoneState'   => String
@@ -15,16 +16,8 @@ Shindo.tests('AWS::Compute | availability zone requests', ['aws']) do
       AWS[:compute].describe_availability_zones.body
     end
 
-    tests("#describe_availability_zones('us-east-1a')").formats(@availability_zones_format) do
-      AWS[:compute].describe_availability_zones('us-east-1a').body
-    end
-
-  end
-
-  tests('failure') do
-
-    tests("#describe_availability_zones('us-east-1e')").raises(Fog::AWS::Compute::Error) do
-      AWS[:compute].describe_availability_zones('us-east-1e')
+    tests("#describe_availability_zones('zone-name' => 'us-east-1a')").formats(@availability_zones_format) do
+      AWS[:compute].describe_availability_zones('zone-name' => 'us-east-1a').body
     end
 
   end

data/tests/aws/requests/compute/image_tests.rb

@@ -13,29 +13,24 @@ Shindo.tests('AWS::Compute | image requests', ['aws']) do
       'kernelId'        => String,
       'productCodes'    => [],
       'ramdiskId'       => String,
-      'rootDeviceType'  => String
+      'rootDeviceType'  => String,
+      'tagSet'          => {}
     }],
       'requestId'     => String,
   }
 
   tests('success') do
 
-    # the result for this is HUGE an relatively uninteresting...de
+    # the result for this is HUGE and relatively uninteresting...
     # tests("#describe_images").formats(@images_format) do
     #   AWS[:compute].describe_images.body
     # end
 
     tests("#describe_images('ImageId' => '#{GENTOO_AMI}')").formats(@images_format) do
+      pending if Fog.mocking?
       AWS[:compute].describe_images('ImageId' => GENTOO_AMI).body
     end
 
   end
 
-  tests('failure') do
-
-    tests("#describe_images('ImageId' => 'ami-00000000')").raises(Fog::AWS::Compute::Error) do
-      AWS[:compute].describe_regions('ImageId' => 'ami-00000000')
-    end
-  end
-
 end

data/tests/aws/requests/compute/instance_tests.rb

@@ -4,6 +4,7 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     # 'architecture'    => String,
     'amiLaunchIndex'      => Integer,
     'blockDeviceMapping'  => [],
+    'clientToken'         => NilClass,
     'dnsName'             => NilClass,
     'imageId'             => String,
     'instanceId'          => String,
@@ -21,7 +22,7 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     'ramdiskId'           => String,
     'reason'              => NilClass,
     # 'rootDeviceName'      => String,
-    'rootDeviceType'      => String
+    'rootDeviceType'      => String,
   }
 
   @run_instances_format = {
@@ -40,7 +41,9 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
         'dnsName'           => String,
         'ipAddress'         => String,
         'privateDnsName'    => String,
-        'privateIpAddress'  => String
+        'privateIpAddress'  => String,
+        'stateReason'       => {},
+        'tagSet'            => {}
       )],
       'ownerId'       => String,
       'reservationId' => String
@@ -81,8 +84,8 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     #   AWS[:compute].describe_instances.body
     # end
 
-    tests("#describe_instances('#{@instance_id}')").formats(@describe_instances_format) do
-      AWS[:compute].describe_instances(@instance_id).body
+    tests("#describe_instances('instance-id' => '#{@instance_id}')").formats(@describe_instances_format) do
+      AWS[:compute].describe_instances('instance-id' => @instance_id).body
     end
 
     tests("#get_console_output('#{@instance_id}')").formats(@get_console_output_format) do
@@ -101,10 +104,6 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
 
   tests('failure') do
 
-    tests("#describe_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_instances('i-00000000')
-    end
-
     tests("#get_console_output('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].get_console_output('i-00000000')
     end

data/tests/aws/requests/compute/key_pair_tests.rb

@@ -27,8 +27,8 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
       AWS[:compute].describe_key_pairs.body
     end
 
-    tests("#describe_key_pairs(#{@key_pair_name})").formats(@keypairs_format) do
-      AWS[:compute].describe_key_pairs(@key_pair_name).body
+    tests("#describe_key_pairs('key-name' => '#{@key_pair_name}')").formats(@keypairs_format) do
+      AWS[:compute].describe_key_pairs('key-name' => @key_pair_name).body
     end
 
     tests("#delete_key_pair('#{@key_pair_name}')").formats(AWS::Compute::Formats::BASIC) do
@@ -56,10 +56,6 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
       AWS[:compute].create_key_pair(@key_pair.name)
     end
 
-    tests("#describe_key_pair('not_a_key_name')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_key_pairs('not_a_key_name').body
-    end
-
     @key_pair.destroy
 
   end

data/tests/aws/requests/compute/region_tests.rb

@@ -14,17 +14,10 @@ Shindo.tests('AWS::Compute | region requests', ['aws']) do
       AWS[:compute].describe_regions.body
     end
 
-    tests("#describe_regions('us-east-1')").formats(@regions_format) do
-      AWS[:compute].describe_regions('us-east-1').body
+    tests("#describe_regions('region-name' => 'us-east-1')").formats(@regions_format) do
+      AWS[:compute].describe_regions('region-name' => 'us-east-1').body
     end
 
   end
 
-  tests('failure') do
-
-    tests("#describe_regions('us-east-2')").raises(Fog::AWS::Compute::Error) do
-      AWS[:compute].describe_regions('us-east-2')
-    end
-  end
-
 end

data/tests/aws/requests/compute/security_group_tests.rb

@@ -16,7 +16,7 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     }]
   }
 
-  @owner_id = AWS[:compute].describe_security_groups('default').body['securityGroupInfo'].first['ownerId']
+  @owner_id = AWS[:compute].describe_security_groups('group-name' => 'default').body['securityGroupInfo'].first['ownerId']
 
   tests('success') do
 
@@ -45,8 +45,8 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       AWS[:compute].describe_security_groups.body
     end
 
-    tests("#describe_security_groups('fog_security_group')").formats(@security_groups_format) do
-      AWS[:compute].describe_security_groups('fog_security_group').body
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").formats(@security_groups_format) do
+      AWS[:compute].describe_security_groups('group-name' => 'fog_security_group').body
     end
 
     tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'fog_security_group', 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
@@ -96,10 +96,6 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       })
     end
 
-    tests("#describe_security_group('not_a_group_name)").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_security_groups('not_a_group_name')
-    end
-
     tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].revoke_security_group_ingress({
         'FromPort' => 80,

data/tests/aws/requests/compute/snapshot_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
 
   @snapshots_format = {
     'requestId'   => String,
-    'snapshotSet' => [@snapshot_format]
+    'snapshotSet' => [@snapshot_format.merge('tagSet' => {})]
   }
 
   @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
@@ -28,14 +28,15 @@ Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
       data
     end
 
+    Fog.wait_for { AWS[:compute].snapshots.get(@snapshot_id) }
     AWS[:compute].snapshots.get(@snapshot_id).wait_for { ready? }
 
     tests("#describe_snapshots").formats(@snapshots_format) do
       AWS[:compute].describe_snapshots.body
     end
 
-    tests("#describe_snapshots('#{@snapshot_id}')").formats(@snapshots_format) do
-      AWS[:compute].describe_snapshots(@snapshot_id).body
+    tests("#describe_snapshots('snapshot-id' => '#{@snapshot_id}')").formats(@snapshots_format) do
+      AWS[:compute].describe_snapshots('snapshot-id' => @snapshot_id).body
     end
 
     tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
@@ -45,10 +46,6 @@ Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
   end
   tests ('failure') do
 
-    tests("#describe_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_snapshots('snap-00000000')
-    end
-
     tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].delete_snapshot('snap-00000000')
     end

data/tests/aws/requests/compute/tag_tests.rb

@@ -0,0 +1,49 @@
+Shindo.tests('AWS::Compute | tag requests', ['aws']) do
+
+  @tags_format = {
+    'tagSet'    => [{
+      'key'          => String,
+      'resourceId'   => String,
+      'resourceType' => String,
+      'value'        => String
+    }],
+    'requestId' => String
+  }
+
+  @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
+  @volume.wait_for { ready? }
+
+  tests('success') do
+
+    tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].create_tags(@volume.identity, 'foo' => 'bar').body
+    end
+
+    tests('#describe_tags').formats(@tags_format) do
+      pending if Fog.mocking?
+      AWS[:compute].describe_tags.body
+    end
+
+    tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:compute].delete_tags(@volume.identity, 'foo' => 'bar').body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#create_tags('vol-00000000', 'baz' => 'qux')").raises(Fog::Service::NotFound) do
+      AWS[:compute].create_tags('vol-00000000', 'baz' => 'qux')
+    end
+
+    tests("#delete_tags('vol-00000000', 'baz' => 'qux')").raises(Fog::Service::NotFound) do
+      pending if Fog.mocking?
+      AWS[:compute].delete_tags('vol-00000000', 'baz' => 'qux')
+    end
+
+  end
+
+  @volume.destroy
+
+end

data/tests/aws/requests/compute/volume_tests.rb

@@ -51,8 +51,8 @@ Shindo.tests('AWS::Compute | volume requests', ['aws']) do
       AWS[:compute].describe_volumes.body
     end
 
-    tests("#describe_volumes(#{@volume_id})").formats(@volumes_format) do
-      AWS[:compute].describe_volumes.body
+    tests("#describe_volumes('volume-id' => #{@volume_id})").formats(@volumes_format) do
+      AWS[:compute].describe_volumes('volume-id' => @volume_id).body
     end
 
     tests("#attach_volume(#{@server.identity}, #{@volume_id}, '/dev/sdh')").formats(@volume_attachment_format) do
@@ -76,10 +76,6 @@ Shindo.tests('AWS::Compute | volume requests', ['aws']) do
 
     @volume = AWS[:compute].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#describe_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].describe_volumes('vol-00000000')
-    end
-
     tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end

data/tests/aws/requests/storage/bucket_tests.rb

@@ -0,0 +1,48 @@
+Shindo.tests('AWS::Storage | bucket requests', ['aws']) do
+
+  tests('success') do
+
+    @service_format = {
+      'Buckets' => [{
+        'CreationDate'  => Time,
+        'Name'          => String,
+      }],
+      'Owner'   => {
+        'DisplayName' => String,
+        'ID'          => String
+      }
+    }
+
+    tests("#put_bucket('fogbuckettests')").succeeds do
+      AWS[:storage].put_bucket('fogbuckettests')
+    end
+
+    tests("#get_service").formats(@service_format) do
+      AWS[:storage].get_service.body
+    end
+
+    tests("#delete_bucket('fogbuckettests')").succeeds do
+      AWS[:storage].delete_bucket('fogbuckettests')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#delete_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
+      AWS[:storage].delete_bucket('fognonbucket')
+    end
+
+    @bucket = AWS[:storage].directories.create(:key => 'fognonempty')
+    @file = @bucket.files.create(:key => 'foo', :body => 'bar')
+
+    tests("#delete_bucket('fognonempty')").raises(Excon::Errors::Conflict) do
+      AWS[:storage].delete_bucket('fognonempty')
+    end
+
+    @file.destroy
+    @bucket.destroy
+
+  end
+
+end