fog-profitbricks 2.0.1 → 3.0.0

data/lib/fog/profitbricks/helpers/compute/data_helper.rb

@@ -3,7 +3,7 @@ module Fog
     module ProfitBricks
       module DataHelper
         def flatten(response_json)
-          ['properties', 'metadata', 'entities'].each {|k| response_json.merge!(response_json.delete(k)) if response_json.has_key?(k)}
+          %w(properties metadata entities).each { |k| response_json.merge!(response_json.delete(k)) if response_json.key?(k) }
           response_json
         end
       end

data/lib/fog/profitbricks/models/compute/datacenter.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute

data/lib/fog/profitbricks/models/compute/datacenters.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../datacenter', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,18 +11,17 @@ module Fog
         def all
           result = service.get_all_datacenters
 
-          load(result.body['items'].each {|dc| flatten(dc)})
+          load(result.body['items'].each { |dc| flatten(dc) })
         end
 
         def get(id)
-          datacenter = service.get_datacenter(id).body
+          response = service.get_datacenter(id)
+
+          datacenter = response.body
 
-          Excon::Errors
           new(flatten(datacenter))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/models/compute/firewall_rule.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,7 +11,7 @@ module Fog
         # properties
         attribute :name
         attribute :protocol
-        attribute :source_mac, 	     :aliases => 'sourceMac'
+        attribute :source_mac, :aliases => 'sourceMac'
         attribute :source_ip, 	     :aliases => 'sourceIp'
         attribute :target_ip, 	     :aliases => 'targetIp'
         attribute :icmp_code, 	     :aliases => 'icmpCode'

data/lib/fog/profitbricks/models/compute/firewall_rules.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../firewall_rule', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,30 +11,27 @@ module Fog
         def all(datacenter_id, server_id, nic_id)
           result = service.get_all_firewall_rules(datacenter_id, server_id, nic_id)
 
-          firewall_rules = result.body['items'].each {|fwr|
+          firewall_rules = result.body['items'].each do |fwr|
             fwr['datacenter_id'] = datacenter_id
             fwr['server_id']      = server_id
             fwr['nic_id']         = nic_id
-          }
+          end
 
           result.body['items'] = firewall_rules
 
-          load(result.body['items'].each {|fwr| flatten(fwr)})
+          load(result.body['items'].each { |fwr| flatten(fwr) })
         end
 
         def get(datacenter_id, server_id, nic_id, firewall_rule_id)
           firewall_rule = service.get_firewall_rule(datacenter_id, server_id, nic_id, firewall_rule_id).body
 
-          Excon::Errors
           firewall_rule['datacenter_id'] = datacenter_id
           firewall_rule['server_id']      = server_id
           firewall_rule['nic_id']         = nic_id
 
           new(flatten(firewall_rule))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/models/compute/flavors.rb

@@ -6,16 +6,13 @@ module Fog
       class Flavors < Fog::Collection
         model Fog::Compute::ProfitBricks::Flavor
 
-        def all()
+        def all
           load(service.get_all_flavors.body["getAllFlavorsResponse"])
         end
 
         def get(id)
           flavor = service.get_flavor(id).body["getFlavorResponse"]
-          Excon::Errors
           new(flavor)
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/image.rb

@@ -1,7 +1,11 @@
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
+
 module Fog
   module Compute
     class ProfitBricks
       class Image < Fog::Models::ProfitBricks::Base
+        include Fog::Helpers::ProfitBricks::DataHelper
+
         identity  :id
 
         # properties

data/lib/fog/profitbricks/models/compute/images.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../image', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,16 +11,13 @@ module Fog
         def all
           result = service.get_all_images
 
-          load(result.body['items'].each {|img| flatten(img)})
+          load(result.body['items'].each { |img| flatten(img) })
         end
 
         def get(id)
           image = service.get_image(id).body
 
-          Excon::Errors
           new(flatten(image))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/ip_block.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute

data/lib/fog/profitbricks/models/compute/ip_blocks.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../ip_block', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,20 +11,15 @@ module Fog
         def all
           result = service.get_all_ip_blocks
 
-          load(result.body['items'].each {|ip_block| flatten(ip_block)})
+          load(result.body['items'].each { |ip_block| flatten(ip_block) })
         end
 
         def get(ip_block_id)
           ip_block = service.get_ip_block(ip_block_id).body
 
-          Excon::Errors
-
           new(flatten(ip_block))
-        rescue Excon::Errors::NotFound
-          nil
         end
-
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/models/compute/lan.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute

data/lib/fog/profitbricks/models/compute/lans.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../lan', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,24 +11,21 @@ module Fog
         def all(datacenter_id)
           result = service.get_all_lans(datacenter_id)
 
-          lans = result.body['items'].each {|lan|
+          lans = result.body['items'].each do |lan|
             lan['datacenter_id'] = datacenter_id
-          }
+          end
 
           result.body['items'] = lans
 
-          load(result.body['items'].each {|lan| flatten(lan)})
+          load(result.body['items'].each { |lan| flatten(lan) })
         end
 
         def get(datacenter_id, lan_id)
           lan = service.get_lan(datacenter_id, lan_id).body
 
-          Excon::Errors
           lan['datacenter_id'] = datacenter_id
 
           new(flatten(lan))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/load_balancer.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -14,7 +14,7 @@ module Fog
         attribute :dhcp
 
         # metadata
-        attribute :created_date,        :aliases => 'createdDate',      :type => :time
+        attribute :created_date,        :aliases => 'createdDate', :type => :time
         attribute :created_by, 	        :aliases => 'createdBy'
         attribute :last_modified_date,  :aliases => 'lastModifiedDate', :type => :time
         attribute :last_modified_by,    :aliases => 'lastModifiedBy'
