fog-profitbricks 2.0.1 → 3.0.0

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

@@ -1,5 +1,5 @@
 # require "fog/compute/models/server"
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -54,13 +54,9 @@ module Fog
           properties[:cpuFamily]        = cpu_family if cpu_family
 
           entities = {}
-          if volumes
-            entities[:volumes] = get_volumes(volumes)
-          end
+          entities[:volumes] = get_volumes(volumes) if volumes
 
-          if nics
-            entities[:nics] = get_nics(nics)
-          end
+          entities[:nics] = get_nics(nics) if nics
 
           data = service.create_server(datacenter_id, properties, entities)
           merge_attributes(flatten(data.body))
@@ -110,6 +106,7 @@ module Fog
           requires :datacenter_id, :id
 
           data = service.attach_cdrom(datacenter_id, id, cdrom_image_id)
+
           flatten(data.body)
         end
 
@@ -216,9 +213,9 @@ module Fog
             item[:imagePassword] = volume[:image_password]
             item[:sshKeys] = volume[:ssh_keys]
             item[:licenceType] = volume[:licence_type]
-            items << { properties: item }
+            items << { :properties => item }
           end
-          { items: items }
+          { :items => items }
         end
 
         def get_nics(nics)
@@ -235,9 +232,9 @@ module Fog
               firewall_rules = get_firewall_rules(nic[:firewall_rules])
               item[:firewallActive] = true
             end
-            items << { properties: item, entities: firewall_rules }
+            items << { :properties => item, :entities => firewall_rules }
           end
-          { items: items }
+          { :items => items }
         end
 
         def get_firewall_rules(firewall_rules)
@@ -253,9 +250,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
-          { firewallrules: { items: items } }
+          { :firewallrules => { :items => items } }
         end
       end
     end

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

