fog-profitbricks 2.0.1 → 3.0.0

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

@@ -42,67 +42,64 @@ module Fog
         #       * licenceType<~String>        - The snapshot's licence type: LINUX, WINDOWS, or UNKNOWN
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-volume-snapshot]
-        def create_volume_snapshot(datacenter_id, volume_id, options={})
-          if options[:name]
-            body = [["name", options[:name]]]
-          end
+        def create_volume_snapshot(datacenter_id, volume_id, options = {})
+          body = [["name", options[:name]]] if options[:name]
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/volumes/#{volume_id}/create-snapshot",
-              :headers => { "Content-Type" => "application/x-www-form-urlencoded" },
-              :body => URI.encode_www_form(body)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/volumes/#{volume_id}/create-snapshot",
+            :headers => { "Content-Type" => "application/x-www-form-urlencoded" },
+            :body => URI.encode_www_form(body)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def create_volume_snapshot(datacenter_id, volume_id, options={})
+        def create_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
 
+          snapshot_id = Fog::UUID.uuid
           snapshot = {
-              'id'          => '3d52b13d-bec4-49de-ad05-fd2f8c687be7',
-              'type'        => 'snapshot',
-              'href'        => 'https =>//api.profitbricks.com/rest/v2/snapshots/3d52b13d-bec4-49de-ad05-fd2f8c687be7',
-              'metadata'    => {
-                  'createdDate'       => '2016-08-07T22:28:39Z',
-                  'createdBy'         => 'test@stackpointcloud.com',
-                  'etag'              => '83ad78a4757ab0d9bdeaebc3a6485dcf',
-                  'lastModifiedDate'  => '2016-08-07T22:28:39Z',
-                  'lastModifiedBy'    => 'test@stackpointcloud.com',
-                  'state'             => 'AVAILABLE'
-              },
-              'properties' => {
-                  'name'                => options[:name],
-                  'description'         => options[:description],
-                  'location'            => 'us/las',
-                  'size'                => 6,
-                  'cpuHotPlug'          => 'true',
-                  'cpuHotUnplug'        => 'false',
-                  'ramHotPlug'          => 'false',
-                  'ramHotUnplug'        => 'false',
-                  'nicHotPlug'          => 'false',
-                  'nicHotUnplug'        => 'false',
-                  'discVirtioHotPlug'   => 'false',
-                  'discVirtioHotUnplug' => 'false',
-                  'discScsiHotPlug'     => 'false',
-                  'discScsiHotUnplug'   => 'false',
-                  'licenceType'         => 'LINUX'
-              }
+            'id' => snapshot_id,
+            'type'        => 'snapshot',
+            'href'        => "https =>//api.profitbricks.com/rest/v2/snapshots/#{snapshot_id}",
+            'metadata'    => {
+              'createdDate' => '2016-08-07T22:28:39Z',
+              'createdBy'         => 'test@stackpointcloud.com',
+              'etag'              => '83ad78a4757ab0d9bdeaebc3a6485dcf',
+              'lastModifiedDate'  => '2016-08-07T22:28:39Z',
+              'lastModifiedBy'    => 'test@stackpointcloud.com',
+              'state'             => 'AVAILABLE'
+            },
+            'properties' => {
+              'name' => options[:name],
+              'description'         => options[:description],
+              'location'            => 'us/las',
+              'size'                => 6,
+              'cpuHotPlug'          => 'true',
+              'cpuHotUnplug'        => 'false',
+              'ramHotPlug'          => 'false',
+              'ramHotUnplug'        => 'false',
+              'nicHotPlug'          => 'true',
+              'nicHotUnplug'        => 'true',
+              'discVirtioHotPlug'   => 'true',
+              'discVirtioHotUnplug' => 'true',
+              'discScsiHotPlug'     => 'false',
+              'discScsiHotUnplug'   => 'false',
+              'licenceType'         => 'OTHER'
+            }
           }
 
-          self.data[:snapshots]['items'] << snapshot
+          data[:snapshots]['items'] << snapshot
 
           response.body = snapshot
           response

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

@@ -1,43 +1,41 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Delete virtual data center
-                #
-                # ==== Parameters
-                # * datacenter_id<~String> - The UUID of the data center
-                #
-                # ==== Returns
-                # * response<~Excon::Response> - No response parameters
-                #   (HTTP/1.1 202 Accepted)
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-a-data-center]
-                def delete_datacenter(datacenter_id)
-                    request(
-                        :expects => [202],
-                        :method  => 'DELETE',
-                        :path    => "/datacenters/#{datacenter_id}"
-                    )
-                rescue => error
-                    Fog::Errors::NotFound.new(error)
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Delete virtual data center
+        #
+        # ==== Parameters
+        # * datacenter_id<~String> - The UUID of the data center
+        #
+        # ==== Returns
+        # * response<~Excon::Response> - No response parameters
+        #   (HTTP/1.1 202 Accepted)
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-a-data-center]
+        def delete_datacenter(datacenter_id)
+          request(
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}"
+          )
+        end
+      end
 
