fog-oneandone 1.0 → 1.2

data/lib/oneandone/models/compute/block_storages.rb

@@ -0,0 +1,24 @@
+require_relative 'block_storage'
+
+module Fog
+  module Compute
+    class OneAndOne
+      class BlockStorages < Fog::Collection
+        model Fog::Compute::OneAndOne::BlockStorage
+
+        def all
+          response = service.list_block_storages
+          load(response.body)
+        end
+
+        def get(id)
+          response = service.get_block_storage(id)
+          new(response.body)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end # BlockStorages
+    end # OneAndOne
+  end # Compute
+end # Fog

data/lib/oneandone/models/compute/firewall.rb

@@ -60,21 +60,6 @@ module Fog
         end
 
 
-        def remove_ip(options = {})
-
-          requires :id
-
-          response = service.remove_firewall_ip(firewall_id: id,
-            ip_id: options[:ip_id])
-
-          # Merge Attributes
-          merge_attributes(response.body)
-
-          true
-
-        end
-
-
         def add_rules(options = {})
 
           requires :id

data/lib/oneandone/models/compute/image.rb

@@ -16,6 +16,10 @@ module Fog
         attribute :frequency
         attribute :num_images
         attribute :creation_date
+        attribute :source
+        attribute :url
+        attribute :os_id
+        attribute :type
         
         
         def save
@@ -24,7 +28,8 @@ module Fog
 
           # Perform Request
           response = service.create_image(name: name, description: description,
-            server_id: server_id, frequency: frequency, num_images: num_images)
+            server_id: server_id, frequency: frequency, num_images: num_images,
+            source: source, url: url, os_id: os_id, type: type)
 
           # Merge Attributes
           merge_attributes(response.body)

data/lib/oneandone/models/compute/public_ip.rb

@@ -14,7 +14,8 @@ module Fog
         attribute :assigned_to
         attribute :state
         attribute :creation_date
-        
+        attribute :is_dhcp
+
         
         def save
 

data/lib/oneandone/models/compute/recovery_appliance.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class OneAndOne
+      class RecoveryAppliance < Fog::Model
+
+        # Declare Model Attributes
+        identity  :id
+
+        attribute :name
+        attribute :os_family
+        attribute :os
+        attribute :os_version
+        attribute :os_architecture
+
+      end # RecoveryAppliance
+    end # OneAndOne
+  end # Compute
+end # Fog

data/lib/oneandone/models/compute/recovery_appliances.rb

@@ -0,0 +1,24 @@
+require_relative 'recovery_appliance'
+
+module Fog
+  module Compute
+    class OneAndOne
+      class RecoveryAppliances < Fog::Collection
+        model Fog::Compute::OneAndOne::RecoveryAppliance
+
+        def all
+          response = service.list_recovery_appliances
+          load(response.body)
+        end
+
+        def get(id)
+          response = service.get_recovery_appliance(id)
+          new(response.body)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end # RecoveryAppliances
+    end # OneAndOne
+  end # Compute
+end # Fog

data/lib/oneandone/models/compute/server.rb

@@ -10,6 +10,8 @@ module Fog
         identity  :id
 
         attribute :name
+        attribute :server_type
+        attribute :baremetal_model_id
         attribute :description
         attribute :rsa_key
         attribute :fixed_instance_id
@@ -21,6 +23,8 @@ module Fog
         attribute :datacenter_id
         attribute :creation_date
         attribute :first_password
+        attribute :ipv6_range
+        attribute :hostname
         attribute :status
         attribute :hardware
         attribute :image
@@ -37,9 +41,11 @@ module Fog
         attribute :alerts
         attribute :monitoring_policy
         attribute :private_networks
+        attribute :public_key
 
         
         def save
+          server_type ||= 'cloud'
 
           requires :name, :appliance_id
 
@@ -48,6 +54,8 @@ module Fog
             requires :ram, :vcore, :cores_per_processor, :hdds
           end
 
