fog 1.22.1 → 1.23.0

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

@@ -11,6 +11,8 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
 
   @volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
   @volume.wait_for { ready? }
+  @vpc    = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+  @network_acl = Fog::Compute[:aws].network_acls.all('vpc-id' => @vpc.id, 'default' => true).first
 
   tests('success') do
     if Fog.mocking?
@@ -26,6 +28,14 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
       tests("#create_tags('#{@image_id}', 'foo' => 'baz')").formats(AWS::Compute::Formats::BASIC) do
         Fog::Compute[:aws].create_tags(@image_id, 'foo' => 'baz').body
       end
+
+      tests("#create_tags('#{@vpc.id}', 'type' => 'vpc')").formats(AWS::Compute::Formats::BASIC) do
+        Fog::Compute[:aws].create_tags(@vpc.id, 'type' => 'vpc').body
+      end
+
+      tests("#create_tags('#{@network_acl.network_acl_id}', 'type' => 'network_acl')").formats(AWS::Compute::Formats::BASIC) do
+        Fog::Compute[:aws].create_tags(@network_acl.network_acl_id, 'type' => 'network_acl').body
+      end
     end
 
     tests('#describe_tags').formats(@tags_format) do
@@ -73,6 +83,17 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
       Fog::Compute[:aws].create_tags('vol-00000000', 'baz' => 'qux')
     end
 
+    tests("#create_tags('abc-12345678', 'type' => 'fake_type')").raises(Fog::Service::NotFound) do
+      Fog::Compute[:aws].create_tags('abc-12345678', 'type' => 'fake_type')
+    end
+
+    tests("#create_tags('vpc-12345678', 'type' => 'non-existent_vpc)").raises(Fog::Service::NotFound) do
+      Fog::Compute[:aws].create_tags('vpc-12345678', 'type' => 'non-existent_vpc')
+    end
+
+    tests("#create_tags('vpc-123', 'type' => 'bad_resource_id)").raises(Fog::Service::NotFound) do
+      Fog::Compute[:aws].create_tags('vpc-123', 'type' => 'bad_resource_id')
+    end
   end
   Fog::Compute::AWS::Mock.reset if Fog.mocking?
 end

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

@@ -1,6 +1,17 @@
 Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
 
