fog-profitbricks 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da98864bbc8f591efae223f144a400046870c7fb
-  data.tar.gz: 392b05d4ae791fc4f06ecd199a137f82e96824db
+  metadata.gz: 6db38014892bf2bdce49625f871aec559f4d8f24
+  data.tar.gz: 2fb1020757ff1989716c6542a579a84d7205dcd5
 SHA512:
-  metadata.gz: 0fcb8d3b8754800884dc37c6fdea7a2dbef8ee8f37656f6e4441203ed1eb720435a0ef37f46af7ab5634c77c403b809f0eb4d6754686463c525c44b4f9bf7383
-  data.tar.gz: 0506d6d67589b01003818ef527e14a7ae76d5ebcd792e33529349fdc7979c4da6f353e7f90b5e16d94424620198a48760bed58afcdea53d9cb71814ccb77b5bb
+  metadata.gz: 5d7a53c0ca044dffc906058619d7b107429aedee43fac6b178c3a5bf44ab5f93bf4380947fa2020820c77b912ce993caefdda090bb100c81720f0e0e477c335f
+  data.tar.gz: fdc7e4267399855ad2924c148edcc0a9aa695d82a7c025a9d3978034830b1cc00c1086fcd57fec180e81e9f03335e8348006a05600c149366b5222160318144f

data/.rubocop.yml

@@ -19,3 +19,6 @@ Style/SignalException:
 Style/StringLiterals:
   Enabled: false
   # EnforcedStyle: double_quotes
+
+Style/IndentationWidth:
+  Width: 2

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 
+before_install:
+  - gem update bundler
+
 script: bundle exec rake travis
 
 matrix:
@@ -13,13 +16,17 @@ matrix:
       gemfile: gemfiles/Gemfile.1.9.2+
       env: COVERAGE=true
     - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.1.9.2+
+      gemfile: Gemfile
       env: COVERAGE=true
     - rvm: 2.1.1
-      gemfile: gemfiles/Gemfile.1.9.2+
+      gemfile: Gemfile
+      env: COVERAGE=true
+    - rvm: 2.2.0
+      gemfile: Gemfile
+      env: COVERAGE=true
+    - rvm: 2.3.0
+      gemfile: Gemfile
       env: COVERAGE=true
-    - rvm: ree
-      gemfile: gemfiles/Gemfile.1.8.7
     - rvm: jruby
       gemfile: gemfiles/Gemfile.1.9.2+
       env: COVERAGE=true

data/README.md

@@ -1,6 +1,6 @@
 # Fog::profitbricks
 
