right_agent 1.0.1 → 2.0.7

data/lib/right_agent/serialize/secure_serializer.rb

@@ -26,6 +26,8 @@ module RightScale
   # X.509 certificate signing
   class SecureSerializer
 
+    include ProtocolVersionMixin
+
     class MissingPrivateKey < Exception; end
     class MissingCertificate < Exception; end
     class InvalidSignature < Exception; end
@@ -90,7 +92,7 @@ module RightScale
     # Exception:: If certificate identity, certificate store, certificate, or private key missing
     def dump(obj, encrypt = nil)
       must_encrypt = encrypt || @encrypt
-      serialize_format = if obj.respond_to?(:send_version) && obj.send_version >= 12
+      serialize_format = if obj.respond_to?(:send_version) && can_handle_msgpack_result?(obj.send_version)
         @serializer.format
       else
         :json

data/lib/right_agent/serialize/secure_serializer_initializer.rb

@@ -36,8 +36,8 @@ module RightScale
     def self.init(agent_type, agent_id)
       cert = Certificate.load(AgentConfig.certs_file("#{agent_type}.cert"))
       key = RsaKeyPair.load(AgentConfig.certs_file("#{agent_type}.key"))
-      mapper_cert = Certificate.load(AgentConfig.certs_file("mapper.cert"))
-      store = StaticCertificateStore.new(cert, key, mapper_cert, mapper_cert)
+      router_cert = Certificate.load(AgentConfig.certs_file("router.cert"))
+      store = StaticCertificateStore.new(cert, key, router_cert, router_cert)
       SecureSerializer.init(Serializer.new, agent_id, store)
       true
     end

data/lib/right_agent/serialize/serializable.rb

@@ -128,6 +128,7 @@ module RightScale
     
     # Symbolize keys of hash, use when retrieving hashes that use symbols
     # for keys as JSON and MessagePack serialization will produce strings instead
+    # Simply return any object that is not a hash as is
     #
     # === Parameters
     # hash(Hash):: Hash whose keys are to be symbolized
@@ -135,9 +136,13 @@ module RightScale
     # === Return
     # (Hash):: Hash with same values but symbol keys
     def self.symbolize_keys(hash)
-      hash.inject({}) do |h, (key, value)|
-        h[(key.to_sym rescue key) || key] = value
-        h
+      if hash.is_a?(Hash)
+        hash.inject({}) do |h, (key, value)|
+          h[(key.to_sym rescue key) || key] = value
+          h
+        end
+      else
+        hash
       end
     end
 

data/right_agent.gemspec

@@ -1,5 +1,5 @@
 # -*-ruby-*-
-# Copyright: Copyright (c) 2011 RightScale, Inc.
+# Copyright: Copyright (c) 2011-2013 RightScale, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,11 +21,12 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'rubygems'
+require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '1.0.1'
-  spec.date      = '2013-10-29'
+  spec.version   = '2.0.7'
+  spec.date      = '2014-02-28'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -39,29 +40,59 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
   spec.add_dependency('right_amqp', '~> 0.7')
