profitbricks 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b9764ad2e524499c1c45274219ad62d1f5642e
-  data.tar.gz: 85fc09ceeb64652682551f1acc3434a4aac4b409
+  metadata.gz: 927f517f665fe6a3edf1b95ba18d309a904cd921
+  data.tar.gz: ef29502801a32db332dfdd289ece88bb3aea3c0f
 SHA512:
-  metadata.gz: 6c19e66e08af35556293a30f70d42331778f72403d6680a76eef06c7d96f45ea74e36c3eb5229763de794d551b9f2ab3f6b78e8d7b7d9fc42547ff417f980f4b
-  data.tar.gz: 04c7c861e13c1d9a3c2edb0595b6e4fe8e9ea85eaf4a97dfdffbd2a1727b601daeef28a8242b55b1a84b5eead82cb859fd8b6d4cadc509318198808c8dbddc91
+  metadata.gz: 16b87afcb38284f88b8003180533a9c278849a93e065cda09319e1e89a8cab8e5c7117b880f427448bb09707172851dfc9033d9d44d6d20d60f19b49dc93ff1b
+  data.tar.gz: 4cc02ae79a0db4a940a22d701acbbc41ca093e391ec9a9554fedd776864f20a8631eb7bd2d77903ccea96d4a1db5d9ac9cd9645634bb31e9285db06969062b13

data/lib/profitbricks.rb

@@ -13,7 +13,7 @@ require 'profitbricks/firewall'
 require 'profitbricks/rule'
 
 module Profitbricks
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end
 
 PB = Profitbricks

data/lib/profitbricks/data_center.rb

@@ -52,6 +52,18 @@ module Profitbricks
       Server.create(options.merge(:data_center_id => self.id))
     end
 
+    # Creates a Storage in the current Virtual Data Center, automatically sets the :data_center_id
+    # @see Profitbricks::Storage#create
+    def create_storage(options)
+      Storage.create(options.merge(:data_center_id => self.id))
+    end
+
+    # Creates a Load Balancer in the current Virtual Data Center, automatically sets the :data_center_id
+    # @see Profitbricks::LoadBalancer#create
+    def create_load_balancer(options)
+      LoadBalancer.create(options.merge(:data_center_id => self.id))
+    end
+
     # Checks if the Data Center was successfully provisioned
     #
     # @return [Boolean] true if the Data Center was provisioned, false otherwise

data/lib/profitbricks/load_balancer.rb

@@ -31,8 +31,11 @@ module Profitbricks
     # @return [Boolean] true on success, false otherwise
     def register_servers(servers)
       raise "You have to provide at least one server" unless servers
-      options = {:server_ids => servers.collect { |s| s.id }.join(','), :load_balancer_id=> self.id}
-      xml = get_xml_and_update_attributes options, [:server_ids, :load_balancer_id]
+      options = {:load_balancer_id => self.id}
+      xml = get_xml_and_update_attributes options, [:load_balancer_id]
+      servers.each do |server|
+        xml += "<serverIds>#{server.id}</serverIds>"
+      end
       response = Profitbricks.request :register_servers_on_load_balancer, xml
       update_attributes(response.to_hash[:register_servers_on_load_balancer_response][:return])
       return true if response.to_hash[:register_servers_on_load_balancer_response][:return]
@@ -48,8 +51,11 @@ module Profitbricks
     # @return [Boolean] true on success, false otherwise
     def deregister_servers(servers)
       raise "You have to provide at least one server" unless servers
-      options = {:server_ids => servers.collect { |s| s.id }.join(','), :load_balancer_id=> self.id}
-      xml = get_xml_and_update_attributes options, [:server_ids, :load_balancer_id]
+      options = {:load_balancer_id => self.id}
+      xml = get_xml_and_update_attributes options, [:load_balancer_id]
+      servers.each do |server|
+        xml += "<serverIds>#{server.id}</serverIds>"
+      end
       response = Profitbricks.request :deregister_servers_on_load_balancer, xml
       return true if response.to_hash[:deregister_servers_on_load_balancer_response][:return]
     end
@@ -60,8 +66,11 @@ module Profitbricks
     # @return [Boolean] true on success, false otherwise
     def activate_servers(servers)
       raise "You have to provide at least one server" unless servers
-      options = {:server_ids => servers.collect { |s| s.id }.join(','), :load_balancer_id=> self.id}
-      xml = get_xml_and_update_attributes options, [:server_ids, :load_balancer_id]
+      options = {:load_balancer_id => self.id}
+      xml = get_xml_and_update_attributes options, [:load_balancer_id]
+      servers.each do |server|
+        xml += "<serverIds>#{server.id}</serverIds>"
+      end
       response = Profitbricks.request :activate_load_balancing_on_servers, xml
       return true if response.to_hash[:activate_load_balancing_on_servers_response][:return]
     end
@@ -72,8 +81,11 @@ module Profitbricks
     # @return [Boolean] true on success, false otherwise
     def deactivate_servers(servers)
       raise "You have to provide at least one server" unless servers
-      options = {:server_ids => servers.collect { |s| s.id }.join(','), :load_balancer_id=> self.id}
-      xml = get_xml_and_update_attributes options, [:server_ids, :load_balancer_id]
+      options = {:load_balancer_id => self.id}
+      xml = get_xml_and_update_attributes options, [:load_balancer_id]
+      servers.each do |server|
+        xml += "<serverIds>#{server.id}</serverIds>"
+      end
       response = Profitbricks.request :deactivate_load_balancing_on_servers, xml
       return true if response.to_hash[:deactivate_load_balancing_on_servers_response][:return]
     end
