right_agent 0.6.3 → 0.6.6

data/lib/right_agent/platform/linux.rb

@@ -180,10 +180,142 @@ module RightScale
 
     # Provides utilities for managing volumes (disks).
     class VolumeManager
+
+      class ParserError < Exception; end
+      class VolumeError < Exception; end
+
       def initialize
-        raise "not yet implemented"
+
       end
-    end
+
+      # Gets a list of currently visible volumes in the form:
+      # [{:device, :label, :uuid, :type, :filesystem}]
+      #
+      # === Parameters
+      # conditions(Hash):: hash of conditions to match, or nil (default)
+      #
+      # === Return
+      # result(Array):: array of volume hashes, or an empty array
+      #
+      # === Raise
+      # VolumeError:: on failure to execute `blkid` to obtain raw output
+      # ParserError:: on failure to parse volume list
+      def volumes(conditions = nil)
+        exit_code, blkid_resp = blocking_popen('blkid')
+        raise VolumeError.new("Failed to list volumes exit code = #{exit_code}\nblkid\n#{blkid_resp}") unless exit_code == 0
+        return parse_volumes(blkid_resp, conditions)
+      end
+
+      # Parses raw output from `blkid` into a hash of volumes
+      #
+      # The hash will contain the device name with a key of :device, and each key value pair
+      # for the device.  In order to keep parity with the Windows VolumeManager.parse_volumes
+      # method, the :type key will be duplicated as :filesystem
+      #
+      # Example of raw output from `blkid`
+      #
+      # /dev/xvdh1: SEC_TYPE="msdos" LABEL="METADATA" UUID="681B-8C5D" TYPE="vfat"
+      # /dev/xvdb1: LABEL="SWAP-xvdb1" UUID="d51fcca0-6b10-4934-a572-f3898dfd8840" TYPE="swap"
+      # /dev/xvda1: UUID="f4746f9c-0557-4406-9267-5e918e87ca2e" TYPE="ext3"
+      # /dev/xvda2: UUID="14d88b9e-9fe6-4974-a8d6-180acdae4016" TYPE="ext3"
+      #
+      # === Parameters
+      # output_text(String):: raw output from `blkid`
+      # conditions(Hash):: hash of conditions to match, or nil (default)
+      #
+      # === Return
+      # result(Array):: array of volume hashes, or an empty array
+      #
+      # === Raise
+      # ParserError:: on failure to parse volume list
+      def parse_volumes(output_text, conditions = nil)
+        results = []
+        output_text.each do |line|
+          volume = {}
+          line_regex = /^([\/a-z0-9]+):(.*)/
+          volmatch = line_regex.match(line)
+          raise ParserError.new("Failed to parse volume info from #{line.inspect} using #{line_regex.inspect}") unless volmatch
+          volume[:device] = volmatch[1]
+          volmatch[2].split(' ').each do |pair|
+            pair_regex = /([a-zA-Z_\-]+)=(.*)/
+            match = pair_regex.match(pair)
+            raise ParserError.new("Failed to parse volume info from #{pair} using #{pair_regex.inspect}") unless match
+            volume[:"#{match[1].downcase}"] = match[2].gsub('"', '')
+            # Make this as much like the windows output as possible
+            if match[1] == "TYPE"
+              volume[:filesystem] = match[2].gsub('"', '')
+            end
+          end
+          if conditions
+            matched = true
+            conditions.each do |key,value|
+
+              unless volume[key] == value
+                matched = false
+                break
+              end
+            end
+            results << volume if matched
+          else
+            results << volume
+          end
+        end
+        results
+      end
+
+      # Mounts a volume (returned by VolumeManager.volumes) to the mountpoint specified.
+      #
+      # === Parameters
+      # volume(Hash):: the volume hash returned by VolumeManager.volumes
+      # mountpoint(String):: the exact path where the device will be mounted ex: /mnt
+      #
+      # === Return
+      # always true
+      #
+      # === Raise
+      # ArgumentError:: on invalid parameters
+      # VolumeError:: on a failure to mount the device
+      def mount_volume(volume, mountpoint)
+        raise ArgumentError.new("Invalid volume = #{volume.inspect}") unless volume.is_a?(Hash) && volume[:device]
+        exit_code, mount_list_output = blocking_popen('mount')
+        raise VolumeError.new("Failed interrogation of current mounts; Exit Status: #{exit_code}\nError: #{mount_list_output}") unless exit_code == 0
+
+        device_match = /^#{volume[:device]} on (.+?)\s/.match(mount_list_output)
+        mountpoint_from_device_match = device_match ? device_match[1] : mountpoint
+        unless (mountpoint_from_device_match && mountpoint_from_device_match == mountpoint)
+          raise VolumeError.new("Attempted to mount volume \"#{volume[:device]}\" at \"#{mountpoint}\" but it was already mounted at #{mountpoint_from_device_match}")
+        end
+
+        mountpoint_match = /^(.+?) on #{mountpoint}/.match(mount_list_output)
+        device_from_mountpoint_match = mountpoint_match ? mountpoint_match[1] : volume[:device]
+        unless (device_from_mountpoint_match && device_from_mountpoint_match == volume[:device])
+          raise VolumeError.new("Attempted to mount volume \"#{volume[:device]}\" at \"#{mountpoint}\" but \"#{device_from_mountpoint_match}\" was already mounted there.")
+        end
+
+        # The volume is already mounted at the correct mountpoint
+        return true if /^#{volume[:device]} on #{mountpoint}/.match(mount_list_output)
+
+        # TODO: Maybe validate that the mountpoint is valid *nix path?
+        exit_code, mount_output = blocking_popen("mount -t #{volume[:filesystem].strip} #{volume[:device]} #{mountpoint}")
+        raise VolumeError.new("Failed to mount volume to \"#{mountpoint}\" with device \"#{volume[:device]}\"; Exit Status: #{exit_code}\nError: #{mount_output}") unless exit_code == 0
+        return true
+      end
+
+      # Runs the specified command synchronously using IO.popen
+      #
+      # === Parameters
+      # command(String):: system command to be executed
+      #
+      # === Return
+      # result(Array):: tuple of [exit_code, output_text]
+      def blocking_popen(command)
+        output_text = ""
+        IO.popen(command) do |io|
+          output_text = io.read
+        end
+        return $?.exitstatus, output_text
+      end
+    end # VolumeManager
 
     class Shell
 

