fog-profitbricks 2.0.1 → 3.0.0

data/tests/profitbricks/requests/compute/request_tests.rb

@@ -1,5 +1,4 @@
-Shindo.tests('Fog::Compute[:profitbricks] | request request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | request request', %w(profitbricks compute)) do
   @requests_schema = {
     'id'    => String,
     'type'  => String,
@@ -18,7 +17,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | request request', ['profitbricks', '
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     Excon.defaults[:connection_timeout] = 500
 
     tests('#get_all_requests').data_matches_schema(@requests_schema) do

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

@@ -1,24 +1,77 @@
-Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | server request', %w(profitbricks compute)) do
   @resource_schema = {
-      'id'                  => String,
-      'type'                => String,
-      'href'                => String,
-      'metadata'            => Hash,
-      'properties'          => Hash
+    'id' => String,
+    'type'                => String,
+    'href'                => String,
+    'metadata'            => Hash,
+    'properties'          => Hash
   }
 
   @minimal_schema_with_items = {
-      'id'    => String,
-      'type'  => String,
-      'href'  => String,
-      'items' => Array
+    'id' => String,
+    'type'  => String,
+    'href'  => String,
+    'items' => Array
+  }
+
+  @volume_schema = {
+    "id"                  => String,
+    "type"                => String,
+    "href"                => String,
+    "name"                => String,
+    "description"         => String,
+    "location"            => String,
+    "size"                => Float,
+    "cpuHotPlug"          => String,
+    "cpuHotUnplug"        => String,
+    "ramHotPlug"          => String,
+    "ramHotUnplug"        => String,
+    "nicHotPlug"          => String,
+    "nicHotUnplug"        => String,
+    "discVirtioHotUnplug" => String,
+    "discScsiHotPlug"     => String,
+    "discScsiHotUnplug"   => String,
+    "licenceType"         => String,
+    "imageType"           => String,
+    "public"              => String,
+    "createdDate"         => String,
+    "createdBy"           => String,
+    "etag"                => String,
+    "lastModifiedDate"    => String,
+    "lastModifiedBy"      => String,
+    "state"               => String
+  }
+
+  @image_schema = {
+    "id"                  => String,
+    "type"                => String,
+    "href"                => String,
+    "name"                => String,
+    "description"         => String,
+    "location"            => String,
+    "size"                => Float,
+    "cpuHotPlug"          => String,
+    "cpuHotUnplug"        => String,
+    "ramHotPlug"          => String,
+    "ramHotUnplug"        => String,
+    "nicHotPlug"          => String,
+    "nicHotUnplug"        => String,
+    "discVirtioHotUnplug" => String,
+    "discScsiHotPlug"     => String,
+    "discScsiHotUnplug"   => String,
+    "imageType"           => String,
+    "public"              => String,
+    "createdDate"         => String,
+    "createdBy"           => String,
+    "etag"                => String,
+    "lastModifiedDate"    => String,
+    "lastModifiedBy"      => String,
+    "state"               => String
   }
 
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     Excon.defaults[:connection_timeout] = 500
 
     tests('#create_datacenter').data_matches_schema(@resource_schema) do
@@ -30,10 +83,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       createDatacenterResponse = service.create_datacenter(options)
       @datacenter_id = createDatacenterResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
-
       createDatacenterResponse.body
     end
 
@@ -56,37 +105,62 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
         @datacenter_id, options
       )
 
-      if ENV["FOG_MOCK"] != "true"
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
-
       updateDatacenterResponse.body
     end
 
     tests('#get_all_images').data_matches_schema(@minimal_schema_with_items) do
       getAllImagesResponse = service.get_all_images
