fog 1.28.0 → 1.29.0

data/lib/fog.rb

@@ -49,6 +49,7 @@ require 'fog/rage4'
 require 'fog/riakcs'
 require 'fog/openstack'
 require 'fog/ovirt'
+require 'fog/powerdns'
 require 'fog/profitbricks'
 require 'fog/sakuracloud'
 require 'fog/serverlove'

data/lib/fog/bin.rb

@@ -81,6 +81,7 @@ require 'fog/bin/rage4'
 require 'fog/bin/riakcs'
 require 'fog/bin/openstack'
 require 'fog/bin/ovirt'
+require 'fog/bin/powerdns'
 require 'fog/bin/profitbricks'
 require 'fog/bin/sakuracloud'
 require 'fog/bin/serverlove'

data/lib/fog/bin/openstack.rb

@@ -20,6 +20,8 @@ class OpenStack < Fog::Bin
         Fog::Orchestration::OpenStack
       when :baremetal
         Fog::Baremetal::OpenStack
+      when :planning
+        Fog::Openstack::Planning
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end

data/lib/fog/cloudsigma/mock_data.rb

@@ -4,39 +4,43 @@ module Fog
       class Mock
         def self.mock_data
           {
-              :volumes => {},
-              :servers => {},
-              :vlans => {},
-              :ips => {},
-              :profile => {:login_sms=>false,
-                           :town=>"",
-                           :postcode=>"",
-                           :reseller=>"",
-                           :has_autotopup=>false,
-                           :currency=>"CHF",
-                           :state=>"REGULAR",
-                           :uuid=>"6c2203a1-a2e6-433f-aeab-b976b8cd3d18",
-                           :company=>"",
-                           :api_https_only=>false,
-                           :my_notes=>"",
-                           :key_auth=>false,
-                           :email=>"MyFirstName.MyLasttName@MyCompany.com",
-                           :bank_reference=>"mmlastname278",
-                           :first_name=>"MyFirstName",
-                           :meta =>"",
-                           :phone=>"",
-                           :language=>"EN",
-                           :vat=>"",
-                           :last_name=>"MyLasttName",
-                           :title=>"",
-                           :mailing_list=>true,
-                           :autotopup_amount=>0.0,
-                           :country=>"",
-                           :address=>""},
-              :subscriptions => {},
-              :current_usage => {},
-              :balance => {:balance => 100, :currency => 'CHF'},
-
+            :volumes => {},
+            :servers => {},
+            :vlans => {},
+            :ips => {},
+            :profile => {
+              :login_sms => false,
+              :town => "",
+              :postcode => "",
+              :reseller => "",
+              :has_autotopup => false,
+              :currency => "CHF",
+              :state => "REGULAR",
+              :uuid => "6c2203a1-a2e6-433f-aeab-b976b8cd3d18",
+              :company => "",
+              :api_https_only => false,
+              :my_notes => "",
+              :key_auth => false,
+              :email => "MyFirstName.MyLasttName@MyCompany.com",
+              :bank_reference => "mmlastname278",
+              :first_name => "MyFirstName",
+              :meta =>"",
+              :phone => "",
+              :language => "EN",
+              :vat => "",
+              :last_name => "MyLasttName",
+              :title => "",
+              :mailing_list => true,
+              :autotopup_amount => 0.0,
+              :country => "",
+              :address => ""
+            },
+            :subscriptions => {},
+            :current_usage => {},
+            :balance => {
+              :balance => 100,
+              :currency => 'CHF'
+            }
           }
         end
       end

data/lib/fog/dnsmadeeasy/models/dns/record.rb

@@ -28,7 +28,7 @@ module Fog
         end
 
         def destroy
-          service.delete_record(zone.domain, identity)
+          service.delete_record(zone.id, identity)
           true
         end
 

data/lib/fog/fogdocker/requests/compute/api_version.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def api_version
-          Docker.version
+          Docker.version(@connection)
         end
       end
       class Mock

data/lib/fog/glesys/compute.rb

@@ -14,11 +14,14 @@ module Fog
       model       :template
       collection  :ips
       model       :ip
+      collection  :ssh_keys
+      model       :ssh_key
 
       request_path 'fog/glesys/requests/compute'
 
       # Server
       request :create
+      request :edit
       request :destroy
       request :list_servers
       request :server_details
@@ -39,6 +42,11 @@ module Fog
       request :ip_add
       request :ip_remove
 
+      # SSH keys
+      request :ssh_key_list
+      request :ssh_key_add
+      request :ssh_key_remove
+
       class Mock
         def initialize(options={})
           @api_url            = options[:glesys_api_url] || API_URL
@@ -120,7 +128,7 @@ module Fog
         end
 
         def urlencode(hash)