+          requires :baremetal_model_id if server_type == 'baremetal'
+
           # Perform Request
           response = service.create_server(name: name, description: description,
             rsa_key: rsa_key, fixed_instance_id: fixed_instance_id,
@@ -55,111 +63,94 @@ module Fog
             appliance_id: appliance_id, hdds: hdds, datacenter_id: datacenter_id,
             password: password, power_on: power_on, firewall_id: firewall_id,
             ip_id: ip_id, load_balancer_id: load_balancer_id,
-            monitoring_policy_id: monitoring_policy_id)
+            monitoring_policy_id: monitoring_policy_id, public_key: public_key,
+            server_type: server_type, baremetal_model_id: baremetal_model_id)
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def update(options = {})
-
           requires :id
 
           response = service.update_server(server_id: id, name: options[:name],
-            description: options[:description])
+                                           description: options[:description])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def update_hardware(options = {})
-
           requires :id
 
           response = service.update_hardware(server_id: id,
-            fixed_instance_id: options[:fixed_instance_id],
-            vcore: options[:vcore], ram: options[:ram],
-            cores_per_processor: options[:cores_per_processor])
+                                             fixed_instance_id: options[:fixed_instance_id],
+                                             vcore: options[:vcore],
+                                             ram: options[:ram],
+                                             cores_per_processor: options[:cores_per_processor])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def add_hdds(options = {})
-
           requires :id
 
           response = service.add_hdds(server_id: id,
-            hdds: options[:hdds])
+                                      hdds: options[:hdds])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def delete_hdd(options = {})
-
           requires :id
 
           response = service.delete_hdd(server_id: id,
-            hdd_id: options[:hdd_id])
+                                        hdd_id: options[:hdd_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def resize_hdd(options = {})
-
           requires :id
 
           response = service.update_hdd(server_id: id,
-            hdd_id: options[:hdd_id], size: options[:size])
+                                        hdd_id: options[:hdd_id],
+                                        size: options[:size])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def install_image(options = {})
-
           requires :id
 
           response = service.install_server_image(server_id: id,
-            image_id: options[:image_id], password: options[:password],
-            firewall_id: options[:firewall_id])
+                                                  image_id: options[:image_id],
+                                                  password: options[:password],
+                                                  firewall_id: options[:firewall_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def add_ip
-
           requires :id
 
           response = service.add_server_ip(server_id: id)
@@ -168,134 +159,111 @@ module Fog
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def delete_ip(options = {})
-
           requires :id
 
           response = service.delete_server_ip(server_id: id,
-            ip_id: options[:ip_id])
+                                              ip_id: options[:ip_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def add_firewall(options = {})
-
           requires :id
 
           response = service.add_firewall(server_id: id,
-            ip_id: options[:ip_id], firewall_id: options[:firewall_id])
+                                          ip_id: options[:ip_id],
+                                          firewall_id:options[:firewall_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def remove_firewall(options = {})
-
           requires :id
 
           response = service.remove_firewall(server_id: id,
-            ip_id: options[:ip_id])
+                                             ip_id: options[:ip_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def add_load_balancer(options = {})
-
           requires :id
 
           response = service.add_load_balancer(server_id: id,
-            ip_id: options[:ip_id],
-            load_balancer_id: options[:load_balancer_id])
+                                               ip_id: options[:ip_id],
+                                               load_balancer_id: options[:load_balancer_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def remove_load_balancer(options = {})
-
           requires :id
 
           response = service.remove_load_balancer(server_id: id,
-            ip_id: options[:ip_id],
-            load_balancer_id: options[:load_balancer_id])
+                                                  ip_id: options[:ip_id],
+                                                  load_balancer_id: options[:load_balancer_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def on
-
           requires :id
 
           response = service.change_status(server_id: id,
-            action: 'POWER_ON', method: 'SOFTWARE')
+                                           action: 'POWER_ON',
+                                           method: 'SOFTWARE')
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def off
-
           requires :id
 
           response = service.change_status(server_id: id,
-            action: 'POWER_OFF', method: 'SOFTWARE')
+                                           action: 'POWER_OFF',
+                                           method: 'SOFTWARE')
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def reboot
-
           requires :id
 
           response = service.change_status(server_id: id,
-            action: 'REBOOT', method: 'SOFTWARE')
+                                           action: 'REBOOT',
+                                           method: 'SOFTWARE')
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def load_dvd(options = {})
-
           requires :id
 
           response = service.load_dvd(server_id: id, dvd_id: options[:dvd_id])
@@ -304,12 +272,9 @@ module Fog
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def eject_dvd
-
           requires :id
 
           response = service.eject_dvd(server_id: id)
@@ -318,42 +283,33 @@ module Fog
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def add_private_network(options = {})
-
           requires :id
 
           response = service.add_private_network(server_id: id,
-            private_network_id: options[:private_network_id])
+                                                 private_network_id: options[:private_network_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def remove_private_network(options = {})
-
           requires :id
 
           response = service.remove_private_network(server_id: id,
-            private_network_id: options[:private_network_id])
+                                                    private_network_id: options[:private_network_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def create_snapshot
-
           requires :id
 
           response = service.create_snapshot(server_id: id)
@@ -362,73 +318,56 @@ module Fog
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def restore_snapshot(options = {})
-
           requires :id
 
           response = service.restore_snapshot(server_id: id,
-            snapshot_id: options[:snapshot_id])
+                                              snapshot_id: options[:snapshot_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def delete_snapshot(options = {})
-
           requires :id
 
           response = service.delete_snapshot(server_id: id,
-            snapshot_id: options[:snapshot_id])
+                                             snapshot_id: options[:snapshot_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def clone(options = {})
-
           requires :id
 
           response = service.clone_server(server_id: id, name: options[:name],
-            datacenter_id: options[:datacenter_id])
+                                          datacenter_id: options[:datacenter_id])
 
           # Merge Attributes
           merge_attributes(response.body)
 
           true
-
         end
 
-
         def destroy
-
           requires :id
 
           service.delete_server(id)
-          
-          true
 
+          true
         end
 
-
         def ready?
-
-          (GOOD_STATES.include? status['state']) && (status['percent'] == nil)
-
+          (GOOD_STATES.include? status['state']) && status['percent'].nil?
         end
-
       end # Server
     end # OneAndOne
   end # Compute
-end # Fog
+end # Fog