+  spec.add_dependency('rest-client', '1.7.0.alpha')
+  spec.add_dependency('faye-websocket', '0.7.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('net-ssh', '~> 2.0')
 
-  # not currently needed by Linux but it does no harm to have it.
-  spec.add_dependency('ffi')
-  case RUBY_PLATFORM
-  when /mswin|mingw/i
-    spec.add_dependency('win32-dir', '~> 0.4.6')
-    spec.add_dependency('win32-process', '~> 0.7.3')
-  when /win32|dos|cygwin/i
+  # TEAL HACK: rake gem may override current RUBY_PLATFORM to allow building
+  # gems for all supported platforms from any platform. rubygems 1.8.x makes it
+  # necessary to produce platform-specific gems with context-sensitive gemspecs
+  # in order to retain Windows (or Linux)-specific gem requirements. this works
+  # from any platform because there is no native code to pre-compile and package
+  # with this gem.
+  gem_platform = defined?(::RightScale::MultiPlatformGemTask.gem_platform_override) ?
+    ::RightScale::MultiPlatformGemTask.gem_platform_override :
+    nil
+  gem_platform ||= ::RbConfig::CONFIG['host_os']
+  case gem_platform
+  when /mswin/i
+    spec.add_dependency('win32-api', ['>= 1.4.5', '< 1.4.7'])
+    spec.add_dependency('win32-dir', '~> 0.3.5')
+    spec.add_dependency('win32-process', '~> 0.6.1')
+    spec.add_dependency('msgpack', ['>= 0.4.4', '< 0.5'])
+    spec.add_dependency('json', '1.4.6')
+    spec.platform = 'x86-mswin32-60'
+  when /mingw/i
+    spec.add_dependency('ffi')
+    spec.add_dependency('win32-dir', '>= 0.3.5')
+    spec.add_dependency('win32-process', '>= 0.6.1')
+    spec.add_dependency('msgpack', ['>= 0.4.4', '< 0.6'])
+    spec.add_dependency('json', '~> 1.4')
+    spec.platform = 'x86-mingw32'
+  when /win32|dos|cygwin|windows/i
     raise ::NotImplementedError, 'Unsupported Ruby-on-Windows variant'
+  else
+    # ffi is not currently needed by Linux but it does no harm to have it and it
+    # allows bundler to generate a consistent Gemfile.lock when it is declared
+    # for both mingw and Linux.
+    spec.add_dependency('ffi')
+    spec.add_dependency('msgpack', ['>= 0.4.4', '< 0.6'])
+    spec.add_dependency('json', '~> 1.4')
   end
-  spec.add_dependency('msgpack', ['>= 0.4.4', '< 0.6'])
-  spec.add_dependency('json', '~> 1.4')
 
   spec.description = <<-EOF
 RightAgent provides a foundation for running an agent on a server to interface
-in a secure fashion with other agents in the RightScale system. A RightAgent
-uses RabbitMQ as the message bus and the RightScale mapper as the routing node.
-Servers running a RightAgent establish a queue on startup for receiving packets
-routed to it via the mapper. The packets are structured to invoke services in
-the agent represented by actors and methods. The RightAgent may respond to these
-requests with a result packet that the mapper then routes to the originator.
+in a secure fashion with other agents in the RightScale system using RightNet,
+which operates in either HTTP or AMQP mode. When using HTTP, RightAgent
+makes requests to RightApi servers and receives requests using long-polling or
+WebSockets via the RightNet router. To respond to requests it posts to the
+HTTP router. When using AMQP, RightAgent uses RabbitMQ as the message bus and
+the RightNet router as the routing node to make requests; to receives requests
+routed to it by the RightNet router, it establishes a queue on startup. The
+packets are structured to invoke services in the agent represented by actors
+and methods. The RightAgent may respond to these requests with a result packet
+that the router then routes to the originator.
 EOF
 
   candidates = Dir.glob("{lib,spec}/**/*") +

data/spec/agent_config_spec.rb

@@ -43,10 +43,10 @@ describe RightScale::AgentConfig do
     @actors = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'right_agent', 'actors'))
     FileUtils.mkdir_p(@certs1 = File.join(@root_dir1, 'certs'))
     FileUtils.mkdir_p(@certs2 = File.join(@root_dir2, 'certs'))
-    FileUtils.touch([@mapper_cert1 = File.join(@certs1, 'mapper.cert')])
-    FileUtils.touch([@mapper_cert2 = File.join(@certs2, 'mapper.cert')])
+    FileUtils.touch([@router_cert1 = File.join(@certs1, 'router.cert')])
+    FileUtils.touch([@router_cert2 = File.join(@certs2, 'router.cert')])
     FileUtils.touch([@agent_cert2 = File.join(@certs2, 'agent.cert')])
-    FileUtils.touch([@mapper_key2 = File.join(@certs2, 'mapper.key')])
+    FileUtils.touch([@router_key2 = File.join(@certs2, 'router.key')])
     FileUtils.mkdir_p(@lib1 = File.join(@root_dir1, 'lib'))
     FileUtils.mkdir_p(@scripts3 = File.join(@root_dir3, 'scripts'))
     FileUtils.mkdir_p(@cfg_dir = File.join(@test_dir, 'cfg'))
@@ -150,15 +150,15 @@ describe RightScale::AgentConfig do
 
   it 'should return first certs file path found' do
     @agent_config.root_dir = [@root_dir1, @root_dir2, @root_dir3]
-    @agent_config.certs_file('mapper.cert').should == @mapper_cert1
-    @agent_config.certs_file('mapper.key').should == @mapper_key2
+    @agent_config.certs_file('router.cert').should == @router_cert1
+    @agent_config.certs_file('router.key').should == @router_key2
     @agent_config.certs_file('agent.key').should be_nil
   end
 
   it 'should return all certs file paths found without any duplicates and by root directory order' do
     @agent_config.root_dir = [@root_dir1, @root_dir2, @root_dir3]
