profitbricks-sdk-ruby 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14db6f0ee04190fb34315ac681ae64790b94eb66
-  data.tar.gz: e33068f4eb3a3c265fc0500338808ca59cf619b5
+  metadata.gz: 4dcd9fb8b417625972962d592809333b2ab5b5a7
+  data.tar.gz: 0fd530ada738ffd0a97084c6482c8f5210f91e93
 SHA512:
-  metadata.gz: 7713cb62f664ce285a7194c0d25fe21809099f1e85bd7ffacdf994a332c3ea84aa09c8214b763a14d143dd88ee9c86f6dccb60a5fb8d79926be71386994d6e31
-  data.tar.gz: f0b25b5a6ef17b8e5e930ca811441213509906040be12cd45d993eed594c1126f0b30339241e32400b97b08ffdc9adf3db181b3019bda72165849660f9121c1c
+  metadata.gz: f69666536c3cfed17aa6ba61e788acd48ef04b604a3784fa950f7abfb0848b32de4b716c2902e07a90fff98279740d7f3c55df368743cb90570ff741254a9675
+  data.tar.gz: 862ecab2e7ffbbbb51a1ca1a1468670a2b0a6dfba88e8e6a925454a9e9a0325f4d4a26d6630945427fb9a803c9c03a96ffc0655723e5cdb38deb39e19092ee77

data/docs/guide.md

@@ -147,10 +147,17 @@ Make sure the image you retrieve is in the same location as the virtual data cen
 
 ProfitBricks allows for the creation of multiple storage volumes that can be attached and detached as needed. It is useful to attach an image when creating a storage volume. The storage size is in gigabytes (GB).
  
-    volume = datacenter.create_volume(name: 'My New Volume, size: 40, image: image.id)
+    volume = datacenter.create_volume(name: 'My New Volume', size: 40, image: image.id, type: 'HDD')
     
     volume.wait_for { ready? }
 
+Several public images allow support for SSH authentication. This allows a list of SSH publics keys to supplied when creating a new volume.
+
+    ssh_key = 'ssh-rsa AAAAB3NzaC1yc2E...'
+    volume = datacenter.create_volume(name: 'Boot Volume', size: 40, image: image.id, type: 'HDD', sshKeys: [ ssh_key ])
+
+The corresonding SSH private key can then be used when logging into a server with that boot volume.
+
 ## How To: Update Cores, Memory, and Disk
 
 ProfitBricks allows users to dynamically update cores, memory, and disk independently of each other. This removes the restriction of needing to upgrade to the next size available size to receive an increase in memory. You can now simply increase the instances memory keeping your costs in-line with your resource needs.

data/docs/reference.md

@@ -205,7 +205,7 @@ Retrieve a volume:
 
 Create a volume:
 
-    volume = datacenter.create_volume(name: "volume1", size: 20)
+    volume = datacenter.create_volume(name: "volume1", size: 20, type: "SSD")
 
 Update a volume:
 

data/lib/profitbricks.rb

@@ -5,6 +5,7 @@ require 'uri'
 # Top-level module
 module ProfitBricks
   require 'profitbricks/version'
+  require 'profitbricks/errors'
   require 'profitbricks/config'
   require 'profitbricks/profitbricks'
   require 'profitbricks/model'

data/lib/profitbricks/datacenter.rb

@@ -4,7 +4,7 @@ module ProfitBricks
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.id}",
+        path: "/datacenters/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
@@ -13,7 +13,7 @@ module ProfitBricks
 
     def update(options = {})
       response = ProfitBricks.request(
-        path: "/datacenters/#{self.id}",
+        path: "/datacenters/#{id}",
         method: :patch,
         expects: 202,
         body: options.to_json
@@ -26,61 +26,61 @@ module ProfitBricks
     end
 
     def list_servers
-      ProfitBricks::Server.list(self.id)
+      ProfitBricks::Server.list(id)
     end
 
     def get_server(server_id)
-      ProfitBricks::Server.get(self.id, server_id)
+      ProfitBricks::Server.get(id, server_id)
     end
 
     def create_server(options = {})
-      ProfitBricks::Server.create(self.id, options)
+      ProfitBricks::Server.create(id, options)
     end
 
     def list_volumes
-      ProfitBricks::Volume.list(self.id)
+      ProfitBricks::Volume.list(id)
     end
 
     def get_volume(volume_id)
-      ProfitBricks::Volume.get(self.id, nil, volume_id)
+      ProfitBricks::Volume.get(id, nil, volume_id)
     end
 
     def create_volume(options = {})
-      ProfitBricks::Volume.create(self.id, options)
+      ProfitBricks::Volume.create(id, options)
     end
 
     def list_loadbalancers
-      ProfitBricks::Loadbalancer.list(self.id)
+      ProfitBricks::Loadbalancer.list(id)
     end
 
     def get_loadbalancer(loadbalancer_id)
-      ProfitBricks::Loadbalancer.get(self.id, loadbalancer_id)
+      ProfitBricks::Loadbalancer.get(id, loadbalancer_id)
     end
 
     def create_loadbalancer(options = {})
-      ProfitBricks::Loadbalancer.create(self.id, options)
+      ProfitBricks::Loadbalancer.create(id, options)
     end
 
     def list_lans
-      ProfitBricks::LAN.list(self.id)
+      ProfitBricks::LAN.list(id)
     end
 
     def get_lan(lan_id)
-      ProfitBricks::LAN.get(self.id, lan_id)
+      ProfitBricks::LAN.get(id, lan_id)
     end
 
     def create_lan(options = {})
-      ProfitBricks::LAN.create(self.id, options)
+      ProfitBricks::LAN.create(id, options)
     end
 
-    alias_method :server, :get_server
-    alias_method :servers, :list_servers
-    alias_method :volume, :get_volume
-    alias_method :volumes, :list_volumes
-    alias_method :loadbalancer, :get_loadbalancer
-    alias_method :loadbalancers, :list_loadbalancers
-    alias_method :lan, :get_lan
-    alias_method :lans, :list_lans
+    alias server get_server
+    alias servers list_servers
+    alias volume get_volume
+    alias volumes list_volumes
+    alias loadbalancer get_loadbalancer
+    alias loadbalancers list_loadbalancers
+    alias lan get_lan
+    alias lans list_lans
 
     class << self
       def create(options = {})

data/lib/profitbricks/errors.rb

@@ -0,0 +1,6 @@
+module ProfitBricks
+  class Errors
+    class Error < StandardError; end
+    class OperationFailure < StandardError; end
+  end
+end

data/lib/profitbricks/firewall.rb

@@ -1,12 +1,11 @@
 module ProfitBricks
   # Firewall class
   class Firewall < ProfitBricks::Model
-
     # Delete the firewall rule.
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.nicId}/firewallrules/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{nicId}/firewallrules/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
@@ -17,18 +16,15 @@ module ProfitBricks
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.nicId}/firewallrules/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{nicId}/firewallrules/#{id}",
         expects: 202,
         body: options.to_json
       )
