fog-profitbricks 0.0.5 → 2.0.1

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

@@ -0,0 +1,12 @@
+module Fog
+  module Helpers
+    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)}
+          response_json
+        end
+      end
+    end
+  end
+end

data/lib/fog/profitbricks/models/base.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Models
+    module ProfitBricks
+      class Base < Fog::Model
+        def wait_for(timeout = Fog.timeout, interval = Fog.interval, &block)
+          reload_has_succeeded = false
+          duration = Fog.wait_for(timeout, interval) do # Note that duration = false if it times out
+            if ready?
+              reload_has_succeeded = true
+              instance_eval(&block)
+            else
+              false
+            end
+          end
+          if reload_has_succeeded
+            return duration # false if timeout; otherwise {:duration => elapsed time }
+          else
+            raise Fog::Errors::Error, "Reload failed, #{self.class} #{identity} not present."
+          end
+        end
+
+        def request_status(request_id)
+          request = service.requests.get_status(request_id)
+          request.status
+        end
+
+        def ready?
+          request_status(request_id) == 'DONE'
+        end
+
+        def failed?
+          request_status(request_id) == 'FAILED'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
+
+module Fog
+  module Compute
+    class ProfitBricks
+      class Datacenter < Fog::Models::ProfitBricks::Base
+        include Fog::Helpers::ProfitBricks::DataHelper
+
+        identity  :id
+
+        # properties
+        attribute :name
+        attribute :description
+        attribute :location
+        attribute :version
+        attribute :features
+
+        # metadata
+        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'
+        attribute :request_id,          :aliases => 'requestId'
+        attribute :state
+
+        attr_accessor :options
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def save
+          requires :name, :location
+
+          options = {}
+          options[:name]        = name
+          options[:location]    = location
+          options[:description] = description if description
+
+          data = service.create_datacenter(options)
+          merge_attributes(flatten(data.body))
+          true
+        end
+
+        def update
+          requires :id
+
+          options = {}
+          options[:name] = name if name
+          options[:description] = description if description
+          data = service.update_datacenter(id, options)
+          merge_attributes(flatten(data.body))
+          true
+        end
+
+        def delete
+          requires :id
+          data = service.delete_datacenter(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/{compute/profit_bricks/models → profitbricks/models/compute}/datacenters.rb

@@ -1,23 +1,28 @@
 require File.expand_path('../datacenter', __FILE__)
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
 
 module Fog
   module Compute
     class ProfitBricks
       class Datacenters < Fog::Collection
+        include Fog::Helpers::ProfitBricks::DataHelper
         model Fog::Compute::ProfitBricks::Datacenter
 
         def all
-          load(service.get_all_data_centers.body["getAllDataCentersResponse"])
+          result = service.get_all_datacenters
+
+          load(result.body['items'].each {|dc| flatten(dc)})
         end
 
         def get(id)
-          datacenter = service.get_data_center(id).body["getDataCenterResponse"]
+          datacenter = service.get_datacenter(id).body
+
           Excon::Errors
-          new(datacenter)
+          new(flatten(datacenter))
         rescue Excon::Errors::NotFound
           nil
         end
       end
     end
   end
-end
+end

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

@@ -0,0 +1,101 @@
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
+
+module Fog
+  module Compute
+    class ProfitBricks
+      class FirewallRule < Fog::Models::ProfitBricks::Base
+        include Fog::Helpers::ProfitBricks::DataHelper
+
+        identity  :id
+
+        # properties
+        attribute :name
+        attribute :protocol
+        attribute :source_mac, 	     :aliases => 'sourceMac'
+        attribute :source_ip, 	     :aliases => 'sourceIp'
+        attribute :target_ip, 	     :aliases => 'targetIp'
+        attribute :icmp_code, 	     :aliases => 'icmpCode'
+        attribute :icmp_type, 	     :aliases => 'icmpType'
+        attribute :port_range_start, :aliases => 'portRangeStart'
+        attribute :port_range_end,   :aliases => 'portRangeEnd'
+
+        # metadata
+        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'
+        attribute :request_id,         :aliases => 'requestId'
+        attribute :state
+
+        attribute :datacenter_id
+        attribute :server_id
+        attribute :nic_id
+
+        def save
+          requires :datacenter_id, :server_id, :nic_id, :protocol
+
+          properties = {}
+          properties[:name]           = name if name
+          properties[:protocol]       = protocol if protocol
+          properties[:sourceMac]      = source_mac if source_mac
+          properties[:sourceIp]       = source_ip if source_ip
+          properties[:targetIp]       = target_ip if target_ip
+          properties[:portRangeStart] = port_range_start if port_range_start
+          properties[:portRangeEnd]   = port_range_end if port_range_end
+          properties[:icmpType]       = icmp_type if icmp_type
+          properties[:icmpCode]       = icmp_code if icmp_code
+
+          data = service.create_firewall_rule(datacenter_id, server_id, nic_id, properties)
+          merge_attributes(flatten(data.body))
+        end
+
+        def update
+          requires :datacenter_id, :server_id, :nic_id, :id
+
+          properties = {}
+          properties[:name]           = name if name
+          properties[:sourceMac]      = source_mac if source_mac
+          properties[:sourceIp]       = source_ip if source_ip
+          properties[:targetIp]       = target_ip if target_ip
+          properties[:portRangeStart] = port_range_start if port_range_start
+          properties[:portRangeEnd]   = port_range_end if port_range_end
+          properties[:icmpType]       = icmp_type if icmp_type
+          properties[:icmpCode]       = icmp_code if icmp_code
+
+          data = service.update_firewall_rule(datacenter_id, server_id, nic_id, id, properties)
+          merge_attributes(flatten(data.body))
+        end
+
+        def delete
+          requires :datacenter_id, :server_id, :nic_id, :id
+          service.delete_firewall_rule(datacenter_id, server_id, nic_id, id)
+          true
+        end
+
+        def reload
+          requires :datacenter_id, :server_id, :nic_id, :id
+
+          data = begin
+            collection.get(datacenter_id, server_id, nic_id, id)
+          rescue Excon::Errors::SocketError
+            nil
+          end
+
+          return unless data
+
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
+        end
+
+        def ready?
+          state == 'AVAILABLE'
+        end
+
+        def failed?
+          state == 'ERROR'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require File.expand_path('../firewall_rule', __FILE__)
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
+
+module Fog
+  module Compute
+    class ProfitBricks
+      class FirewallRules < Fog::Collection
+        include Fog::Helpers::ProfitBricks::DataHelper
+        model Fog::Compute::ProfitBricks::FirewallRule
+
+        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|
+            fwr['datacenter_id'] = datacenter_id
+            fwr['server_id']      = server_id
+            fwr['nic_id']         = nic_id
+          }
+
+          result.body['items'] = firewall_rules
+
+          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

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