-      data = service.get_all_images.body['items'].find { |image|
-        image['properties']['location'] == 'us/las' &&
-        image['properties']['imageType'] == 'CDROM' &&
-        image['properties']['licenceType'] == 'LINUX'
-      }
+
+      data = getAllImagesResponse.body['items'].find do |image|
+        if ENV["FOG_MOCK"] != "true"
+          if image['properties']
+            image['properties']['location'] == 'us/las' &&
+              image['properties']['imageType'] == 'CDROM' &&
+              image['properties']['licenceType'] == 'LINUX'
+          else
+            image['location'] == 'us/las' &&
+              image['imageType'] == 'CDROM' &&
+              image['licenceType'] == 'LINUX'
+          end
+        else
+          if image['properties']
+            image['properties']['location'] == 'us/las' &&
+              image['properties']['imageType'] == 'CDROM' &&
+              image['properties']['licenceType'] == 'UNKNOWN'
+          else
+            image['location'] == 'us/las' &&
+              image['imageType'] == 'CDROM' &&
+              image['licenceType'] == 'UNKNOWN'
+          end
+        end
+      end
+
       @image_id = data['id']
       getAllImagesResponse.body
     end
 
-    tests('#get_image').data_matches_schema(@resource_schema) do
-      getImageResponse = service.get_image(@image_id)
-      getImageResponse.body
+    if Fog.mock?
+      tests('#get_image').data_matches_schema(@volume_schema) do
+        getImageResponse = service.get_image(@image_id)
+        getImageResponse.body
+      end
     end
 
-    if ENV["FOG_MOCK"] == "true"
-      tests('#update_image').data_matches_schema(@resource_schema) do
+    unless Fog.mock?
+      tests('#get_image').data_matches_schema(@resource_schema) do
+        getImageResponse = service.get_image(@image_id)
+        getImageResponse.body
+      end
+    end
+
+    if Fog.mock?
+      tests('#update_image').data_matches_schema(@image_schema) do
         options = {}
         options[:name]                = 'FogImageRename'
         options[:description]         = 'FogImageDescriptionUpdated'
 
         updateImageResponse = service.update_image(
-            @image_id, options
+          @image_id, options
         )
 
         updateImageResponse.body
@@ -94,11 +168,11 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
     end
 
     tests('#get_all_volumes').data_matches_schema(@minimal_schema_with_items) do
-      if dc = service.get_all_datacenters.body["items"].find {
-          |datacenter| datacenter["id"] == @datacenter_id
-      }
+      if dc = service.get_all_datacenters.body["items"].find do |datacenter|
+        datacenter["id"] == @datacenter_id
+      end
       else
-        raise Fog::Errors::NotFound.new("The requested resource could not be found")
+        raise Fog::Errors::NotFound, "The requested resource could not be found"
       end
 
       getAllVolumesResponse = service.get_all_volumes(dc['id'])
@@ -107,24 +181,16 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
 
     tests('#create_volume').data_matches_schema(@resource_schema) do
       options = {}
-      options[:name]        = 'FogRestTestVolume'
-      options[:size]        = 5
-      options[:licenceType] = 'LINUX'
-      options[:type]        = 'HDD'
+      options[:name]             = 'FogRestTestVolume'
+      options[:size]             = 5
+      options[:licenceType]      = 'LINUX'
+      options[:type]             = 'HDD'
+      options[:availabilityZone] = 'AUTO'
 
       createVolumeResponse = service.create_volume(@datacenter_id, options)
       @volume_id = createVolumeResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(5)
-          vlm = service.volumes.get(@datacenter_id, @volume_id)
-          break unless !vlm.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # vlm.wait_for { ready? }
+      sleep(5) if ENV["FOG_MOCK"] != "true"
 
       createVolumeResponse.body
     end
@@ -139,15 +205,11 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       options[:name]        = 'FogRestTestSnapshot'
       options[:description] = 'Testing fog create snapshot'
 
+      sleep(15) if ENV["FOG_MOCK"] != "true"
+
       createVolumeSnapshotResponse = service.create_volume_snapshot(@datacenter_id, @volume_id, options)
       @snapshot_id = createVolumeSnapshotResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        sleep(5)
-        snapshot = service.snapshots.get(@snapshot_id)
-        snapshot.wait_for { ready? }
-      end
-
       createVolumeSnapshotResponse.body
     end
 
@@ -158,17 +220,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
 
       updateVolumeResponse = service.update_volume(@datacenter_id, @volume_id, options)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(1)
