ns-fog 1.22.2 → 1.22.3

data/fog.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'ns-fog'
-  s.version           = '1.22.2'
+  s.version           = '1.22.3'
   s.date              = '2014-05-29'
   s.rubyforge_project = 'fog'
 

data/lib/fog/qingcloud/core.rb

@@ -5,6 +5,14 @@ module Fog
     extend Fog::Provider
     service(:compute,         'Compute')
 
+    def self.wait_timeout
+      @wait_timeout || Fog.timeout
+    end
+
+    def self.wait_timeout=(timeout)
+      @wait_timeout = timeout
+    end
+
     def self.indexed_param(key, values)
       params = {}
       unless key.include?('%d')

data/lib/fog/qingcloud/model.rb

@@ -32,8 +32,7 @@ module Fog
 
       def wait_for(&block)
         wait_policy = lambda { |retries| retries < 8 ? 9 - retries : 1 }
-        timeout = 80
-        super(timeout, wait_policy, &block)
+        super(Fog::QingCloud.wait_timeout, wait_policy, &block)
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class QingCloud
 
-      class Server < Fog::QingCloud::Model
+      class Server < Fog::Compute::Server
         extend Fog::Deprecation
         identity  :id,           :aliases => 'instance_id'
 
@@ -196,6 +196,19 @@ module Fog
           nics.map{|x| x.private_ip}
         end
 
+        def wait_for(&block)
+          wait_policy = lambda { |retries| retries < 8 ? 9 - retries : 1 }
+          super(Fog::QingCloud.wait_timeout, wait_policy, &block)
+        end
+        
+        def modify_attributes(name, description)
+          requires :id
+          raise Fog::QingCloud::Errors::CommonClientError, "name or description must be specified" unless name || description
+          service.modify_resource_attributes(id, 'instance', name, description)
+          merge_attributes('instance_name' => name, 'description' => description)
+          true
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-fog
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.22.3
   prerelease: 
 platform: ruby
 authors: