fog-profitbricks 2.0.1 → 3.0.0

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

@@ -1,44 +1,42 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Deletes the specified volume
-                #
-                # ==== Parameters
-                # * datacenter_id<~String> - UUID of the data center
-                # * volume_id<~String>      - UUID of the volume
-                #
-                # ==== Returns
-                # * response<~Excon::Response> - No response parameters
-                #   (HTTP/1.1 202 Accepted)
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-volume]
-                def delete_volume(datacenter_id, volume_id)
-                    request(
-                        :expects => [202],
-                        :method  => 'DELETE',
-                        :path    => "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
-                    )
-                rescue => error
-                    Fog::Errors::NotFound.new(error)
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Deletes the specified volume
+        #
+        # ==== Parameters
+        # * datacenter_id<~String> - UUID of the data center
+        # * volume_id<~String>      - UUID of the volume
+        #
+        # ==== Returns
+        # * response<~Excon::Response> - No response parameters
+        #   (HTTP/1.1 202 Accepted)
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#delete-volume]
+        def delete_volume(datacenter_id, volume_id)
+          request(
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/volumes/#{volume_id}"
+          )
+        end
+      end
 
-            class Mock
-                def delete_volume(datacenter_id, volume_id)
-                  response = Excon::Response.new
-                  response.status = 202
+      class Mock
+        def delete_volume(datacenter_id, volume_id)
+          response = Excon::Response.new
+          response.status = 202
 
