rest_connection 0.1.10 → 0.1.11

data/LICENSE

@@ -1,22 +1,10 @@
-#--
-# Copyright (c) 2010-2012 RightScale Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+Copyright (c) 2012 RightScale, Inc, All Rights Reserved Worldwide.
+
+THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
+reproduction, modification, or disclosure of this program is
+strictly prohibited.  Any use of this program by an authorized
+licensee is strictly subject to the terms and conditions,
+including confidentiality obligations, set forth in the applicable
+License Agreement between RightScale, Inc. and
+the licensee.

data/README.rdoc

@@ -13,7 +13,7 @@
 
 You must setup ~/.rest_connection/rest_api_config.yaml or /etc/rest_connection/rest_api_config.yaml
 
-Copy the example from GEMHOME/rest_connection/examples/rest_api_config.yaml.sample and fill in your connection info.
+Copy the example from GEMHOME/rest_connection/config/rest_api_config.yaml.sample and fill in your connection info.
 
   Pro Tip: to find a GEMHOME, use gemedit
   "gem install gemedit"

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/config/rest_api_config.yaml.sample

@@ -1,10 +1,13 @@
---- 
-:ssh_keys: 
+---
+:ssh_keys:
 - ~/.ssh/my_server_key
 - ~/.ssh/my_server_key-eu
 - ~/.ssh/my_server_key-west
 :pass: myUltraSecurePasswordz
 :user: myUserEmail@MyMailDomain.com
 :api_url: https://my.rightscale.com/api/acct/00000000
-:common_headers: 
+:common_headers:
   X_API_VERSION: "1.0"
+:azure_hack_on: true
+:azure_hack_retry_count: 5
+:azure_hack_sleep_seconds: 60

data/lib/rest_connection.rb

@@ -81,6 +81,9 @@ module RestConnection
         @@pass = ask("Password:") { |q| q.echo = false } unless @@pass
         @settings[:pass] = @@pass
       end
+      @settings[:azure_hack_on] ||= true
+      @settings[:azure_hack_retry_count] ||= 5
+      @settings[:azure_hack_sleep_seconds] ||= 60
     end
 
     # Main HTTP connection loop. Common settings are set here, then we yield(BASE_URI, OPTIONAL_HEADERS) to other methods for each type of HTTP request: GET, PUT, POST, DELETE
