fog-profitbricks 4.0.0 → 4.1.0

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

@@ -6,7 +6,9 @@ module Fog
       class Datacenter < Fog::Models::ProfitBricks::Base
         include Fog::Helpers::ProfitBricks::DataHelper
 
-        identity  :id
+        identity :id
+
+        attribute :type
 
         # properties
         attribute :name
@@ -16,13 +18,19 @@ module Fog
         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 :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
 
+        #entities
+        attribute :servers
+        attribute :volumes
+        attribute :loadbalancers
+        attribute :lans
+
         attr_accessor :options
 
         def initialize(attributes = {})
@@ -33,11 +41,37 @@ module Fog
           requires :name, :location
 
           options = {}
-          options[:name]        = name
-          options[:location]    = location
+          options[:name] = name
+          options[:location] = location
           options[:description] = description if description
+          options[:servers] = servers if servers
+          options[:volumes] = volumes if volumes
+          options[:loadbalancers] = loadbalancers if loadbalancers
+          options[:lans] = lans if lans
+
+          entities = {}
+
+          # Retrieve servers collection if present and generate appropriate JSON.
+          if options.key?(:servers)
+            entities[:servers] = collect_entities(options.delete(:servers))
+          end
+
+          # Retrieve volumes collection if present and generate appropriate JSON.
+          if options.key?(:volumes)
+            entities[:volumes] = collect_entities(options.delete(:volumes))
+          end
 
-          data = service.create_datacenter(options)
+          # Retrieve volumes collection if present and generate appropriate JSON.
+          if options.key?(:loadbalancers)
+            entities[:loadbalancers] = collect_entities(options.delete(:loadbalancers))
+          end
+
+          # Retrieve volumes collection if present and generate appropriate JSON.
+          if options.key?(:lans)
+            entities[:lans] = collect_entities(options.delete(:lans))
+          end
+
+          data = service.create_datacenter(options, entities)
           merge_attributes(flatten(data.body))
           true
         end
@@ -58,6 +92,26 @@ module Fog
           data = service.delete_datacenter(id)
           true
         end
+
+        private
+
+        def collect_entities(entities)
+          if entities.is_a?(Array) && entities.length > 0
+            items = []
+            entities.each do |entity|
+              if entity.key?(:volumes)
+                subentities = collect_entities(entity.delete(:volumes))
+                items << {
+                  properties: entity,
+                  entities: {volumes: subentities}
+                }
+              else
+                items << {properties: entity}
+              end
+            end
+            {items: items}
+          end
+        end
       end
     end
   end

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

@@ -8,10 +8,12 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # 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/group.rb

@@ -8,6 +8,9 @@ module Fog
 
         identity  :id
 
+        attribute :type
+        attribute :request_id
+
         # properties
         attribute :name
         attribute :create_datacenter,       :aliases => 'createDataCenter'
@@ -45,10 +48,10 @@ module Fog
 
           options = {}
           options[:name]              = name
-          options[:createDataCenter]  = create_datacenter if create_datacenter
-          options[:createSnapshot]    = create_snapshot if create_snapshot
-          options[:reserveIp]         = reserve_ip if reserve_ip
-          options[:accessActivityLog] = access_activity_log if access_activity_log
+          options[:createDataCenter]  = create_datacenter if [true, false].include?(create_datacenter)
+          options[:createSnapshot]    = create_snapshot if [true, false].include?(create_snapshot)
+          options[:reserveIp]         = reserve_ip if [true, false].include?(reserve_ip)
+          options[:accessActivityLog] = access_activity_log if [true, false].include?(access_activity_log)
 
           data = service.update_group(id, options)
           merge_attributes(flatten(data.body))

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :name
         attribute :description
@@ -26,6 +28,7 @@ module Fog
         attribute :licence_type,           :aliases => 'licenceType'
         attribute :image_type,             :aliases => 'imageType'
         attribute :public
+        attribute :image_aliases,          :aliases => 'imageAliases'
 
         # metadata
         attribute :created_date,       :aliases => 'createdDate', :type => :time

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :ips
         attribute :location

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

@@ -7,6 +7,7 @@ module Fog
         include Fog::Helpers::ProfitBricks::DataHelper
 
         identity  :id
+        attribute :type
 
         # properties
         attribute :name
@@ -24,7 +25,7 @@ module Fog
         # entities
         attribute :nics
 
-        attribute :datacenter_id
+        attribute :datacenter_id,      :aliases => 'datacenterId'
 
         attr_accessor :options
 

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :name
         attribute :ip

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

@@ -6,6 +6,7 @@ module Fog
 
         attribute :name
         attribute :features
+        attribute :type
         attribute :image_aliases, :aliases => 'imageAliases'
 
         attr_accessor :options

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :name
         attribute :mac

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

@@ -9,6 +9,7 @@ module Fog
         attribute :headers
         attribute :body
         attribute :url
+        attribute :type
 
         # metadata
         attribute :created_date,   :aliases => 'createdDate', :type => :time

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

@@ -7,6 +7,7 @@ module Fog
         include Fog::Helpers::ProfitBricks::DataHelper
 
         identity  :id
