rhc 1.1.11 → 1.2.7

data/spec/rest_spec_helper.rb

@@ -111,6 +111,8 @@ module RestSpecHelper
       carts << {
         :name  => "mock_cart_#{carts.length}",
         :type  => "mock_cart_#{carts.length}_type",
+        :base_gear_storage => 1,
+        :additional_gear_storage => 0,
         :links => mock_response_links(mock_cart_links('mock_domain','mock_app',"mock_cart_#{carts.length}"))
       }
     end
@@ -140,6 +142,10 @@ module RestSpecHelper
     }
   end
 
+  def mock_cart_properties
+    {:cart_data => {:connection_url => {'name' => 'connection_url', 'value' => "http://fake.url" }}}
+  end
+
   class MockRestClient < RHC::Rest::Client
     def initialize
       RHC::Rest::Client.stub(:new) { self }
@@ -286,9 +292,9 @@ module RestSpecHelper
       @domain.applications.delete self
     end
 
-    def add_cartridge(name, embedded=true)
+    def add_cartridge(name, embedded=true, additional_storage=0)
       type = embedded ? "embedded" : "standalone"
-      c = MockRestCartridge.new(name, type, self)
+      c = MockRestCartridge.new(name, type, self, mock_cart_properties, additional_storage)
       @cartridges << c
       c
     end
@@ -324,9 +330,10 @@ module RestSpecHelper
   end
 
   class MockRestCartridge < RHC::Rest::Cartridge
-    attr_accessor :scales_to, :scales_from, :current_scale, :scales_with, :display_name
-    def initialize(name, type, app=nil, properties={:cart_data => {:connection_url => {'name' => 'connection_url', 'value' => "http://fake.url" }}})
+    attr_accessor :scales_to, :scales_from, :current_scale, :scales_with, :display_name, :base_gear_storage, :additional_gear_storage
+    def initialize(name, type, app=nil, properties=mock_cart_properties, additional_storage=0)
       @name = name
+      @display_name = name
       @type = type
       @app = app
       @properties = properties
@@ -334,6 +341,8 @@ module RestSpecHelper
       @scales_from = 1
       @scales_to = 1
       @current_scale = 1
+      @base_gear_storage = 1
+      @additional_gear_storage = additional_storage
     end
 
     def destroy
@@ -369,6 +378,11 @@ module RestSpecHelper
       @scales_to = values[:scales_to] if values[:scales_to]
       self
     end
+
+    def set_storage(values)
+      @additional_gear_storage = values[:additional_storage]
+      self
+    end
   end
 
   class MockRestKey < RHC::Rest::Key

data/spec/rhc/commands/cartridge_spec.rb

@@ -346,4 +346,95 @@ describe RHC::Commands::Cartridge do
       end
     end
   end