data/lib/right_agent/sender.rb

@@ -202,8 +202,12 @@ module RightScale
       # true:: Always return true
       def start
         if @state == :initializing
-          @state = :running
-          flush unless @mode == :offline
+          if @mode == :offline
+            @state = :running
+          else
+            @state = :flushing
+            flush
+          end
           @mode = :online if @mode == :initializing
         end
         true
@@ -243,7 +247,7 @@ module RightScale
           Log.info("[offline] Disconnect from broker detected, entering offline mode")
           Log.info("[offline] Messages will be queued in memory until connection to broker is re-established")
           @offline_stats.update
-          @queue ||= []  # ensure queue is valid without losing any messages when going offline
+          @queue ||= []  # Ensure queue is valid without losing any messages when going offline
           @mode = :offline
           start_timer
         end

data/right_agent.gemspec

@@ -24,7 +24,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.6.3'
+  spec.version   = '0.6.6'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', '~> 1.0')
-  spec.add_dependency('amqp', '0.7.5')
+  spec.add_dependency('amqp', '0.6.7')
   spec.add_dependency('json', ['~> 1.4'])
   spec.add_dependency('eventmachine', '~> 0.12.10')
   spec.add_dependency('right_popen', '~> 1.0.11')

data/spec/broker_client_spec.rb

@@ -50,7 +50,7 @@ describe RightScale::BrokerClient do
       @amqp = flexmock(AMQP)
       @amqp.should_receive(:connect).and_return(@connection).by_default
       @channel.should_receive(:prefetch).never.by_default
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
       @island = flexmock("island", :id => 2, :broker_hosts => "local_host").by_default
     end
 
@@ -120,7 +120,7 @@ describe RightScale::BrokerClient do
       @connection.should_receive(:close).once
       @log.should_receive(:info).once
       @log.should_receive(:error).with(/Failed connecting/, Exception, :trace).once
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_raise(Exception)
+      flexmock(MQ).should_receive(:new).with(@connection).and_raise(Exception)
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
       broker.summary.should == {:alias => "b0", :identity => @identity, :status => :failed,
                                 :disconnects => 0, :failures => 1, :retries => 0}