-  @vpcs_format = {
+  @create_vpcs_format = {
+    'vpcSet' => [{
+      'vpcId'           => String,
+      'state'           => String,
+      'cidrBlock'       => String,
+      'dhcpOptionsId'   => String,
+      'tagSet'          => Hash
+    }],
+    'requestId' => String
+  }
+
+  @describe_vpcs_format = {
     'vpcSet' => [{
       'vpcId'           => String,
       'state'           => String,
@@ -16,13 +27,13 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
 
     @vpc_id = nil
 
-    tests('#create_vpc').formats(@vpcs_format) do
+    tests('#create_vpc').formats(@create_vpcs_format) do
       data = Fog::Compute[:aws].create_vpc('10.255.254.0/28').body
       @vpc_id = data['vpcSet'].first['vpcId']
       data
     end
 
-    tests('#describe_vpcs').formats(@vpcs_format) do
+    tests('#describe_vpcs').formats(@describe_vpcs_format) do
       Fog::Compute[:aws].describe_vpcs.body
     end
 
@@ -66,8 +77,35 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
     end
 
+    # Create another vpc to test tag filters
+    test_tags = {'foo' => 'bar'}
+    @another_vpc = Fog::Compute[:aws].vpcs.create :cidr_block => '1.2.3.4/24', :tags => test_tags
+
+    tests("#describe_vpcs('tag-key' => 'foo')").formats(@describe_vpcs_format)do
+      body = Fog::Compute[:aws].describe_vpcs('tag-key' => 'foo').body
+      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
+      body
+    end
+
+    tests("#describe_vpcs('tag-value' => 'bar')").formats(@describe_vpcs_format)do
+      body = Fog::Compute[:aws].describe_vpcs('tag-value' => 'bar').body
+      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
+      body
+    end
+
+    tests("#describe_vpcs('tag:foo' => 'bar')").formats(@describe_vpcs_format)do
+      body = Fog::Compute[:aws].describe_vpcs('tag:foo' => 'bar').body
+      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
+      body
+    end
+
     tests("#delete_vpc('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_vpc(@vpc_id).body
     end
+
+    # Clean up
+    Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
+    @another_vpc.destroy
+    Fog::Compute::AWS::Mock.reset if Fog.mocking?
   end
 end

data/tests/aws/requests/data_pipeline/pipeline_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do
       name = 'fog-test-pipeline-name'
       description = 'Fog test pipeline'
 
-      result = Fog::AWS[:data_pipeline].create_pipeline(unique_id, name, description)
+      result = Fog::AWS[:data_pipeline].create_pipeline(unique_id, name, description, {})
       @pipeline_id = result['pipelineId']
       result
     end

data/tests/aws/requests/dns/dns_tests.rb

@@ -180,8 +180,9 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       # create an ALIAS record
       host = @domain_name
       alias_target = {
-        :hosted_zone_id => hosted_zone_id,
-        :dns_name       => dns_name
+        :hosted_zone_id         => hosted_zone_id,
+        :dns_name               => dns_name,
+        :evaluate_target_health => false
       }
       resource_record = { :name => host, :type => 'A', :alias_target => alias_target }
       resource_record_set = resource_record.merge(:action => 'CREATE')
@@ -245,7 +246,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       response = @r53_connection.create_hosted_zone('invalid-domain')
     end
 
-    tests('get hosted zone using invalid ID').raises(Excon::Errors::Forbidden) do
+    tests('get hosted zone using invalid ID').raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
       zone_id = 'dummy-id'
       response = @r53_connection.get_hosted_zone(zone_id)

data/tests/glesys/requests/compute/helper.rb

@@ -37,6 +37,7 @@ class Glesys
             'memorysize'    => Integer,
             'cpucores'      => Integer,
             'transfer'      => Integer,
+            'bandwidth'     => Integer,
             'templatename'  => String,
             'iplist'        =>  [{
               'cost'      => Integer,
@@ -79,6 +80,7 @@ class Glesys
               'memorysize'    => String,
               'cpucores'      => String,
               'transfer'      => String,
+              'bandwidth'     => String,
               'description'   => String
             }
           }

data/tests/glesys/requests/compute/server_tests.rb

@@ -5,11 +5,11 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
 
     @create = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
     ":datacenter => 'Falkenberg', :platform => 'Xen', :templatename => 'Debian-6 x64', "+
-    ":disksize => '10', :memorysize => '512', :cpucores => '1', :transfer => '500'"
+    ":disksize => '10', :memorysize => '512', :cpucores => '1', :transfer => '500', :bandwidth => '10'"
 
     @create_vz = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
     ":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 6.0 64-bit', "+
-    ":disksize => '10', :memorysize => '256', :cpucores => '2', :transfer => '500'"
+    ":disksize => '10', :memorysize => '256', :cpucores => '2', :transfer => '500', :bandwidth => '10'"
 
   tests('success') do
 
@@ -29,7 +29,8 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
               :disksize     => "10",
               :memorysize   => "512",
               :cpucores     => "1",
-              :transfer     => "500"
+              :transfer     => "500",
+              :bandwidth    => "10"
             )
 
       @serverid = vm.body['response']['server']['serverid']
@@ -89,7 +90,8 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
               :disksize     => "10",
               :memorysize   => "256",
               :cpucores     => "2",
-              :transfer     => "500"
+              :transfer     => "500",
+              :bandwidth    => "10"
             )
 
       @serverid = vm.body['response']['server']['serverid']

data/tests/google/helpers/google_tests_helper.rb

@@ -0,0 +1,21 @@
+require 'securerandom'
+
+# create a disk to be used in tests
+def create_test_disk(connection, zone)
+  zone = 'us-central1-a'
+  random_string = SecureRandom.hex
+
+  disk = connection.disks.create({
+    :name => "fog-test-disk-#{random_string}",
+    :size_gb => "10",
+    :zone => zone,
+    :source_image => "debian-7-wheezy-v20140408",
+  })
+  disk.wait_for { ready? }
+  disk
+end
+
+def wait_operation(connection, response)
+  operation = connection.operations.get(response['name'], response['zone'], response['region'])
+  operation.wait_for { ready? }
+end

data/tests/google/models/compute/disk_tests.rb

@@ -1,5 +1,9 @@
 Shindo.tests("Fog::Compute[:google] | disk model", ['google']) do
 
-  model_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone => 'us-central1-a'})
+  model_tests(Fog::Compute[:google].disks, {:name => 'fog-disk-model-tests',
+                                            :zone => 'us-central1-a',
+                                            :size_gb => 10}) do |model|
+    model.wait_for { ready? }
+  end
 
 end

data/tests/google/models/compute/disk_types_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests("Fog::Compute[:google] | disk_types model", ['google']) do
+  @disk_types = Fog::Compute[:google].disk_types
+
+  tests('success') do
+
+    tests('#all').succeeds do
+      @disk_types.all
+    end
+
+    tests('#get').succeeds do
+      disk_type = @disk_types.all.first
+      @disk_types.get(disk_type.name)
+    end
+
+    tests('failure') do
+      tests('#get').returns(nil) do
+        @disk_types.get(Fog::Mock.random_letters_and_numbers(16))
+      end
+    end
+
+  end
+end

data/tests/google/models/compute/disks_tests.rb

@@ -1,5 +1,9 @@
 Shindo.tests("Fog::Compute[:google] | disks", ['google']) do
 
-  collection_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone => 'us-central1-a'})
+  collection_tests(Fog::Compute[:google].disks, {:name => 'fog-disks-collections-tests',
+                                                 :zone => 'us-central1-a',
+                                                 :size_gb => 10}) do |instance|
+  	instance.wait_for { ready? }
+  end
 
 end

