fog-profitbricks 2.0.1 → 3.0.0

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

@@ -1,43 +1,43 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Retrieves a list of requests
-                #
-                # ==== Parameters
-                # * None
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String> 		  - The resource's unique identifier
-                #     * type<~String>		  - The type of the resource
-                #     * href<~String>		  - URL to the object’s representation (absolute path)
-                #     * items<~Hash>      - Collection of individual request objects
-                #       * id<~String> 		  - The resource's unique identifier
-                #       * type<~String>		  - The type of the resource
-                #       * href<~String>		  - URL to the object’s representation (absolute path)
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-requests]
-                def get_all_requests
-                    request(
-                        :expects => [200],
-                        :method  => 'GET',
-                        :path    => "/requests"
-                    )
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Retrieves a list of requests
+        #
+        # ==== Parameters
+        # * None
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String> 		  - The resource's unique identifier
+        #     * type<~String>		  - The type of the resource
+        #     * href<~String>		  - URL to the object’s representation (absolute path)
+        #     * items<~Hash>      - Collection of individual request objects
+        #       * id<~String> 		  - The resource's unique identifier
+        #       * type<~String>		  - The type of the resource
+        #       * href<~String>		  - URL to the object’s representation (absolute path)
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-requests]
+        def get_all_requests
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/requests"
+          )
+        end
+      end
 
-            class Mock
-                def get_all_requests
-                  requests = self.data[:requests]
-                  response        = Excon::Response.new
-                  response.status = 200
-                  response.body   = requests
+      class Mock
+        def get_all_requests
+          requests = data[:requests]
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = requests
 
-                  response
-                end
-            end
+          response
         end
+      end
     end
-end
+  end
+end

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

@@ -105,27 +105,26 @@ module Fog
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-servers]
         def get_all_servers(datacenter_id)
-
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/servers?depth=5"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/servers?depth=5"
           )
         end
       end
 
       class Mock
         def get_all_servers(datacenter_id)
-          if servs = self.data[:servers]['items'].select {
-              |attrib| attrib['datacenter_id'] == datacenter_id
-          }
+          if servs = data[:servers]['items'].select do |attrib|
+            attrib['datacenter_id'] == datacenter_id
+          end
           else
-            raise Fog::Errors::NotFound.new('Server resource could not be found')
+            raise Fog::Errors::NotFound, 'Server resource could not be found'
           end
 
           response        = Excon::Response.new
           response.status = 200
-          response.body   = self.data[:servers]
+          response.body   = data[:servers]
           response
         end
       end

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

@@ -45,9 +45,9 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-snapshots]
         def get_all_snapshots
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/snapshots?depth=5"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/snapshots?depth=5"
           )
         end
       end
@@ -56,7 +56,7 @@ module Fog
         def get_all_snapshots
           response        = Excon::Response.new
           response.status = 200
-          response.body   = self.data[:snapshots]
+          response.body   = data[:snapshots]
 
           response
         end

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