+
+=begin
+#  Commenting this out for US2438
+  describe 'cartridge storage' do
+    let(:cmd_base) { ['cartridge', 'storage'] }
+    let(:std_args) { ['-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] | (@extra_args || []) }
+    let(:cart_type) { ['mock_cart-1'] }
+
+    before(:each) do
+      @rc = MockRestClient.new
+      domain = @rc.add_domain("mock_domain")
+      app = domain.add_application("app1", "mock_type", false)
+      app.add_cartridge('mock_cart-1', true, 5)
+    end
+
+    context 'when run with no arguments' do
+      let(:arguments) { cmd_base | std_args }
+      it "should show a list of storage info for all carts" do
+        run_output.should match('mock_type')
+        run_output.should match('mock_cart-1')
+      end
+    end
+
+    context 'when run for a non-existent cartridge' do
+      let(:arguments) { cmd_base | ['bogus_cart'] | std_args }
+      it { fail_with_message("Cartridge bogus_cart can't be found in application", 154) }
+    end
+
+    context 'when run with -c flag' do
+      let(:arguments) { cmd_base | ['-c', 'mock_cart-1'] | std_args}
+      it "should show storage info for the indicated app and cart" do
+        run_output.should match('mock_cart-1')
+        run_output.should_not match('mock_type')
+      end
+
+      it "should set storage for the indicated app and cart" do
+        @extra_args = ["--set", "6GB"]
+        run_output.should match('6GB')
+      end
+    end
+
+    context 'when run with valid arguments' do
+      let(:arguments) { cmd_base | cart_type | std_args }
+      it "should show storage info for the indicated app and cart" do
+        @extra_args = ["--show"]
+        run_output.should match('mock_cart-1')
+        run_output.should_not match('mock_type')
+      end
+      it "should add storage for the indicated app and cart" do
+        @extra_args = ["--add", "5GB"]
+        run_output.should match('10GB')
+      end
+      it "should remove storage for the indicated app and cart" do
+        @extra_args = ["--remove", "5GB"]
+        run_output.should match('None')
+      end
+      it "should warn when told to remove more storage than the indicated app and cart have" do
+        @extra_args = ["--remove", "70GB"]
+        fail_with_message('The amount of additional storage to be removed exceeds the total amount in use')
+      end
+      it "should not warn when told to remove more storage than the indicated app and cart have when forced" do
+        @extra_args = ["--remove", "70GB", "--force"]
+        run_output.should match('None')
+      end
+      it "should set storage for the indicated app and cart" do
+        @extra_args = ["--set", "6GB"]
+        run_output.should match('6GB')
+      end
+      it "should work correctly with a bare number value" do
+        @extra_args = ["--set", "6"]
+        run_output.should match('6GB')
+      end
+    end
+
+    context 'when run with invalid arguments' do
+      let(:arguments) { cmd_base | cart_type | std_args }
+      it "should raise an error when multiple storage operations are provided" do
+        @extra_args = ["--show", "--add", "5GB"]
+        fail_with_message('Only one storage action can be performed at a time')
+      end
+      it "should raise an error when the storage amount is not provided" do
+        @extra_args = ["--set"]
+        fail_with_message('missing argument')
+      end
+      it "should raise an error when the storage amount is invalid" do
+        @extra_args = ["--set", "5ZB"]
+        fail_with_message("The amount format must be a number, optionally followed by 'GB'")
+      end
+    end
+  end
+=end
 end

data/spec/rhc/commands/domain_spec.rb

@@ -9,15 +9,19 @@ describe RHC::Commands::Domain do
   end
 
   describe 'default action' do
-    let(:arguments) { ['domain', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
-
     context 'when run with no domains' do
+      let(:arguments) { ['domain', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       before(:each) do
         @rc = MockRestClient.new
       end
       it { expect { run }.should exit_with_code(0) }
       it { run_output.should match(/No domain exists.  You can use/) }
     end
+    context 'when help is shown' do
+      let(:arguments) { ['domain', '--noprompt', '--help'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match(/The default action for this resource is 'show'/) }
+    end
   end
 
   describe 'show' do

data/spec/rhc/commands/port-forward_spec.rb

@@ -12,32 +12,32 @@ describe RHC::Commands::PortForward do
   describe 'run' do
     let(:arguments) { ['port-forward', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp'] }
 
-    context 'when port forwarding a scaled app' do
+    before :each do
+      @rc = MockRestClient.new
+      @domain = @rc.add_domain("mockdomain")
+      @app = @domain.add_application 'mockapp', 'mock-1.0'
+      @uri = URI.parse @app.ssh_url
+      @ssh = mock(Net::SSH)
+    end
+
+    context 'when port forwarding for a down appl' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        domain.add_application 'mockapp', 'mock-1.0', true
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh)
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, '127.0.0.1:3306')
+        @gg = MockRestGearGroup.new
+        @app.should_receive(:gear_groups).and_return([@gg])
+        @gg.should_receive(:gears).and_return([{'state' => 'stopped', 'id' => 'fakegearid'}])
       end
-      it "should error out" do
-        expect { run }.should exit_with_code(128)
-      end
-      it "should match the app state" do
-        @rc.domains[0].id.should == 'mockdomain'
-        @rc.domains[0].applications.size.should == 1
-        @rc.domains[0].applications[0].name.should == 'mockapp'
+      it "should error out and suggest restarting the application" do
+        expect { run }.should exit_with_code(1)
       end
-      it { run_output.should match("This utility does not currently support scaled applications. You will need to set up port forwarding manually.") }
+      it { run_output.should match(/Application \S+ is stopped\..*restart/m) }
     end
 
     context 'when port forwarding an app without ports to forward' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        app = domain.add_application 'mockapp', 'mock-1.0'
-        uri = URI.parse app.ssh_url
-        ssh = mock(Net::SSH)
-        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh)
-        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, '127.0.0.1:3306')
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh)
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, '127.0.0.1:3306')
       end
       it "should error out as no ports to forward" do
         expect { run }.should exit_with_code(102)
@@ -50,13 +50,8 @@ describe RHC::Commands::PortForward do
 
     context 'when port forwarding an app with permission denied ports' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        app = domain.add_application 'mockapp', 'mock-1.0'
-        ssh = mock(Net::SSH)
-        uri = URI.parse app.ssh_url
-        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh)
-        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'permission denied')
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh)
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'permission denied')
       end
       it "should error out as permission denied" do
         expect { run }.should exit_with_code(129)