@@ -153,14 +153,14 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:queue).and_return(@queue).by_default
       @channel.should_receive(:direct).and_return(@direct).by_default
       @channel.should_receive(:fanout).and_return(@fanout).by_default
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should subscribe queue to exchange" do
       @queue.should_receive(:bind).and_return(@bind).once
       @bind.should_receive(:subscribe).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}) {|_, _|}
     end
 
@@ -168,7 +168,7 @@ describe RightScale::BrokerClient do
       @queue.should_receive(:bind).and_return(@bind).twice
       @bind.should_receive(:subscribe).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       options = {:exchange2 => {:type => :fanout, :name => "exchange2", :options => {:durable => true}}}
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}, options) {|_, _|}
     end
@@ -182,7 +182,7 @@ describe RightScale::BrokerClient do
     it "should subscribe queue to empty exchange if no exchange specified" do
       @queue.should_receive(:subscribe).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.subscribe({:name => "queue"}) {|b, p| p.should == nil}
     end
 
@@ -216,7 +216,7 @@ describe RightScale::BrokerClient do
       @info.should_receive(:ack).once
       @bind.should_receive(:subscribe).and_yield(@info, @message).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       result = broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"},
                                 :ack => true, RightScale::Request => true) {|b, p| p.should == @packet}
       result.should be_true
@@ -237,7 +237,7 @@ describe RightScale::BrokerClient do
       @serializer.should_receive(:load).with(@message).and_return(@packet).once
       @bind.should_receive(:subscribe).and_yield(@message).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"},
                        RightScale::Request => nil) {|b, p| p.class.should == RightScale::Request}
     end
@@ -250,7 +250,7 @@ describe RightScale::BrokerClient do
       @serializer.should_receive(:load).with(@message).and_return(@packet).once
       @bind.should_receive(:subscribe).and_yield(@message).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       result = broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"},
                                 RightScale::Request => nil) {|b, p| raise Exception}
       result.should be_false
@@ -263,7 +263,7 @@ describe RightScale::BrokerClient do
       @log.should_receive(:debug).with(/nil message ignored/).once
       @bind.should_receive(:subscribe).and_yield(@info, "nil").once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       called = 0
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}, :ack => true) { |b, m| called += 1 }
       called.should == 0
@@ -276,7 +276,7 @@ describe RightScale::BrokerClient do
       @log.should_receive(:debug).with(/nil message ignored/).once
       @bind.should_receive(:subscribe).and_yield("nil").once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       called = 0
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}) { |b, m| called += 1 }
       called.should == 0
@@ -288,7 +288,7 @@ describe RightScale::BrokerClient do
       @log.should_receive(:info).with(/^RECV/).never
       @bind.should_receive(:subscribe).and_yield(@message).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}, :no_unserialize => true) do |b, m|
         b.should == "rs-broker-localhost-5672"
         m.should == @message
@@ -302,7 +302,7 @@ describe RightScale::BrokerClient do
       @exceptions.should_receive(:track).once
       @bind.should_receive(:subscribe).and_raise(Exception)
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       result = broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}) {|b, p|}
       result.should be_false
     end
@@ -422,7 +422,7 @@ describe RightScale::BrokerClient do
       @queue = flexmock("queue", :bind => @bind, :name => "queue1")
       @channel.should_receive(:queue).and_return(@queue).by_default
       @channel.should_receive(:direct).and_return(@direct).by_default
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should unsubscribe a queue by name" do
@@ -472,7 +472,7 @@ describe RightScale::BrokerClient do
   context "when declaring" do
 
     before(:each) do
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
       @channel.should_receive(:queues).and_return({}).by_default
       @channel.should_receive(:exchanges).and_return({}).by_default
     end
@@ -524,14 +524,14 @@ describe RightScale::BrokerClient do
       @message = flexmock("message")
       @packet = flexmock("packet", :class => RightScale::Request, :to_s => true, :version => [12, 12]).by_default
       @direct = flexmock("direct")
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should serialize message, publish it, and return true" do
       @channel.should_receive(:direct).with("exchange", :durable => true).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :persistent => true).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange", :options => {:durable => true}},
                      @packet, @message, :persistent => true).should be_true
     end
@@ -540,7 +540,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {:declare => true}).and_return(@direct)
       @direct.should_receive(:publish).with(@message, {})
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       exchange = {:type => :direct, :name => "exchange", :options => {:declare => true}}
       flexmock(broker).should_receive(:delete_amqp_resources).with(:direct, "exchange").once
       broker.publish(exchange, @packet, @message).should be_true