@@ -1,78 +1,78 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Retrieve a list of all volumes
-                #
-                # ==== Parameters
-                # * datacenter_id - UUID of the datacenter which contains the volumes
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String>                   - Id of the requested resource
-                #     * type<~String>                 - type of the requested resource
-                #     * href<~String>                 - url to the requested resource
-                #     * 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 volume 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 volume.
-                #         * type<~String>               - The volume type, HDD or SSD.
-                #         * size<~Integer>              - The size of the volume in GB.
-                #         * image<~String>              - The image or snapshot ID.
-                #         * imagePassword<~Boolean>     - Indicates if a password is set on the image.
-                #         * bus<~String>                - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
-                #         * licenceType<~String>        - Volume licence type. ( WINDOWS, LINUX, OTHER, UNKNOWN)
-                #         * cpuHotPlug<~Boolean>        - This volume is capable of CPU hot plug (no reboot required)
-                #         * cpuHotUnplug<~Boolean>      - This volume is capable of CPU hot unplug (no reboot required)
-                #         * ramHotPlug<~Boolean>        - This volume is capable of memory hot plug (no reboot required)
-                #         * ramHotUnplug<~Boolean>      - This volume is capable of memory hot unplug (no reboot required)
-                #         * nicHotPlug<~Boolean>        - This volume is capable of nic hot plug (no reboot required)
-                #         * nicHotUnplug<~Boolean>      - This volume is capable of nic hot unplug (no reboot required)
-                #         * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot plug (no reboot required)
-                #         * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot unplug (no reboot required)
-                #         * discScsiHotPlug<~Boolean>   - This volume is capable of Scsi drive hot plug (no reboot required)
-                #         * discScsiHotUnplug<~Boolean> - This volume is capable of Scsi drive hot unplug (no reboot required)
-                #         * deviceNumber<~Integer>      - The LUN ID of the storage volume
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-volumes]
-                def get_all_volumes(datacenter_id)
-                    request(
-                        :expects => [200],
-                        :method  => 'GET',
-                        :path    => "/datacenters/#{datacenter_id}/volumes?depth=5"
-                    )
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Retrieve a list of all volumes
+        #
+        # ==== Parameters
+        # * datacenter_id - UUID of the datacenter which contains the volumes
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String>                   - Id of the requested resource
+        #     * type<~String>                 - type of the requested resource
+        #     * href<~String>                 - url to the requested resource
+        #     * 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 volume 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 volume.
+        #         * type<~String>               - The volume type, HDD or SSD.
+        #         * size<~Integer>              - The size of the volume in GB.
+        #         * image<~String>              - The image or snapshot ID.
+        #         * imagePassword<~Boolean>     - Indicates if a password is set on the image.
+        #         * bus<~String>                - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
+        #         * licenceType<~String>        - Volume licence type. ( WINDOWS, LINUX, OTHER, UNKNOWN)
+        #         * cpuHotPlug<~Boolean>        - This volume is capable of CPU hot plug (no reboot required)
+        #         * cpuHotUnplug<~Boolean>      - This volume is capable of CPU hot unplug (no reboot required)
+        #         * ramHotPlug<~Boolean>        - This volume is capable of memory hot plug (no reboot required)
+        #         * ramHotUnplug<~Boolean>      - This volume is capable of memory hot unplug (no reboot required)
+        #         * nicHotPlug<~Boolean>        - This volume is capable of nic hot plug (no reboot required)
+        #         * nicHotUnplug<~Boolean>      - This volume is capable of nic hot unplug (no reboot required)
+        #         * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot plug (no reboot required)
+        #         * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot unplug (no reboot required)
+        #         * discScsiHotPlug<~Boolean>   - This volume is capable of Scsi drive hot plug (no reboot required)
+        #         * discScsiHotUnplug<~Boolean> - This volume is capable of Scsi drive hot unplug (no reboot required)
+        #         * deviceNumber<~Integer>      - The LUN ID of the storage volume
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#list-volumes]
+        def get_all_volumes(datacenter_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/volumes?depth=5"
+          )
+        end
+      end
 
-            class Mock
-                def get_all_volumes(datacenter_id)
-                  volumes = self.data[:volumes]
+      class Mock
+        def get_all_volumes(datacenter_id)
+          volumes = data[:volumes]
 
-                  if vlms = self.data[:volumes]['items'].select {
-                      |attrib| attrib['datacenter_id'] == datacenter_id
-                  }
-                  else
-                    raise Fog::Errors::NotFound.new('Volume resource could not be found')
-                  end
+          if vlms = data[:volumes]['items'].select do |attrib|
+            attrib['datacenter_id'] == datacenter_id
+          end
+          else
+            raise Fog::Errors::NotFound, 'Volume resource could not be found'
+          end
 
-                  volumes['items'] = vlms
-                  response        = Excon::Response.new
-                  response.status = 200
-                  response.body   = self.data[:volumes]
+          volumes['items'] = vlms
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = data[:volumes]
 