@@ -32,15 +32,14 @@ module Fog
         def save
           requires :datacenter_id, :name
 
-          properties  = {}
+          properties = {}
           properties[:name]       = name if name
           properties[:ip]         = ip if ip
           properties[:dhcp]       = dhcp if dhcp
 
-          entities    = {}
+          entities = {}
           entities[:balancednics] = balancednics if balancednics
 
-
           data = service.create_load_balancer(datacenter_id, properties, entities)
           merge_attributes(flatten(data.body))
           true
@@ -49,7 +48,7 @@ module Fog
         def update
           requires :datacenter_id, :id
 
-          properties  = {}
+          properties = {}
           properties[:name]       = name if name
           properties[:ip]         = ip if ip
           properties[:dhcp]       = dhcp if dhcp
@@ -86,7 +85,7 @@ module Fog
 
           response = service.get_all_load_balanced_nics(datacenter_id, id)
 
-          response.body['items'].each {|load_balanced_nic| flatten(load_balanced_nic)}
+          response.body['items'].each { |load_balanced_nic| flatten(load_balanced_nic) }
         end
 
         def get_nic(nic_id)

data/lib/fog/profitbricks/models/compute/load_balancers.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../load_balancer', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,24 +11,20 @@ module Fog
         def all(datacenter_id)
           result = service.get_all_load_balancers(datacenter_id)
 
-          load_balancers = result.body['items'].each {|volume| volume['datacenter_id'] = datacenter_id}
+          load_balancers = result.body['items'].each { |volume| volume['datacenter_id'] = datacenter_id }
           result.body['items'] = load_balancers
 
-          load(result.body['items'].each {|load_balancer| flatten(load_balancer)})
+          load(result.body['items'].each { |load_balancer| flatten(load_balancer) })
         end
 
         def get(datacenter_id, load_balancer_id)
-          response  = service.get_load_balancer(datacenter_id, load_balancer_id)
+          response = service.get_load_balancer(datacenter_id, load_balancer_id)
           load_balancer = response.body
 
-          Excon::Errors
           load_balancer['datacenter_id'] = datacenter_id
           new(flatten(load_balancer))
-        rescue Excon::Errors::NotFound
-          nil
         end
-
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/models/compute/locations.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../location', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,16 +11,13 @@ module Fog
         def all
           result = service.get_all_locations
 
-          load(result.body['items'].each {|location| flatten(location)})
+          load(result.body['items'].each { |location| flatten(location) })
         end
 
         def get(id)
           location = service.get_location(id).body
 
-          Excon::Errors
           new(flatten(location))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/nic.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -14,6 +14,7 @@ module Fog
         attribute :ips
         attribute :dhcp
         attribute :lan
+        attribute :nat
         attribute :firewall_active, :aliases => 'firewallActive'
 
         # metadata
@@ -41,6 +42,7 @@ module Fog
           properties[:ips]            = ips if ips
           properties[:dhcp]           = dhcp if dhcp
           properties[:lan]            = lan if lan
+          properties[:nat]            = nat if nat
           properties[:firewallActive] = firewall_active if firewall_active
 
           entities = {}
@@ -61,6 +63,7 @@ module Fog
           properties[:ips]  = ips if ips
           properties[:dhcp] = dhcp if dhcp
           properties[:lan]  = lan if lan
+          properties[:nat]  = nat if nat
 
           data = service.update_nic(datacenter_id, server_id, id, properties)
           merge_attributes(data.body)
@@ -101,9 +104,9 @@ module Fog
             item[:portRangeEnd]   = firewall_rule[:port_range_end] if firewall_rule.key?(:port_range_end)
             item[:icmpType]       = firewall_rule[:icmp_type] if firewall_rule.key?(:icmp_type)
             item[:icmpCode]       = firewall_rule[:icmp_code] if firewall_rule.key?(:icmp_code)
-            items << { properties: item }
+            items << { :properties => item }
           end
-          { items: items }
+          { :items => items }
         end
       end
     end

data/lib/fog/profitbricks/models/compute/nics.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../nic', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -24,13 +24,10 @@ module Fog
         def get(datacenter_id, server_id, nic_id)
           nic = service.get_nic(datacenter_id, server_id, nic_id).body
 
-          Excon::Errors
           nic['datacenter_id'] = datacenter_id
-          nic['server_id']      = server_id
+          nic['server_id'] = server_id
 
           new(flatten(nic))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/regions.rb

@@ -6,16 +6,13 @@ module Fog
       class Regions < Fog::Collection
         model Fog::Compute::ProfitBricks::Region
 
-        def all()
+        def all
           load(service.get_all_locations.body["getAllLocationsResponse"])
         end
 
         def get(id)
           region = service.get_location(id).body["getLocationResponse"]
-          Excon::Errors
           new(region)
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/request.rb

@@ -2,7 +2,6 @@ module Fog
   module Compute
     class ProfitBricks
       class Request < Fog::Models::ProfitBricks::Base
-
         identity  :id
 
         # properties

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

@@ -1,5 +1,5 @@
 require File.expand_path('../request', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,7 +11,7 @@ module Fog
         def all
           result = service.get_all_requests
 
-          load(result.body['items'].each {|request| flatten(request)})
+          load(result.body['items'].each { |request| flatten(request) })
         end
 
         def get(request_id)
@@ -27,8 +27,6 @@ module Fog
         def get_status(request_id)
           request = service.get_request_status(request_id).body
 
-          Excon::Errors
-
           new(flatten(request))
         end
       end