fog 1.22.1 → 1.23.0

data/lib/fog/cloudstack/requests/compute/update_user.rb

@@ -1,18 +1,21 @@
 module Fog
   module Compute
     class Cloudstack
+
       class Real
-        # Updates a user account.
+        # Updates a user account
         #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateUser.html]
-        def update_user(options={})
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateUser.html]
+        def update_user(id, options={})
           options.merge!(
-            'command' => 'updateUser'
+            'command' => 'updateUser', 
+            'id' => id  
           )
-
           request(options)
         end
       end
+
     end
   end
 end
+

data/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb

@@ -1,18 +1,21 @@
 module Fog
   module Compute
     class Cloudstack
+
       class Real
-        # Updates account information for the authenticated user.
+        # Updates properties of a virtual machine. The VM has to be stopped and restarted for the new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. Therefore, stop the VM manually before issuing this call.
         #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateAccount.html]
-        def update_virtual_machine(options={})
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVirtualMachine.html]
+        def update_virtual_machine(id, options={})
           options.merge!(
-            'command' => 'updateVirtualMachine'
+            'command' => 'updateVirtualMachine', 
+            'id' => id  
           )
-
           request(options)
         end
       end
+
     end
   end
 end
+

data/lib/fog/cloudstack/requests/compute/update_vm_affinity_group.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the new properties to take effect.
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVMAffinityGroup.html]
+        def update_vm_affinity_group(id, options={})
+          options.merge!(
+            'command' => 'updateVMAffinityGroup', 
+            'id' => id  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/update_volume.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Updates the volume.
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVolume.html]
+        def update_volume(id, path, options={})
+          options.merge!(
+            'command' => 'updateVolume', 
+            'id' => id, 
+            'path' => path  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/update_vpc.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Updates a VPC
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVPC.html]
+        def update_vpc(id, name, options={})
+          options.merge!(
+            'command' => 'updateVPC', 
+            'id' => id, 
+            'name' => name  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/update_vpcoffering.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Updates VPC offering
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVPCOffering.html]
+        def update_vpcoffering(id, options={})
+          options.merge!(
+            'command' => 'updateVPCOffering', 
+            'id' => id  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/update_vpn_customer_gateway.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Update site to site vpn customer gateway
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateVpnCustomerGateway.html]
+        def update_vpn_customer_gateway(id, esppolicy, ikepolicy, cidrlist, gateway, ipsecpsk, options={})
+          options.merge!(
+            'command' => 'updateVpnCustomerGateway', 
+            'id' => id, 
+            'esppolicy' => esppolicy, 
+            'ikepolicy' => ikepolicy, 
+            'cidrlist' => cidrlist, 
+            'gateway' => gateway, 
+            'ipsecpsk' => ipsecpsk  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/update_zone.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Updates a Zone.
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/updateZone.html]
+        def update_zone(id, options={})
+          options.merge!(
+            'command' => 'updateZone', 
+            'id' => id  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/upload_custom_certificate.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Uploads a custom certificate for the console proxy VMs to use for SSL. Can be used to upload a single certificate signed by a known CA. Can also be used, through multiple calls, to upload a chain of certificates from CA to the custom certificate itself.
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/uploadCustomCertificate.html]
+        def upload_custom_certificate(domainsuffix, certificate, options={})
+          options.merge!(
+            'command' => 'uploadCustomCertificate', 
+            'domainsuffix' => domainsuffix, 
+            'certificate' => certificate  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/upload_volume.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Real
+        # Uploads a data disk.
+        #
+        # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.3/root_admin/uploadVolume.html]
+        def upload_volume(zoneid, name, url, format, options={})
+          options.merge!(
+            'command' => 'uploadVolume', 
+            'zoneid' => zoneid, 
+            'name' => name, 
+            'url' => url, 
+            'format' => format  
+          )
+          request(options)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/digitalocean/requests/compute/destroy_ssh_key.rb

@@ -5,7 +5,7 @@ module Fog
         #
         # Delete a SSH public key from your account
         #
-        # @see https://www.digitalocean.com/api#ssh_keys
+        # @see https://developers.digitalocean.com/ssh-keys
         #
         def destroy_ssh_key(id)
           request(

data/lib/fog/digitalocean/requests/compute/get_ssh_key.rb

@@ -6,7 +6,7 @@ module Fog
         # This method shows a specific public SSH key in your account
         # that can be added to a droplet.
         #
-        # @see https://www.digitalocean.com/api#ssh_keys
+        # @see https://developers.digitalocean.com/ssh-keys
         #
         def get_ssh_key(id)
           request(
@@ -24,7 +24,7 @@ module Fog
           response.body = {
             "status" => "OK",
             # key listing does not return ssh_pub_key
-            # https://www.digitalocean.com/api#ssh_keys
+            # https://developers.digitalocean.com/ssh-keys
             "ssh_key"  => self.data[:ssh_keys].find { |k| k['id'] == id }
           }
           response

data/lib/fog/dynect/dns.rb

@@ -120,19 +120,24 @@ module Fog
 
         def poll_job(response, original_expects, time_to_wait = 10)
           job_location = response.headers['Location']
-
-          Fog.wait_for(time_to_wait) do
-            response = request(
-              :expects => original_expects,
-              :idempotent => true,
-              :method => :get,
-              :path => job_location
-            )
-            response.body['status'] != 'incomplete'
-          end
-
-          if response.body['status'] == 'incomplete'
-            raise JobIncomplete.new("Job #{response.body['job_id']} is still incomplete")
+          
+          begin
+            Fog.wait_for(time_to_wait) do
+             response = request(
+               :expects => original_expects,
+               :idempotent => true,
+               :method => :get,
+               :path => job_location
+             )
+             response.body['status'] != 'incomplete'
+            end
+          
+          rescue Errors::TimeoutError => error
+            if response.body['status'] == 'incomplete'
+              raise JobIncomplete.new("Job #{response.body['job_id']} is still incomplete")
+            else
+              raise error
+            end
           end
 
           response

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

@@ -19,7 +19,7 @@ module Fog
           true
         end
 
-        def save
+        def save(replace=false)
           requires :name, :type, :rdata, :zone
 
           options = {
@@ -27,7 +27,11 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = service.post_record(type, zone.identity, name, rdata, options).body['data']
+          if replace
+            data = service.put_record(type, zone.identity, name, rdata, options).body['data']
+          else
+            data = service.post_record(type, zone.identity, name, rdata, options).body['data']
+          end
           # avoid overwriting zone object with zone string
           data = data.reject {|key, value| key == 'zone'}
           merge_attributes(data)

data/lib/fog/dynect/models/dns/records.rb

@@ -12,22 +12,17 @@ module Fog
         def all(options = {})
           requires :zone
           data = []
-          service.get_all_records(zone.domain, options).body['data'].each do |url|
-            (_, _, t, _, fqdn, id) = url.split('/')
-            type = t.gsub(/Record$/, '')
-
-            # leave out the default, read only records
-            # by putting this here we don't make the secondary request for these records
-            next if ['NS', 'SOA'].include?(type)
-
-            record = service.get_record(type, zone.domain, fqdn, 'record_id' => id).body['data']
-
-            data << {
-              :identity => record['record_id'],
-              :fqdn => record['fqdn'],
-              :type => record['record_type'],
-              :rdata => record['rdata']
-            }
+          service.get_all_records(zone.domain, options).body['data'].each do |records|
+            (type, list) = records
+            next if %w{soa_records ns_records}.include?(type)
+            list.each do |record|
+              data << {
+                :identity => record['record_id'],
+                :fqdn => record['fqdn'],
+                :type => record['record_type'],
+                :rdata => record['rdata']
+              }
+            end
           end
 
           load(data)
@@ -36,19 +31,12 @@ module Fog
         def get(record_id)
           requires :zone
 
-          list = service.get_all_records(zone.domain, {}).body['data']
-          url = list.find { |e| e =~ /\/#{record_id}$/ }
-          return unless url
-          (_, _, t, _, fqdn, id) = url.split('/')
-          type = t.gsub(/Record$/, '')
-          record = service.get_record(type, zone.domain, fqdn, 'record_id' => id).body['data']
-
-          new({
-            :identity => record['record_id'],
-            :fqdn => record['fqdn'],
-            :type => record['record_type'],
-            :rdata => record['rdata']
-          })
+          # there isn't a way to look up by just id
+          # must have type and domain for 'get_record' request
+          # so we pick it from the list returned by 'all'
+
+          list = all
+          list.detect {|e| e.id == record_id}
         end
 
         def new(attributes = {})

data/lib/fog/dynect/requests/dns/get_all_records.rb

@@ -15,7 +15,8 @@ module Fog
             :expects  => 200,
             :idempotent => true,
             :method   => :get,
-            :path     => ['AllRecord', zone, requested_fqdn].compact.join('/')
+            :path     => ['AllRecord', zone, requested_fqdn].compact.join('/'),
+            :query    => {'detail' => 'Y'} # return full records, instead of just resource URLs
           )
         end
       end

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

@@ -14,6 +14,7 @@ module Fog
         attribute :memorysize
         attribute :disksize
         attribute :transfer
+        attribute :bandwidth
         attribute :uptime
         attribute :templatename
         attribute :managedhosting
@@ -65,6 +66,7 @@ module Fog
             :cpucores       => cpucores     || "1",
             :rootpassword   => rootpassword,
             :transfer       => transfer     || "500",
+            :bandwidth      => bandwidth    || "10",
           }
 
           # optional options when creating a server:

data/lib/fog/google/compute.rb

@@ -13,6 +13,8 @@ module Fog
       request :list_aggregated_addresses
       request :list_disks
       request :list_aggregated_disks
+      request :list_disk_types
+      request :list_aggregated_disk_types
       request :list_firewalls
       request :list_images
       request :list_machine_types
@@ -32,6 +34,7 @@ module Fog
       request :get_server
       request :get_address
       request :get_disk
+      request :get_disk_type
       request :get_firewall
       request :get_image
       request :get_machine_type
@@ -109,6 +112,9 @@ module Fog
       model :disk
       collection :disks
 
+      model :disk_type
+      collection :disk_types
+
       model :address
       collection :addresses
 
@@ -178,23 +184,6 @@ module Fog
           response
         end
 
-        def backoff_if_unfound(&block)
-          retries_remaining = 10
-          sleep_time = 0.1
-          begin
-            result = block.call
-          rescue Exception => msg
-            if msg.to_s.include? 'was not found' and retries_remaining > 0
-              retries_remaining -= 1
-              sleep sleep_time
-              sleep_time *= 1.6
-              retry
-            else
-              raise msg
-            end
-          end
-          result
-        end
       end
 
       class Mock
@@ -213,61 +202,6 @@ module Fog
         def self.data(api_version)
           @data ||= Hash.new do |hash, key|
             case key
-            when 'google'
-              hash[key] = {
-                :images => {
-                  "centos-6-2-v20120621" => {
-                    "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-2-v20120621",
-                    "id" => "12920641029336858796",
-                    "creationTimestamp" => "2012-06-21T22:59:56.392-07:00",
-                    "name" => "centos-6-2-v20120621",
-                    "description" => "CentOS 6.2; Created Thu, 21 Jun 2012 14:22:21 +0000",
-                    "sourceType" => "RAW",
-                    "rawDisk" => {
-                      "containerType" => "TAR",
-                      "source" => ""
-                    },
-                    "deprecated" => {
-                      "state" => "DELETED",
-                      "replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
-                    },
-                    "status" => "READY"
-                  },
-                  "centos-6-v20120912" => {
-                    "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20120912",
-                    "id" => "12994279803511049620",
-                    "creationTimestamp" => "2012-09-18T08:52:47.584-07:00",
-                    "name" => "centos-6-v20120912",
-                    "description" => "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000",
-                    "sourceType" => "RAW",
-                    "rawDisk" => {
-                      "containerType" => "TAR",
-                      "source" => ""
-                    },
-                    "deprecated" => {
-                      "state" => "DEPRECATED",
-                      "replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
-                    },
-                    "status" => "READY"
-                  },
-                  "centos-6-v20121106" => {
-                    "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20121106",
-                    "id" => "13037720516378381209",
-                    "creationTimestamp" => "2012-11-09T11:40:41.079-08:00",
-                    "name" => "centos-6-v20121106",
-                    "description" => "SCSI-enabled CentOS 6; Created Tue, 06 Nov 2012 00:00:00 +0000",
-                    "sourceType" => "RAW",
-                    "rawDisk" => {
-                      "containerType" => "TAR",
-                      "source" => ""
-                    },
-                    "status" => "READY"
-                  }
-                }
-              }
             when 'debian-cloud'
               hash[key] = {
                 :images => {
@@ -871,7 +805,8 @@ module Fog
                     "sizeGb" => "10",
                     "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
                     "sourceImage" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
-                    "sourceImageId" => "17312518942796567788"
+                    "sourceImageId" => "17312518942796567788",
+                    "type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-standard",
                   },
                   "fog-2" => {
                     "kind" => "compute#disk",
@@ -881,7 +816,8 @@ module Fog
                     "status" => "READY",
                     "name" => "fog-2",
                     "sizeGb" => "10",
-                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1"
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
+                    "type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-ssd",
                   }
                 },
                 :operations => {}