-      if response
-        @properties = @properties.merge(response['properties'])
-      end
+      @properties = @properties.merge(response['properties'])
       self
     end
 
     class << self
-
       # Create a new firewall rule.
       def create(datacenter_id, server_id, nic_id, options = {})
         response = ProfitBricks.request(

data/lib/profitbricks/ipblock.rb

@@ -5,7 +5,7 @@ module ProfitBricks
     def release
       ProfitBricks.request(
         method: :delete,
-        path: "/ipblocks/#{self.id}",
+        path: "/ipblocks/#{id}",
         expects: 202
       )
     end

data/lib/profitbricks/loadbalancer.rb

@@ -5,7 +5,7 @@ module ProfitBricks
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}",
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
@@ -16,21 +16,19 @@ module ProfitBricks
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}",
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}",
         expects: 202,
         body: options.to_json
       )
-      if response
-        @properties = @properties.merge(response['properties'])
-      end
+      @properties = @properties.merge(response['properties'])
       self
     end
 
     def list_balanced_nics
       response = ProfitBricks.request(
         method: :get,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}/balancednics",
-        expects: 200,
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}/balancednics",
+        expects: 200
       )
       self.class.instantiate_objects(response)
     end
@@ -38,7 +36,7 @@ module ProfitBricks
     def associate_balanced_nic(nic_id)
       response = ProfitBricks.request(
         method: :post,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}/balancednics",
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}/balancednics",
         expects: 202,
         body: { id: nic_id }.to_json
       )
@@ -48,7 +46,7 @@ module ProfitBricks
     def get_balanced_nic(nic_id)
       response = ProfitBricks.request(
         method: :get,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}/balancednics/#{nic_id}",
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}/balancednics/#{nic_id}",
         expects: 200
       )
       self.class.instantiate_objects(response)