@@ -151,6 +154,7 @@ module RestConnection
     def get(href, additional_parameters = "")
       rest_connect do |base_uri,headers|
         new_href = (href =~ /^\// ? href : "#{base_uri}/#{href}")
+        puts("DEBUG: new_href get : #{new_href.inspect}")
         params = requestify(additional_parameters) || ""
         new_path = URI.escape(new_href + @settings[:extension] + "?") + params
         Net::HTTP::Get.new(new_path, headers)
@@ -165,6 +169,7 @@ module RestConnection
     def post(href, additional_parameters = {})
       rest_connect do |base_uri, headers|
         new_href = (href =~ /^\// ? href : "#{base_uri}/#{href}")
+        puts("DEBUG: new_href post : #{new_href.inspect}")
         res = Net::HTTP::Post.new(new_href , headers)
         unless additional_parameters.empty?
           res.set_content_type('application/json')
@@ -184,7 +189,9 @@ module RestConnection
       rest_connect do |base_uri, headers|
         new_href = (href =~ /^\// ? href : "#{base_uri}/#{href}")
         new_path = URI.escape(new_href)
+        puts("DEBUG: new_href put : #{new_href.inspect}")
         req = Net::HTTP::Put.new(new_path, headers)
+        puts("DEBUG: req  put : #{req.inspect}")
         req.set_content_type('application/json')
         req.body = additional_parameters.to_json
         req

data/lib/rest_connection/rightscale/mc_server.rb

@@ -57,7 +57,62 @@ class McServer < Server
   def launch
     if actions.include?("launch")
       t = URI.parse(self.href)
-      connection.post(t.path + '/launch')
+      begin
+        connection.post(t.path + '/launch')
+      rescue Exception => e
+        puts "************* McServer.launch(): Caught exception #{e.inspect}"
+        puts "************* McServer.launch(): connection.settings[:azure_hack_on] = #{connection.settings[:azure_hack_on]}"
+        puts "************* McServer.launch(): connection.settings[:azure_hack_retry_count] = #{connection.settings[:azure_hack_retry_count]}"
+        puts "************* McServer.launch(): connection.settings[:azure_hack_sleep_seconds] = #{connection.settings[:azure_hack_sleep_seconds]}"
+        # THIS IS A TEMPORARY HACK TO GET AROUND AZURE SERVER LAUNCH PROBLEMS AND SHOULD BE REMOVED ONCE MICROSOFT
+        # FIXES THIS BUG ON THEIR END!
+
+        # Retry on 422 conflict exception (ONLY MS AZURE WILL GENERATE THIS EXCEPTION)
+        target_422_conflict_error_message = "Invalid response HTTP code: 422: CloudException: ConflictError:"
+        target_504_gateway_timeout_error_message = "504 Gateway Time-out"
+        if e.message =~ /#{target_504_gateway_timeout_error_message}/
+          exception_matched_message = "McServer.launch(): Caught #{e.message}, treating as a successful launch..."
+          puts(exception_matched_message)
+          connection.logger(exception_matched_message)
+          true
+        elsif e.message =~ /#{target_422_conflict_error_message}/
+          if connection.settings[:azure_hack_on]
+            azure_hack_retry_count = connection.settings[:azure_hack_retry_count]
+            exception_matched_message = "************* McServer.launch(): Matched Azure exception: \"#{target_422_conflict_error_message}\""
+            puts(exception_matched_message)
+            connection.logger(exception_matched_message)
+
+            retry_count = 1
+            loop do
+              # sleep for azure_hack_sleep_seconds seconds
+              sleep_message = "************* McServer.launch(): Sleeping for #{connection.settings[:azure_hack_sleep_seconds]} seconds and then retrying (#{retry_count}) launch..."
+              puts(sleep_message)
+              connection.logger(sleep_message)
+              sleep(connection.settings[:azure_hack_sleep_seconds])
+
+              # retry the launch
+              begin
+                connection.post(t.path + '/launch')
+              rescue Exception => e2
+                if e2.message =~ /#{target_422_conflict_error_message}/
+                  azure_hack_retry_count -= 1
+                  if azure_hack_retry_count > 0
+                    retry_count += 1
+                    next
+                  else
+                    raise
+                  end
+                else
+                  raise
+                end
+              end
+              break
+            end
+          else
+            raise
+          end
+        end
+      end
     elsif self.state == "inactive"
       raise "FATAL: Server is in an unlaunchable state!"
     else

data/lib/rest_connection/rightscale/server.rb

@@ -455,4 +455,25 @@ class Server
     tags = tags.select { |tag| tag.start_with?("#{namespace}:") } if namespace
     self.remove_tags(*tags)
   end
+
+  def lock
+    unless self.settings['locked']
+      serv_href = URI.parse(self.href)
+      res = connection.put(serv_href.path, :server => {:lock => 'true'})
+      res.is_a?(Net::HTTPSuccess) ? true : false
+    else
+      connection.logger("Server is already locked")
+    end
+  end
+
+  def unlock
+    if self.settings['locked']
+      serv_href = URI.parse(self.href)
+      res = connection.put(serv_href.path, :server => {:lock => 'false'})
+      res.is_a?(Net::HTTPSuccess) ? true : false
+    else
+      connection.logger("Server is already unlocked")
+    end
+  end
+
 end

data/log_api_call_parser

@@ -0,0 +1,92 @@
+#!/usr/bin/ruby
+
+#--
+# Copyright (c) 2012 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited.  Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale, Inc. and
+# the licensee.
+#++
+
+########################################################################################################################
+# rest_connection API Call Parser Main program
+#
+# This program will parse a rest_connection.log produced from any given monkey run and display the:
+#		- API version
+#		- Request Type
+#		- Request
+#	in tabular format on STDOUT. It will also generate the csv file odf the same information.
+########################################################################################################################
+
+# Third party requires
+require 'rubygems'
+require 'trollop'
+require 'terminal-table'
+require 'tempfile'
+require 'csv'
+
+#
+# Parse and validate command line arguments
+#
+opts = Trollop::options do
+	banner <<-EOS
+Usage:
+log_api_call_parser [options]
+ where [options] are:
+	EOS
+	opt :input,  		"Path to the input file in standard rest_connection logger format", :short => "-i", :type => String, :required => true
+	opt :csv_file,  "Path to the csv output file", 																			:short => "-o", :type => String, :required => true
+end
+
+# Open the input file and read it into an array
+input_file = File.open(opts[:input])
+log_file_array = input_file.readlines
+input_file.close
+
+# Loop over the array and for each row, parse out the api version, request type and the request
+# and add them to output_array for later sorting and writing.
+output_array = []
+search_string = "INFO -- :"
+log_file_array.each { |element|
+	if element[0..2] == "I, "
+		# Find the API version start column as this can vary at least per log file and maybe even per line
+		api_version_start_column = element.index(search_string)
+		api_version_start_column = api_version_start_column + search_string.length + 1
+
+		# Get the elements
+		element = element[api_version_start_column..-1]
+		version = element[5..8]
+		request_type = element[11..13]
+		if request_type == "GET" || request_type == "PUT"
+			request = element[16..-1]
+			output_array.push "#{version},#{request_type},#{request}"
+		end
+	end
+}
+
+# Sort the output array by API version
+output_array.sort! {|a,b| a <=> b}
+
+# Remove duplicates
+output_array.uniq!
+
+# Write out the CSV file
+csv_file = File.open(opts[:csv_file], "w")
+csv_file_name = csv_file.path()
+output_array.each { |element| csv_file.puts element }
+csv_file.close
+
+# Generate a table version and write that out to STDOUT
+csv_array = CSV.read(csv_file_name)
+table = Terminal::Table.new
+csv_array.collect do |line|
+	table << line
+	table << :separator
+end
+puts table
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -210,6 +210,7 @@ files:
 - lib/rest_connection/rightscale/user.rb
 - lib/rest_connection/rightscale/vpc_dhcp_option.rb
 - lib/rest_connection/ssh_hax.rb
+- log_api_call_parser
 - spec/ec2_server_array_spec.rb
 - spec/ec2_ssh_key_internal_spec.rb
 - spec/image_jockey.rb
@@ -253,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Modular RESTful API library