rest_connection 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/rest_connection/rightscale/ec2_ebs_snapshot.rb

@@ -0,0 +1,20 @@
+#    This file is part of RestConnection 
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+class Ec2EbsSnapshot
+  include  RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+end

data/lib/rest_connection/rightscale/ec2_ebs_volume.rb

@@ -0,0 +1,20 @@
+#    This file is part of RestConnection 
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+class Ec2EbsVolume
+  include  RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+end

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -26,3 +26,6 @@ require 'rest_connection/rightscale/multi_cloud_image'
 require 'rest_connection/rightscale/tag'
 require 'rest_connection/rightscale/rs_internal'
 require 'rest_connection/rightscale/audit_entry'
+require 'rest_connection/rightscale/ec2_ebs_volume'
+require 'rest_connection/rightscale/ec2_ebs_snapshot'
+

data/lib/rest_connection/rightscale/server.rb

@@ -139,9 +139,15 @@ class Server
     @params.merge! connection.get(serv_href.path + "/monitoring")
   end
 
-  def reboot
+  # takes Bool argument to wait for state change (insurance that we can detect a reboot happened)
+  def reboot(wait_for_state = false)
+    reload
+    old_state = self.state
     serv_href = URI.parse(self.href)
     connection.post(serv_href.path + "/reboot") 
+    if wait_for_state
+      wait_for_state_change(old_state)
+    end
   end
 
   def events
@@ -156,6 +162,20 @@ class Server
     self.start  
   end
 
+  def wait_for_state_change(old_state = nil)
+    timeout = 60*7
+    timer = 0
+    while(timer < timeout)
+      reload
+      old_state = self.state unless old_state
+      connection.logger("#{nickname} is #{self.state}")
+      return true if self.state != old_state
+      sleep 5
+      timer += 5
+      connection.logger("waiting for server #{nickname} to change from #{old_state} state.")
+    end
+    raise("FATAL: timeout after #{timeout}s waiting for state change")
+  end
 
 #  DOES NOT WORK: fragile web scraping
 #  def relaunch

data/lib/rest_connection/ssh_hax.rb

@@ -20,6 +20,8 @@ require 'net/ssh'
 # The mixin typically used from Server#run_recipe
 module SshHax
 
+  SSH_RETRY_COUNT = 3
+
   def ssh_key_config(item)
     if item.is_a?(Array)
       ssh_keys = item
@@ -146,6 +148,10 @@ module SshHax
     connection.logger "SSHing to #{host_dns} using key(s) #{ssh_key_config(ssh_key)}"
     status = nil
     output = ""
+    success = false
+    retry_count = 0
+    while (!success && retry_count < SSH_RETRY_COUNT) do
+    begin
     Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key)) do |ssh|
       cmd_channel = ssh.open_channel do |ch1|
         ch1.on_request('exit-status') do |ch, data|
@@ -158,7 +164,6 @@ module SshHax
             status = 1
           end
           ch2.on_data do |ch, data|
-
             output += data
           end
           ch2.on_extended_data do |ch, type, data|
@@ -167,6 +172,11 @@ module SshHax
         end
       end
     end
+    rescue Exception => e
+      retry_count += 1 # opening the ssh channel failed -- try again.
+      sleep 10
+    end
+    end
     connection.logger output
     return {:status => status, :output => output}
   end 

data/rest_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2010-04-15}
+  s.date = %q{2010-04-20}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
      "lib/rest_connection.rb",
      "lib/rest_connection/rightscale/audit_entry.rb",
      "lib/rest_connection/rightscale/deployment.rb",
+     "lib/rest_connection/rightscale/ec2_ebs_snapshot.rb",
+     "lib/rest_connection/rightscale/ec2_ebs_volume.rb",
      "lib/rest_connection/rightscale/ec2_security_group.rb",
      "lib/rest_connection/rightscale/ec2_server_array.rb",
      "lib/rest_connection/rightscale/ec2_ssh_key.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +00:00
+date: 2010-04-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,8 @@ files:
 - lib/rest_connection.rb
 - lib/rest_connection/rightscale/audit_entry.rb
 - lib/rest_connection/rightscale/deployment.rb
+- lib/rest_connection/rightscale/ec2_ebs_snapshot.rb
+- lib/rest_connection/rightscale/ec2_ebs_volume.rb
 - lib/rest_connection/rightscale/ec2_security_group.rb
 - lib/rest_connection/rightscale/ec2_server_array.rb
 - lib/rest_connection/rightscale/ec2_ssh_key.rb