@@ -560,7 +560,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).and_raise(Exception)
       @direct.should_receive(:publish).with(@message, {}).never
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message).should be_false
     end
 
@@ -570,7 +570,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, {}).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message).should be_true
     end
 
@@ -582,7 +582,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, {}).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message).should be_true
     end
 
@@ -592,7 +592,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :no_log => true).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message, :no_log => true).should be_true
     end
 
@@ -603,7 +603,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :no_log => true).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message, :no_log => true).should be_true
     end
 
@@ -613,7 +613,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, {}).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message).should be_true
     end
 
@@ -625,7 +625,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :log_filter => [:to]).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message, :log_filter => [:to]).should be_true
     end
 
@@ -638,7 +638,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :log_filter => [:to]).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message, :log_filter => [:to]).should be_true
     end
     
@@ -648,7 +648,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, :log_data => "More data").once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message, :log_data => "More data").should be_true
     end
 
@@ -659,7 +659,7 @@ describe RightScale::BrokerClient do
       @channel.should_receive(:direct).with("exchange", {}).and_return(@direct).once
       @direct.should_receive(:publish).with(@message, {}).once
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.publish({:type => :direct, :name => "exchange"}, @packet, @message).should be_true
     end
 
@@ -738,7 +738,7 @@ describe RightScale::BrokerClient do
       @queue = flexmock("queue", :bind => @bind, :name => "queue1")
       @channel.should_receive(:queue).and_return(@queue).by_default
       @channel.should_receive(:direct).and_return(@direct).by_default
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should delete the named queue and return true" do
@@ -777,13 +777,13 @@ describe RightScale::BrokerClient do
     include RightScale::StatsHelper
 
     before(:each) do
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should distinguish whether the client is usable based on whether connecting or connected" do
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
       broker.usable?.should be_true
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.usable?.should be_true
       broker.__send__(:update_status, :disconnected)
       broker.usable?.should be_false
@@ -795,7 +795,7 @@ describe RightScale::BrokerClient do
     it "should distinguish whether the client is connected" do
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
       broker.connected?.should be_false
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.connected?.should be_true
       broker.__send__(:update_status, :disconnected)
       broker.connected?.should be_false
@@ -807,7 +807,7 @@ describe RightScale::BrokerClient do
     it "should distinguish whether the client has failed" do
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
       broker.failed?.should be_false
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.failed?.should be_false
       broker.__send__(:update_status, :disconnected)
       broker.failed?.should be_false
@@ -820,7 +820,7 @@ describe RightScale::BrokerClient do
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, @options)
       broker.summary.should == {:alias => "b0", :identity => @identity, :status => :connecting,
                                 :disconnects => 0, :failures => 0, :retries => 0}
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.summary.should == {:alias => "b0", :identity => @identity, :status => :connected,
                                 :disconnects => 0, :failures => 0, :retries => 0}
       @log.should_receive(:error).with(/Failed to connect to broker/).once
@@ -834,7 +834,7 @@ describe RightScale::BrokerClient do
       broker.stats.should == {"alias" => "b0", "identity" => "rs-broker-localhost-5672",
                               "status" => "connecting", "disconnects" => nil, "disconnect last" => nil,
                               "failures" => nil, "failure last" => nil, "retries" => nil}
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.stats.should == {"alias" => "b0", "identity" => "rs-broker-localhost-5672",
                               "status" => "connected", "disconnects" => nil, "disconnect last" => nil,
                               "failures" => nil, "failure last" => nil, "retries" => nil}
@@ -852,7 +852,7 @@ describe RightScale::BrokerClient do
       callback = lambda { |b, c| called += 1; b.should == broker; c.should == connected_before }
       options = {:update_status_callback => callback}
       broker = RightScale::BrokerClient.new(@identity, @address, @serializer, @exceptions, options)
-      broker.__send__(:update_status, :connected)
+      broker.__send__(:update_status, :ready)
       broker.last_failed.should be_false
       called.should == 1
       connected_before = true
@@ -875,7 +875,7 @@ describe RightScale::BrokerClient do
   context "when closing" do
 
     before(:each) do
-      flexmock(AMQP::Channel).should_receive(:new).with(@connection).and_return(@channel).by_default
+      flexmock(MQ).should_receive(:new).with(@connection).and_return(@channel).by_default
     end
 
     it "should close broker connection and send status update" do