-          hash.to_a.map! { |k, v| "#{k}=#{v.to_s}" }.join("&")
+          hash.to_a.map! { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join("&")
         end
       end
     end

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

@@ -53,28 +53,39 @@ module Fog
         end
 
         def save
-          raise "Operation not supported" if self.identity
-          requires :hostname, :rootpassword
-
-          options = {
-            :datacenter     => datacenter   || "Falkenberg",
-            :platform       => platform     || "Xen",
-            :hostname       => hostname,
-            :templatename   => templatename || "Debian-6 x64",
-            :disksize       => disksize     || "10",
-            :memorysize     => memorysize   || "512",
-            :cpucores       => cpucores     || "1",
-            :rootpassword   => rootpassword,
-            :transfer       => transfer     || "500",
-            :bandwidth      => bandwidth    || "10",
-          }
-
-          # optional options when creating a server:
-          [:ip, :ipv6, :description].each do |k|
-            options[k] = attributes[k] if attributes[k]
+          if self.identity
+            options = {
+              :serverid => self.identity,
+              :disksize => disksize,
+              :memorysize => memorysize,
+              :cpucores => cpucores,
+              :hostname => hostname,
+              :bandwidth => bandwidth
+            }
+            data = service.edit(options)
+          else
+            requires :hostname, :rootpassword
+
+            options = {
+              :datacenter     => datacenter   || "Falkenberg",
+              :platform       => platform     || "OpenVz",
+              :hostname       => hostname,
+              :templatename   => templatename || "Debian 7.0 64-bit",
+              :disksize       => disksize     || "10",
+              :memorysize     => memorysize   || "512",
+              :cpucores       => cpucores     || "1",
+              :rootpassword   => rootpassword,
+              :transfer       => transfer     || "500",
+              :bandwidth      => bandwidth    || "10",
+            }
+
+            # optional options when creating a server:
+            [:ip, :ipv6, :description].each do |k|
+              options[k] = attributes[k] if attributes[k]
+            end
+
+            data = service.create(options)
           end
-
-          data = service.create(options)
           merge_attributes(data.body['response']['server'])
           data.status == 200 ? true : false
         end

data/lib/fog/glesys/models/compute/ssh_key.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class Glesys
+      class SshKey < Fog::Model
+        identity :id
+
+        attribute :description
+        attribute :data
+
+        def save
+          requires :description, :data
+
+          merge_attributes(service.ssh_key_add(:description => description,
+                                              :sshkey => data
+                                             ).body["response"]["sshkey"])
+          true
+        end
+
+        def destroy
+          requires :id
+
+          service.ssh_key_remove(:sshkeyids => id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/models/compute/ssh_keys.rb

@@ -0,0 +1,21 @@
+require "fog/glesys/models/compute/ssh_key"
+
+module Fog
+  module Compute
+    class Glesys
+      class SshKeys < Fog::Collection
+        model Fog::Compute::Glesys::SshKey
+
+        def all
+          data = service.ssh_key_list.body["response"]["sshkeys"]
+          load(data)
+        end
+
+        def get(id)
+          hash = service.ssh_key_list.body["response"]["sshkeys"].find{|a| a["id"] == id}
+          hash.nil? ? nil : new(hash)
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/requests/compute/edit.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Glesys
+      class Real
+        def edit(options = {})
+          request('server/edit/',options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/requests/compute/ssh_key_add.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Glesys
+      class Real
+        def ssh_key_add(options)
+          request("sshkey/add", options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/requests/compute/ssh_key_list.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Glesys
+      class Real
+        def ssh_key_list(options = {})
+          request("sshkey/list", options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/requests/compute/ssh_key_remove.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Glesys
+      class Real
+        def ssh_key_remove(options)
+          request("sshkey/remove", options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/compute.rb

@@ -147,6 +147,8 @@ module Fog
       request :delete_server_access_config
       request :update_url_map
       request :validate_url_map
+      request :start_server
+      request :stop_server
 
       model_path 'fog/google/models/compute'
       model :server

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

@@ -129,6 +129,20 @@ module Fog
           Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'], data.body['zone'])
         end
 
+        def start
+          requires :identity, :zone
+
+          data = service.start_server(identity, zone_name)
+          Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'], data.body['zone'])
+        end
+
+        def stop
+          requires :identity, :zone
+
+          data = service.stop_server(identity, zone_name)
+          Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'], data.body['zone'])
+        end
+
         def serial_port_output
           requires :identity, :zone
 

data/lib/fog/google/requests/compute/start_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def start_server(identity, zone_name)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def start_server(identity, zone_name)
+          api_method = @compute.instances.start
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'instance' => identity,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/stop_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def stop_server(identity, zone_name)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def stop_server(identity, zone_name)
+          api_method = @compute.instances.stop
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'instance' => identity,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+    end
+  end
+end

data/lib/fog/linode/compute.rb

@@ -33,8 +33,15 @@ module Fog
       request :linode_disk_create
       request :linode_disk_list
       request :linode_disk_delete
+      request :linode_disk_resize
+      request :linode_disk_update
+      request :linode_disk_imagize
+      request :linode_disk_duplicate
       request :linode_disk_createfromdistribution
       request :linode_disk_createfromstackscript
+      request :linode_disk_createfromimage
+      request :image_list
+      request :image_delete
       request :linode_ip_list
       request :linode_ip_addprivate
       request :linode_config_list

data/lib/fog/linode/requests/compute/image_delete.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class Linode
+      class Real
+        def image_delete(image_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'image.delete',
+              :imageId => image_id
+            }
+          )
+        end
+      end
+
+      class Mock
+        def image_delete(image_id, status='available')
+          size = rand(1..999999)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "ERRORARRAY" => [],
+            "ACTION"     => "image.delete",
+            "DATA"       => { "LAST_USED_DT" => "2014-07-21 12:31:54.0",
+                              "DESCRIPTION" => "Fog Mock Linode Image #{image_id}",
+                              "LABEL" => "test_#{image_id}_image",
+                              "STATUS" => status,
+                              "SIZE" => size,
+                              "ISPUBLIC" => rand(0..1),
+                              "CREATE_DT" => "2014-06-23 13:45:12.0",
+                              "USED" => rand(1..size),
+                              "FS_TYPE" => "ext4",
+                              "USERID" => Fog::Mock.random_numbers(4),
+                              "IMAGEID" => image_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end