-![Gem Version](https://badge.fury.io/rb/fog-profitbricks.svg) [![Build Status](https://travis-ci.org/fog/fog-profitbricks.svg?branch=master)](https://travis-ci.org/fog/fog-profitbricks) [![Dependency Status](https://gemnasium.com/fog/fog-profitbricks.svg)](https://gemnasium.com/fog/fog-profitbricks) [![Coverage Status](https://img.shields.io/coveralls/fog/fog-profitbricks.svg)](https://coveralls.io/r/fog/fog-profitbricks?branch=master) [![Code Climate](https://codeclimate.com/github/fog/fog-profitbricks.png)](https://codeclimate.com/github/fog/fog-profitbricks)
+![Gem Version](https://badge.fury.io/rb/fog-profitbricks.svg) [![Build Status](https://travis-ci.org/fog/fog-profitbricks.svg?branch=master)](https://travis-ci.org/fog/fog-profitbricks) [![Dependency Status](https://gemnasium.com/fog/fog-profitbricks.svg)](https://gemnasium.com/fog/fog-profitbricks) [![Coverage Status](https://img.shields.io/coveralls/fog/fog-profitbricks.svg)](https://coveralls.io/r/fog/fog-profitbricks?branch=master) [![Code Climate](https://codeclimate.com/github/fog/fog-profitbricks/badges/gpa.svg)](https://codeclimate.com/github/fog/fog-profitbricks)
 
 Module for the 'fog' gem to support ProfitBricks Cloud API.
 
@@ -96,7 +96,7 @@ Module for the 'fog' gem to support ProfitBricks Cloud API.
 
 Before you begin, you will need to have signed up for a ProfitBricks account. The credentials you create during sign-up will be used to authenticate against the API.
 
-For more information on ProfitBricks REST API, visit the [API documentation](https://devops.profitbricks.com/api/cloud/v2/) page.
+For more information on ProfitBricks REST API, visit the [API documentation](https://devops.profitbricks.com/api/cloud/v3/) page.
 
 ### Installation
 
@@ -638,10 +638,11 @@ The following table describes the request arguments:
 | image | string | The image or snapshot ID. | Yes* |
 | type | string | The volume type, HDD or SSD. | Yes |
 | licenceType | string | The licence type of the volume. Options: LINUX, WINDOWS, UNKNOWN, OTHER | Yes* |
-| imagePassword | string | One-time password is set on the Image for the appropriate account. This field may only be set in creation requests. When reading, it always returns null. Password has to contain 8-50 characters. Only these characters are allowed: [abcdefghjkmnpqrstuvxABCDEFGHJKLMNPQRSTUVX23456789] | No |
-| sshKeys | string | SSH keys to allow access to the volume via SSH | No |
+| imagePassword | string | One-time password is set on the Image for the appropriate account. This field may only be set in creation requests. When reading, it always returns null. Password has to contain 8-50 characters. Only these characters are allowed: [abcdefghjkmnpqrstuvxABCDEFGHJKLMNPQRSTUVX23456789] | Yes* |
+| sshKeys | string | SSH keys to allow access to the volume via SSH | Yes* |
+| availabilityZone | string | The storage availability zone assigned to the volume. Valid values: AUTO, ZONE_1, ZONE_2, or ZONE_3. This only applies to HDD volumes. Leave blank or set to AUTO when provisioning SSD volumes. | No |
 
-*You will need to provide either the image or the licenceType parameters. licenceType is required, but if image is supplied, it will already have a licenceType set.
+*You will need to provide either the `image` or the `licenceType` parameters. `licenceType` is required, but if `image` is supplied, it is already set and cannot be changed. Similarly either the `imagePassword` or `sshKeys` parameters need to be supplied when creating a volume. We recommend setting a valid value for `imagePassword` even when using `sshKeys` so that it is possible to authenticate using the remote console feature of the DCD.
 
 ```
 volume = compute.volumes.create(:datacenter_id => 'datacenter_id', :size => 5, :type => 'HDD', :licence_type => 'LINUX')
@@ -1212,6 +1213,7 @@ The following table describes the request arguments:
 | ips | string collection | IPs assigned to the NIC. This can be a collection. ||
 | dhcp | bool | Set to FALSE if you wish to disable DHCP on the NIC. Default: TRUE. ||
 | lan | int | The LAN ID the NIC will sit on. If the LAN ID does not exist it will be created. | Yes |
+| nat | bool | Indicates the private IP address has outbound access to the public internet. ||
 | firewallActive | bool | Once you add a firewall rule this will reflect a true value. ||
 | firewallrules | string collection | A list of firewall rules associated to the NIC represented as a collection. ||
 
@@ -1240,6 +1242,7 @@ The following table describes the request arguments:
 | ips | string collection | IPs assigned to the NIC represented as a collection. ||
 | dhcp | bool | Boolean value that indicates if the NIC is using DHCP or not. ||
 | lan | int | The LAN ID the NIC sits on. ||
+| nat | bool | Indicates the private IP address has outbound access to the public internet. ||
 
 After retrieving a NIC, either by getting it by id, or as a create response object, you can call the `update` method directly on the object:
 

data/Rakefile

@@ -21,4 +21,4 @@ namespace :test do
 end
 
 desc "Default Task"
-task :default => [ :test ]
+task :default => [:test]

data/examples/pb_demo.rb

@@ -7,13 +7,13 @@ compute = Fog::Compute.new(:provider => 'ProfitBricks')
 # Find the Ubuntu 16 image in North America.
 image = compute.images.all.find do |image|
   image.name =~ /Ubuntu-16/ &&
-  image.location == 'us/las'
+    image.location == 'us/las'
 end
 
 # Create datacenter.
-datacenter = compute.datacenters.create(name: 'fog-demo',
-                                        location: 'us/las',
-                                        description: 'fog-profitbricks demo')
+datacenter = compute.datacenters.create(:name => 'fog-demo',
+                                        :location => 'us/las',
+                                        :description => 'fog-profitbricks demo')
 datacenter.wait_for { ready? }
 
 # Rename datacenter.
@@ -21,41 +21,41 @@ datacenter.name = 'rename fog-demo'
 datacenter.update
 
 # Create public LAN.
-lan = compute.lans.create(datacenter_id: datacenter.id,
-                          name: 'public',
-                          public: true)
+lan = compute.lans.create(:datacenter_id => datacenter.id,
+                          :name => 'public',
+                          :public => true)
 
 # Define system volume.
 system_volume = {
-  name: 'system',
-  size: 5,
-  image: image.id,
-  image_password: 'volume2016',
-  ssh_keys: ['ssh-rsa AAAAB3NzaC1yc2EAAAADA=='],
-  type: 'HDD'
+  :name => 'system',
+  :size => 5,
+  :image => image.id,
+  :image_password => 'volume2016',
+  :ssh_keys => ['ssh-rsa AAAAB3NzaC1yc2EAAAADA=='],
+  :type => 'HDD'
 }
 
 # Define public firewall rules.
-fw1 = { name: 'Allow SSH', protocol: 'TCP', port_range_start: 22, port_range_end: 22 }
-fw2 = { name: 'Allow Ping', protocol: 'ICMP', icmp_type: 8, icmp_code: 0 }
+fw1 = { :name => 'Allow SSH', :protocol => 'TCP', :port_range_start => 22, :port_range_end => 22 }
+fw2 = { :name => 'Allow Ping', :protocol => 'ICMP', :icmp_type => 8, :icmp_code => 0 }
 
 # Define public network interface.
 public_nic = {
-  name: 'public',
-  lan: lan.id,
-  dhcp: true,
-  firewall_active: true,
-  firewall_rules: [fw1, fw2]
+  :name => 'public',
+  :lan => lan.id,
+  :dhcp => true,
+  :firewall_active => true,
+  :firewall_rules => [fw1, fw2]
 }
 
 # Create a server with the above system volume and public network interface.
-server1 = compute.servers.create(datacenter_id: datacenter.id,
-                                 name: 'server1',
-                                 cores: 1,
-                                 cpu_family: 'AMD_OPTERON',
-                                 ram: 2048,
-                                 volumes: [system_volume],
-                                 nics: [public_nic])
+server1 = compute.servers.create(:datacenter_id => datacenter.id,
+                                 :name => 'server1',
+                                 :cores => 1,
+                                 :cpu_family => 'AMD_OPTERON',
+                                 :ram => 2048,
+                                 :volumes => [system_volume],
+                                 :nics => [public_nic])
 server1.wait_for { ready? }
 
 # Change CPU family from AMD_OPTERON to INTEL_XEON.
@@ -64,38 +64,38 @@ server1.cpu_family = 'INTEL_XEON'
 server1.update
 
 # Create data volume.
-data_volume = compute.volumes.create(datacenter_id: datacenter.id,
-                                     name: 'data',
-                                     size: 5,
-                                     licence_type: 'OTHER',
-                                     type: 'SSD')
+data_volume = compute.volumes.create(:datacenter_id => datacenter.id,
+                                     :name => 'data',
+                                     :size => 5,
+                                     :licence_type => 'OTHER',
+                                     :type => 'SSD')
 data_volume.wait_for { ready? }
 
 # Attach data volume to server1.
 server1.attach_volume(data_volume.id)
 
 # Connect a second network interface to server1.
-private_nic = compute.nics.create(datacenter_id: datacenter.id,
-                                  server_id: server1.id,
-                                  name: 'private',
-                                  dhcp: true,
-                                  lan: 2)
+private_nic = compute.nics.create(:datacenter_id => datacenter.id,
+                                  :server_id => server1.id,
+                                  :name => 'private',
+                                  :dhcp => true,
+                                  :lan => 2)
 private_nic.wait_for { ready? }
 
 # Create a second server.
-server2 = compute.servers.create(datacenter_id: datacenter.id,
-                                 name: 'server2',
-                                 cores: 1,
-                                 cpu_family: 'AMD_OPTERON',
-                                 ram: 2048,
-                                 volumes: [system_volume])
+server2 = compute.servers.create(:datacenter_id => datacenter.id,
+                                 :name => 'server2',
+                                 :cores => 1,
+                                 :cpu_family => 'AMD_OPTERON',
+                                 :ram => 2048,
+                                 :volumes => [system_volume])
 server2.wait_for { ready? }
 
 # Connect a private network interface to server2 with SSH access.
-private_nic = compute.nics.create(datacenter_id: datacenter.id,
-                                  server_id: server2.id,
-                                  name: 'private',
-                                  dhcp: true,
-                                  lan: 2,
-                                  firewall_rules: [fw1])
+private_nic = compute.nics.create(:datacenter_id => datacenter.id,
+                                  :server_id => server2.id,
+                                  :name => 'private',
+                                  :dhcp => true,
+                                  :lan => 2,
+                                  :firewall_rules => [fw1])
 private_nic.wait_for { ready? }

data/fog-profitbricks.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Fog::ProfitBricks::VERSION
   spec.authors       = ["Ethan Devenport"]
   spec.email         = ["ethand@stackpointcloud.com"]
-  spec.summary       = %q{Module for the 'fog' gem to support ProfitBricks.}
-  spec.description   = %q{This library can be used as a module for 'fog' or as
-                        standalone ProfitBricks provider.}
+  spec.summary       = "Module for the 'fog' gem to support ProfitBricks."
+  spec.description   = "This library can be used as a module for 'fog' or as
+                        standalone ProfitBricks provider."
   spec.homepage      = "https://github.com/fog/fog-profitbricks"
   spec.license       = "MIT"
 
@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "shindo", "~> 0.3"
   spec.add_development_dependency "turn", "~> 0.9"
   spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "rubocop", "~> 0" if RUBY_VERSION >= "1.9.3"
-  spec.add_development_dependency "coveralls", "~> 0" if RUBY_VERSION.to_f >= 1.9
+  spec.add_development_dependency "rubocop" if RUBY_VERSION >= "2.0.0"
 end

data/gemfiles/Gemfile.1.9.2+

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'json', '~> 1.8'
 gem 'activesupport', '>= 3.0', '< 4'
 gem 'mime-types', '< 2.0'
 

data/lib/fog/bin/profitbricks.rb

@@ -12,11 +12,11 @@ class ProfitBricks < Fog::Bin
     def [](service)
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
-        when :compute
-          Fog::Logger.warning("ProfitBricks[:compute] is not recommended, use Fog::Compute[:profitbricks] for portability")
-          Fog::Compute.new(:provider => 'ProfitBricks')
-        else
-          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                    when :compute
+                      Fog::Logger.warning("ProfitBricks[:compute] is not recommended, use Fog::Compute[:profitbricks] for portability")
+                      Fog::Compute.new(:provider => 'ProfitBricks')
+                    else
+                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]

data/lib/fog/profitbricks.rb

@@ -1,16 +1,16 @@
 require "fog/core"
 require "fog/json"
 
-require File.expand_path('profitbricks/version', __dir__)
+require File.expand_path('../profitbricks/version', __FILE__)
 
 module Fog
   module Compute
-    autoload :ProfitBricks, File.expand_path('profitbricks/compute', __dir__)
+    autoload :ProfitBricks, File.expand_path('../profitbricks/compute', __FILE__)
   end
 
   module Models
     module ProfitBricks
-      autoload :Base, File.expand_path('profitbricks/models/base', __dir__)
+      autoload :Base, File.expand_path('../profitbricks/models/base', __FILE__)
     end
   end
 

data/lib/fog/profitbricks/compute.rb

@@ -1,9 +1,9 @@
 module Fog
   module Compute
     class ProfitBricks < Fog::Service
-      API_VERSION = 'v2'
+      API_VERSION = 'v3'.freeze
 
-      autoload :Base, File.expand_path('models/base', __dir__)
+      autoload :Base, File.expand_path('../models/base', __FILE__)
 
       requires    :profitbricks_username, :profitbricks_password
       recognizes  :profitbricks_url
@@ -127,38 +127,43 @@ module Fog
       request    :remove_nic_association          # associateNicToLoadBalancer
 
       class Real
-        def initialize(options={})
+        def initialize(options = {})
           @profitbricks_username = options[:profitbricks_username]
           @profitbricks_password = options[:profitbricks_password]
           @profitbricks_url      = options[:profitbricks_url] || "https://api.profitbricks.com"
 
           connection_options = options[:connection_options] || {}
           connection_options[:headers] ||= {}
-          connection_options[:headers]["User-Agent"] = "#{Fog::Core::Connection.user_agents}"
+          connection_options[:headers]["User-Agent"] = Fog::Core::Connection.user_agents.to_s
           connection_options[:omit_default_port] = true
-          connection_options[:path_prefix] = "/rest/#{API_VERSION}"
+          connection_options[:path_prefix] = "/cloudapi/#{API_VERSION}"
 
           @connection = Fog::Core::Connection.new(@profitbricks_url, false, connection_options)
         end
 
         def request(params)
           params[:headers] ||= {}
-          params[:headers].merge!("Authorization" => "Basic #{auth_header}")
+          params[:headers]["Authorization"] = "Basic #{auth_header}"
           params[:path_style] = false
 
           begin
             response = @connection.request(params)
+
           rescue Excon::Errors::Unauthorized => error
+            Logger.warning('Unauthorized error')
             raise error, Fog::JSON.decode(error.response.body)['messages']
           rescue Excon::Errors::HTTPStatusError => error
+            Logger.warning('HTTPStatusError error')
             raise error, Fog::JSON.decode(error.response.body)['messages']
           rescue Excon::Errors::InternalServerError => error
+            Logger.warning('InternalServerError error')
             raise error, Fog::JSON.decode(error.response.body)['messages']
           rescue Fog::Errors::NotFound => error
+            Logger.warning('NotFound error')
             raise error, Fog::JSON.decode(error.response.body)['messages']
           end
 
-          unless response.body.empty?
+          if response && response.body && !response.body.empty?
             response.body = Fog::JSON.decode(response.body)
             response.body['requestId'] = get_request_id(response.headers)
           end
@@ -168,7 +173,7 @@ module Fog
         private
 
         def auth_header
-          return Base64.strict_encode64(
+          Base64.strict_encode64(
             "#{@profitbricks_username}:#{@profitbricks_password}"
           )
         end
@@ -181,83 +186,83 @@ module Fog
 
       class Mock
         def self.data
-          dc_1_id   = Fog::UUID.uuid
-          dc_2_id   = Fog::UUID.uuid
-          serv_1_id = Fog::UUID.uuid
-          vol_1_id  = Fog::UUID.uuid
-          vol_2_id  = Fog::UUID.uuid
-          req_1_id  = Fog::UUID.uuid
-          req_2_id  = Fog::UUID.uuid
-          nic_1_id  = Fog::UUID.uuid
-          nic_2_id  = Fog::UUID.uuid
-          ipb_1_id  = Fog::UUID.uuid
-          ipb_2_id  = Fog::UUID.uuid
-          fwr_1_id  = Fog::UUID.uuid
-          fwr_2_id  = Fog::UUID.uuid
-          lb_1_id   = Fog::UUID.uuid
-          lb_2_id   = Fog::UUID.uuid
+          dc1_id   = Fog::UUID.uuid
+          dc2_id   = Fog::UUID.uuid
+          serv1_id = Fog::UUID.uuid
+          vol1_id  = Fog::UUID.uuid
+          vol2_id  = Fog::UUID.uuid
+          req1_id  = Fog::UUID.uuid
+          req2_id  = Fog::UUID.uuid
+          nic1_id  = Fog::UUID.uuid
+          nic2_id  = Fog::UUID.uuid
+          ipb1_id  = Fog::UUID.uuid
+          ipb2_id  = Fog::UUID.uuid
+          fwr1_id  = Fog::UUID.uuid
+          fwr2_id  = Fog::UUID.uuid
+          lb1_id   = Fog::UUID.uuid
+          lb2_id   = Fog::UUID.uuid
 
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :datacenters  => {
+              :datacenters => {
                 "id"    => "datacenters",
                 "type"  => "collection",
                 "href"  => "https://api.profitbricks.com/rest/v2/datacenters",
                 "items" =>
                 [
                   {
-                    'id'        => dc_1_id,
+                    'id'        => dc1_id,
                     'type'      => 'datacenter',
-                    'href'      => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}",
+                    'href'      => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}",
                     'metadata'  => {
-                        'createdDate'       => '2016-07-31T15:41:27Z',
-                        'createdBy'         => 'test@stackpointcloud.com',
-                        'etag'              => '5b91832ee85a758568d4523a86bd8702',
-                        'lastModifiedDate'  => '2016-07-31T15:41:27Z',
-                        'lastModifiedBy'    => 'test@stackpointcloud.com',
-                        'state'             => 'AVAILABLE'
+                      'createdDate' => '2016-07-31T15:41:27Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => '5b91832ee85a758568d4523a86bd8702',
+                      'lastModifiedDate'  => '2016-07-31T15:41:27Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
                     },
                     'properties' => {
-                        'name'        => 'dc_1',
-                        'description' => 'testing fog rest implementation',
-                        'location'    => 'us/las',
-                        'version'     => 1,
-                        'features'    => ["SSD", "MULTIPLE_CPU"]
+                      'name' => 'dc_1',
+                      'description' => 'testing fog rest implementation',
+                      'location'    => 'us/las',
+                      'version'     => 1,
+                      'features'    => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
-                    'id'        => dc_2_id,
+                    'id'        => dc2_id,
                     'type'      => 'datacenter',
-                    'href'      => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_2_id}",
+                    'href'      => "https://api.profitbricks.com/rest/v2/datacenters/#{dc2_id}",
                     'metadata'  => {
-                        'createdDate'       => '2016-07-31T15:41:27Z',
-                        'createdBy'         => 'test@stackpointcloud.com',
-                        'etag'              => '5b91832ee85a758568d4523a86bd8702',
-                        'lastModifiedDate'  => '2016-07-31T15:41:27Z',
-                        'lastModifiedBy'    => 'test@stackpointcloud.com',
-                        'state'             => 'AVAILABLE'
+                      'createdDate' => '2016-07-31T15:41:27Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => '5b91832ee85a758568d4523a86bd8702',
+                      'lastModifiedDate'  => '2016-07-31T15:41:27Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
                     },
-                    'properties'  =>{
-                        'name'        => 'dc_2',
-                        'description' => 'testing fog rest implementation',
-                        'location'    => 'de/fkb',
-                        'version'     => 1,
-                        'features'    => ["SSD", "MULTIPLE_CPU"]
+                    'properties' => {
+                      'name' => 'dc_2',
+                      'description' => 'testing fog rest implementation',
+                      'location'    => 'de/fkb',
+                      'version'     => 1,
+                      'features'    => %w(SSD MULTIPLE_CPU)
                     }
                   }
                 ]
               },
-              :servers      => {
+              :servers => {
                 'id'    => 'servers',
                 'type'  => 'collection',
-                "href"  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers",
+                "href"  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers",
                 'items' =>
                 [
                   {
-                    'id'    => serv_1_id,
+                    'id'    => serv1_id,
                     'type'  => 'server',
-                    'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}",
-                    'metadata'    => {
+                    'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}",
+                    'metadata' => {
                       'createdDate'       => '2014-10-20T21:20:46Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '0018832d7a7ba455db74ac41ae9f11fe',
@@ -265,7 +270,7 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'              => 'FogTestServer_1',
                       'cores'             => 1,
                       'ram'               => 1024,
@@ -274,7 +279,7 @@ module Fog
                       'bootVolume'    => {
                         'id'          => 'c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1',
                         'type'        => 'volume',
-                        'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1",
+                        'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1",
                         'metadata'    => {
                           'createdDate'       => '2014-10-20T21:20:46Z',
                           'createdBy'         => 'test@stackpointcloud.com',
@@ -283,7 +288,7 @@ module Fog
                           'lastModifiedBy'    => 'test@stackpointcloud.com',
                           'state'             => 'AVAILABLE'
                         },
-                        'properties'  => {
+                        'properties' => {
                           'name'                => 'Storage',
                           'type'                => 'HDD',
                           'size'                => 50,
@@ -305,23 +310,23 @@ module Fog
                       },
                       'cpuFamily' => 'AMD_OPTERON'
                     },
-                    'entities'    => {
+                    'entities' => {
                       'cdroms'  => {
-                        'id'    => "#{serv_1_id}/cdroms",
+                        'id'    => "#{serv1_id}/cdroms",
                         'type'  => 'collection',
-                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/cdroms",
-                        'items' => [ ]
+                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/cdroms",
+                        'items' => []
                       },
                       'volumes' => {
-                        'id'    => "#{serv_1_id}/volumes",
+                        'id'    => "#{serv1_id}/volumes",
                         'type'  => 'collection',
-                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/volumes",
+                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/volumes",
                         'items' =>
                         [
                           {
                             'id'          => 'c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1',
                             'type'        => 'volume',
-                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1",
+                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/c04a2198-7e60-4bc0-b869-6e9c9dbcb8e1",
                             'metadata'    => {
                               'createdDate'       => '2014-10-20T21:20:46Z',
                               'createdBy'         => 'test@stackpointcloud.com',
@@ -330,7 +335,7 @@ module Fog
                               'lastModifiedBy'    => 'test@stackpointcloud.com',
                               'state'             => 'AVAILABLE'
                             },
-                            'properties'  => {
+                            'properties' => {
                               'name'                => 'Storage',
                               'type'                => 'HDD',
                               'size'                => 50,
@@ -353,7 +358,7 @@ module Fog
                           {
                             'id'          => '5c4d37ca-d620-4546-8b24-f92e3c608c2c',
                             'type'        => 'volume',
-                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/5c4d37ca-d620-4546-8b24-f92e3c608c2c",
+                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/5c4d37ca-d620-4546-8b24-f92e3c608c2c",
                             'metadata'    => {
                               'createdDate'       => '2015-03-18T21:31:10Z',
                               'createdBy'         => 'test@stackpointcloud.com',
@@ -362,7 +367,7 @@ module Fog
                               'lastModifiedBy'    => 'test@stackpointcloud.com',
                               'state'             => 'AVAILABLE'
                             },
-                            'properties'  => {
+                            'properties' => {
                               'name'                => 'Docker Registry Volume',
                               'type'                => 'HDD',
                               'size'                => 50,
@@ -384,15 +389,15 @@ module Fog
                         ]
                       },
                       'nics'    => {
-                        'id'    => "#{serv_1_id}/nics",
+                        'id'    => "#{serv1_id}/nics",
                         'type'  => 'collection',
-                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics",
+                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics",
                         'items' =>
                         [
                           {
                             'id'          => '01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d',
                             'type'        => 'nic',
-                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d",
+                            'href'        => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d",
                             'metadata'    => {
                               'createdDate'       => '2015-02-09T22:46:38Z',
                               'createdBy'         => 'test@stackpointcloud.com',
@@ -401,30 +406,30 @@ module Fog
                               'lastModifiedBy'    => 'test@stackpointcloud.com',
                               'state'             => 'AVAILABLE'
                             },
-                            'properties'  => {
+                            'properties' => {
                               'mac'             => '00:02:94:9e:f4:b0',
-                              'ips'             => [ '210.94.35.77' ],
+                              'ips'             => ['210.94.35.77'],
                               'dhcp'            => 'true',
                               'lan'             => 1,
                               'firewallActive'  => 'false'
                             },
-                            'entities'    => {
+                            'entities' => {
                               'firewallrules' => {
                                 'id'    => '01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d/firewallrules',
                                 'type'  => 'collection',
-                                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/664f0f1c-7384-462b-8f0c-cfc4c3f6e2a3/nics/01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d/firewallrules",
-                                'items' => [ ]
+                                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/664f0f1c-7384-462b-8f0c-cfc4c3f6e2a3/nics/01ea3bd9-047c-4941-85cf-ed6b7a2d1d7d/firewallrules",
+                                'items' => []
                               }
                             }
                           }
                         ]
                       }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   }
                 ]
               },
-              :locations    => {
+              :locations => {
                 "id"    => "locations",
                 "type"  => "collection",
                 "href"  => "https://api.profitbricks.com/rest/v2/locations",
@@ -436,7 +441,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/de/fkb',
                     'properties'  => {
                       'name'      => 'karlsruhe',
-                      'features'  => [ "SSD", "MULTIPLE_CPU" ]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
@@ -445,7 +450,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/de/fra',
                     'properties'  => {
                       'name'      => 'frankfurt',
-                      'features'  => [ "SSD", "MULTIPLE_CPU" ]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
@@ -454,7 +459,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/us/las',
                     'properties'  => {
                       'name'      => 'lasvegas',
-                      'features'  => [ "SSD", "MULTIPLE_CPU" ]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   }
                 ]
@@ -478,7 +483,7 @@ module Fog
                       'lastModifiedBy'    => 'System',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'      => {
+                    'properties' => {
                       'name'                => 'CentOS-6.8-x86_64-netinstall.iso',
                       'description'         => '',
                       'location'            => 'us/las',
@@ -510,7 +515,7 @@ module Fog
                       'lastModifiedBy'    => 'System',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'      => {
+                    'properties' => {
                       'name'                => 'Microsoft-SQL-2012-Full-trial-english.iso',
                       'description'         => '',
                       'location'            => 'us/las',
@@ -535,30 +540,30 @@ module Fog
               :flavors =>
               [
                 {
-                   'flavorId'   => Fog::UUID.uuid,
-                   'flavorName' => 'Micro',
-                   'ram'        => 1024,
-                   'disk'       => 50,
-                   'cores'      => 1
+                  'flavorId'   => Fog::UUID.uuid,
+                  'flavorName' => 'Micro',
+                  'ram'        => 1024,
+                  'disk'       => 50,
+                  'cores'      => 1
                 },
                 {
-                   'flavorId'   => Fog::UUID.uuid,
-                   'flavorName' => 'Small',
-                   'ram'        => 2048,
-                   'disk'       => 50,
-                   'cores'      => 1
+                  'flavorId'   => Fog::UUID.uuid,
+                  'flavorName' => 'Small',
+                  'ram'        => 2048,
+                  'disk'       => 50,
+                  'cores'      => 1
                 }
               ],
               :volumes => {
-                "id"    => "#{dc_1_id}/volumes",
+                "id"    => "#{dc1_id}/volumes",
                 "type"  => 'collection',
-                "href"  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes",
+                "href"  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes",
                 "items" =>
                 [
                   {
-                    'id'        => vol_1_id,
+                    'id'        => vol1_id,
                     'type'      => 'volume',
-                    'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/#{vol_1_id}",
+                    'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/#{vol1_id}",
                     'metadata'  => {
                       'createdDate'       => '2015-03-18T19:00:51Z',
                       'createdBy'         => 'test@stackpointcloud.com',
@@ -586,12 +591,12 @@ module Fog
                       'discScsiHotUnplug'   => 'false',
                       'deviceNumber'        => 1
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   },
                   {
-                    'id'        => vol_2_id,
+                    'id'        => vol2_id,
                     'type'      => 'volume',
-                    'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/#{vol_2_id}",
+                    'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/#{vol2_id}",
                     'metadata'  => {
                       'createdDate'       => '2015-03-18T21:31:10Z',
                       'createdBy'         => 'test@stackpointcloud.com',
@@ -600,7 +605,7 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'                => 'Docker Registry Volume',
                       'type'                => 'HDD',
                       'size'                => 50,
@@ -618,20 +623,20 @@ module Fog
                       'discScsiHotUnplug'   => 'false',
                       'deviceNumber'        => 2
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   }
                 ]
               },
               :lans => {
-                'id'    => "#{dc_1_id}/lans",
+                'id'    => "#{dc1_id}/lans",
                 'type'  => 'collection',
-                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/lans",
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/lans",
                 'items' =>
                 [
                   {
                     'id'          => '9',
                     'type'        => 'nic',
-                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/lans/9",
+                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/lans/9",
                     'metadata'    => {
                       'createdDate'       => '2015-03-18T19:00:51Z',
                       'createdBy'         => 'test@stackpointcloud.com',
@@ -640,32 +645,32 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'            => 'FogTestLAN_1',
                       'public'          => 'true'
                     },
-                    'entities'    => {
+                    'entities' => {
                       'nics' => {
                         'id'    => '9/nics',
                         'type'  => 'collection',
-                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/lans/9/nics",
-                        'items' => [ ]
+                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/lans/9/nics",
+                        'items' => []
                       }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   }
                 ]
               },
               :nics => {
-                'id'    => "#{serv_1_id}/nics",
+                'id'    => "#{serv1_id}/nics",
                 'type'  => 'collection',
-                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics",
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics",
                 'items' =>
                 [
                   {
-                    'id'          => nic_1_id,
+                    'id'          => nic1_id,
                     'type'        => 'nic',
-                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}",
+                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}",
                     'metadata'    => {
                       'createdDate'       => '2015-03-18T19:00:51Z',
                       'createdBy'         => 'test@stackpointcloud.com',
@@ -674,28 +679,28 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'            => 'FogTestNIC_1',
                       'mac'             => '02:01:36:5f:09:da',
-                      'ips'             => [ '10.9.194.12'],
+                      'ips'             => ['10.9.194.12'],
                       'dhcp'            => 'true',
                       'lan'             => 2,
                       'firewallActive'  => 'false'
                     },
-                    'entities'    => {
+                    'entities' => {
                       'firewallrules' => {
-                        'id'    => "#{nic_1_id}/firewallrules",
+                        'id'    => "#{nic1_id}/firewallrules",
                         'type'  => 'collection',
-                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules",
-                        'items' => [ ]
+                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}/firewallrules",
+                        'items' => []
                       }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   },
                   {
-                    'id'          => nic_2_id,
+                    'id'          => nic2_id,
                     'type'        => 'nic',
-                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_2_id}",
+                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic2_id}",
                     'metadata'    => {
                       'createdDate'       => '2015-03-18T19:00:51Z',
                       'createdBy'         => 'test@stackpointcloud.com',
@@ -704,23 +709,23 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'            => 'FogTestNIC_2',
                       'mac'             => '03:01:60:bf:d4:8a',
-                      'ips'             => [ '192.96.159.188' ],
+                      'ips'             => ['192.96.159.188'],
                       'dhcp'            => 'true',
                       'lan'             => 1,
                       'firewallActive'  => 'false'
                     },
-                    'entities'=> {
-                      'firewallrules'=> {
-                        'id'=> 'cf6d01d3-295d-48bd-8d07-568cce63cbbc/firewallrules',
-                        'type'=> 'collection',
-                        'href'=> "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_2_id}/firewallrules",
-                        'items'=> [ ]
+                    'entities' => {
+                      'firewallrules' => {
+                        'id' => 'cf6d01d3-295d-48bd-8d07-568cce63cbbc/firewallrules',
+                        'type' => 'collection',
+                        'href' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic2_id}/firewallrules",
+                        'items' => []
                       }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   }
                 ]
               },
@@ -762,24 +767,24 @@ module Fog
                   }
                 ]
               },
-              :requests =>  {
+              :requests => {
                 'id'    => 'requests',
                 'type'  => 'collection',
                 'href'  => 'https=>//api.profitbricks.com/rest/v2/requests',
                 'items' =>
                 [
                   {
-                    'id'        => req_1_id,
+                    'id'        => req1_id,
                     'type'      => 'request',
-                    'href'      => "https=>//api.profitbricks.com/rest/v2/requests/#{req_1_id}",
+                    'href'      => "https=>//api.profitbricks.com/rest/v2/requests/#{req1_id}",
                     'metadata'  => {
                       'createdDate'   => '2016-08-07T23:32:17Z',
                       'createdBy'     => 'test@stackpointcloud.com',
                       'etag'          => '37a6259cc0c1dae299a7866489dff0bd',
                       'requestStatus' => {
-                        'id'    => "#{req_1_id}/status",
+                        'id'    => "#{req1_id}/status",
                         'type'  => 'request-status',
-                        'href'  => "https://api.profitbricks.com/rest/v2/requests/#{req_1_id}/status"
+                        'href'  => "https://api.profitbricks.com/rest/v2/requests/#{req1_id}/status"
                       }
                     },
                     'properties' => {
@@ -796,21 +801,21 @@ module Fog
                         'x-forwarded-server'  => 'my.profitbricks.com'
                       },
                       'body' => '{\'snapshotId\': \'3d52b13d-bec4-49de-ad05-fd2f8c687be6\'}',
-                      'url' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/#{vol_1_id}/restore-snapshot"
+                      'url' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/#{vol1_id}/restore-snapshot"
                     }
                   },
                   {
-                    'id'        => req_2_id,
+                    'id'        => req2_id,
                     'type'      => 'request',
-                    'href'      => "https=>//api.profitbricks.com/rest/v2/requests/#{req_2_id}",
+                    'href'      => "https=>//api.profitbricks.com/rest/v2/requests/#{req2_id}",
                     'metadata'  => {
                       'createdDate'   => '2016-08-07T23:32:17Z',
                       'createdBy'     => 'test@stackpointcloud.com',
                       'etag'          => '37a6259cc0c1dae299a7866489dff0bd',
                       'requestStatus' => {
-                        'id'    => "#{req_2_id}/status",
+                        'id'    => "#{req2_id}/status",
                         'type'  => 'request-status',
-                        'href'  => "https://api.profitbricks.com/rest/v2/requests/#{req_2_id}/status"
+                        'href'  => "https://api.profitbricks.com/rest/v2/requests/#{req2_id}/status"
                       }
                     },
                     'properties' => {
@@ -827,15 +832,15 @@ module Fog
                         'x-forwarded-server'  => 'my.profitbricks.com'
                       },
                       'body' => '{\'snapshotId\': \'3d52b13d-bec4-49de-ad05-fd2f8c687be6\'}',
-                      'url' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/volumes/#{vol_2_id}/restore-snapshot"
+                      'url' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/volumes/#{vol2_id}/restore-snapshot"
                     }
                   }
                 ]
               },
               :request_status => {
-                'id' => "#{req_1_id}/status",
+                'id' => "#{req1_id}/status",
                 'type' => 'request-status',
-                'href' => "https=>//api.profitbricks.com/rest/v2/requests/#{req_1_id}/status",
+                'href' => "https=>//api.profitbricks.com/rest/v2/requests/#{req1_id}/status",
                 'metadata' => {
                   'status' => 'DONE',
                   'message' => 'Request has been successfully executed',
@@ -860,10 +865,10 @@ module Fog
                 'items' =>
                 [
                   {
-                    'id' => ipb_1_id,
+                    'id' => ipb1_id,
                     'type' => 'ipblock',
-                    'href' => "https://api.profitbricks.com/rest/v2/ipblocks/#{ipb_1_id}",
-                    'metadata'  => {
+                    'href' => "https://api.profitbricks.com/rest/v2/ipblocks/#{ipb1_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8702',
@@ -875,14 +880,14 @@ module Fog
                       'ips'    	  => ["111.111.111.111", "222.222.222.222"],
                       'location'  => 'us/las',
                       'size'	    => 2,
-                      'name'      => 'Fog test IP Block 1'
+                      'name' => 'Fog test IP Block 1'
                     }
                   },
                   {
-                    'id' => ipb_2_id,
+                    'id' => ipb2_id,
                     'type' => 'ipblock',
-                    'href' => "https://api.profitbricks.com/rest/v2/ipblocks/#{ipb_2_id}",
-                    'metadata'  => {
+                    'href' => "https://api.profitbricks.com/rest/v2/ipblocks/#{ipb2_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8702',
@@ -894,22 +899,22 @@ module Fog
                       'ips'    	  => ["333.333.333.333"],
                       'location'  => 'us/las',
                       'size'	    => 1,
-                      'name'      => 'Fog test IP Block 2'
+                      'name' => 'Fog test IP Block 2'
                     }
                   }
                 ]
               },
               :firewall_rules => {
-                'id'    => "#{nic_1_id}/firewallrules",
+                'id'    => "#{nic1_id}/firewallrules",
                 'type'  => 'collection',
-                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules",
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}/firewallrules",
                 'items' =>
                 [
                   {
-                    'id'    => fwr_1_id,
+                    'id'    => fwr1_id,
                     'type'  => 'firewall-rule',
-                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules/#{fwr_1_id}",
-                    'metadata'    => {
+                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}/firewallrules/#{fwr1_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8703',
@@ -917,7 +922,7 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'            => 'Fog test Firewall Rule 1',
                       'protocol'        => 'TCP',
                       'sourceMac'       => 'null',
@@ -928,15 +933,15 @@ module Fog
                       'portRangeStart'  => 22,
                       'portRangeEnd'    => 22
                     },
-                    'datacenter_id'  => dc_1_id,
-                    'server_id'       => serv_1_id,
-                    'nic_id'          => nic_1_id
+                    'datacenter_id' => dc1_id,
+                    'server_id'       => serv1_id,
+                    'nic_id'          => nic1_id
                   },
                   {
-                    'id'    => fwr_2_id,
+                    'id'    => fwr2_id,
                     'type'  => 'firewall-rule',
-                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules/#{fwr_2_id}",
-                    'metadata'    => {
+                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}/firewallrules/#{fwr2_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8701',
@@ -944,7 +949,7 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'            => 'Fog test Firewall Rule 2',
                       'protocol'        => 'TCP',
                       'sourceMac'       => 'null',
@@ -955,23 +960,23 @@ module Fog
                       'portRangeStart'  => 24,
                       'portRangeEnd'    => 25
                     },
-                    'datacenter_id'  => dc_1_id,
-                    'server_id'       => serv_1_id,
-                    'nic_id'          => nic_1_id
+                    'datacenter_id' => dc1_id,
+                    'server_id'       => serv1_id,
+                    'nic_id'          => nic1_id
                   }
                 ]
               },
               :load_balancers => {
-                'id'    => "#{dc_1_id}/loadbalancers",
+                'id'    => "#{dc1_id}/loadbalancers",
                 'type'  => 'collection',
-                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/loadbalancers",
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/loadbalancers",
                 'items' =>
                 [
                   {
-                    'id'    => lb_1_id,
+                    'id'    => lb1_id,
                     'type'  => 'loadbalancer',
-                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/loadbalancers/#{lb_1_id}",
-                    'metadata'    => {
+                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/loadbalancers/#{lb1_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8723',
@@ -979,22 +984,22 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'  => 'Fog test Load Balancer 1',
                       'ip'    => 'null',
                       'dhcp'  => 'true'
                     },
-                    'entities'    => {
-                      'balancednics'  => {
-                        'id'    => "#{lb_1_id}/balancednics",
+                    'entities' => {
+                      'balancednics' => {
+                        'id'    => "#{lb1_id}/balancednics",
                         'type'  => 'collection',
-                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/loadbalancers/#{lb_1_id}/balancednics",
+                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/loadbalancers/#{lb1_id}/balancednics",
                         'items' =>
                         [
                           {
-                            'id'          => nic_1_id,
+                            'id'          => nic1_id,
                             'type'        => 'nic',
-                            'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}",
+                            'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}",
                             'metadata'    => {
                               'createdDate'       => '2015-03-18T19:00:51Z',
                               'createdBy'         => 'test@stackpointcloud.com',
@@ -1003,35 +1008,35 @@ module Fog
                               'lastModifiedBy'    => 'test@stackpointcloud.com',
                               'state'             => 'AVAILABLE'
                             },
-                            'properties'  => {
+                            'properties' => {
                               'name'            => 'FogTestLoadBalancedNIC_1',
                               'mac'             => '02:01:36:5f:09:da',
-                              'ips'             => [ '10.9.194.12'],
+                              'ips'             => ['10.9.194.12'],
                               'dhcp'            => 'true',
                               'lan'             => 2,
                               'firewallActive'  => 'false'
                             },
-                            'entities'    => {
+                            'entities' => {
                               'firewallrules' => {
-                                'id'    => "#{nic_1_id}/firewallrules",
+                                'id'    => "#{nic1_id}/firewallrules",
                                 'type'  => 'collection',
-                                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules",
-                                'items' => [ ]
+                                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/servers/#{serv1_id}/nics/#{nic1_id}/firewallrules",
+                                'items' => []
                               }
                             },
-                            'datacenter_id'    => dc_1_id,
-                            'load_balancer_id'  => lb_1_id
+                            'datacenter_id' => dc1_id,
+                            'load_balancer_id' => lb1_id
                           }
                         ]
                       }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   },
                   {
-                    'id'    => lb_2_id,
+                    'id'    => lb2_id,
                     'type'  => 'loadbalancer',
-                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/loadbalancers/#{lb_2_id}",
-                    'metadata'    => {
+                    'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/loadbalancers/#{lb2_id}",
+                    'metadata' => {
                       'createdDate'       => '2016-07-31T15:41:27Z',
                       'createdBy'         => 'test@stackpointcloud.com',
                       'etag'              => '5b91832ee85a758568d4523a86bd8721',
@@ -1039,20 +1044,20 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'INACTIVE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'  => 'Fog test Load Balancer 2',
                       'ip'    => 'null',
                       'dhcp'  => 'false'
                     },
-                    'entities'    => {
-                        'balancednics'  => {
-                            'id'    => "#{lb_2_id}/balancednics",
-                            'type'  => 'collection',
-                            'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc_1_id}/loadbalancers/#{lb_2_id}/balancednics",
-                            'items' => [ ]
-                        }
+                    'entities' => {
+                      'balancednics' => {
+                        'id' => "#{lb2_id}/balancednics",
+                        'type'  => 'collection',
+                        'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{dc1_id}/loadbalancers/#{lb2_id}/balancednics",
+                        'items' => []
+                      }
                     },
-                    'datacenter_id'  => dc_1_id
+                    'datacenter_id' => dc1_id
                   }
                 ]
               }
@@ -1064,7 +1069,7 @@ module Fog
           @data = nil
         end
 
-        def initialize(options={})
+        def initialize(options = {})
           @profitbricks_username = options[:profitbricks_username]
           @profitbricks_password = options[:profitbricks_password]
         end