data/tests/google/models/compute/server_tests.rb

@@ -1,9 +1,15 @@
+require 'securerandom'
+
 Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
   @zone = 'us-central1-a'
   @disk = create_test_disk(Fog::Compute[:google], @zone)
+  random_string = SecureRandom.hex
 
-  model_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
+  model_tests(Fog::Compute[:google].servers, {:name => "fog-test-server-#{random_string}",
+                                              :zone_name => @zone,
+                                              :machine_type => 'n1-standard-1',
+                                              :disks => [@disk]})
 
   tests('servers') do
     @instance = nil
@@ -20,7 +26,7 @@ Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
     test('#ssh') do
       pending if Fog.mocking?
-      @instance.ssh("uname") == "Linux"
+      !!(@instance.ssh("uname").first.stdout =~ /Linux/)
     end
 
     test('#destroy') do

data/tests/google/models/compute/servers_tests.rb

@@ -1,8 +1,14 @@
+require 'securerandom'
+
 Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
 
   @zone = 'us-central1-a'
   @disk = create_test_disk(Fog::Compute[:google], @zone)
+  random_string = SecureRandom.hex
 
-  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
+  collection_tests(Fog::Compute[:google].servers, {:name => "fog-test-server-#{random_string}",
+                                                   :zone_name => @zone,
+                                                   :machine_type => 'n1-standard-1',
+                                                   :disks => [@disk]})
 
 end

data/tests/google/requests/compute/disk_tests.rb

@@ -28,6 +28,7 @@ Shindo.tests('Fog::Compute[:google] | disk requests', ['google']) do
       'sizeGb' => String,
       'sourceImageId' => String,
       'sourceImage' => String,