-                  if vlm = self.data[:volumes]["items"].find {
-                      |volume| volume["id"] == volume_id && volume["datacenter_id"] == datacenter_id
-                  }
-                  else
-                    raise Fog::Errors::NotFound.new("The requested resource could not be found")
-                  end
+          if vlm = data[:volumes]["items"].find do |volume|
+            volume["id"] == volume_id && volume["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
+end

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

@@ -16,12 +16,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#detach-a-cd-rom]
         def detach_cdrom(datacenter_id, server_id, cdrom_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms/#{cdrom_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms/#{cdrom_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -30,18 +28,18 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          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
 
-          if cdrom = server['entities']['cdroms']['items'].find {
-              |cd|  cd['id'] == cdrom_id
-          }
+          if cdrom = server['entities']['cdroms']['items'].find do |cd|
+            cd['id'] == cdrom_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The attached volume resource could not be found")
+            raise Fog::Errors::NotFound, "The attached volume resource could not be found"
           end
 
           response

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

@@ -17,12 +17,10 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#detach-a-volume]
         def detach_volume(datacenter_id, server_id, volume_id)
           request(
-              :expects => [202],
-              :method  => 'DELETE',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}"
+            :expects => [202],
+            :method  => 'DELETE',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -31,18 +29,23 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          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
 
-          if volume = server['entities']['volumes']['items'].find {
-              |vlm|  vlm['id'] == volume_id
-          }
+          if server['entities']
+            volume = server['entities']['volumes']['items'].find do |vlm|
+              vlm['id'] == volume_id
+            end
+          elsif server['volumes']
+            volume = server['volumes']['items'].find do |vlm|
+              vlm['id'] == volume_id
+            end
           else
-            raise Fog::Errors::NotFound.new("The attached volume resource could not be found")
+            raise Fog::Errors::NotFound, "The attached volume resource could not be found"
           end
 
           response

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

@@ -50,7 +50,7 @@ module Fog
         def get_all_datacenters
           response        = Excon::Response.new
           response.status = 200
-          response.body   = self.data[:datacenters]
+          response.body   = data[:datacenters]
           response
         end
       end

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

@@ -49,18 +49,17 @@ module Fog
             :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules?depth=5"
           )
         end
-
       end
 
       class Mock
         def get_all_firewall_rules(datacenter_id, server_id, nic_id)
-          firewall_rules = self.data[:firewall_rules]
+          firewall_rules = data[:firewall_rules]
 
-          if nics = self.data[:firewall_rules]['items'].select {
-              |attrib| attrib['datacenter_id'] == datacenter_id && attrib['server_id'] == server_id && attrib['nic_id'] == nic_id
-          }
+          if nics = data[:firewall_rules]['items'].select do |attrib|
+            attrib['datacenter_id'] == datacenter_id && attrib['server_id'] == server_id && attrib['nic_id'] == nic_id
+          end
           else
-            raise Fog::Errors::NotFound.new('The resource could not be found')
+            raise Fog::Errors::NotFound, 'The resource could not be found'
           end
 
           firewall_rules['items'] = nics
@@ -73,4 +72,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,77 +1,77 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                def get_all_flavors()
-                    response        = Excon::Response.new
-                    response.status = 200
-                    response.body   = {
-                        'getAllFlavorsResponse' => [
-                            {
-                                'flavorId'   => '00db4c8f-5e83-49b0-a70b-ac4aad786163',
-                                'flavorName' => 'Micro',
-                                'ram'        => 1024,
-                                'cores'      => 1
-                            },
-                            {
-                                'flavorId'   => 'dc64957b-be9d-431e-91cd-9e217f94d3de',
-                                'flavorName' => 'Small',
-                                'ram'        => 2048,
-                                'cores'      => 1
-                            },
-                            {
-                                'flavorId'   => 'b37d000e-b347-4592-b572-df13ef8f68e1',
-                                'flavorName' => 'Medium',
-                                'ram'        => 4096,
-                                'cores'      => 2
-                            },
-                            {
-                                'flavorId'   => 'a5a4389f-54b6-4f47-b6e8-1c5c55976b94',
-                                'flavorName' => 'Large',
-                                'ram'        => 7168,
-                                'cores'      => 4
-                            },
-                            {
-                                'flavorId'   => '0052db40-f1dd-4ecf-a711-5980081b7059',
-                                'flavorName' => 'Extra Large',
-                                'ram'        => 14336,
-                                'cores'      => 8
-                            },
-                            {
-                                'flavorId'   => '8b2b835d-be09-48cf-aae2-7e35aafe92d6',
-                                'flavorName' => 'Memory Intensive Small',
-                                'ram'        => 16384,
-                                'cores'      => 2
-                            },
-                            {
-                                'flavorId'   => '45c28f8b-6a67-4f69-8c94-231d371da2b6',
-                                'flavorName' => 'Memory Intensive Medium',
-                                'ram'        => 28672,
-                                'cores'      => 4
-                            },
-                            {
-                                'flavorId'    => '1d22436d-d958-4151-b144-43a8e180c4c4',
-                                'flavorName'  => 'Memory Intensive Large',
-                                'ram'         => 57344,
-                                'cores'       => 8
-                            },
-                        ]
-                    }
-                    response
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        def get_all_flavors
+          response = Excon::Response.new
+          response.status = 200
+          response.body   = {
+            'getAllFlavorsResponse' => [
+              {
+                'flavorId' => '00db4c8f-5e83-49b0-a70b-ac4aad786163',
+                'flavorName' => 'Micro',
+                'ram'        => 1024,
+                'cores'      => 1
+              },
+              {
+                'flavorId'   => 'dc64957b-be9d-431e-91cd-9e217f94d3de',
+                'flavorName' => 'Small',
+                'ram'        => 2048,
+                'cores'      => 1
+              },
+              {
+                'flavorId'   => 'b37d000e-b347-4592-b572-df13ef8f68e1',
+                'flavorName' => 'Medium',
+                'ram'        => 4096,
+                'cores'      => 2
+              },
+              {
+                'flavorId'   => 'a5a4389f-54b6-4f47-b6e8-1c5c55976b94',
+                'flavorName' => 'Large',
+                'ram'        => 7168,
+                'cores'      => 4
+              },
+              {
+                'flavorId'   => '0052db40-f1dd-4ecf-a711-5980081b7059',
+                'flavorName' => 'Extra Large',
+                'ram'        => 14_336,
+                'cores'      => 8
+              },
+              {
+                'flavorId'   => '8b2b835d-be09-48cf-aae2-7e35aafe92d6',
+                'flavorName' => 'Memory Intensive Small',
+                'ram'        => 16_384,
+                'cores'      => 2
+              },
+              {
+                'flavorId'   => '45c28f8b-6a67-4f69-8c94-231d371da2b6',
+                'flavorName' => 'Memory Intensive Medium',
+                'ram'        => 28_672,
+                'cores'      => 4
+              },
+              {
+                'flavorId' => '1d22436d-d958-4151-b144-43a8e180c4c4',
+                'flavorName'  => 'Memory Intensive Large',
+                'ram'         => 57_344,
+                'cores'       => 8
+              }
+            ]
+          }
+          response
+        end
+      end
 
-            class Mock
-                def get_all_flavors
-                    data = self.data[:flavors]
-                    response        = Excon::Response.new
-                    response.status = 200
-                    response.body   = {
-                        'getAllFlavorsResponse' => self.data[:flavors]
-                    }
-                    response
-                end
-            end
+      class Mock
+        def get_all_flavors
+          data = self.data[:flavors]
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = {
+            'getAllFlavorsResponse' => self.data[:flavors]
+          }
+          response
         end
+      end
     end
+  end
 end

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

@@ -1,66 +1,66 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Displays a list of all available images.
-                #
-                # ==== Parameters
-                # * N/A
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String>                   - The resource's unique identifier
-                #     * type<~String>                 - The type of the requested resource
-                #     * href<~String>                 - URL to the object’s representation (absolute path)
-                #     * items<~Array>
-                #       * id<~String>                   - The resource's unique identifier
-                #       * type<~String>                 - The type of the requested resource
-                #       * href<~String>                 - URL to the object’s representation (absolute path)
-                #       * metadata<~Hash>               - Hash containing the image metadata
-                #         * createdDate<~String>        - The date the resource was created
-                #         * createdBy<~String>          - The user who created the resource
-                #         * etag<~String>               - The etag for the resource
-                #         * lastModifiedDate<~String>   - The last time the resource has been modified
-                #         * lastModifiedBy<~String>     - The user who last modified the resource
-                #         * state<~String>              - Volume state
-                #       * properties<~Hash>             - Hash containing the volume properties
-                #         * name<~String>               - The name of the image
-                #         * description<~String>        - The description of the image
-                #         * location<~String>           - The image's location
-                #         * size<~Integer>              - The size of the image in GB
-                #         * cpuHotPlug<~Boolean>        - This image is capable of CPU hot plug (no reboot required)
-                #         * cpuHotUnplug<~Boolean>      - This image is capable of CPU hot unplug (no reboot required)
-                #         * ramHotPlug<~Boolean>        - This image is capable of memory hot plug (no reboot required)
-                #         * ramHotUnplug<~Boolean>      - This image is capable of memory hot unplug (no reboot required)
-                #         * nicHotPlug<~Boolean>        - This image is capable of nic hot plug (no reboot required)
-                #         * nicHotUnplug<~Boolean>      - This image is capable of nic hot unplug (no reboot required)
-                #         * discVirtioHotPlug<~Boolean> - This image is capable of Virt-IO drive hot plug (no reboot required)
-                #         * discVirtioHotPlug<~Boolean> - This image is capable of Virt-IO drive hot unplug (no reboot required)
-                #         * discScsiHotPlug<~Boolean>   - This image is capable of Scsi drive hot plug (no reboot required)
-                #         * discScsiHotUnplug<~Boolean> - This image is capable of Scsi drive hot unplug (no reboot required)
-                #         * licenceType<~String>        - The image's licence type: LINUX, WINDOWS, or UNKNOWN
-                #         * imageType<~String>          - The type of image: HDD, CDROM
-                #         * public<~String>             - Indicates if the image is part of the public repository or not
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-images]
-                def get_all_images()
-                  request(
-                      :expects => [200],
-                      :method  => 'GET',
-                      :path    => "/images?depth=5"
-                  )
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Displays a list of all available images.
+        #
+        # ==== Parameters
+        # * N/A
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String>                   - The resource's unique identifier
+        #     * type<~String>                 - The type of the requested resource
+        #     * href<~String>                 - URL to the object’s representation (absolute path)
+        #     * items<~Array>
+        #       * id<~String>                   - The resource's unique identifier
+        #       * type<~String>                 - The type of the requested resource
+        #       * href<~String>                 - URL to the object’s representation (absolute path)
+        #       * metadata<~Hash>               - Hash containing the image metadata
+        #         * createdDate<~String>        - The date the resource was created
+        #         * createdBy<~String>          - The user who created the resource
+        #         * etag<~String>               - The etag for the resource
+        #         * lastModifiedDate<~String>   - The last time the resource has been modified
+        #         * lastModifiedBy<~String>     - The user who last modified the resource
+        #         * state<~String>              - Volume state
+        #       * properties<~Hash>             - Hash containing the volume properties
+        #         * name<~String>               - The name of the image
+        #         * description<~String>        - The description of the image
+        #         * location<~String>           - The image's location
+        #         * size<~Integer>              - The size of the image in GB
+        #         * cpuHotPlug<~Boolean>        - This image is capable of CPU hot plug (no reboot required)
+        #         * cpuHotUnplug<~Boolean>      - This image is capable of CPU hot unplug (no reboot required)
+        #         * ramHotPlug<~Boolean>        - This image is capable of memory hot plug (no reboot required)
+        #         * ramHotUnplug<~Boolean>      - This image is capable of memory hot unplug (no reboot required)
+        #         * nicHotPlug<~Boolean>        - This image is capable of nic hot plug (no reboot required)
+        #         * nicHotUnplug<~Boolean>      - This image is capable of nic hot unplug (no reboot required)
+        #         * discVirtioHotPlug<~Boolean> - This image is capable of Virt-IO drive hot plug (no reboot required)
+        #         * discVirtioHotPlug<~Boolean> - This image is capable of Virt-IO drive hot unplug (no reboot required)
+        #         * discScsiHotPlug<~Boolean>   - This image is capable of Scsi drive hot plug (no reboot required)
+        #         * discScsiHotUnplug<~Boolean> - This image is capable of Scsi drive hot unplug (no reboot required)
+        #         * licenceType<~String>        - The image's licence type: LINUX, WINDOWS, or UNKNOWN
+        #         * imageType<~String>          - The type of image: HDD, CDROM
+        #         * public<~String>             - Indicates if the image is part of the public repository or not
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-images]
+        def get_all_images
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/images?depth=5"
+          )
+        end
+      end
 
-            class Mock
-                def get_all_images()
-                  response        = Excon::Response.new
-                  response.status = 200
-                  response.body   = self.data[:images]
-                  response
-                end
-            end
+      class Mock
+        def get_all_images
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = data[:images]
+          response
         end
+      end
     end
-end
+  end
+end