@@ -104,9 +116,13 @@ module Profitbricks
       # @option options [Array<Server>] :servers Array of servers to connect to the LoadBalancer
       # @return [LoadBalancer] The created LoadBalancer
       def create(options = {})
-        options[:server_ids] = options[:servers].collect { |s| s.id }.join(',')
         xml = "<arg0>"
-        xml += get_xml_and_update_attributes options, [:data_center_id, :lan_id, :ip, :name, :algorithm, :server_ids]
+        xml += get_xml_and_update_attributes options, [:data_center_id, :lan_id, :ip, :name, :algorithm]
+        unless options[:servers].nil?
+          options[:servers].each do |server|
+            xml += "<serverIds>#{server.id}</serverIds>"
+          end
+        end
         xml += "</arg0>"
         response = Profitbricks.request :create_load_balancer, xml
         self.find(:id => response.to_hash[:create_load_balancer_response][:return][:load_balancer_id])
@@ -124,4 +140,4 @@ module Profitbricks
       end
     end
   end
-end
+end

data/lib/profitbricks/profitbricks.rb

@@ -12,7 +12,7 @@ module Profitbricks
     Savon.configure do |config|
       config.raise_errors = false 
       config.log = Profitbricks::Config.log
-
+      config.pretty_print_xml = true
     end
     HTTPI.log = false
 

data/lib/profitbricks/server.rb

@@ -18,17 +18,16 @@ module Profitbricks
 
     # Updates parameters of an existing virtual Server device. 
     # @param [Hash] options parameters for the new server
-    # @option options [Fixnum] :cores Number of cores to be assigned to the specified server (required)
-    # @option options [Fixnum] :ram Number of RAM memory (in MiB) to be assigned to the server. Must be at least 256 and a multiple of it. (required)
-    # @option options [String]  :name Name of the server to be created
-    # @option options [String]  :boot_from_image_id Defines an existing CD-ROM/DVD image ID to be set as boot device of the server. A virtual CD-ROM/DVD drive with the mounted image will be connected to the server.
-    # @option options [String]  :boot_from_storage_id Defines an existing storage device ID to be set as boot device of the server. The storage will be connected to the server implicitly.
-    # @option options [String]  :availability_zone Sets the availability zone in which the server is located (AUTO, ZONE_1, ZONE_2). If set to AUTO servers will be placed in a random zone.
-    # @option options [String]  :os_type Sets the OS type of the server. (WINDOWS, OTHER) If left empty, the server will inherit the OS Type of its selected boot image / storage.
+    # @option options [Fixnum] :cores Number of cores to be assigned to the specified server.
+    # @option options [Fixnum] :ram Number of RAM memory (in MiB) to be assigned to the server. Must be at least 256 and a multiple of it.
+    # @option options [String] :name Name of the server to be created.
+    # @option options [String] :boot_from_image_id Defines an existing CD-ROM/DVD image ID to be set as boot device of the server. A virtual CD-ROM/DVD drive with the mounted image will be connected to the server.
+    # @option options [String] :boot_from_storage_id Defines an existing storage device ID to be set as boot device of the server. The storage will be connected to the server implicitly.
+    # @option options [String] :availability_zone Sets the availability zone in which the server is located (AUTO, ZONE_1, ZONE_2). If set to AUTO servers will be placed in a random zone.
+    # @option options [String] :os_type Sets the OS type of the server. (WINDOWS, OTHER) If left empty, the server will inherit the OS Type of its selected boot image / storage.
     # @return [Boolean] true on success, false otherwise
     def update(options = {})
       return false if options.empty?
-      raise ArgumentError.new(":ram and :cores are mandatory options.") unless options[:ram] or options[:core]
       raise ArgumentError.new(":ram has to be at least 256MiB and a multiple of it") if options[:ram] < 256 or (options[:ram] % 256) > 0
       raise ArgumentError.new(":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'") if options[:availability_zone] and !['AUTO', 'ZONE_1', 'ZONE_2'].include? options[:availability_zone]
       raise ArgumentError.new(":os_type has to be either 'WINDOWS' or 'OTHER'") if options[:os_type] and !['WINDOWS', 'OTHER'].include? options[:os_type]
@@ -54,6 +53,12 @@ module Profitbricks
       end
     end
 
+    # Creates a Nic for the current Server, automatically sets the :server_id
+    # @see Profitbricks::Nic#create
+    def create_nic(options)
+      Nic.create(options.merge(:server_id => self.id))
+    end
+
     class << self
       # Creates a Virtual Server within an existing data center. Parameters can be specified to set up a 
       # boot device and connect the server to an existing LAN or the Internet.

data/lib/profitbricks/storage.rb

@@ -13,10 +13,11 @@ module Profitbricks
     #
     # @param [Hash] options Parameters to connect the Storage
     # @option options [:server_id] Identifier of the target virtual server (required) 
-    # @option options [:bus_type] Bus type to which the storage will be connected. Type can be IDE, SCSI or VIRTIO (required)
+    # @option options [:bus_type] Bus type to which the storage will be connected. Type can be IDE or VIRTIO. Default: VIRTIO
     # @option options [:device_number] Defines the device number of the virtual storage. If no device number is set, a device number will be automatically assigned 
     # @return [Boolean] true on success, false otherwise
     def connect(options = {})
+      raise ArgumentError.new(":bus_type has to be either 'IDE' or 'VIRTIO'") if options[:bus_type] and !['IDE', 'VIRTIO'].include? options[:bus_type]
       xml = "<arg0>"
       xml += get_xml_and_update_attributes options.merge(:storage_id => self.id), [:server_id, :storage_id, :bus_type, :device_number]
       xml += "</arg0>"
@@ -81,4 +82,4 @@ module Profitbricks
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Dominik Sander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon