rhc 1.1.11 → 1.2.7

data/features/cartridge.feature

@@ -1,4 +1,4 @@
-@single_cartridge @domain_required
+@single_cartridge @domain_required @cartridge_storage_user_required
 Feature: Single Cartridge Tests
 
   # Need to keep these outlines duplicated until we update cucumber to allow tagged examples
@@ -32,3 +32,16 @@ Feature: Single Cartridge Tests
       | php-5.3     | PHP 5.3       |
       | mongodb-2.2 | MongoDB NoSQL |
       | cron-1.4    | Cron 1.4      |
+
+#  Commenting this out for US2438
+#  Scenario Outline: Cartridge Storage
+#    Given we have a running mysql-5.1 cartridge
+#    When we <action> storage for the mysql-5.1 cartridge
+#    Then the additional cartridge storage amount should be <total>
+#
+#    Examples:
+#      | action     | total |
+#      | show       | None  |
+#      | add 5GB    | 5GB   |
+#      | remove 3GB | 2GB   |
+#      | set 4GB    | 4GB   |

data/features/domain.feature

@@ -17,7 +17,7 @@ Feature: Existing Domain Operations
 
   Scenario: Domain Create Fails
     When rhc domain create is called
-    Then the domain command should fail with an exitcode of 128
+    Then the domain command should fail with an exitcode of 103
 
   Scenario: Domain Delete
     When domain is deleted

data/features/lib/rhc_helper.rb

@@ -6,13 +6,13 @@ require 'tmpdir'
 module RHCHelper
   TEMP_DIR = File.join(Dir.tmpdir, "rhc") unless const_defined?(:TEMP_DIR)
   # The regex to parse the UUID output from the create app results
-  UUID_OUTPUT_PATTERN = %r|UUID\s*=\s*(.+)| unless const_defined?(:UUID_OUTPUT_PATTERN)
+  UUID_OUTPUT_PATTERN = /UUID\s*(?:\:|=)\s*(.+)/i unless const_defined?(:UUID_OUTPUT_PATTERN)
   # The regex to parse the Gear Profile output from the create app results
-  GEAR_PROFILE_OUTPUT_PATTERN = %r|Application Info.*Gear Size\s*=\s*(\w+)|m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
+  GEAR_PROFILE_OUTPUT_PATTERN = /Info.*Gear Size\s*(?:\:|=)\s*(\w+)/m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
   # Regex to parse passwords out of logging messages
   PASSWORD_REGEX = / -p [^\s]* / unless const_defined?(:PASSWORD_REGEX)
 end
-
+\
 require 'rhc_helper/loggable'
 require 'rhc_helper/commandify'
 require 'rhc_helper/httpify'

data/features/lib/rhc_helper/app.rb

@@ -36,15 +36,23 @@ module RHCHelper
       #   2 - password
       #   3 - upload SSH keys
       #   4 - if no namespace is found, create namespace? (blank is no)
+      args = [$username, $password]
+      args << 'yes' unless ($keyed_users ||= []).include?($username)
+      puts "User #{$username} has no keys" if args.length == 3
+      args << '' # always skip namespace
       if $namespace
         # Namespace is already created, so don't pass anything in
         logger.info("Namespace (#{$namespace}) should be found by the wizard")
-        run("rhc setup", nil, [$username, $password, 'yes', ""])
+        run("rhc setup", nil, args) do |exitstatus, out, err, arg|
+          raise "Unmatched namespace #{$namespace}" unless out.include?($namespace)
+        end
       else
         # Pass in a blank value for namespace to create in the next step
+        args << ''
         logger.info("Skipping namespace creation")
-        run("rhc setup", nil, [$username, $password, 'yes', "", ""])
+        run("rhc setup", nil, args)
       end
+      $keyed_users << $username
     end
 
     def self.create_unique(type, scalable, gear_profile=nil, prefix="test")
@@ -58,7 +66,7 @@ module RHCHelper
           test_names << app.name if app.name.start_with?(prefix)
         end
       end
-      
+
       loop do
         # Generate a random application name
         chars = ("1".."9").to_a

data/features/lib/rhc_helper/cartridge.rb

@@ -78,6 +78,14 @@ module RHCHelper
       status
     end
 
+    def storage(cartridge, args)
+      output = nil
+      rhc_cartridge("storage #{cartridge} #{args}") do |exitstatus, out, err, arg|
+        output = out.split(" ")[-1]
+      end
+      output
+    end
+
     def show
       result = ""
       rhc_cartridge('show') do |exitstatus, out, err, arg|

data/features/lib/rhc_helper/domain.rb

@@ -27,13 +27,14 @@ module RHCHelper
 
     def self.create_if_needed(prefix="test")
       unless $namespace
-        $namespace = unique_namespace(prefix)
-        # Create the domain
-        rhc_domain_create
-
-        # Write the new domain to a file in the temp directory
-        File.open(File.join(RHCHelper::TEMP_DIR, 'namespace'), 'w') do |f|
-          f.write($namespace)
+        client = RHC::Rest::Client.new($end_point, $username, $password)
+        domain = client.domains.first
+        if domain
+          $namespace = domain.id
+        else
+          $namespace = unique_namespace(prefix)
+          # Create the domain
+          rhc_domain_create
         end
       end
     end
@@ -45,9 +46,6 @@ module RHCHelper
     def self.delete
       rhc_domain_delete
       $namespace = nil
-      # Write the new domain to a file in the temp directory
-      namespace_file = File.join(RHCHelper::TEMP_DIR, 'namespace')
-      File.delete(namespace_file) if File.exists?(namespace_file)
     end
 
     def self.update(prefix="update")
@@ -55,12 +53,7 @@ module RHCHelper
       $namespace = unique_namespace(prefix)
       rhc_domain_update
 
-      namespace_file = File.join(RHCHelper::TEMP_DIR, 'namespace')
       if @exitcode == 0
-        # Write the new domain to a file in the temp directory
-        File.open(namespace_file, 'w') do |f|
-          f.write($namespace)
-        end
       else
         $namespace = $old_namespace
       end

data/features/lib/rhc_helper/httpify.rb

@@ -70,25 +70,26 @@ module RHCHelper
       begin
         timeout(options[:timeout]) do
           loop do
+            logger.debug "HTTP_CHECK: Requesting: #{uri}"
             # Send the HTTP request
             response = begin
                          http = http_instance(uri,options[:http_timeout])
-                         logger.debug "Requesting: #{uri}"
                          http.send_request(
                            options[:method].to_s.upcase, # Allow options to be a symbol
                            uri.request_uri, nil, headers
                          )
                        rescue Exception => e
                          # Pass these up so we can check them
-                         return e
+                         e
                        end
-
+            logger.debug "HTTP_CHECK: Response: #{response.class}"
             case response
               # Catch any response if we're expecting it or redirection
             when expected.class, Net::HTTPRedirection
               break
               # Retry these responses
-            when Net::HTTPServiceUnavailable, SocketError
+            when Net::HTTPServiceUnavailable, SocketError, Timeout::Error
+              logger.debug "HTTP_CHECK: Error #{response.message}"
               my_sleep(response,expected,start,options)
             else
               case expected
@@ -123,13 +124,17 @@ module RHCHelper
 
     def is_inaccessible?(options = {})
       check_response(options.merge({
-        :expected => Net::HTTPServiceUnavailable
+        :expected => Net::HTTPServiceUnavailable,
+        :http_timeout => 2,
+        :timeout => 60,
       }))
     end
 
     def is_accessible?(options = {})
       check_response(options.merge({
-        :expected => Net::HTTPSuccess
+        :expected => Net::HTTPSuccess,
+        :http_timeout => 20,
+        :timeout => 180,
       }))
     end
 

data/features/lib/rhc_helper/runnable.rb

@@ -1,10 +1,28 @@
 require 'open4'
 require 'timeout'
+require 'iconv'
+require 'rubygems'
 
 module RHCHelper
   module Runnable
     include Loggable
 
+    class StringTee < StringIO
+      attr_reader :tee
+      def initialize(other)
+        @tee = other
+        super()
+      end
+      def <<(buf)
+        tee << buf
+        super
+      end
+    end
+
+    def iconv_handler
+      @iconv ||= Iconv.new('UTF-8//IGNORE', 'UTF-8')
+    end
+
     def run(cmd, arg=nil, input=[])
       logger.info("Running: #{cmd}")
 
@@ -12,17 +30,35 @@ module RHCHelper
       output = nil
 
       # Don't let a command run more than 5 minutes
-      Timeout::timeout(500) do
-        pid, stdin, stdout, stderr = Open4::popen4 cmd
-        input.each {|line| stdin.puts line}
-        stdin.close
+      Timeout::timeout(240) do
+
+        stdout, stderr = (ENV['VERBOSE'] ? [$stdout, $stderr] : [logger, logger]).map{ |t| StringTee.new(t) }
+        stdin = input.inject(StringIO.new){ |io, s| io.puts s; io }
+        stdin.close_write
+        stdin.rewind
+        status = Open4.spawn(cmd, 'stdout' => stdout, 'stderr' => stderr, 'stdin' => stdin, 'quiet' => true)
+        out, err = [stdout, stderr].map(&:string)
+
+        #pid, stdin, stdout, stderr = Open4::popen4 cmd
+        #input.each {|line| stdin.puts line}
+        #stdin.close
 
         # Block until the command finishes
-        ignored, status = Process::waitpid2 pid
-        out = stdout.read.strip
-        err = stderr.read.strip
+        #ignored, status = Process::waitpid2 pid
+        #out = stdout.read.strip
+        #err = stderr.read.strip
         stdout.close
         stderr.close
+
+        # Force the output to ASCII-only characters or logger will barf.
+        if (Gem::Version.new(RUBY_VERSION.dup) <=> Gem::Version.new('1.9.3')) >= 0
+          out.encode!('UTF-8', 'UTF-8', :undef => :replace, :invalid => :replace)
+          err.encode!('UTF-8', 'UTF-8', :undef => :replace, :invalid => :replace)
+        else
+          out = iconv_handler.iconv(out + ' ')[0..-2]
+          err = iconv_handler.iconv(err + ' ')[0..-2]
+        end
+
         logger.debug("Standard Output:\n#{out}")
         logger.debug("Standard Error:\n#{err}")
 

data/features/sshkey.feature

@@ -28,7 +28,7 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add
   Scenario: invalid key name is given
     When a new SSH key "key1.pub" is added as "blah\\ss"
-    Then the command exits with status code 128
+    Then the command exits with status code 117
 
   @sshkey_add
   Scenario: invalid SSH key is added
@@ -43,14 +43,13 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add @key1
   Scenario: SSH key with the same name already exists
     When a new SSH key "key2.pub" is added as "key1"
-    Then the command exits with status code 128
+    Then the command exits with status code 120
 
   @sshkey_add
   Scenario: SSH key with the identical content already exists
     Given a new SSH key "key1.pub" is added as "key1"
     And a new SSH key "key1.pub" is added as "key2"
-    Then the command exits with status code 128
-  
+    Then the command exits with status code 121  
 
   @sshkey_remove @key1
   Scenario: SSH key is deleted successfully

data/features/step_definitions/application_steps.rb

@@ -25,9 +25,9 @@ Given /^an existing (or new )?(scaled )?(.+) (application with.*)$/ do |create,
   @app = nil if @app.nil? or not @app.is_created?
 
   if create && @app.nil?
-    When "a #{scaled}#{type} application is created"
+    step "a #{scaled}#{type} application is created"
     embeds.each do |embed|
-      When "the #{embed} cartridge is added"
+      step "the #{embed} cartridge is added"
     end
   end
 
@@ -45,7 +45,7 @@ end
 When /^(\d+) (.+) applications are created$/ do |app_count, type|
   old_app = @app
   @apps = app_count.to_i.times.collect do
-    Then "a #{type} application is created"
+    step "a #{type} application is created"
     @app
   end
   @app = old_app
@@ -88,7 +88,7 @@ end
 Then /^the applications should be accessible?$/ do
   old_app = @app
   @apps.each do |app|
-    Then "the application should be accessible"
+    step "the application should be accessible"
   end
   @app = old_app
 end
@@ -110,7 +110,7 @@ Then /^it should succeed$/ do
 end
 
 Then /^the application should be scalable/ do
-  Then "the haproxy-1.4 cartridge should be running"
+  step "the haproxy-1.4 cartridge should be running"
 end
 
 Then /^the application should have a (.*) gear$/ do |gear_profile|

data/features/step_definitions/cartridge_steps.rb

@@ -19,6 +19,8 @@ When /^the (.+) cartridge is (stopped|(?:re)?started)$/ do |name,command|
           'start'
         when :restarted
           'restart'
+        else
+          raise "Unrecognized command type #{status}"
         end
   @app.cartridge(name).send(cmd)
 end
@@ -31,6 +33,8 @@ Then /^the (.+) cartridge should be (.*)$/ do |name,status|
                "(.+) stopped"
              when :removed
                "Invalid cartridge specified: '#{name}'"
+             else
+               raise "Unrecognized status type #{status}"
              end
   @app.cartridge(name).status.should match(expected)
 end
@@ -51,6 +55,10 @@ When /^we list cartridges$/ do
   @exitcode, @cartridge_output = Cartridge.list
 end
 