@@ -1,5 +1,5 @@
 require File.expand_path('../server', __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,17 @@ module Fog
         def all(datacenter_id)
           result = service.get_all_servers(datacenter_id)
 
-          servers = result.body['items'].each {|server| server['datacenter_id'] = datacenter_id}
+          servers = result.body['items'].each { |server| server['datacenter_id'] = datacenter_id }
           result.body['items'] = servers
 
-          load(result.body['items'].each {|dc| flatten(dc)})
+          load(result.body['items'].each { |dc| flatten(dc) })
         end
 
         def get(datacenter_id, server_id)
           server = service.get_server(datacenter_id, server_id).body
           server['datacenter_id'] = datacenter_id
 
-          Excon::Errors
           new(flatten(server))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

data/lib/fog/profitbricks/models/compute/snapshot.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
@@ -55,7 +55,7 @@ module Fog
           options[:discVirtioHotUnplug] = disc_virtio_hot_unplug if disc_virtio_hot_unplug
           options[:discScsiHotPlug]     = disc_scsi_hot_plug if disc_scsi_hot_plug
           options[:discScsiHotUnplug]   = disc_scsi_hot_unplug if disc_scsi_hot_unplug
-          options[:licenceType]         = license_type if license_type
+          options[:licenceType]         = licence_type if licence_type
 
           data = service.update_snapshot(id, options)
           merge_attributes(flatten(data.body))

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

@@ -1,5 +1,5 @@
 require File.expand_path('../snapshot', __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,15 @@ module Fog
         def all
           result = service.get_all_snapshots
 
-          load(result.body['items'].each {|snapshot| flatten(snapshot)})
+          load(result.body['items'].each { |snapshot| flatten(snapshot) })
         end
 
         def get(id)
           snapshot = service.get_snapshot(id).body
 
-          Excon::Errors
           new(flatten(snapshot))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/models/compute/volume.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 :image
         attribute :bus
         attribute :type
+        attribute :availability_zone,       :aliases => 'availabilityZone'
         attribute :image_password,          :aliases => 'imagePassword'
         attribute :ssh_keys,                :aliases => 'sshKeys'
         attribute :licence_type,            :aliases => 'licenceType'
@@ -49,14 +50,15 @@ module Fog
           requires :datacenter_id, :size, :type
 
           options = {}
-          options[:name]          = name if name
-          options[:size]          = size
-          options[:bus]           = bus if bus
-          options[:image]         = image if image
-          options[:type]          = type
-          options[:licenceType]   = licence_type if licence_type
-          options[:imagePassword] = image_password if image_password
-          options[:sshKeys]       = ssh_keys if ssh_keys
+          options[:name]              = name if name
+          options[:size]              = size
+          options[:bus]               = bus if bus
+          options[:image]             = image if image
+          options[:type]              = type
+          options[:licenceType]       = licence_type if licence_type
+          options[:imagePassword]     = image_password if image_password
+          options[:sshKeys]           = ssh_keys if ssh_keys
+          options[:availabilityZone]  = availability_zone if availability_zone
 
           data = service.create_volume(datacenter_id, options)
           merge_attributes(flatten(data.body))

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

@@ -1,5 +1,5 @@
 require File.expand_path('../volume', __FILE__)
-require File.expand_path('../../helpers/compute/data_helper', __dir__)
+require File.expand_path('../../../helpers/compute/data_helper', __FILE__)
 
 module Fog
   module Compute
@@ -11,21 +11,18 @@ module Fog
         def all(datacenter_id)
           result = service.get_all_volumes(datacenter_id)
 
-          volumes = result.body['items'].each {|volume| volume['datacenter_id'] = datacenter_id}
+          volumes = result.body['items'].each { |volume| volume['datacenter_id'] = datacenter_id }
           result.body['items'] = volumes
 
-          load(result.body['items'].each {|volume| flatten(volume)})
+          load(result.body['items'].each { |volume| flatten(volume) })
         end
 
         def get(datacenter_id, volume_id)
           response = service.get_volume(datacenter_id, volume_id)
           volume = response.body
 
-          Excon::Errors
           volume['datacenter_id'] = datacenter_id
           new(flatten(volume))
-        rescue Excon::Errors::NotFound
-          nil
         end
       end
     end

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

@@ -68,30 +68,43 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#associate-nic-to-load-balancer]
         def associate_nic_to_load_balancer(datacenter_id, load_balancer_id, nic_id)
           nic = {
-              :id => nic_id
+            :id => nic_id
           }
 
           request(
-              :expects => [202],
-              :method  => 'POST',
-              :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics",
-              :body     => Fog::JSON.encode(nic)
+            :expects => [202],
+            :method  => 'POST',
+            :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics",
+            :body => Fog::JSON.encode(nic)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def associate_nic_to_load_balancer(datacenter_id, load_balancer_id, nic_id)
-          if load_balancer = self.data[:load_balancers]['items'].find {
-              |lb| lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
-          }
+          if load_balancer = data[:load_balancers]['items'].find do |lb|
+            lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Fog::Errors::NotFound, "The requested resource could not be found"
+          end
+
+          unless load_balancer['entities'] && load_balancer['entities']['balancednics'] && load_balancer['entities']['balancednics']['items']
+            nic = data[:nics]['items'].find do |nic|
+              nic["datacenter_id"] == datacenter_id && nic["id"] == nic_id
+            end
+
+            load_balancer['entities'] = {
+              'balancednics' => {
+                'id'    => "#{load_balancer_id}/balancednics",
+                'type'  => "collection",
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics",
+                'items' => [nic]
+              }
+            }
           end
 
-          data = load_balancer['entities'][:balancednics][0]
+          data = load_balancer['entities']['balancednics']['items'][0]
 
           response        = Excon::Response.new
           response.status = 202
@@ -101,4 +114,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -44,37 +44,46 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#attach-a-cd-rom]
         def attach_cdrom(datacenter_id, server_id, cdrom_image_id)
           volume = {
-              :id => cdrom_image_id
+            :id => cdrom_image_id
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms",
-              :body     => Fog::JSON.encode(volume)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms",
+            :body     => Fog::JSON.encode(volume)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def attach_cdrom(datacenter_id, server_id, cdrom_image_id)
-          if cdrom = self.data[:images]['items'].find {
-              |cd| cd["id"] == cdrom_image_id
-          }
+          if cdrom = data[:images]['items'].find do |cd|
+            cd["id"] == cdrom_image_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Fog::Errors::NotFound, "The requested resource could not be found"
           end
 
-          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
 
-          server['entities']['cdroms']['items'] << cdrom
+          if server['entities'] && server['entities']['cdroms'] && server['entities']['cdroms']['items']
+            server['entities']['cdroms']['items'] << cdrom
+          else
+            server['entities'] = {
+              'cdroms' => {
+                'id'    => "#{server['id']}/cdroms",
+                'type'  => 'collection',
+                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{server['datacenter_id']}/servers/#{server['id']}/cdroms",
+                'items' => [cdrom]
+              }
+            }
+          end
 
           response        = Excon::Response.new
           response.status = 202

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

@@ -45,37 +45,46 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#attach-a-volume]
         def attach_volume(datacenter_id, server_id, storage_id)
           volume = {
-              :id => storage_id
+            :id => storage_id
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes",
-              :body     => Fog::JSON.encode(volume)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/volumes",
+            :body     => Fog::JSON.encode(volume)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def attach_volume(datacenter_id, server_id, storage_id)
-          if volume = self.data[:volumes]['items'].find {
-              |vlm| vlm["id"] == storage_id && vlm["datacenter_id"] == datacenter_id
-          }
+          if volume = data[:volumes]['items'].find do |vlm|
+            vlm["id"] == storage_id && vlm["datacenter_id"] == datacenter_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
 
-          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
 
-          server['entities']['volumes']['items'] << volume
+          if server['entities'] && server['entities']['volumes'] && server['entities']['volumes']['items']
+            server['entities']['volumes']['items'] << volume
+          else
+            server['entities'] = {
+              'volumes' => {
+                'id'    => "#{server_id}/volumes",
+                'type'  => 'collection',
+                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/volumes",
+                'items' => [volume]
+              }
+            }
+          end
 
           response        = Excon::Response.new
           response.status = 202

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

@@ -38,7 +38,7 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-a-data-center]
         def create_datacenter(options)
           datacenter = {
-              :properties => options
+            :properties => options
           }
 
           request(
@@ -51,39 +51,38 @@ module Fog
       end
 
       class Mock
-        def create_datacenter(options)
+        def create_datacenter(_options)
           dc_3_id = Fog::UUID.uuid
           datacenter = {
-              'id'=>dc_3_id,
-              'type'=>'datacenter',
-              'href'=>"https://api.profitbricks.com/rest/v2/datacenters/#{dc_3_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'
-              },
-              'properties'=>{
-                  'name'=>'dc_3',
-                  'description'=>'testing fog rest implementation',
-                  'location'=>'de/fra',
-                  'version'=>1,
-                  'features'=>[
+            'id' => dc_3_id,
+            'type' => 'datacenter',
+            'href' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_3_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'
+            },
+            'properties' => {
+              'name' => 'fog-demo',
+              'description' => 'testing fog rest implementation',
+              'location' => 'de/fra',
+              'version' => 1,
+              'features' => [
 
-                  ]
-              }
+              ]
+            }
           }
 
-          self.data[:datacenters]['items'] << datacenter
+          data[:datacenters]['items'] << datacenter
           response        = Excon::Response.new
           response.status = 202
           response.body   = datacenter
           response
         end
       end
-
     end
   end
 end