@@ -69,34 +64,31 @@ describe RHC::Commands::PortForward do
 
     context 'when port forwarding an app with ports to forward' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        app = domain.add_application 'mockapp', 'mock-1.0'
-        ssh = mock(Net::SSH)
-        uri = URI.parse app.ssh_url
-        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh).twice
-        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stdout, '127.0.0.1:3306')
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
         forward = mock(Net::SSH::Service::Forward)
-        ssh.should_receive(:forward).and_return(forward)
-        forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
-        ssh.should_receive(:loop)
+        @ssh.should_receive(:forward).and_return(forward)
+        if mac?
+          forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
+        else
+          forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
+        end
+        @ssh.should_receive(:loop)
       end
-      it "should error out as no ports to forward" do
+      it "should run successfully" do
         expect { run }.should exit_with_code(0)
         @rc.domains[0].id.should == 'mockdomain'
         @rc.domains[0].applications.size.should == 1
         @rc.domains[0].applications[0].name.should == 'mockapp'
       end
-      it { run_output.should include("Forwarding ports, use ctl + c to stop") }
+      it { run_output.should match(/Forwarding ports.*Press CTRL-C/m) }
     end
 
-    context 'when port forwarding an app with ports to forward' do
+    context 'when host is unreachable' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        app = domain.add_application 'mockapp', 'mock-1.0'
+        Net::SSH.should_receive(:start).and_raise(Errno::EHOSTUNREACH)
       end
-      it "should error out if ssh host is unreachable" do
+      it "should error out" do
         expect { run }.should exit_with_code(1)
         @rc.domains[0].id.should == 'mockdomain'
         @rc.domains[0].applications.size.should == 1
@@ -105,19 +97,28 @@ describe RHC::Commands::PortForward do
       it { run_output.should include("Error trying to forward ports.") }
     end
 
+    context 'when REST client connection times out' do
+      before(:each) do
+        @rc.should_receive(:find_domain).and_raise(RestClient::ServerBrokeConnection)
+      end
+      it "should error out" do
+        expect { run }.should exit_with_code(1)
+      end
+      it { run_output.should match("Connection.*failed:") }
+    end
+
     context 'when port forwarding an app with ports to forward' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        app = domain.add_application 'mockapp', 'mock-1.0'
-        ssh = mock(Net::SSH)
-        uri = URI.parse app.ssh_url
-        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh).twice
-        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stdout, '127.0.0.1:3306')
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
         forward = mock(Net::SSH::Service::Forward)
-        ssh.should_receive(:forward).and_return(forward)
-        forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
-        ssh.should_receive(:loop).and_raise(Interrupt.new)
+        @ssh.should_receive(:forward).and_return(forward)
+        if mac?
+          forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
+        else
+          forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
+        end
+        @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end
       it "should exit when user interrupts" do
         expect { run }.should exit_with_code(0)
@@ -128,6 +129,46 @@ describe RHC::Commands::PortForward do
       it { run_output.should include("Ending port forward") }
     end
 
-   end
+    context 'when host refuses connection' do
+      before(:each) do
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
+        forward = mock(Net::SSH::Service::Forward)
+        @ssh.should_receive(:forward).and_raise(Errno::ECONNREFUSED)
+      end
+      it "should error out" do
+        expect { run }.should exit_with_code(0)
+      end
+      it { run_output.should include("ssh -N") }
+      it { run_output.should include("Error forwarding") }
+    end
+
+    context 'when port forwarding a scaled app with ports to forward' do
+      before(:each) do
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, "httpd -> 127.0.0.1:8080\nhttpd -> 127.0.0.2:8080")
+        forward = mock(Net::SSH::Service::Forward)
+        @ssh.should_receive(:forward).at_least(3).times.and_return(forward)
+        if mac?
+          forward.should_receive(:local).with(8080, '127.0.0.1', 8080)
+          forward.should_receive(:local).with(8080, '127.0.0.2', 8080).and_raise(Errno::EADDRINUSE)
+          forward.should_receive(:local).with(8081, '127.0.0.2', 8080)
+        else
+          forward.should_receive(:local).with('127.0.0.1', 8080, '127.0.0.1', 8080)
+          forward.should_receive(:local).with('127.0.0.2', 8080, '127.0.0.2', 8080).and_raise(Errno::EADDRINUSE)
+          forward.should_receive(:local).with('127.0.0.2', 8081, '127.0.0.2', 8080)
+        end
+        @ssh.should_receive(:loop).and_raise(Interrupt.new)
+      end
+      it "should exit when user interrupts" do
+        expect { run }.should exit_with_code(0)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should include("Ending port forward") }
+    end
+
+  end
 end
 