@@ -57,7 +55,7 @@ module ProfitBricks
     def remove_balanced_nic(nic_id)
       ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}/balancednics/#{nic_id}",
+        path: "/datacenters/#{datacenterId}/loadbalancers/#{id}/balancednics/#{nic_id}",
         expects: 202
       )
     end
@@ -73,7 +71,8 @@ module ProfitBricks
       # * +options+<Hash>:
       #   - +name+<String> - *Optional*, name of the loadbalancer
       #   - +ip+<String> - *Optional*, IPv4 address of the loadbalancer
-      #   - +dhcp+<Boolean> - *Optional*, Indicates if the loadbalancer will reserve an IP using DHCP
+      #   - +dhcp+<Boolean> - *Optional*, Indicates if the loadbalancer will
+      #     reserve an IP using DHCP
       #
       # ==== Returns
       # * +id+<String> - Universally unique identifer of resource

data/lib/profitbricks/model.rb

@@ -19,13 +19,16 @@ module ProfitBricks
 
     def ready?
       status = ProfitBricks::Request.get(self.requestId).status
+      if status.metadata['status'] == 'FAILED' then
+          raise ProfitBricks::Errors::OperationFailure, status.metadata['message']
+      end
       status.metadata['status'] == 'DONE'
     end
 
     def reload
       # Remove URL host and prefix path from href.
       path = URI(self.href).path
-      path.sub!(ProfitBricks::Config.path_prefix, '/')
+      path.sub!(ProfitBricks::Config.path_prefix, '')
       
       response = ProfitBricks.request(
         method: :get,
@@ -80,7 +83,7 @@ module ProfitBricks
     # Add parent resource ID's to response resources. This will provide
     # convenient ID instance variable for subsequent methods.
     def self.add_parent_identities(response)
-      uri = URI(response['href']).path.split('/')
+      uri = URI(response['href']).path
       if response.key?('items') then
         response['items'].each do |item|
           item.merge!(extract_identities(uri))
@@ -92,9 +95,15 @@ module ProfitBricks
 
     def self.extract_identities(uri)
       identities = {}
-      identities['datacenterId'] = uri[3] if uri[2] == 'datacenters'
-      identities['serverId'] = uri[5] if uri[4] == 'servers'
-      identities['nicId'] = uri[7] if uri[6] == 'nics'
+      if match = uri.match(/datacenters\/([-a-f0-9]+)/i) then
+          identities['datacenterId'] = match[1]
+      end
+      if match = uri.match(/servers\/([-a-f0-9]+)/i) then
+          identities['serverId'] = match[1]
+      end
+      if match = uri.match(/nics\/([-a-f0-9]+)/i) then
+          identities['nicId'] = match[1]
+      end
       identities
     end
 

data/lib/profitbricks/nic.rb

@@ -1,12 +1,11 @@
 module ProfitBricks
   # NIC class
   class NIC < ProfitBricks::Model
-
     # Delete the NIC.
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
@@ -17,39 +16,36 @@ module ProfitBricks
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{id}",
         expects: 202,
         body: options.to_json
       )
-      if response
-        @properties = @properties.merge(response['properties'])
-      end
+      @properties = @properties.merge(response['properties'])
       self
     end
 
     # List all NIC firewall rules
     def list_firewall_rules
-      ProfitBricks::Firewall.list(self.datacenterId, self.serverId, self.id)
+      ProfitBricks::Firewall.list(datacenterId, serverId, id)
     end
 
     # Retrieve NIC firewall rule
     def get_firewall_rule(fwrule_id)
-      ProfitBricks::Firewall.get(self.datacenterId, self.serverId, self.id, fwrule_id)
+      ProfitBricks::Firewall.get(datacenterId, serverId, id, fwrule_id)
     end
 
     # Create NIC firewall rule
     def create_firewall_rule(options = {})
-      ProfitBricks::Firewall.create(self.datacenterId, self.serverId, self.id, options)
-    end 
+      ProfitBricks::Firewall.create(datacenterId, serverId, id, options)
+    end
 
-    alias_method :list_fwrules, :list_firewall_rules
-    alias_method :fwrules, :list_firewall_rules
-    alias_method :get_fwrule, :get_firewall_rule
-    alias_method :fwrule, :get_firewall_rule
-    alias_method :create_fwrule, :create_firewall_rule
+    alias list_fwrules list_firewall_rules
+    alias fwrules list_firewall_rules
+    alias get_fwrule get_firewall_rule
+    alias fwrule get_firewall_rule
+    alias create_fwrule create_firewall_rule
 
     class << self