@@ -0,0 +1,72 @@
+module Fog
+  module Compute
+    class ProfitBricks
+      class Image < Fog::Models::ProfitBricks::Base
+        identity  :id
+
+        # properties
+        attribute :name
+        attribute :description
+        attribute :location
+        attribute :size
+        attribute :cpu_hot_plug,           :aliases => 'cpuHotPlug'
+        attribute :cpu_hot_unplug,         :aliases => 'cpuHotUnplug'
+        attribute :ram_hot_plug,           :aliases => 'ramHotPlug'
+        attribute :ram_hot_unplug,         :aliases => 'ramHotUnplug'
+        attribute :nic_hot_plug,           :aliases => 'nicHotPlug'
+        attribute :nic_hot_unplug,         :aliases => 'nicHotUnplug'
+        attribute :disc_virtio_hot_plug,   :aliases => 'discVirtioHotPlug'
+        attribute :disc_virtio_hot_unplug, :aliases => 'discVirtioHotUnplug'
+        attribute :disc_scsi_hot_plug, 	   :aliases => 'discScsiHotPlug'
+        attribute :disc_scsi_hot_unplug,   :aliases => 'discScsiHotUnplug'
+        attribute :licence_type,           :aliases => 'licenceType'
+        attribute :image_type,             :aliases => 'imageType'
+        attribute :public
+
+        # metadata
+        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'
+        attribute :state
+
+        def update
+          requires :id
+
+          options = {}
+          options[:name]                 = name if name
+          options[:description]          = description if description
+          options[:licenceType]          = licence_type if licence_type
+          options[:cpuHotPlug]           = cpu_hot_plug if cpu_hot_plug
+          options[:cpuHotUnplug]         = cpu_hot_unplug if cpu_hot_unplug
+          options[:ramHotPlug]           = ram_hot_plug if ram_hot_plug
+          options[:ramHotUnplug]         = ram_hot_unplug if ram_hot_unplug
+          options[:nicHotPlug]           = nic_hot_plug if nic_hot_plug
+          options[:nicHotUnplug]         = nic_hot_unplug if nic_hot_unplug
+          options[:discVirtioHotPlug]    = disc_virtio_hot_plug if disc_virtio_hot_plug
+          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
+
+          data = service.update_image(id, options)
+          merge_attributes(flatten(data.body))
+          true
+        end
+
+        def delete
+          requires :id
+          service.delete_image(id)
+          true
+        end
+
+        def ready?
+          state == 'AVAILABLE'
+        end
+
+        def failed?
+          state == 'ERROR'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require File.expand_path('../image', __FILE__)
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
+
+module Fog
+  module Compute
+    class ProfitBricks
+      class Images < Fog::Collection
+        include Fog::Helpers::ProfitBricks::DataHelper
+        model Fog::Compute::ProfitBricks::Image
+
+        def all
+          result = service.get_all_images
+
+          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
+  end
+end

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

@@ -0,0 +1,58 @@
+require File.expand_path('../../helpers/compute/data_helper', __dir__)
+
+module Fog
+  module Compute
+    class ProfitBricks
+      class IpBlock < Fog::Models::ProfitBricks::Base
+        include Fog::Helpers::ProfitBricks::DataHelper
+
+        identity  :id
+
+        # properties
+        attribute :ips
+        attribute :location
+        attribute :size
+        attribute :name
+
+        # metadata
+        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'
+        attribute :request_id,         :aliases => 'requestId'
+        attribute :state
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def save
+          requires :location, :size
+
+          properties = {}
+          properties[:location] = location if location
+          properties[:size]     = size if size
+          properties[:name]     = name if name
+
+          data = service.create_ip_block(properties)
+          merge_attributes(flatten(data.body))
+          true
+        end
+
+        def delete
+          requires :id
+          service.delete_ip_block(id)
+          true
+        end
+
+        def ready?
+          state == 'AVAILABLE'
+        end
+
+        def failed?
+          state == 'ERROR'
+        end
+      end
+    end
+  end
+end