-                  response
-                end
-            end
+          response
         end
+      end
     end
-end
+  end
+end

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

@@ -44,27 +44,27 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#retrieve-attached-cd-rom]
         def get_attached_cdrom(datacenter_id, server_id, cdrom_image_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms/#{cdrom_image_id}?depth=1"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms/#{cdrom_image_id}?depth=1"
           )
         end
       end
 
       class Mock
         def get_attached_cdrom(datacenter_id, server_id, cdrom_image_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
 
-          if cdrom = server['entities']['cdroms']['items'].find {
-              |cd|  cd['id'] == cdrom_image_id
-          }
+          if cdrom = server['entities']['cdroms']['items'].find do |cd|
+            cd['id'] == cdrom_image_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        = Excon::Response.new

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

@@ -45,27 +45,32 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#retrieve-an-attached-volume]
         def get_attached_volume(datacenter_id, server_id, volume_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}?depth=1"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes/#{volume_id}?depth=1"
           )
         end
       end
 
       class Mock
         def get_attached_volume(datacenter_id, server_id, volume_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
 
-          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        = Excon::Response.new

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

@@ -40,18 +40,16 @@ module Fog
             :method  => "GET",
             :path    => "/datacenters/#{datacenter_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_datacenter(datacenter_id)
-          if dc = self.data[:datacenters]["items"].find {
-            |datacenter| datacenter["id"] == datacenter_id
-          }
+          if dc = data[:datacenters]["items"].find do |datacenter|
+            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/get_firewall_rule.rb

@@ -41,23 +41,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-firewall-rule]
         def get_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
-
       end
 
       class Mock
         def get_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id)
-          if firewall_rule = self.data[:firewall_rules]['items'].find {
-              |fwr| fwr["datacenter_id"] == datacenter_id && fwr["server_id"] == server_id && fwr["nic_id"] == nic_id && fwr["id"] == firewall_rule_id
-          }
+          if firewall_rule = data[:firewall_rules]['items'].find do |fwr|
+            fwr["datacenter_id"] == datacenter_id && fwr["server_id"] == server_id && fwr["nic_id"] == nic_id && fwr["id"] == firewall_rule_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
@@ -68,4 +65,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -34,27 +34,27 @@ module Fog
               {
                 "flavorId"   => "0052db40-f1dd-4ecf-a711-5980081b7059",
                 "flavorName" => "Extra Large",
-                "ram"        => 14336,
+                "ram"        => 14_336,
                 "cores"      => 8
               },
               {
                 "flavorId"   => "8b2b835d-be09-48cf-aae2-7e35aafe92d6",
                 "flavorName" => "Memory Intensive Small",
-                "ram"        => 16384,
+                "ram"        => 16_384,
                 "cores"      => 2
               },
               {
                 "flavorId"   => "45c28f8b-6a67-4f69-8c94-231d371da2b6",
                 "flavorName" => "Memory Intensive Medium",
-                "ram"        => 28672,
+                "ram"        => 28_672,
                 "cores"      => 4
               },
               {
                 "flavorId"   => "1d22436d-d958-4151-b144-43a8e180c4c4",
                 "flavorName" => "Memory Intensive Large",
-                "ram"        => 57344,
+                "ram"        => 57_344,
                 "cores"      => 8
-              },
+              }
             ].find { |flavor| flavor["flavorId"] == flavor_id } || raise(Fog::Errors::NotFound)
           }
           response
@@ -66,11 +66,11 @@ module Fog
           response        = Excon::Response.new
           response.status = 200
 
-          if flavor = self.data[:flavors].find {
-            |attrib| attrib["flavorId"] == flavor_id
-          }
+          if flavor = data[:flavors].find do |attrib|
+            attrib["flavorId"] == flavor_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested flavor could not be found")
+            raise Fog::Errors::NotFound, "The requested flavor could not be found"
           end
 
           response.body = { "getFlavorResponse" => flavor }