-    @agent_config.certs_files('*.cert').should == [@mapper_cert1, @agent_cert2]
-    @agent_config.certs_files('*.key').should == [@mapper_key2]
+    @agent_config.certs_files('*.cert').should == [@router_cert1, @agent_cert2]
+    @agent_config.certs_files('*.key').should == [@router_key2]
     @agent_config.certs_files('*.abc').should == []
   end
 

data/spec/agent_identity_spec.rb

@@ -56,20 +56,23 @@ describe RightScale::AgentIdentity do
     RightScale::AgentIdentity.valid?(id.to_s).should be_true
   end
 
-  it "should treat serialized id with nanite or mapper prefix as valid" do
+  it "should treat serialized id with nanite, mapper, or router prefix as valid" do
     RightScale::AgentIdentity.valid?("nanite-prefix-agent_type-token-1").should be_true
     RightScale::AgentIdentity.valid?("mapper-prefix-agent_type-token-1").should be_true
+    RightScale::AgentIdentity.valid?("router-prefix-agent_type-token-1").should be_true
   end
 
-  it "should parse serialized id with nanite or mapper prefix but discard this prefix" do
+  it "should parse serialized id with nanite, mapper, or router prefix but discard this prefix" do
     RightScale::AgentIdentity.parse("nanite-prefix-agent_type-token-1").to_s.should == "prefix-agent_type-token-1"
     RightScale::AgentIdentity.parse("mapper-prefix-agent_type-token-1").to_s.should == "prefix-agent_type-token-1"
+    RightScale::AgentIdentity.parse("router-prefix-agent_type-token-1").to_s.should == "prefix-agent_type-token-1"
   end
 
   it 'should prefix with nanite to make backward compatible' do
     id = RightScale::AgentIdentity.new('prefix', 'agent_type', 1, 'token')
-    RightScale::AgentIdentity.compatible_serialized(id.to_s, 10).should == "prefix-agent_type-token-1"
-    RightScale::AgentIdentity.compatible_serialized(id.to_s, 9).should == "nanite-prefix-agent_type-token-1"
+    RightScale::AgentIdentity.compatible_serialized(id.to_s, version_can_handle_non_nanite_ids).should == "prefix-agent_type-token-1"
+    RightScale::AgentIdentity.compatible_serialized(id.to_s, version_cannot_handle_non_nanite_ids).should == "nanite-prefix-agent_type-token-1"
+    RightScale::AgentIdentity.compatible_serialized(id.to_s).should == "prefix-agent_type-token-1"
   end
 
 end

data/spec/agent_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009-2012 RightScale Inc
+# Copyright (c) 2009-2013 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -309,7 +309,7 @@ describe RightScale::Agent do
           @agent.instance_variable_get(:@remaining_queue_setup).should == {@identity => @broker_ids.last(1)}
           @sender.should_receive(:send_push).with("/registrar/connect", {:agent_identity => @identity, :host => "123",
                                                                          :port => 2, :id => 1, :priority => 1}).once
-          @agent.__send__(:check_status)
+          @agent.send(:check_status)
         end
       end
 
@@ -539,6 +539,38 @@ describe RightScale::Agent do
         end
       end
 
+      it "should sleep before an abnormal termination that is following a crash" do
+        run_in_em do
+          @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
+          @broker.should_receive(:nil?).and_return(true)
+          @log.should_receive(:error).with(/Terminating because just because/, Exception, :trace).once
+          @log.should_receive(:info).with(/Delaying termination for 10 sec/).once.ordered
+          @log.should_receive(:info).with(/Terminating immediately/).once.ordered
+          now = Time.now
+          flexmock(Time).should_receive(:now).and_return(now)
+          flexmock(@agent.instance_variable_get(:@history)).should_receive(:analyze_service).
+              and_return({:last_crashed => true, :last_crash_time => now.to_i - 5}).once
+          flexmock(@agent).should_receive(:sleep).with(10).once
+          @agent.terminate("just because", Exception.new("error"))
+        end
+      end
+
+      it "should limit the sleep time before an abnormal termination" do
+        run_in_em do
+          @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
+          @broker.should_receive(:nil?).and_return(true)
+          @log.should_receive(:error).with(/Terminating because just because/, Exception, :trace).once
+          @log.should_receive(:info).with(/Delaying termination for 60 min 0 sec/).once.ordered
+          @log.should_receive(:info).with(/Terminating immediately/).once.ordered
+          now = Time.now
+          flexmock(Time).should_receive(:now).and_return(now)
+          flexmock(@agent.instance_variable_get(:@history)).should_receive(:analyze_service).
+              and_return({:last_crashed => true, :last_crash_time => now.to_i - 1801}).once
+          flexmock(@agent).should_receive(:sleep).with(3600).once
+          @agent.terminate("just because", Exception.new("error"))
+        end
+      end
+
       it "should close unusable broker connections at start of termination" do
         @broker.should_receive(:unusable).and_return(["rs-broker-123-1"]).once
         @broker.should_receive(:close_one).with("rs-broker-123-1", false).once