-            class Mock
-                def delete_datacenter(datacenter_id)
-                    response = Excon::Response.new
-                    response.status = 202
+      class Mock
+        def delete_datacenter(datacenter_id)
+          response = Excon::Response.new
+          response.status = 202
 
-                    if dc = self.data[:datacenters]["items"].find {
-                        |datacenter| datacenter["id"] == datacenter_id
-                    }
-                    else
-                        raise Fog::Errors::NotFound.new("The requested resource could not be found")
-                    end
+          if dc = data[:datacenters]["items"].find do |datacenter|
+            datacenter["id"] == datacenter_id
+          end
+          else
+              raise Excon::Error::HTTPStatus, "The requested resource could not be found"
+          end
 
-                    response
-                end
-            end
+          response
         end
+      end
     end
+  end
 end

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

@@ -17,12 +17,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-firewall-rule]
         def delete_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -31,12 +29,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          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
           else
-            raise Fog::Errors::NotFound.new("The requested firewall rule resource could not be found")
+            raise Fog::Errors::NotFound, "The requested firewall rule resource could not be found"
           end
 
           response
@@ -44,4 +41,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -14,12 +14,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-image]
         def delete_image(image_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/images/#{image_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/images/#{image_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -28,11 +26,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          if img = self.data[:images]["items"].find {
-              |image| image["id"] == image_id
-          }
+          if img = data[:images]["items"].find do |image|
+            image["id"] == image_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

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

@@ -14,12 +14,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-ip-block]
         def delete_ip_block(ip_block_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/ipblocks/#{ip_block_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/ipblocks/#{ip_block_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -28,11 +26,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          if ip_block = self.data[:ip_blocks]["items"].find {
-              |attribute| attribute["id"] == ip_block_id
-          }
+          if ip_block = data[:ip_blocks]["items"].find do |attribute|
+            attribute["id"] == ip_block_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested IP Block could not be found")
+            raise Fog::Errors::NotFound, "The requested IP Block could not be found"
           end
 
           response
@@ -40,4 +38,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -15,12 +15,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-lan]
         def delete_lan(datacenter_id, lan_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenter/#{datacenter_id}/lans/#{lan_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/lans/#{lan_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -29,11 +27,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          if lan = self.data[:lans]["items"].find {
-              |attribute| attribute["datacenter_id"] == datacenter_id && attribute["id"] == lan_id
-          }
+          if lan = data[:lans]["items"].find do |attribute|
+            attribute["datacenter_id"] == datacenter_id && attribute["id"] == lan_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested lan could not be found")
+            raise Fog::Errors::NotFound, "The requested lan could not be found"
           end
 
           response

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

@@ -15,12 +15,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-load-balancer]
         def delete_load_balancer(datacenter_id, load_balancer_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -29,11 +27,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          if lb = self.data[:load_balancers]["items"].find {
-              |attribute| attribute["datacenter_id"] == datacenter_id && attribute["id"] == load_balancer_id
-          }
+          if lb = data[:load_balancers]["items"].find do |attribute|
+            attribute["datacenter_id"] == datacenter_id && attribute["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
@@ -41,4 +39,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -16,12 +16,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-a-nic]
         def delete_nic(datacenter_id, server_id, nic_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -30,12 +28,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          if nic = self.data[:nics]["items"].find {
-              |attribute| attribute["datacenter_id"] == datacenter_id && attribute["server_id"] == server_id && attribute["id"] == nic_id
-
-          }
+          if nic = data[:nics]["items"].find do |attribute|
+            attribute["datacenter_id"] == datacenter_id && attribute["server_id"] == server_id && attribute["id"] == nic_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested nic resource could not be found")
+            raise Fog::Errors::NotFound, "The requested nic resource could not be found"
           end
 
           response

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

@@ -21,21 +21,17 @@ module Fog
             :method  => 'DELETE',
             :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def delete_server(datacenter_id, server_id)
-          if server = self.data[:servers]['items'].find {
-            |attrib| attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
-          }
-            self.data[:servers].delete(server)
+          if server = data[:servers]['items'].find do |attrib|
+            attrib['datacenter_id'] == datacenter_id && attrib['id'] == server_id
+          end
+            data[:servers].delete(server)
           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
@@ -45,4 +41,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -13,13 +13,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-snapshot]
         def delete_snapshot(snapshot_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/snapshots/#{snapshot_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/snapshots/#{snapshot_id}"
           )
-        rescue => error
-          puts error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -28,11 +25,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          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 Fog::Errors::NotFound, 'The requested resource could not be found'
           end
 
           response