fog 1.10.1 → 1.11.0

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

@@ -0,0 +1,85 @@
+Shindo.tests('Fog::Compute[:google] | firewall requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @insert_firewall_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @get_firewall_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'creationTimestamp' => DateTime,
+      'name' => String,
+      'network' => String,
+      'sourceRanges' => [],
+      'allowed' => [],
+  }
+
+  @delete_firewall_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'targetId' => String,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @list_firewalls_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'items' => []
+  }
+
+  tests('success') do
+
+    firewall_name = 'new-firewall-test'
+    source_range = [ '10.0.0.0/8' ]
+    allowed = [{
+      "IPProtocol" => "tcp",
+      "ports" => [ "1-65535" ]
+    }, {
+      "IPProtocol" => "udp",
+      "ports" => [ "1-65535" ]
+    }, {
+      "IPProtocol" => "icmp"
+    }]
+
+    tests("#insert_firewall").formats(@insert_firewall_format) do
+      @google.insert_firewall(firewall_name, source_range, allowed).body
+    end
+
+    # TODO: Get better matching for firewall responses.
+    tests("#get_firewall").succeeds do
+      @google.get_firewall(firewall_name)
+    end
+
+    tests("#list_firewalls").succeeds do
+      @google.list_firewalls
+    end
+
+    tests("#delete_firewall").formats(@delete_firewall_format) do
+      @google.delete_firewall(firewall_name).body
+    end
+
+  end
+
+end

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

@@ -0,0 +1,80 @@
+Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @insert_image_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @get_image_format = {
+      'kind' => String,
+      'id' => String,
+      'creationTimestamp' => String,
+      'selfLink' => String,
+      'name' => String,
+      'description' => String,
+      'sourceType' => String,
+      'preferredKernel' => String,
+      'rawDisk' => {
+        'containerType' => String,
+        'source' => String
+      }
+  }
+
+  @delete_image_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @list_images_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'items' => [@get_image_format]
+  }
+
+  tests('success') do
+
+    image_name = 'test-image'
+    source = 'https://www.google.com/images/srpr/logo4w.png'
+
+    tests("#insert_image").formats(@insert_image_format) do
+      @google.insert_image(image_name, source).body
+    end
+
+    tests("#get_image").formats(@get_image_format) do
+      @google.insert_image(image_name, source)
+      @google.get_image(image_name).body
+    end
+
+    tests("#list_images").formats(@list_images_format) do
+      @google.list_images.body
+    end
+
+    tests("#delete_image").formats(@delete_image_format) do
+      @google.insert_image(image_name, source)
+      @google.delete_image(image_name).body
+    end
+
+  end
+
+end

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

@@ -0,0 +1,74 @@
+Shindo.tests('Fog::Compute[:google] | network requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @insert_network_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @get_network_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'creationTimestamp' => String,
+      'name' => String,
+      'IPv4Range' => String,
+      'gatewayIPv4' => String
+  }
+
+  @delete_network_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'targetId' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @list_networks_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'items' => [@get_network_format]
+  }
+
+  tests('success') do
+
+    network_name = 'new-network-test'
+    ip_range = '192.168.0.0/16'
+
+    tests("#insert_network").formats(@insert_network_format) do
+      @google.insert_network(network_name, ip_range).body
+    end
+
+    tests("#get_network").formats(@get_network_format) do
+      @google.get_network(network_name).body
+    end
+
+    tests("#list_networks").formats(@list_networks_format) do
+      @google.list_networks.body
+    end
+
+    tests("#delete_network").formats(@delete_network_format) do
+      @google.delete_network(network_name).body
+    end
+
+  end
+
+end

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

@@ -0,0 +1,19 @@
+Shindo.tests('Fog::Compute[:google] | operation requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  tests('success') do
+
+    # We are not testing the format here because operation formats are pretty
+    # extensive based on what has happened to you account, ever.
+    # https://developers.google.com/compute/docs/reference/latest/globalOperations#resource
+    tests("#list_global_operations").succeeds do
+      @google.list_global_operations
+    end
+
+    tests("#list_zone_operations").succeeds do
+      zone_name = @google.list_zones.body["items"][0]["name"]
+      @google.list_zone_operations(zone_name)
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @insert_server_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'user' => String,
+      'startTime' => String,
+      'insertTime' => String,
+      'operationType' => String,
+      'status' => String,
+      'progress' => Integer
+  }
+
+  @get_server_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'creationTimestamp' => String,
+      'name' => String,
+      'image' => String,
+      'machineType' => String,
+      'status' => String,
+      'zone' => String,
+      'disks' => [],
+      'networkInterfaces' => []
+  }
+
+  @delete_server_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'targetId' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @list_servers_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+  }
+
+  tests('success') do
+
+    server_name = 'new-server-test'
+    image_name = "gcel-12-04-v20130325"
+    machine_type = "n1-standard-1"
+    zone_name = "us-central1-a"
+
+    tests("#insert_server").formats(@insert_server_format) do
+      @google.insert_server(
+        server_name,
+        image_name,
+        zone_name,
+        machine_type
+      ).body
+    end
+
+    tests("#list_servers").formats(@list_servers_format) do
+      @google.list_servers(zone_name).body
+    end
+
+    # Both of these tests require the server to be there...
+
+    #tests("#get_server").formats(@get_server_format) do
+    #  @google.get_server(server_name, zone_name).body
+    #end
+
+    #tests("#delete_server").formats(@delete_server_format) do
+    #  @google.delete_server(server_name, zone_name).body
+    #end
+  end
+end

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