@@ -611,11 +643,13 @@ describe RightScale::Agent do
         @broker.should_receive(:close).and_yield.once
         flexmock(EM::Timer).should_receive(:new).with(20, Proc).and_return(@timer).and_yield.once
         run_in_em do
+          called = 0
+          callback = lambda { called += 1}
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
+          @agent.instance_variable_set(:@terminate_callback, callback)
           flexmock(@agent).should_receive(:load_actors).and_return(true)
           @agent.run
-          called = 0
-          @agent.terminate { called += 1 }
+          @agent.terminate
           called.should == 1
         end
       end
@@ -647,13 +681,15 @@ describe RightScale::Agent do
         @timer.should_receive(:cancel).once
         @periodic_timer.should_receive(:cancel).once
         run_in_em do
+          called = 0
+          callback = lambda { called += 1}
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
+          @agent.instance_variable_set(:@terminate_callback, callback)
           flexmock(@agent).should_receive(:load_actors).and_return(true)
           @agent.run
-          called = 0
-          @agent.terminate { called += 1 }
+          @agent.terminate
           called.should == 0
-          @agent.terminate { called += 1 }
+          @agent.terminate
           called.should == 1
         end
       end

data/spec/agent_tag_manager_spec.rb

@@ -29,18 +29,18 @@ describe RightScale::AgentTagManager do
   before(:each) do
     @log = flexmock(RightScale::Log)
     @log.should_receive(:error).by_default.and_return { |m| raise RightScale::Log.format(*m) }
-    @identity = "rs-agent-0-0"
-    @agent = flexmock("agent", :identity => @identity)
-    @agent_id1 = "rs-agent-1-1"
-    @agent_id2 = "rs-agent-2-2"
-    @agent_ids = [@agent_id2, @agent_id3]
+    @identity = "rs-agent-1-1"
+    @agent_href = "/api/clouds/1/instances/1"
+    @agent_href2 = "/api/clouds/2/instances/2"
+    @agent = flexmock("agent", :self_href => @agent_href, :identity => @identity)
+    @hrefs = [@agent_href, @agent_href2]
     @manager = RightScale::AgentTagManager.instance
     @manager.agent = @agent
     @request = flexmock("request", :run => true)
     @request.should_receive(:callback).and_yield("result").by_default
     @request.should_receive(:errback).by_default
     @request.should_receive(:raw_response).and_return("raw response").by_default
-    @idempotent_request = flexmock(RightScale::IdempotentRequest)
+    @retryable_request = flexmock(RightScale::RetryableRequest)
     @tag = "some:tag=value"
     @tag1 = "other:tag=value"
     @tags = [@tag, @tag1]
@@ -50,13 +50,12 @@ describe RightScale::AgentTagManager do
   context :tags do
 
     before(:each) do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :agent_ids => [@identity]},
-                                                    {}).and_return(@request).once.by_default
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :hrefs => [@agent_href]}, {}).and_return(@request).once.by_default
     end
 
     it "retrieves current agent tags" do
-      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}}).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => [@tag]}}).once
       @manager.tags { |r| @result = r }
       @result.should == [@tag]
     end
@@ -81,10 +80,9 @@ describe RightScale::AgentTagManager do
     end
 
     it "forwards timeout option" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :agent_ids => [@identity]},
-                                                    {:timeout => 9}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :hrefs => [@agent_href]}, {:timeout => 9}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => [@tag]}}).once
       @manager.tags(:timeout => 9) { |r| @result = r }
       @result.should == [@tag]
     end