-
       # Create a new NIC.
       def create(datacenter_id, server_id, options = {})
         response = ProfitBricks.request(

data/lib/profitbricks/profitbricks.rb

@@ -8,13 +8,13 @@ module ProfitBricks
     ProfitBricks::Config.debug = false
     ProfitBricks::Config.protocol = 'https'
     ProfitBricks::Config.port = '443'
-    ProfitBricks::Config.path_prefix = '/rest/'
+    ProfitBricks::Config.path_prefix = '/rest/v2'
     yield ProfitBricks::Config
 
     if ProfitBricks::Config.host
       url = construct_url
     else
-      url = ProfitBricks::Config.url || 'https://api.profitbricks.com/rest/'
+      url = ProfitBricks::Config.url || 'https://api.profitbricks.com/rest/v2'
     end
 
     params = {
@@ -69,7 +69,7 @@ module ProfitBricks
 
   def self.add_request_id(response)
     location ||= response.headers['Location']
-    request_id ||= URI(location).path.split('/')[3] unless location.nil?
+    request_id ||= location.match(/requests\/([-a-f0-9]+)/i)[1] unless location.nil?
     body = parse_json(response.body)
 
     if body.nil?

data/lib/profitbricks/version.rb

@@ -1,3 +1,3 @@
 module ProfitBricks
-  VERSION = "1.0.5"
+  VERSION = '1.1.0'
 end

data/lib/profitbricks/volume.rb

@@ -1,12 +1,11 @@
 module ProfitBricks
   # Volume class
   class Volume < ProfitBricks::Model
-
     # Delete the volume.
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/volumes/#{self.id}",
+        path: "/datacenters/#{datacenterId}/volumes/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
@@ -17,23 +16,21 @@ module ProfitBricks
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/datacenters/#{self.datacenterId}/volumes/#{self.id}",
+        path: "/datacenters/#{datacenterId}/volumes/#{id}",
         expects: 202,
         body: options.to_json
       )
-      if response
-        @properties = @properties.merge(response['properties'])
-      end
+      @properties = @properties.merge(response['properties'])
       self
     end
 
     # Attach volume to server.
     def attach(server_id)
-      response = ProfitBricks.request(
+      ProfitBricks.request(
         method: :post,
-        path: "/datacenters/#{self.datacenterId}/servers/#{server_id}/volumes",
+        path: "/datacenters/#{datacenterId}/servers/#{server_id}/volumes",
         expects: 202,
-        body: { id: self.id }.to_json
+        body: { id: id }.to_json
       )
       self
     end
@@ -42,7 +39,7 @@ module ProfitBricks
     def detach(server_id)
       ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/servers/#{server_id}/volumes/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{server_id}/volumes/#{id}",
         expects: 202
       )
     end
@@ -84,7 +81,7 @@ module ProfitBricks
     def create_snapshot(options = {})
       response = ProfitBricks.request(
         method: :post,
-        path: "/datacenters/#{self.datacenterId}/volumes/#{self.id}/create-snapshot",
+        path: "/datacenters/#{datacenterId}/volumes/#{id}/create-snapshot",
         headers: { 'Content-Type' => 'application/x-www-form-urlencoded' },
         expects: 202,
         body: URI.encode_www_form(options)
@@ -103,7 +100,7 @@ module ProfitBricks
     def restore_snapshot(snapshot_id)
       ProfitBricks.request(
         method: :post,
-        path: "/datacenters/#{self.datacenterId}/volumes/#{self.id}/restore-snapshot",
+        path: "/datacenters/#{datacenterId}/volumes/#{id}/restore-snapshot",
         headers: { 'Content-Type' => 'application/x-www-form-urlencoded' },
         expects: 202,
         body: URI.encode_www_form(snapshotId: snapshot_id)
@@ -111,17 +108,18 @@ module ProfitBricks
     end
 
     class << self
-
       # Create a new volume.
       #
       # ==== Parameters
       # * +options+<Hash>:
       #   - +name+<String> - *Optional*, name of the volume
       #   - +size+<Integer> - *Required*, size of the volume in GB
+      #   - +type+<String> - *Required*, the volume type (HDD or SSD)
       #   - +bus+<String> - *Optional*, the bus type of the volume
       #     * +VIRTIO+ - *Default*
       #     * +IDE+
       #   - +image+<String> - *Optional*, image or snapshot ID
+      #   - +sshKeys+<Array> - *Optional*, a list of public SSH keys
       #
       # ==== Returns
       # * +id+<String> - Universally unique identifer of resource
@@ -152,6 +150,7 @@ module ProfitBricks
       #   - +discVirtioHotUnPlug+<Boolean>
       #   - +discScsiHotPlug+<Boolean>
       #   - +discScsiHotUnPlug+<Boolean>
+      #   - +sshKeys+<Array>
       #
       def create(datacenter_id, options = {})
         response = ProfitBricks.request(
@@ -166,11 +165,11 @@ module ProfitBricks
 
       # List all datacenter volumes.
       def list(datacenter_id, server_id = nil)
-        if server_id.nil?
-          path = "/datacenters/#{datacenter_id}/volumes"
-        else
-          path = "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes"
-        end
+        path = if server_id.nil?
+                 "/datacenters/#{datacenter_id}/volumes"
+               else
+                 "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes"
+               end
         response = ProfitBricks.request(
           method: :get,
           path: path,
@@ -182,11 +181,11 @@ module ProfitBricks
 
       # Retrieve a datacenter volume.
       def get(datacenter_id, server_id = nil, volume_id)
-        if server_id.nil?
-          path = "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
-        else
-          path = "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}"
-        end
+        path = if server_id.nil?
+                 "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
+               else
+                 "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}"
+               end
         response = ProfitBricks.request(
           method: :get,
           path: path,

data/lib/profitbricks/wait_for.rb

@@ -1,5 +1,8 @@
 module ProfitBricks
-  def self.wait_for(timeout = ProfitBricks::Config.timeout, interval = ProfitBricks::Config.interval, &_block)
+  # Resource wait_for check
+  def self.wait_for(timeout = ProfitBricks::Config.timeout,
+                    interval = ProfitBricks::Config.interval,
+                    &_block)
     duration = 0
     start = Time.now
     retries = 0
@@ -8,9 +11,10 @@ module ProfitBricks
       duration = Time.now - start
     end
     if duration > timeout
-      raise StandardError, "The specified wait_for timeout (#{timeout} seconds) was exceeded"
+      fail StandardError,
+           "The specified wait_for timeout (#{timeout} seconds) was exceeded."
     else
-      { :duration => duration }
+      { duration: duration }
     end
   end
 end

data/spec/datacenter_spec.rb

@@ -116,7 +116,7 @@ describe ProfitBricks::Datacenter do
     expect(volumes[0].type).to eq('volume')
     expect(volumes[0].id).to match(options[:uuid])
     expect(volumes[0].properties['name']).to eq('my boot volume for server 1')
-    expect(volumes[0].properties['size']).to eq(10)
+    expect(volumes[0].properties['size']).to eq(5)
     expect(volumes[0].properties['bus']).to be nil
     expect(volumes[0].properties['image']).to be nil
     expect(volumes[0].properties['imagePassword']).to be nil
@@ -131,7 +131,7 @@ describe ProfitBricks::Datacenter do
     expect(volume.type).to eq('volume')
     expect(volume.id).to match(options[:uuid])
     expect(volume.properties['name']).to eq('my boot volume for server 1')
-    expect(volume.properties['size']).to eq(10)
+    expect(volume.properties['size']).to eq(5)
     expect(volume.properties['bus']).to be nil
     expect(volume.properties['image']).to be nil
     expect(volume.properties['imagePassword']).to be nil
@@ -147,7 +147,7 @@ describe ProfitBricks::Datacenter do
     expect(volume.type).to eq('volume')
     expect(volume.id).to match(options[:uuid])
     expect(volume.properties['name']).to eq('my boot volume for server 1')
-    expect(volume.properties['size']).to eq(10)
+    expect(volume.properties['size']).to eq(5)
     expect(volume.properties['bus']).to be nil
     expect(volume.properties['image']).to be nil
     expect(volume.properties['imagePassword']).to be nil

data/spec/image_spec.rb

@@ -10,9 +10,9 @@ describe ProfitBricks::Image do
     expect(@images[0].type).to eq('image')
     expect(@images[0].id).to match(options[:uuid])
     expect(@images[0].properties['name']).to be_kind_of(String)
-    expect(@images[0].properties['description']).to be nil
+    expect(@images[0].properties['description']).to eq('')
     expect(@images[0].properties['location']).to match(/\w+\/\w+/)
-    expect(@images[0].properties['size']).to be_kind_of(Integer)
+    expect(@images[0].properties['size']).to be > 0
   end
 
   it '#get' do
@@ -23,7 +23,7 @@ describe ProfitBricks::Image do
     expect(image.properties['name']).to be_kind_of(String)
     expect(image.properties['description']).to be nil
     expect(image.properties['location']).to match(/\w+\/\w+/)
-    expect(image.properties['size']).to be_kind_of(Integer)
+    expect(image.properties['size']).to be > 0
   end
 
   # Unable to test in production due to public images.

data/spec/server_spec.rb

@@ -68,7 +68,8 @@ describe ProfitBricks::Server do
     expect(servers[0].properties['ram']).to eq(1024)
     expect(servers[0].properties['availabilityZone']).to eq('AUTO')
     expect(servers[0].properties['vmState']).to eq('RUNNING')
-    expect(servers[0].properties['bootVolume']).to be nil
+    expect(servers[0].properties['bootVolume']['type']).to eq('volume')
+    expect(servers[0].properties['bootVolume']['id']).to match(options[:uuid])
     expect(servers[0].properties['bootCdrom']).to be nil
   end
 
@@ -82,7 +83,8 @@ describe ProfitBricks::Server do
     expect(server.properties['ram']).to eq(1024)
     expect(server.properties['availabilityZone']).to eq('AUTO')
     expect(server.properties['vmState']).to eq('RUNNING')
-    expect(server.properties['bootVolume']).to be nil
+    expect(server.properties['bootVolume']['type']).to eq('volume')
+    expect(server.properties['bootVolume']['id']).to match(options[:uuid])
     expect(server.properties['bootCdrom']).to be nil
   end
 
@@ -98,7 +100,8 @@ describe ProfitBricks::Server do
     expect(server.properties['ram']).to eq(1024)
     expect(server.properties['availabilityZone']).to eq('AUTO')
     expect(server.properties['vmState']).to eq('RUNNING')
-    expect(server.properties['bootVolume']).to be nil
+    expect(server.properties['bootVolume']['type']).to eq('volume')
+    expect(server.properties['bootVolume']['id']).to match(options[:uuid])
     expect(server.properties['bootCdrom']).to be nil
   end
 

data/spec/snapshot_spec.rb

@@ -108,6 +108,8 @@ describe ProfitBricks::Snapshot do
     snapshot = @volume.create_snapshot(options[:snapshot])
     snapshot.wait_for { ready? }
 
-    expect(snapshot.delete).to have_key(:requestId)
+    snapshot = snapshot.delete
+    expect(snapshot.type).to eq('snapshot')
+    expect(snapshot.delete.requestId).to match(options[:uuid])
   end
 end

data/spec/support/resource_helper.rb

@@ -16,7 +16,8 @@ module Helpers
 
       volume: {
         name: 'my boot volume for server 1',
-        size: 10,
+        size: 5,
+        type: 'HDD',
         licenceType: 'UNKNOWN'
       },
 
@@ -27,7 +28,7 @@ module Helpers
 
       nic: {
         name: 'nic1',
-        dhcp: 'true',
+        dhcp: true,
         lan: 1,
         firewallActive: true
       },
@@ -67,7 +68,8 @@ module Helpers
         volumes: [
           {
             name: 'composite-boot',
-            size: 10,
+            size: 5,
+            type: 'HDD',
             licenceType: 'UNKNOWN'
           }
         ],

data/spec/volume_spec.rb

@@ -28,7 +28,7 @@ describe ProfitBricks::Volume do
     expect(@volume.properties['name']).to eq('my boot volume for server 1')
     expect(@volume.properties['size']).to be_kind_of(Integer)
     expect(@volume.properties['bus']).to be nil
-    expect(@volume.properties['type']).to be nil
+    expect(@volume.properties['type']).to eq('HDD') 
   end
 
   it '#list' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Ethan Devenport
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -98,6 +98,7 @@ files:
 - lib/profitbricks.rb
 - lib/profitbricks/config.rb
 - lib/profitbricks/datacenter.rb
+- lib/profitbricks/errors.rb
 - lib/profitbricks/firewall.rb
 - lib/profitbricks/image.rb
 - lib/profitbricks/ipblock.rb