data/spec/rhc/commands/snapshot_spec.rb

@@ -21,6 +21,11 @@ describe RHC::Commands::Snapshot do
     File.delete filename if File.exist? filename
   end
 
+  describe 'snapshot without an action' do
+    let(:arguments) {['snapshot', '--trace', '--noprompt']}
+    it('should raise') { expect{ run }.should raise_error(ArgumentError, /Please specify an action to take/) }
+  end
+
   describe 'snapshot save' do
     let(:arguments) {['snapshot', 'save', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp']}
 

data/spec/rhc/rest_spec.rb

@@ -2,9 +2,14 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/rest'
 
-# We have to make an object to test the RHC::Rest module
 class RHCRest
   include RHC::Rest
+  def debug?
+    false
+  end
+  def debug
+    raise "Unchecked debug"
+  end
 end
 
 module MockRestResponse
@@ -264,6 +269,22 @@ module RHC
         end
       end
 
+      context "with a 502 (Bad Gateway) error" do
+        before{ stub_request(method, mock_href).to_return(:status => 502) }
+        let(:req){ RestClient::Request.new(:url => mock_href, :method => method) }
+        let(:method){ :get }
+
+        it("should make two requests"){ subject.request(req) rescue nil; WebMock.should have_requested(method, mock_href).twice }
+        it{ expect{ subject.request(req) }.should raise_error(RHC::Rest::ConnectionException, /communicating with the server.*temporary/i) }
+
+        context "on a POST request" do
+          let(:method){ :post }
+
+          it("should make one request"){ subject.request(req) rescue nil; WebMock.should have_requested(method, mock_href).once }
+          it{ expect{ subject.request(req) }.should raise_error(RHC::Rest::ConnectionException, /communicating with the server.*temporary/i) }
+        end
+      end
+
       context "with a request timeout" do
         before do
           stub_request(:get, mock_href).to_timeout
@@ -273,7 +294,7 @@ module RHC
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(RHC::Rest::TimeoutException, "Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.")
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::TimeoutException, /Connection to server timed out. It is possible/)
         end
       end
 

data/spec/rhc/wizard_spec.rb

@@ -26,9 +26,8 @@ describe RHC::Wizard do
     it "should print out first run greeting" do
       @wizard.run_next_stage
       greeting = $terminal.read
-      greeting.count("\n").should >= 7
-      greeting.should match(Regexp.escape("It looks like you have not configured or used OpenShift client tools on this computer."))
-      greeting.should match(Regexp.escape("\n#{@wizard.config_path}\n"))
+      greeting.count("\n").should >= 3
+      greeting.should match(/OpenShift Client Tools \(RHC\) Setup Wizard/)
     end
 
     it "should ask for login and hide password input" do
@@ -41,8 +40,8 @@ describe RHC::Wizard do
       @wizard.run_next_stage
 
       output = $terminal.read
-      output.should match("OpenShift login")
-      output.should =~ /(#{Regexp.escape("Password: ********\n")})$/
+      output.should match("Login to ")
+      output.should match(/Password: [\*]{8}$/)
     end
 
     it "should write out a config" do
@@ -111,9 +110,7 @@ describe RHC::Wizard do
     it "should print out repeat run greeting" do
       @wizard.run_next_stage
       greeting = $terminal.read
-      greeting.count("\n").should == 7
-      greeting.should match(Regexp.escape("Starting Interactive Setup for OpenShift's command line interface"))
-      greeting.should match(Regexp.escape("#{@wizard.config_path}\n"))
+      greeting.should match(/OpenShift Client Tools \(RHC\) Setup Wizard/)
     end
 
     it "should ask for login and hide password input" do
@@ -124,8 +121,8 @@ describe RHC::Wizard do
       @wizard.run_next_stage
 
       output = $terminal.read
-      output.should match("OpenShift login")
-      output.should =~ /(#{Regexp.escape("Password: ********\n")})$/
+      output.should match("Login to ")
+      output.should match(/Password: [\*]{8}$/)
     end
 
     it "should write out a config" do
@@ -432,8 +429,8 @@ describe RHC::Wizard do
       @wizard.run_next_stage
 
       output = $terminal.read
-      output.should match("OpenShift login")
-      output.should =~ /(#{Regexp.escape("Password: ********\n")})$/
+      output.should match("Login to ")
+      output.should match(/Password: [\*]{8}$/)
     end
 
     it "should write out a config" do