ns-fog 1.22.9 → 1.22.10

data/fog.gemspec

@@ -6,8 +6,8 @@ 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.9'
-  s.date              = '2014-07-21'
+  s.version           = '1.22.10'
+  s.date              = '2014-08-07'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog/qingcloud/model.rb

@@ -34,6 +34,12 @@ module Fog
         wait_policy = lambda { |retries| retries < 8 ? 9 - retries : 1 }
         super(Fog::QingCloud.wait_timeout, wait_policy, &block)
       end
+      
+      def changing?
+        respond_to?(:transition_status) &&
+          transition_status && !transition_status.empty?
+      end
+
     end
   end
 end

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

@@ -46,7 +46,6 @@ module Fog
 
         def rules(direction = nil)
           requires :id
-          direction = [:egress, :ingress].index(direction)
           service.security_group_rules.all('group-id' => id, 'direction' => direction)
         end
 

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

@@ -79,9 +79,15 @@ module Fog
           status == 'running'
         end
 
-        def reboot
+        def changing?
+          respond_to?(:transition_status) &&
+            transition_status && !transition_status.empty?
+        end
+
+        def reboot(wait = false)
           requires :id
           service.reboot_instances(id)
+          wait_for { status == 'running' and !changing? } if wait
           true
         end
 
@@ -173,15 +179,17 @@ module Fog
           Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
         end
 
-        def start
+        def start(wait = false)
           requires :id
           service.start_instances(id)
+          wait_for { status == 'running' and !changing? } if wait
           true
         end
 
-        def stop(force = false)
+        def stop(wait = false, force = false)
           requires :id
           service.stop_instances(id, force)
+          wait_for { status == 'stopped' and !changing? } if wait
           true
         end
 

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

@@ -26,6 +26,7 @@ module Fog
           data = service.describe_instances(filters).body['instance_set']
           load(data.map do |x| 
               x['vxnet_ids'] = x['vxnets'].map{|v| v['vxnet_id']}
+              x['image_id'] = x['image']['image_id']
               x
             end
           )
@@ -52,14 +53,19 @@ module Fog
           end
           
           # make sure port 22 is open in the first security group
-          authorized = security_group.ip_permissions.detect do |ip_permission|
-            ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
-            ip_permission['fromPort'] == 22 &&
-            ip_permission['ipProtocol'] == 'tcp' &&
-            ip_permission['toPort'] == 22
+          authorized = security_group.ingress_rules.detect do |rule|
+            rule.port_range == (22..22)
           end
           unless authorized
-            security_group.authorize_port_range(22..22)
+            security_group.add_rule(
+              'protocol' => 'tcp',
+              'priority' => 1,
+              'action' => 'accept',
+              'direction' => 0,
+              'port_range' => 22,
+              'name' => 'ssh',
+              'auto_apply' => true
+            )
           end
 
           server.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-fog
 version: !ruby/object:Gem::Version
-  version: 1.22.9
+  version: 1.22.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core