@@ -0,0 +1,46 @@
+Shindo.tests('Fog::Compute[:google] | zone requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @get_zone_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'creationTimestamp' => String,
+      'name' => String,
+      'description' => String,
+      'status' => String,
+      'maintenanceWindows' => [{
+        'name' => String,
+        'description' => String,
+        'beginTime' => String,
+        'endTime' => String,
+      }],
+      'quotas' => [{
+        'metric' => String,
+        'limit' => Float,
+        'usage' => Float},
+      ],
+  }
+
+  @list_zones_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'items' => [@get_zone_format]
+  }
+
+  tests('success') do
+
+    tests("#get_zone").formats(@get_zone_format) do
+      zone_name = @google.list_zones.body["items"][0]["name"]
+      @google.get_zone(zone_name).body
+    end
+
+    tests("#list_zones").formats(@list_zones_format) do
+      @google.list_zones.body
+    end
+
+  end
+
+end

data/tests/helpers/mock_helper.rb

@@ -41,6 +41,10 @@ if Fog.mock?
     :go_grid_shared_secret            => 'go_grid_shared_secret',
     :google_storage_access_key_id     => 'google_storage_access_key_id',
     :google_storage_secret_access_key => 'google_storage_secret_access_key',
+    # Commented out till there are mocks for google/compute
+    #:google_project                   => 'google_project_name',
+    #:google_client_email              => 'fake@developer.gserviceaccount.com',
+    #:google_key_location              => '~/fake.p12',
     :hp_access_key                    => 'hp_access_key',
     :hp_secret_key                    => 'hp_secret_key',
     :hp_tenant_id                     => 'hp_tenant_id',

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

@@ -25,7 +25,7 @@ Shindo.tests("Fog::Compute[:openstack] | server", ['openstack']) do
 
         group = found_groups.first
         returns('my_group') { group.name }
-        returns(server.connection) { group.connection }
+        returns(server.service) { group.service }
       ensure
         unless Fog.mocking? then
           server.destroy if server
@@ -78,8 +78,98 @@ Shindo.tests("Fog::Compute[:openstack] | server", ['openstack']) do
       end
     end
 
+    tests('#resize').succeeds do
+      fog = Fog::Compute[:openstack]
+
+      begin
+        flavor = fog.flavors.first.id
+        image  = fog.images.first.id
+
+        server = fog.servers.new(:name       => 'test server',
+                                 :flavor_ref => flavor,
+                                 :image_ref  => image)
+
+        server.save
+
+        flavor_resize = fog.flavors[1].id
+        server.resize(flavor_resize)
+        server.wait_for { server.state == "VERIFY_RESIZE" } unless Fog.mocking?
+        server.revert_resize
+        server.wait_for { server.state == "ACTIVE" } unless Fog.mocking?
+        server.resize(flavor_resize)
+        server.wait_for { server.state == "VERIFY_RESIZE" } unless Fog.mocking?
+        server.confirm_resize
+
+      ensure
+        unless Fog.mocking? then
+          server.destroy if server
+
+          begin
+            fog.servers.get(server.id).wait_for do false end
+          rescue Fog::Errors::Error
+            # ignore, server went away
+          end
+        end
+      end
+    end
+
+    tests('#volumes').succeeds do
+      fog = Fog::Compute[:openstack]
+
+      begin
+        volume = fog.volumes.new(:name => 'test volume',
+                                 :description => 'test volume',
+                                 :size => 1)
+        volume.save
+        volume.wait_for { volume.status == 'available' } unless Fog.mocking?
+
+        flavor = fog.flavors.first.id
+        image  = fog.images.first.id
+
+        server = fog.servers.new(:name       => 'test server',
+                                 :flavor_ref => flavor,
+                                 :image_ref  => image)
+
+        server.save
+        server.wait_for { server.state == "ACTIVE" } unless Fog.mocking?
+
+        server.attach_volume(volume.id, '/dev/vdc')
+        volume.wait_for { volume.status == 'in-use' } unless Fog.mocking?
+
+        found_volumes = server.volumes
+        returns(1) { found_volumes.length }
+
+        volume = found_volumes.first
+        returns('test volume') { volume.name }
+
+        found_attachments = server.volume_attachments
+        returns(1) { found_attachments.length }
 
+        attachment = found_attachments.first
+        returns('/dev/vdc') { attachment['device'] }
 
+        server.detach_volume(volume.id)
+        volume.wait_for { volume.status == 'available' } unless Fog.mocking?
+
+        found_volumes = server.volumes
+        returns(0) { found_volumes.length }
+
+        found_attachments = server.volume_attachments
+        returns(0) { found_attachments.length }
+      ensure
+        unless Fog.mocking? then
+          server.destroy if server
+          volume.destroy if volume
+
+          begin
+            fog.servers.get(server.id).wait_for do false end
+            fog.volumes.get(volume.id).wait_for do false end
+          rescue Fog::Errors::Error
+            # ignore, server went away
+          end
+        end
+      end
+    end
 
   end
 end