@@ -101,27 +99,24 @@ describe RightScale::AgentTagManager do
   context :query_tags do
 
     it "queries for agents having individual tag" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => [@tag]},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_id1 => {"tags" => [@tag]}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => [@tag]}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_href => {"tags" => [@tag]}}).once
       @manager.query_tags(@tag) { |r| @result = r }
-      @result.should == {@identity => {"tags" => [@tag]}, @agent_id1 => {"tags" => [@tag]}}
+      @result.should == {@identity => {"tags" => [@tag]}, @agent_href => {"tags" => [@tag]}}
     end
 
     it "queries for agents having multiple tags" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => @tags},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@agent_id1 => {"tags" => @tags}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => @tags}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => @tags}}).once
       @manager.query_tags(@tags) { |r| @result = r }
-      @result.should == {@agent_id1 => {"tags" => @tags}}
+      @result.should == {@agent_href => {"tags" => @tags}}
     end
 
     it "forwards options" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => @tags},
-                                                    {:timeout => 9}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => @tags}, {:timeout => 9}).and_return(@request).once
       @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}}).once
       @request.should_receive(:raw_response).and_return("raw response").once
       @manager.query_tags(@tags, :raw => true, :timeout => 9) { |r| @result = r }
@@ -129,9 +124,8 @@ describe RightScale::AgentTagManager do
     end
 
     it "yields error result and logs error" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => [@tag]},
-                                                    {}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => [@tag]}, {}).and_return(@request).once
       @log.should_receive(:error).with(/Failed to query tags/).once
       @request.should_receive(:errback).and_yield("error").once
       @request.should_receive(:callback).once
@@ -147,45 +141,40 @@ describe RightScale::AgentTagManager do
     end
 
     it "always yields raw response" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => [@tag]},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_id1 => {"tags" => [@tag]}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => [@tag]}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_href => {"tags" => [@tag]}}).once
       @manager.query_tags_raw(@tag) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "queries for agents having individual tag and always yields raw response" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => [@tag]},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_id1 => {"tags" => [@tag]}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => [@tag]}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}, @agent_href => {"tags" => [@tag]}}).once
       @manager.query_tags_raw(@tag) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "queries for agents having multiple tags always yields raw response" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => @tags},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@agent_id1 => {"tags" => @tags}}).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => @tags}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => @tags}}).once
       @manager.query_tags_raw(@tags) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "queries for selected agents" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :agent_ids => @agent_ids, :tags => @tags},
-                                                    {}).and_return(@request).once
-      @request.should_receive(:callback).and_yield({@agent_id1 => {"tags" => @tags}}).once
-      @manager.query_tags_raw(@tags, @agent_ids) { |r| @result = r }
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :hrefs => @hrefs, :tags => @tags}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => @tags}}).once
+      @manager.query_tags_raw(@tags, @hrefs) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "forwards timeout option" do
-      @idempotent_request.should_receive(:new).with("/mapper/query_tags",
-                                                    {:agent_identity => @identity, :tags => @tags},
-                                                    {:timeout => 9}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :tags => @tags}, {:timeout => 9}).and_return(@request).once
       @request.should_receive(:callback).and_yield({@identity => {"tags" => [@tag]}}).once
       @manager.query_tags_raw(@tags, nil, :timeout => 9) { |r| @result = r }
       @result.should == "raw response"
@@ -201,20 +190,17 @@ describe RightScale::AgentTagManager do
     end
 
     it "adds individual tag to agent" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => []}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
       @manager.add_tags(@tag).should be_true
     end
 
     it "adds multiple tags to agent" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => @tags, :obsolete_tags => []}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => @tags}).and_return(@request).once
       @manager.add_tags(@tags).should be_true
     end
 
     it "optionally yields raw response" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => @tags, :obsolete_tags => []}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => @tags}).and_return(@request).once
       @request.should_receive(:callback).and_yield("result").once
       @manager.add_tags(@tags) { |r| @result = r }
       @result.should == "raw response"
@@ -223,8 +209,7 @@ describe RightScale::AgentTagManager do
     it "updates local tags" do
       @agent.should_receive(:tags).and_return([@tag1]).once
       @agent.should_receive(:tags=).should_receive([@tag]).once
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => []}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
       @manager.add_tags(@tag).should be_true
     end
   end