+        attribute :type
 
         # metadata
         attribute :created_date,       :aliases => 'createdDate'

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

@@ -9,6 +9,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :name
         attribute :cores
@@ -29,7 +31,7 @@ module Fog
         attribute :state
 
         # entities
-        # attribute :cdroms
+        attribute :cdroms
         attribute :volumes
         attribute :nics
 
@@ -203,6 +205,7 @@ module Fog
 
         def get_volumes(volumes)
           items = []
+
           for volume in volumes do
             item = {}
             item[:name] = volume[:name]
@@ -210,6 +213,7 @@ module Fog
             item[:type] = volume[:type]
             item[:bus] = volume[:bus] || 'VIRTIO'
             item[:image] = volume[:image]
+            item[:imageAlias] = volume[:image_alias]
             item[:imagePassword] = volume[:image_password]
             item[:sshKeys] = volume[:ssh_keys]
             item[:licenceType] = volume[:licence_type]

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :edit_privilege,   :aliases => 'editPrivilege'
         attribute :share_privilege,  :aliases => 'sharePrivilege'
@@ -40,8 +42,8 @@ module Fog
           requires :group_id, :resource_id
 
           options = {}
-          options[:editPrivilege]  = edit_privilege if edit_privilege
-          options[:sharePrivilege] = share_privilege if share_privilege
+          options[:editPrivilege]  = edit_privilege if [true, false].include?(edit_privilege)
+          options[:sharePrivilege] = share_privilege if [true, false].include?(share_privilege)
 
           data = service.update_share(group_id, resource_id, options)
           merge_attributes(flatten(data.body))

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

@@ -8,6 +8,8 @@ module Fog
 
         identity  :id
 
+        attribute :type
+
         # properties
         attribute :name
         attribute :description

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

@@ -8,6 +8,9 @@ module Fog
 
         identity  :id
 
+        attribute :type
+        attribute :request_id
+
         # metadata
         attribute :etag
         attribute :creation_date,   :aliases => 'creationDate'
@@ -22,7 +25,7 @@ module Fog
         attribute :force_sec_auth,  :aliases => 'forceSecAuth'
         attribute :sec_auth_active, :aliases => 'secAuthActive'
 
-        # metadata
+        # entities
         attribute :owns
         attribute :groups
 

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

@@ -48,8 +48,8 @@ module Fog
             'type'      => 'resource',
             'href'      => "https=>//api.profitbricks.com/rest/v4/um/groups/#{group_id}/shares/#{resource_id}",
             'properties' => {
-                'editPrivilege'  => options[:edit_privilege],
-                'sharePrivilege' => options[:share_privilege]
+                'editPrivilege'  => options[:editPrivilege],
+                'sharePrivilege' => options[:sharePrivilege]
             }
           }
 

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

@@ -67,18 +67,18 @@ module Fog
             grp["id"] == group_id
           end
           else
-            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           if user = data[:users]['items'].find do |usr|
             usr["id"] == user_id
           end
           else
-            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
-          group['users'] << user
-          user['groups'] << group
+          group['users']['items'] << user
+          user['groups']['items'] << group
 
           response.body = user
           response

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

@@ -104,11 +104,9 @@ module Fog
             }
           end
 
-          data = load_balancer['entities']['balancednics']['items'][0]
-
           response        = Excon::Response.new
           response.status = 202
-          response.body   = data
+          response.body   = nic
           response
         end
       end

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

@@ -48,10 +48,10 @@ module Fog
           }
 
           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)
           )
         end
       end
@@ -62,32 +62,33 @@ module Fog
             cd["id"] == cdrom_image_id
           end
           else
-            raise Fog::Errors::NotFound, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           if server = data[:servers]['items'].find do |serv|
             serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
           end
           else
-            raise Fog::Errors::NotFound, "The server resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
-          if server['entities'] && server['entities']['cdroms'] && server['entities']['cdroms']['items']
-            server['entities']['cdroms']['items'] << cdrom
+          cdrom['properties'] = {}
+          cdrom['properties']['name'] = cdrom['name']
+
+          if server['cdroms'] && server['cdroms']['items']
+            server['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]
-              }
+            server['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 = Excon::Response.new
           response.status = 202
-          response.body   = cdrom
+          response.body = cdrom
 
           response
         end

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

@@ -63,16 +63,23 @@ module Fog
             vlm["id"] == storage_id && vlm["datacenter_id"] == datacenter_id
           end
           else
-            raise Fog::Errors::NotFound, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           if server = data[:servers]['items'].find do |serv|
             serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
           end
           else
-            raise Fog::Errors::NotFound, "The server resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
+          volume['properties'] = {}
+          volume['properties']['name'] = volume['name']
+          volume['properties']['size'] = volume['size']
+          volume['properties']['bus'] = volume['bus']
+          volume['properties']['type'] = volume['type']
+          volume['properties']['licenceType'] = 'LINUX'
+
           if server['entities'] && server['entities']['volumes'] && server['entities']['volumes']['items']
             server['entities']['volumes']['items'] << volume
           else