+      'type' => String,
   }
 
   @delete_disk_format = {
@@ -51,11 +52,13 @@ Shindo.tests('Fog::Compute[:google] | disk requests', ['google']) do
     disk_name = 'new-disk-test'
     disk_size = '2'
     zone_name = 'us-central1-a'
-    image_name = 'centos-6-v20130813'
+    image_name = 'debian-7-wheezy-v20140408'
 
     # These will all fail if errors happen on insert
     tests("#insert_disk").formats(@insert_disk_format) do
-      @google.insert_disk(disk_name, zone_name, image_name).body
+      response = @google.insert_disk(disk_name, zone_name, image_name).body
+      wait_operation(@google, response)
+      response
     end
 
     tests("#get_disk").formats(@get_disk_format) do

data/tests/google/requests/compute/disk_type_tests.rb

@@ -0,0 +1,45 @@
+Shindo.tests('Fog::Compute[:google] | disk_type requests', ['google']) do
+  @google = Fog::Compute[:google]
+
+  @get_disk_type_format = {
+    'name' => String,
+    'kind' => String,
+    'id' => Fog::Nullable::String,
+    'creationTimestamp' => String,
+    'deprecated' => Fog::Nullable::Array,
+    'description' => String,
+    'selfLink' => String,
+    'validDiskSize' => String,
+    'zone' => String,
+  }
+
+  @list_disk_types_format = {
+    'kind' => String,
+    'selfLink' => String,
+    'items' => [@get_disk_type_format],
+  }
+
+  @list_aggregated_disk_types = {
+    'kind' => String,
+    'selfLink' => String,
+    'items' => Hash,
+  }
+
+  tests('success') do
+
+    tests('#list_aggregated_disk_types').formats(@list_aggregated_disk_types) do
+      @google.list_aggregated_disk_types.body
+    end
+
+    tests('#list_disk_types').formats(@list_disk_types_format) do
+      @google.list_disk_types('us-central1-a').body
+    end
+
+    tests('#get_disk_type').formats(@get_disk_type_format) do
+      disk_type = @google.disk_types.first
+      @google.get_disk_type(disk_type.identity, disk_type.zone).body
+    end
+
+  end
+
+end

data/tests/google/requests/compute/firewall_tests.rb

@@ -52,7 +52,7 @@ Shindo.tests('Fog::Compute[:google] | firewall requests', ['google']) do
 
   tests('success') do
 
-    firewall_name = 'new-firewall-test'
+    firewall_name = 'fog-test-firewall'
     source_range = [ '10.0.0.0/8' ]
     allowed = [{
       "IPProtocol" => "tcp",
@@ -65,7 +65,9 @@ Shindo.tests('Fog::Compute[:google] | firewall requests', ['google']) do
     }]
 
     tests("#insert_firewall").formats(@insert_firewall_format) do
-      @google.insert_firewall(firewall_name, source_range, allowed).body
+      response = @google.insert_firewall(firewall_name, allowed, 'default', :source_ranges => source_range).body
+      wait_operation(@google, response)
+      response
     end
 
     # TODO: Get better matching for firewall responses.

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

@@ -53,28 +53,33 @@ Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
 
   tests('success') do
 
-    image_name = 'test-image'
+    random_string = SecureRandom.hex
+    image_name = "fog-test-image-#{random_string}"
     source = 'https://www.google.com/images/srpr/logo4w.png'
 
     tests("#insert_image").formats(@insert_image_format) do
-      pending if Fog.mocking?
-      @google.insert_image(image_name, source).body
+      pending
+      # pending if Fog.mocking?
+      # response = @google.insert_image(image_name, 'rawDisk' => source).body
+      # wait_operation(@google, response)
+      # response
     end
 
     tests("#get_image").formats(@get_image_format) do
-      pending if Fog.mocking?
-      @google.insert_image(image_name, source)
-      @google.get_image(image_name).body
+      pending
+      # pending if Fog.mocking?
+      # @google.get_image(image_name).body
     end
 
     tests("#list_images").formats(@list_images_format) do
-      @google.list_images.body
+      pending
+      # @google.list_images.body
     end
 
     tests("#delete_image").formats(@delete_image_format) do
-      pending if Fog.mocking?
-      @google.insert_image(image_name, source)
-      @google.delete_image(image_name).body
+      pending
+      # pending if Fog.mocking?
+      # @google.delete_image(image_name).body
     end
 
   end

data/tests/google/requests/compute/zone_tests.rb

@@ -10,12 +10,8 @@ Shindo.tests('Fog::Compute[:google] | zone requests', ['google']) do
       'name' => String,
       'description' => String,
       'status' => String,
-      'maintenanceWindows' => Fog::Nullable::Array,
-      'quotas' => [{
-        'metric' => String,
-        'limit' => Float,
-        'usage' => Float},
-      ],
+      'region' => String,
+      'maintenanceWindows' => Fog::Nullable::Array
   }
 
   @list_zones_format = {