+When /^we (.+) storage for the (.+) cartridge$/ do |storage_action,cartridge|
+  @output = @app.cartridge(@cartridge_name).send(:storage, cartridge, "--#{storage_action}")
+end
+
 Then /^the (\w+) scaling value should be (.*)$/ do |minmax,value|
   expected = {
     :min => "Minimum",
@@ -65,6 +73,10 @@ Then /^the (\w+) scaling value should be (.*)$/ do |minmax,value|
   @app.cartridge(@cartridge_name).send(:show).should match(regex)
 end
 
+Then /^the additional cartridge storage amount should be (\w+)$/ do |value|
+  @output.should == value
+end
+
 Then /^it should fail with code (\d+)$/ do |code|
   @exitcode.should == code.to_i
 end

data/features/step_definitions/client_steps.rb

@@ -22,6 +22,7 @@ Given /^the libra client tools$/ do
 end
 
 When /^the setup wizard is run$/ do
+  puts "Running setup"
   RHCHelper::App.rhc_setup
 
   # Force a refresh of the loaded RHC state
@@ -29,10 +30,10 @@ When /^the setup wizard is run$/ do
 end
 
 Then /^the client tools should be setup( if needed)?$/ do |setup|
-  configured = (RHC::Config.has_local_config? or RHC::Config.has_opts_config?)
+  configured = (RHC::Config.default_rhlogin && RHC::Config.default_rhlogin == $username && $keyed_users.include?($username))
 
   if !configured && setup
-    Then 'the setup wizard is run'
+    step 'the setup wizard is run'
     configured = (RHC::Config.has_local_config? or RHC::Config.has_opts_config?)
   end
 

data/features/step_definitions/sshkey_steps.rb

@@ -9,7 +9,7 @@ When /^'rhc sshkey (\S+)( .*?)?'(?: command)? is run$/ do |subcommand, rest|
 end
 
 Given "the existing keys are listed" do
-  When "'rhc sshkey list' is run"
+  step "'rhc sshkey list' is run"
 end
 
 Given /^the key "(.*?)" is (.*)$/ do |key,cmd|
@@ -19,12 +19,12 @@ Given /^the key "(.*?)" is (.*)$/ do |key,cmd|
         when "removed"
           "remove"
         end
-  When "'rhc sshkey #{cmd} \"#{key}\"' is run"
+  step "'rhc sshkey #{cmd} \"#{key}\"' is run"
 end
 
 When /^a new SSH key "(.*?)" is added as "(.*)"$/ do |keyfile, name|
   keyfile = Sshkey.keyfile_path(keyfile)
-  When "'rhc sshkey add #{name} #{keyfile}' is run"
+  step "'rhc sshkey add #{name} #{keyfile}' is run"
 end
 
 Then /^the command exits with status code (\d+)$/ do |arg1|

data/features/support/assumptions.rb

@@ -1,16 +1,16 @@
 Given 'we have the client tools setup' do
-  When 'the libra client tools'
-  When 'the client tools should be setup if needed'
+  step 'the libra client tools'
+  step 'the client tools should be setup if needed'
 end
 
 Given 'we have an existing domain' do
-  When 'we have the client tools setup'
-  When 'a new domain is needed and created'
+  step 'we have the client tools setup'
+  step 'a new domain is needed and created'
   begin
-    When 'the key "key1" is shown'
-    Then 'the output includes the key information for "key1"'
+    step 'the key "key1" is shown'
+    step 'the output includes the key information for "key1"'
   rescue Spec::Expectations::ExpectationNotMetError
-    Given 'a new SSH key "key1.pub" is added as "key1"'
+    step 'a new SSH key "key1.pub" is added as "key1"'
   end
 end
 
@@ -26,9 +26,9 @@ Given /^we have a (.*) (.*) cartridge$/ do |status,type|
   #  only try once
   retried = false
   begin
-    When "the #{type} cartridge should be #{status}"
+    step "the #{type} cartridge should be #{status}"
   rescue Spec::Expectations::ExpectationNotMetError
-    When "the #{type} cartridge is #{cmd}"
+    step "the #{type} cartridge is #{cmd}"
     (retried = true && retry) unless retried
   end
 end
@@ -42,8 +42,8 @@ Given /^we have a (stopped|running) application$/ do |state|
                    end
 
   begin
-    When "the application should #{before}"
+    step "the application should #{before}"
   rescue Spec::Expectations::ExpectationNotMetError
-    When "the application is #{after}"
+    step "the application is #{after}"
   end
 end