fog-profitbricks 2.0.1 → 3.0.0

data/lib/fog/profitbricks/requests/compute/get_server.rb

@@ -103,23 +103,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#retrieve-a-server]
         def get_server(datacenter_id, server_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_server(datacenter_id, server_id)
-
-          if server = self.data[:servers]['items'].find {
-            |serv|  serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |serv|
+            serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The server resource could not be found")
+            raise Fog::Errors::NotFound, "The server resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_snapshot.rb

@@ -41,22 +41,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-snapshot]
         def get_snapshot(snapshot_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/snapshots/#{snapshot_id}"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/snapshots/#{snapshot_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_snapshot(snapshot_id)
-          if snapshot = self.data[:snapshots]['items'].find {
-              |attrib| attrib["id"] == snapshot_id
-          }
+          if snapshot = data[:snapshots]['items'].find do |attrib|
+            attrib["id"] == snapshot_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_volume.rb

@@ -44,22 +44,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-volume]
         def get_volume(datacenter_id, volume_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_volume(datacenter_id, volume_id)
-          if volume = self.data[:volumes]['items'].find {
-            |vlm| vlm["id"] == volume_id && vlm["datacenter_id"] == datacenter_id
-          }
+          if volume = data[:volumes]['items'].find do |vlm|
+            vlm["id"] == volume_id && vlm["datacenter_id"] == datacenter_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/list_attached_cdroms.rb

@@ -47,25 +47,25 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-attached-cd-roms]
         def list_attached_cdroms(datacenter_id, server_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms?depth=1"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms?depth=1"
           )
         end
       end
 
       class Mock
         def list_attached_cdroms(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-              |serv|  serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |serv|
+            serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The server resource could not be found")
+            raise Fog::Errors::NotFound, "The server resource could not be found"
           end
 
           response        = Excon::Response.new
           response.status = 200
-          response.body   = server['entities']['cdroms']
+          response.body   = data[:images]
           response
         end
       end

data/lib/fog/profitbricks/requests/compute/list_attached_volumes.rb

@@ -48,25 +48,35 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-attached-volumes]
         def list_attached_volumes(datacenter_id, server_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes?depth=1"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes?depth=1"
           )
         end
       end
 
       class Mock
         def list_attached_volumes(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-              |serv|  serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |serv|
+            serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The server resource could not be found")
+            raise Fog::Errors::NotFound, "The server resource could not be found"
           end
 
           response        = Excon::Response.new
           response.status = 200
-          response.body   = server['entities']['volumes']
+          response.body = if server['entities'] && server['entities']['volumes']
+                            server['entities']['volumes']
+                          else
+                            {
+                              'id' => "#{server_id}/volumes",
+                              'type'  => 'collection',
+                              'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/volumes",
+                              'items' => []
+                            }
+                          end
+
           response
         end
       end

data/lib/fog/profitbricks/requests/compute/reboot_server.rb

@@ -17,24 +17,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#reboot-a-server]
         def reboot_server(datacenter_id, server_id)
           request(
-              :expects => [202],
-              :method  => 'POST',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/reboot"
+            :expects => [202],
+            :method  => 'POST',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/reboot"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def reboot_server(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-              |attrib| attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |attrib|
+            attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new(
-                'The requested server resource could not be found'
-            )
+            raise Fog::Errors::NotFound, 'The requested server resource could not be found'
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/remove_nic_association.rb

@@ -16,22 +16,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#remove-a-nic-association]
         def remove_nic_association(datacenter_id, load_balancer_id, nic_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics/#{nic_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics/#{nic_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def remove_nic_association(datacenter_id, load_balancer_id, nic_id)
-          if load_balancer = self.data[:load_balancers]['items'].find {
-              |lb| lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
-          }
+        def remove_nic_association(datacenter_id, load_balancer_id, _nic_id)
+          if load_balancer = data[:load_balancers]['items'].find do |lb|
+            lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_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
 
           response        = Excon::Response.new
@@ -41,4 +39,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/requests/compute/restore_volume_snapshot.rb

@@ -21,36 +21,34 @@ module Fog
         #     * Connection<~String>
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-volume-snapshot]
-        def restore_volume_snapshot(datacenter_id, volume_id, options={})
+        def restore_volume_snapshot(datacenter_id, volume_id, options = {})
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/volumes/#{volume_id}/restore-snapshot",
-              :headers => { "Content-Type" => "application/x-www-form-urlencoded" },
-              :body => URI.encode_www_form("snapshotId" => options[:snapshot_id])
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/volumes/#{volume_id}/restore-snapshot",
+            :headers => { "Content-Type" => "application/x-www-form-urlencoded" },
+            :body => URI.encode_www_form("snapshotId" => options[:snapshot_id])
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def restore_volume_snapshot(datacenter_id, volume_id, options={})
+        def restore_volume_snapshot(datacenter_id, volume_id, _options = {})
           response = Excon::Response.new
           response.status = 202
 
-          if datacenter = self.data[:datacenters]['items'].find {
-              |attrib| attrib['id'] == datacenter_id
-          }
+          if datacenter = data[:datacenters]['items'].find do |attrib|
+            attrib['id'] == datacenter_id
+          end
           else
-            raise Fog::Errors::NotFound.new('Data center resource could not be found')
+            raise Excon::Error::HTTPStatus, 'Data center resource could not be found'
           end
 
-          if volume = self.data[:volumes]['items'].find {
-              |attrib| attrib['id'] == volume_id && attrib['datacenter_id'] == datacenter_id
-          }
+          if volume = data[:volumes]['items'].find do |attrib|
+            attrib['id'] == volume_id && attrib['datacenter_id'] == datacenter_id
+          end
           else
-            raise Fog::Errors::NotFound.new('Volume resource could not be found')
+            raise Excon::Error::HTTPStatus, 'Volume resource could not be found'
           end
 
           response

data/lib/fog/profitbricks/requests/compute/start_server.rb

@@ -16,24 +16,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#start-a-server]
         def start_server(datacenter_id, server_id)
           request(
-              :expects => [202],
-              :method  => 'POST',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/start"
+            :expects => [202],
+            :method  => 'POST',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/start"
           )
-        rescue Excon::Errors::InternalServerError => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def start_server(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-              |attrib| attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |attrib|
+            attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new(
-                'The requested server resource could not be found'
-            )
+            raise Fog::Errors::NotFound, 'The requested server resource could not be found'
           end
 
           server['vm_state'] = 'RUNNING'

data/lib/fog/profitbricks/requests/compute/stop_server.rb

@@ -17,24 +17,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#stop-a-server]
         def stop_server(datacenter_id, server_id)
           request(
-              :expects => [202],
-              :method  => 'POST',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/stop"
+            :expects => [202],
+            :method  => 'POST',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/stop"
           )
-        rescue Excon::Errors::InternalServerError => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def stop_server(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-              |attrib| attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
-          }
+          if server = data[:servers]['items'].find do |attrib|
+            attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
+          end
           else
-            raise Fog::Errors::NotFound.new(
-                'The requested server resource could not be found'
-            )
+            raise Fog::Errors::NotFound, 'The requested server resource could not be found'
           end
 
           server['vm_state'] = 'SHUTOFF'

data/lib/fog/profitbricks/requests/compute/update_datacenter.rb

@@ -35,30 +35,35 @@ module Fog
         #       * lans<~Hash>                 - A collection that represents the LANs in a data center
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#update-a-data-center]
-        def update_datacenter(datacenter_id, options={})
-            request(
-                :expects => [202],
-                :method  => 'PATCH',
-                :path    => "/datacenters/#{datacenter_id}",
-                :body    => Fog::JSON.encode(options)
-            )
-        rescue => error
-            Fog::Errors::NotFound.new(error)
+        def update_datacenter(datacenter_id, options = {})
+          request(
+            :expects => [202],
+            :method  => 'PATCH',
+            :path    => "/datacenters/#{datacenter_id}",
+            :body    => Fog::JSON.encode(options)
+          )
         end
       end
 
       class Mock
-        def update_datacenter(datacenter_id, options={})
-          if dc = self.data[:datacenters]["items"].find {
-              |datacenter| datacenter["id"] == datacenter_id
-          }
+        def update_datacenter(datacenter_id, options = {})
+          if dc = data[:datacenters]["items"].find do |datacenter|
+            datacenter["id"] == datacenter_id
+          end
             options.each do |key, value|
               dc[key] = value
             end
 
-            dc['properties']['version']    += 1
+            dc['properties']['version'] += 1 if dc['properties']
+            dc['version'] += 1 if dc['version']
+
+            dc['properties']['name'] += ' - updated' if dc['properties']
+            dc['name'] += ' - updated' if dc['name']
+            dc['properties']['description'] += ' - updated' if dc['properties']
+            dc['description'] += ' - updated' if dc['description']
+
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/update_firewall_rule.rb

@@ -53,26 +53,24 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#update-firewall-rule]
         def update_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id, options = {})
           request(
-              :expects => [202],
-              :method  => 'PATCH',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}",
-              :body    => Fog::JSON.encode(options)
+            :expects => [202],
+            :method  => 'PATCH',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}",
+            :body    => Fog::JSON.encode(options)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def update_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id, options = {})
-          if firewall_rule = self.data[:firewall_rules]['items'].find {
-              |attribute| attribute["datacenter_id"] == datacenter_id && attribute["server_id"] == server_id && attribute["nic_id"] == nic_id && attribute["id"] == firewall_rule_id
-          }
+          if firewall_rule = data[:firewall_rules]['items'].find do |attribute|
+            attribute["datacenter_id"] == datacenter_id && attribute["server_id"] == server_id && attribute["nic_id"] == nic_id && attribute["id"] == firewall_rule_id
+          end
             options.each do |key, value|
               firewall_rule[key] = value
             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
 
           response        = Excon::Response.new
@@ -84,4 +82,4 @@ module Fog
       end
     end
   end
-end
+end