@@ -238,20 +223,17 @@ describe RightScale::AgentTagManager do
     end
 
     it "removes individual tag to agent" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [], :obsolete_tags => [@tag]}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => [@tag]}).and_return(@request).once
       @manager.remove_tags(@tag).should be_true
     end
 
     it "removes multiple tags to agent" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [], :obsolete_tags => @tags}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => @tags}).and_return(@request).once
       @manager.remove_tags(@tags).should be_true
     end
 
     it "optionally yields raw response" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [], :obsolete_tags => @tags}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => @tags}).and_return(@request).once
       @request.should_receive(:callback).and_yield("result").once
       @manager.remove_tags(@tags) { |r| @result = r }
       @result.should == "raw response"
@@ -260,13 +242,12 @@ describe RightScale::AgentTagManager do
     it "updates local tags" do
       @agent.should_receive(:tags).and_return([]).once
       @agent.should_receive(:tags=).should_receive([@tag]).once
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [], :obsolete_tags => [@tag]}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => [@tag]}).and_return(@request).once
       @manager.remove_tags(@tag).should be_true
     end
   end
 
-  context :update_tags do
+  context :do_update do
 
     before(:each) do
       @agent.should_receive(:tags).and_return([]).once.by_default
@@ -275,42 +256,51 @@ describe RightScale::AgentTagManager do
     it "checks that agent has been set" do
       @manager.agent = nil
       @agent.should_receive(:tags).never
-      lambda { @manager.update_tags([@tag], [@tag1]) }.should raise_error(ArgumentError, "Must set agent= before using tag manager")
+      lambda { @manager.send(:do_update, [@tag], []) }.should \
+          raise_error(ArgumentError, "Must set agent= before using tag manager")
+    end
+
+    it "does not allow both add and removal of tags in same request" do
+      @agent.should_receive(:tags).never
+      lambda { @manager.send(:do_update, [@tag], [@tag1]) }.should \
+          raise_error(ArgumentError, "Cannot add and remove tags in same update")
+    end
+
+    it "adds tags for agent" do
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
+      @agent.should_receive(:tags=).never
+      @manager.send(:do_update, [@tag], []).should be_true
     end
 
-    it "adds and removes tags for agent" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => [@tag1]}).and_return(@request).once
+    it "removes tags for agent" do
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => [@tag1]}).and_return(@request).once
       @agent.should_receive(:tags=).never
-      @manager.update_tags([@tag], [@tag1]).should be_true
+      @manager.send(:do_update, [], [@tag1]).should be_true
     end
 
     it "yields raw response if block given" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => [@tag1]}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
       @request.should_receive(:raw_response).and_return("raw response").once
       @agent.should_receive(:tags=).once
-      @manager.update_tags([@tag], [@tag1]) { |r| @result = r }
+      @manager.send(:do_update, [@tag], []) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "updates local tags if block given and successful" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => [@tag1]}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
       @request.should_receive(:raw_response).and_return("raw response").once
       @agent.should_receive(:tags=).with([@tag]).once
-      @manager.update_tags([@tag], [@tag1]) { |r| @result = r }
+      @manager.send(:do_update, [@tag], []) { |r| @result = r }
       @result.should == "raw response"
     end
 
     it "yields error result and does not update local tags" do
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [@tag], :obsolete_tags => [@tag1]}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/add_tags", {:tags => [@tag]}).and_return(@request).once
       @request.should_receive(:raw_response).and_return("error").once
       @request.should_receive(:errback).and_yield("error").once
       @request.should_receive(:callback).once
       @agent.should_receive(:tags=).never
-      @manager.update_tags([@tag], [@tag1]) { |r| @result = r }
+      @manager.send(:do_update, [@tag], []) { |r| @result = r }
       @result.should == "error"
     end
   end
@@ -321,8 +311,7 @@ describe RightScale::AgentTagManager do
       @request.should_receive(:raw_response).and_return("raw response").once
       @agent.should_receive(:tags).and_return(@tags).twice
       @agent.should_receive(:tags=).with([]).once
-      @idempotent_request.should_receive(:new).with("/mapper/update_tags",
-                                                    {:new_tags => [], :obsolete_tags => @tags}).and_return(@request).once
+      @retryable_request.should_receive(:new).with("/router/delete_tags", {:tags => @tags}).and_return(@request).once
       @manager.clear { |r| @result = r }
       @result.should == "raw response"
     end