-          vlm = service.volumes.get(@datacenter_id, @volume_id)
-          break unless !vlm.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # vlm.wait_for { ready? }
-
       updateVolumeResponse.body
     end
 
@@ -180,10 +231,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
 
       updateSnapshotResponse = service.update_snapshot(@snapshot_id, options)
 
-      if ENV["FOG_MOCK"] != "true"
-        snapshot = service.snapshots.get(@snapshot_id)
-        snapshot.wait_for { ready? }
-      end
       updateSnapshotResponse.body
     end
 
@@ -224,21 +271,13 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       createServerResponse = service.create_server(@datacenter_id, properties, entities)
       @server_id = createServerResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(480)
-          server = service.servers.get(@datacenter_id, @server_id)
-          break unless !server.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { ready? }
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createServerResponse.body
     end
 
     tests('#get_server').data_matches_schema(@resource_schema) do
+      sleep(10) if ENV["FOG_MOCK"] != "true"
       getServerResponse = service.get_server(@datacenter_id, @server_id)
       getServerResponse.body
     end
@@ -251,17 +290,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
     tests('#attach_volume').data_matches_schema(@resource_schema) do
       attachVolumeResponse = service.attach_volume(@datacenter_id, @server_id, @volume_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          vlm = service.volumes.get(@datacenter_id, @volume_id)
-          sleep(1)
-          break unless !vlm.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # vlm.wait_for { ready? }
-
       attachVolumeResponse.body
     end
 
@@ -275,28 +303,44 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       detachVolumeResponse.status == 202
     end
 
-    tests('#attach_cdrom').data_matches_schema(@resource_schema) do
-      attachCdromResponse = service.attach_cdrom(@datacenter_id, @server_id, @image_id)
+    unless Fog.mock?
+      tests('#attach_cdrom').data_matches_schema(@resource_schema) do
+        attachCdromResponse = service.attach_cdrom(@datacenter_id, @server_id, @image_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        cd = service.images.get(@image_id)
-        cd.wait_for { ready? }
+        @cdrom_id = attachCdromResponse.body['id']
+
+        attachCdromResponse.body
       end
+    end
 
-      @cdrom_id = attachCdromResponse.body['id']
+    if Fog.mock?
+      tests('#attach_cdrom').succeeds do
+        attachCdromResponse = service.attach_cdrom(@datacenter_id, @server_id, @image_id)
 
-      attachCdromResponse.body
+        @cdrom_id = attachCdromResponse.body['id']
+
+        attachCdromResponse.body
+      end
     end
 
-    tests('#get_attached_cdrom').data_matches_schema(@resource_schema) do
-      if ENV["FOG_MOCK"] != "true"
-        sleep(240)
+    unless Fog.mock?
+      tests('#get_attached_cdrom').data_matches_schema(@resource_schema) do
+        sleep(60)
+        getAttachedVolumeResponse = service.get_attached_cdrom(@datacenter_id, @server_id, @cdrom_id)
+        getAttachedVolumeResponse.body
+      end
+    end
+
+    if Fog.mock?
+      tests('#get_attached_cdrom').succeeds do
+        getAttachedVolumeResponse = service.get_attached_cdrom(@datacenter_id, @server_id, @cdrom_id)
+        getAttachedVolumeResponse.body
       end
-      getAttachedVolumeResponse = service.get_attached_cdrom(@datacenter_id, @server_id, @cdrom_id)
-      getAttachedVolumeResponse.body
     end
 
     tests('#list_attached_cdroms').data_matches_schema(@minimal_schema_with_items) do
+      sleep(10) if ENV["FOG_MOCK"] != "true"
+
       listAttachedCdromsResponse = service.list_attached_cdroms(@datacenter_id, @server_id)
 
       listAttachedCdromsResponse.body
@@ -308,18 +352,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
     end
 
     tests('#update_server').data_matches_schema(@resource_schema) do
-      updateServerResponse = service.update_server(@datacenter_id, @server_id, { 'name' => 'FogServerRename' })
-
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { ready? }
+      updateServerResponse = service.update_server(@datacenter_id, @server_id, 'name' => 'FogServerRename')
 
       updateServerResponse.body
     end
@@ -333,48 +366,18 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
     tests('#stop_server').succeeds do
       stopServerResponse = service.stop_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.shutoff?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { shutoff? }
-
       stopServerResponse.status == 202
     end
 
     tests('#start_server').succeeds do
       startServerResponse = service.start_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.running?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { running? }
-
       startServerResponse.status == 202
     end
 
     tests('#reboot_server').succeeds do
       rebootServerResponse = service.reboot_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.running?
-        end
-      end
-
       rebootServerResponse.status == 202
     end
 
@@ -393,7 +396,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       deleteVolumeResponse.status == 202
     end
 
-    if ENV["FOG_MOCK"] == "true"
+    if Fog.mock?
       tests('#delete_image').succeeds do
         deleteImageResponse = service.delete_image(@image_id)
         deleteImageResponse.status == 202
@@ -407,25 +410,24 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
   end
 
   tests('failure') do
-
-    tests('#get_datacenter').raises(Fog::Errors::NotFound) do
+    tests('#get_datacenter').raises(Excon::Error::HTTPStatus) do
       service.get_datacenter('00000000-0000-0000-0000-000000000000')
     end
 
-    tests('#update_datacenter').raises(Fog::Errors::NotFound) do
+    tests('#update_datacenter').raises(Excon::Error::HTTPStatus) do
       service.update_datacenter('00000000-0000-0000-0000-000000000000',
-                    { 'name' => 'FogTestDCRename' })
+                                'name' => 'FogTestDCRename')
     end
 
-    tests('#delete_datacenter').raises(Fog::Errors::NotFound) do
+    tests('#delete_datacenter').raises(Excon::Error::HTTPStatus) do
       service.delete_datacenter('00000000-0000-0000-0000-000000000000')
     end
 
-    tests('#get_image').raises(Fog::Errors::NotFound) do
+    tests('#get_image').raises(Excon::Error::HTTPStatus) do
       service.get_image('00000000-0000-0000-0000-000000000000')
     end
 
-    tests('#update_image').raises(Fog::Errors::NotFound) do
+    tests('#update_image').raises(Excon::Error::HTTPStatus) do
       service.update_image('00000000-0000-0000-0000-000000000000', {})
     end
 
@@ -437,11 +439,11 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       service.create_volume_snapshot
     end
 
-    tests('#create_volume_snapshot').raises(Fog::Errors::NotFound) do
-      service.create_volume_snapshot('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000', {})
+    tests('#create_volume_snapshot').raises(Excon::Error::HTTPStatus) do
+      service.create_volume_snapshot('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000', :name => 'test')
     end
 
-    tests('#get_snapshot').raises(Fog::Errors::NotFound) do
+    tests('#get_snapshot').raises(Excon::Error::HTTPStatus) do
       service.get_snapshot('00000000-0000-0000-0000-000000000000')
     end
 
@@ -453,19 +455,19 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
       service.restore_volume_snapshot
     end
 
-    tests('#restore_volume_snapshot').raises(Fog::Errors::NotFound) do
-      service.restore_volume_snapshot('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000', {})
+    tests('#restore_volume_snapshot').raises(Excon::Error::HTTPStatus) do
+      service.restore_volume_snapshot('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000', :name => 'test')
     end
 
-    tests('#get_volume').raises(Fog::Errors::NotFound) do
+    tests('#get_volume').raises(Excon::Error::HTTPStatus) do
       service.get_volume('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000')
     end
 
-    tests('#update_volume').raises(Fog::Errors::NotFound) do
+    tests('#update_volume').raises(Excon::Error::HTTPStatus) do
       service.update_volume('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000')
     end
 
-    tests('#delete_volume').raises(Fog::Errors::NotFound) do
+    tests('#delete_volume').raises(Excon::Error::HTTPStatus) do
       service.delete_volume('00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000000')
     end
   end